diff options
Diffstat (limited to 'db/dist')
100 files changed, 25672 insertions, 16297 deletions
diff --git a/db/dist/Makefile.in b/db/dist/Makefile.in index cf484b6bf..190103e6b 100644 --- a/db/dist/Makefile.in +++ b/db/dist/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 11.264 2004/11/01 21:55:33 mark Exp $ +# $Id: Makefile.in,v 12.79 2006/09/13 14:53:38 mjc Exp $ srcdir= @srcdir@/.. builddir=. @@ -22,15 +22,15 @@ transform=@program_transform_name@ ################################################## # Paths for standard user-level commands. ################################################## +AR= @AR@ +CHMOD= @CHMOD@ +CP= @CP@ +LN= @LN@ +MKDIR= @MKDIR@ +RANLIB= @RANLIB@ +RM= @RM@ SHELL= @db_cv_path_sh@ -ar= @db_cv_path_ar@ -chmod= @db_cv_path_chmod@ -cp= @db_cv_path_cp@ -ln= @db_cv_path_ln@ -mkdir= @db_cv_path_mkdir@ -ranlib= @db_cv_path_ranlib@ -rm= @db_cv_path_rm@ -strip= @db_cv_path_strip@ +STRIP= @STRIP@ ################################################## # General library information. @@ -51,14 +51,14 @@ CPPFLAGS= -I$(builddir) -I$(srcdir) @CPPFLAGS@ ################################################## # C API. ################################################## -CFLAGS= -c $(CPPFLAGS) @CFLAGS@ +CFLAGS= -c $(CPPFLAGS) @CFLAGS@ CC= @MAKEFILE_CC@ CCLINK= @MAKEFILE_CCLINK@ @CFLAGS@ LDFLAGS= @LDFLAGS@ -LIBS= @LIBS@ +LIBS= @LIBSO_LIBS@ TEST_LIBS= @TEST_LIBS@ -LIBSO_LIBS= @LIBSO_LIBS@ +LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@ libdb_base= libdb libdb= $(libdb_base).a @@ -77,7 +77,7 @@ CXXFLAGS= -c $(CPPFLAGS) @CXXFLAGS@ CXX= @MAKEFILE_CXX@ CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@ XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@ -LIBXSO_LIBS= @LIBXSO_LIBS@ +LIBXSO_LIBS= @LIBXSO_LIBS@ @LIBSO_LIBS@ libcxx_base= libdb_cxx libcxx= $(libcxx_base).a @@ -93,25 +93,20 @@ libxso_major= $(libcxx_base)-$(LIBMAJOR)@SOSUFFIX@ # Java support is optional and requires shared librarires. ################################################## CLASSPATH= $(JAVA_CLASSTOP) -LIBJSO_LIBS= @LIBJSO_LIBS@ +LIBJSO_LIBS= @LIBJSO_LIBS@ @LIBSO_LIBS@ +SWIGCFLAGS= @SWIGCFLAGS@ JAR= @JAR@ JAVAC= env CLASSPATH="$(CLASSPATH)" @JAVAC@ JAVACFLAGS= @JAVACFLAGS@ JAVA_CLASSTOP= ./classes -JAVA_RPCCLASSTOP=./classes.rpc JAVA_EXCLASSTOP=./classes.ex -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_EXDIR= $(srcdir)/examples_java/src JAVA_SLEEPYCAT= $(srcdir)/java/src/com/sleepycat libj_jarfile= db.jar libj_exjarfile= dbexamples.jar -rpc_jarfile= dbsvc.jar libjso_base= libdb_java libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@ libjso_static= $(libjso_base)-$(LIBVERSION).a @@ -125,8 +120,8 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g@JMODSUFFIX@ # # Tcl support is optional and requires shared libraries. ################################################## -TCFLAGS= @TCFLAGS@ -LIBTSO_LIBS= @LIBTSO_LIBS@ +TCL_INCLUDE_SPEC= @TCL_INCLUDE_SPEC@ +LIBTSO_LIBS= @LIBTSO_LIBS@ @LIBSO_LIBS@ libtso_base= libdb_tcl libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@ libtso_static= $(libtso_base)-$(LIBVERSION).a @@ -158,7 +153,7 @@ BTREE_OBJS=\ bt_compare@o@ bt_conv@o@ bt_curadj@o@ bt_cursor@o@ bt_delete@o@ \ bt_method@o@ bt_open@o@ bt_put@o@ bt_rec@o@ bt_reclaim@o@ \ bt_recno@o@ bt_rsearch@o@ bt_search@o@ bt_split@o@ bt_stat@o@ \ - bt_upgrade@o@ btree_auto@o@ + bt_compact@o@ bt_upgrade@o@ btree_auto@o@ BTREE_VRFY_OBJS=\ db_ovfl_vrfy@o@ db_vrfy@o@ db_vrfyutil@o@ bt_verify@o@ HASH_OBJS=\ @@ -173,40 +168,49 @@ QUEUE_OBJS=\ QUEUE_VRFY_OBJS=\ qam_verify@o@ REP_OBJS=\ - rep_auto@o@ rep_backup@o@ rep_method@o@ rep_record@o@ rep_region@o@ \ - rep_stat@o@ rep_util@o@ + rep_auto@o@ rep_backup@o@ rep_elect@o@ rep_log@o@ rep_method@o@ \ + rep_record@o@ rep_region@o@ rep_stat@o@ rep_util@o@ rep_verify@o@ +REPMGR_OBJS=\ + getaddrinfo@o@\ + repmgr_elect@o@ repmgr_method@o@ repmgr_msg@o@ repmgr_net@o@ \ + repmgr_posix@o@ repmgr_queue@o@ repmgr_sel@o@ repmgr_stat@o@ \ + repmgr_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@ \ - db_byteorder@o@ db_cam@o@ db_conv@o@ db_dispatch@o@ db_dup@o@ \ - 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_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@ \ + crdel_auto@o@ crdel_rec@o@ ctime@o@ db@o@ db_am@o@ db_auto@o@ \ + db_byteorder@o@ db_cam@o@ db_cds@o@ db_clock@o@ db_conv@o@ \ + db_dispatch@o@ db_dup@o@ 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_remove@o@ \ + db_rename@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_config@o@ env_failchk@o@ env_file@o@ \ + env_method@o@ env_open@o@ env_recover@o@ env_region@o@ \ + env_register@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_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@ + lock_deadlock@o@ lock_failchk@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_debug@o@ \ + log_get@o@ log_method@o@ log_put@o@ log_stat@o@ mkpath@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_mvcc@o@ mp_region@o@ \ + mp_register@o@ mp_stat@o@ mp_sync@o@ mp_trickle@o@ mut_alloc@o@ \ + mut_failchk@o@ mut_method@o@ mut_region@o@ mut_stat@o@ os_abs@o@ \ + os_alloc@o@ os_clock@o@ os_config@o@ os_dir@o@ os_errno@o@ \ + os_fid@o@ os_flock@o@ os_fsync@o@ os_fzero@o@ os_getenv@o@ \ + os_handle@o@ os_map@o@ os_method@o@ os_mkdir@o@ os_oflags@o@ \ + os_open@o@ os_pid@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_uid@o@ os_unlink@o@ \ + os_yield@o@ seq_stat@o@ sequence@o@ sha1@o@ snprintf@o@ txn@o@ \ + txn_auto@o@ txn_chkpt@o@ txn_failchk@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@ \ @@ -225,6 +229,7 @@ JAVA_DBSRCS=\ $(JAVA_SLEEPYCAT)/bind/EntryBinding.java \ $(JAVA_SLEEPYCAT)/bind/RecordNumberBinding.java \ $(JAVA_SLEEPYCAT)/bind/serial/ClassCatalog.java \ + $(JAVA_SLEEPYCAT)/bind/serial/SerialBase.java \ $(JAVA_SLEEPYCAT)/bind/serial/SerialBinding.java \ $(JAVA_SLEEPYCAT)/bind/serial/SerialInput.java \ $(JAVA_SLEEPYCAT)/bind/serial/SerialOutput.java \ @@ -245,7 +250,10 @@ JAVA_DBSRCS=\ $(JAVA_SLEEPYCAT)/bind/tuple/MarshalledTupleEntry.java \ $(JAVA_SLEEPYCAT)/bind/tuple/MarshalledTupleKeyEntity.java \ $(JAVA_SLEEPYCAT)/bind/tuple/ShortBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/SortedDoubleBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/SortedFloatBinding.java \ $(JAVA_SLEEPYCAT)/bind/tuple/StringBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/TupleBase.java \ $(JAVA_SLEEPYCAT)/bind/tuple/TupleBinding.java \ $(JAVA_SLEEPYCAT)/bind/tuple/TupleInput.java \ $(JAVA_SLEEPYCAT)/bind/tuple/TupleInputBinding.java \ @@ -255,14 +263,14 @@ JAVA_DBSRCS=\ $(JAVA_SLEEPYCAT)/bind/tuple/TupleTupleKeyCreator.java \ $(JAVA_SLEEPYCAT)/bind/tuple/TupleTupleMarshalledBinding.java \ $(JAVA_SLEEPYCAT)/bind/tuple/TupleTupleMarshalledKeyCreator.java \ + $(JAVA_SLEEPYCAT)/collections/BaseIterator.java \ + $(JAVA_SLEEPYCAT)/collections/BlockIterator.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/MyRangeCursor.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 \ @@ -288,6 +296,8 @@ JAVA_DBSRCS=\ $(JAVA_SLEEPYCAT)/db/CacheFileStats.java \ $(JAVA_SLEEPYCAT)/db/CacheStats.java \ $(JAVA_SLEEPYCAT)/db/CheckpointConfig.java \ + $(JAVA_SLEEPYCAT)/db/CompactConfig.java \ + $(JAVA_SLEEPYCAT)/db/CompactStats.java \ $(JAVA_SLEEPYCAT)/db/Cursor.java \ $(JAVA_SLEEPYCAT)/db/CursorConfig.java \ $(JAVA_SLEEPYCAT)/db/Database.java \ @@ -300,6 +310,8 @@ JAVA_DBSRCS=\ $(JAVA_SLEEPYCAT)/db/Environment.java \ $(JAVA_SLEEPYCAT)/db/EnvironmentConfig.java \ $(JAVA_SLEEPYCAT)/db/ErrorHandler.java \ + $(JAVA_SLEEPYCAT)/db/EventHandler.java \ + $(JAVA_SLEEPYCAT)/db/EventType.java \ $(JAVA_SLEEPYCAT)/db/FeedbackHandler.java \ $(JAVA_SLEEPYCAT)/db/HashStats.java \ $(JAVA_SLEEPYCAT)/db/Hasher.java \ @@ -320,19 +332,33 @@ JAVA_DBSRCS=\ $(JAVA_SLEEPYCAT)/db/LogStats.java \ $(JAVA_SLEEPYCAT)/db/MemoryException.java \ $(JAVA_SLEEPYCAT)/db/MessageHandler.java \ + $(JAVA_SLEEPYCAT)/db/MultipleNIODataEntry.java \ + $(JAVA_SLEEPYCAT)/db/MultipleKeyNIODataEntry.java \ + $(JAVA_SLEEPYCAT)/db/MultipleRecnoNIODataEntry.java \ $(JAVA_SLEEPYCAT)/db/MultipleDataEntry.java \ $(JAVA_SLEEPYCAT)/db/MultipleEntry.java \ $(JAVA_SLEEPYCAT)/db/MultipleKeyDataEntry.java \ $(JAVA_SLEEPYCAT)/db/MultipleRecnoDataEntry.java \ + $(JAVA_SLEEPYCAT)/db/MutexStats.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/ReplicationConfig.java \ + $(JAVA_SLEEPYCAT)/db/ReplicationDuplicateMasterException.java \ $(JAVA_SLEEPYCAT)/db/ReplicationHandleDeadException.java \ + $(JAVA_SLEEPYCAT)/db/ReplicationHoldElectionException.java \ + $(JAVA_SLEEPYCAT)/db/ReplicationHostAddress.java \ + $(JAVA_SLEEPYCAT)/db/ReplicationJoinFailureException.java \ + $(JAVA_SLEEPYCAT)/db/ReplicationLockoutException.java \ + $(JAVA_SLEEPYCAT)/db/ReplicationManagerAckPolicy.java \ + $(JAVA_SLEEPYCAT)/db/ReplicationManagerStartPolicy.java \ + $(JAVA_SLEEPYCAT)/db/ReplicationSiteUnavailableException.java \ $(JAVA_SLEEPYCAT)/db/ReplicationStats.java \ $(JAVA_SLEEPYCAT)/db/ReplicationStatus.java \ + $(JAVA_SLEEPYCAT)/db/ReplicationTimeoutType.java \ $(JAVA_SLEEPYCAT)/db/ReplicationTransport.java \ $(JAVA_SLEEPYCAT)/db/RunRecoveryException.java \ $(JAVA_SLEEPYCAT)/db/SecondaryConfig.java \ @@ -347,8 +373,8 @@ JAVA_DBSRCS=\ $(JAVA_SLEEPYCAT)/db/TransactionConfig.java \ $(JAVA_SLEEPYCAT)/db/TransactionStats.java \ $(JAVA_SLEEPYCAT)/db/VerifyConfig.java \ + $(JAVA_SLEEPYCAT)/db/VersionMismatchException.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 \ @@ -365,8 +391,12 @@ JAVA_DBSRCS=\ $(JAVA_SLEEPYCAT)/util/FastInputStream.java \ $(JAVA_SLEEPYCAT)/util/FastOutputStream.java \ $(JAVA_SLEEPYCAT)/util/IOExceptionWrapper.java \ + $(JAVA_SLEEPYCAT)/util/PackedInteger.java \ $(JAVA_SLEEPYCAT)/util/RuntimeExceptionWrapper.java \ - $(JAVA_SLEEPYCAT)/util/UtfOps.java + $(JAVA_SLEEPYCAT)/util/UtfOps.java \ + $(JAVA_SLEEPYCAT)/util/keyrange/KeyRange.java \ + $(JAVA_SLEEPYCAT)/util/keyrange/KeyRangeException.java \ + $(JAVA_SLEEPYCAT)/util/keyrange/RangeCursor.java JAVA_EXSRCS=\ $(JAVA_EXDIR)/collections/access/AccessExample.java \ @@ -452,6 +482,7 @@ JAVA_EXSRCS=\ $(JAVA_EXDIR)/db/AccessExample.java \ $(JAVA_EXDIR)/db/BtRecExample.java \ $(JAVA_EXDIR)/db/BulkAccessExample.java \ + $(JAVA_EXDIR)/db/BulkAccessNIOExample.java \ $(JAVA_EXDIR)/db/EnvExample.java \ $(JAVA_EXDIR)/db/GettingStarted/ExampleDatabaseLoad.java \ $(JAVA_EXDIR)/db/GettingStarted/ExampleDatabaseRead.java \ @@ -463,7 +494,14 @@ JAVA_EXSRCS=\ $(JAVA_EXDIR)/db/LockExample.java \ $(JAVA_EXDIR)/db/RPCExample.java \ $(JAVA_EXDIR)/db/SequenceExample.java \ - $(JAVA_EXDIR)/db/TpcbExample.java + $(JAVA_EXDIR)/db/TpcbExample.java \ + $(JAVA_EXDIR)/db/repquote/RepConfig.java \ + $(JAVA_EXDIR)/db/repquote/RepQuoteEnvironment.java \ + $(JAVA_EXDIR)/db/repquote/RepQuoteExample.java \ + $(JAVA_EXDIR)/db/txn/DBWriter.java \ + $(JAVA_EXDIR)/db/txn/PayloadData.java \ + $(JAVA_EXDIR)/db/txn/TxnGuide.java \ + $(JAVA_EXDIR)/db/txn/TxnGuideInMemory.java TCL_OBJS=\ tcl_compat@o@ tcl_db@o@ tcl_db_pkg@o@ tcl_dbcursor@o@ tcl_env@o@ \ @@ -482,162 +520,10 @@ RPC_CXXSRV_OBJS=\ db_server_cxxproc@o@ db_server_cxxutil@o@ db_server_svc@o@ \ gen_db_server@o@ -RPC_JAVASRV_SRCS=\ - $(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)/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 \ - $(JAVA_RPCDIR)/gen/__db_bt_maxkey_reply.java \ - $(JAVA_RPCDIR)/gen/__db_bt_minkey_msg.java \ - $(JAVA_RPCDIR)/gen/__db_bt_minkey_reply.java \ - $(JAVA_RPCDIR)/gen/__db_close_msg.java \ - $(JAVA_RPCDIR)/gen/__db_close_reply.java \ - $(JAVA_RPCDIR)/gen/__db_create_msg.java \ - $(JAVA_RPCDIR)/gen/__db_create_reply.java \ - $(JAVA_RPCDIR)/gen/__db_cursor_msg.java \ - $(JAVA_RPCDIR)/gen/__db_cursor_reply.java \ - $(JAVA_RPCDIR)/gen/__db_del_msg.java \ - $(JAVA_RPCDIR)/gen/__db_del_reply.java \ - $(JAVA_RPCDIR)/gen/__db_encrypt_msg.java \ - $(JAVA_RPCDIR)/gen/__db_encrypt_reply.java \ - $(JAVA_RPCDIR)/gen/__db_extentsize_msg.java \ - $(JAVA_RPCDIR)/gen/__db_extentsize_reply.java \ - $(JAVA_RPCDIR)/gen/__db_flags_msg.java \ - $(JAVA_RPCDIR)/gen/__db_flags_reply.java \ - $(JAVA_RPCDIR)/gen/__db_get_bt_minkey_msg.java \ - $(JAVA_RPCDIR)/gen/__db_get_bt_minkey_reply.java \ - $(JAVA_RPCDIR)/gen/__db_get_encrypt_flags_msg.java \ - $(JAVA_RPCDIR)/gen/__db_get_encrypt_flags_reply.java \ - $(JAVA_RPCDIR)/gen/__db_get_extentsize_msg.java \ - $(JAVA_RPCDIR)/gen/__db_get_extentsize_reply.java \ - $(JAVA_RPCDIR)/gen/__db_get_flags_msg.java \ - $(JAVA_RPCDIR)/gen/__db_get_flags_reply.java \ - $(JAVA_RPCDIR)/gen/__db_get_h_ffactor_msg.java \ - $(JAVA_RPCDIR)/gen/__db_get_h_ffactor_reply.java \ - $(JAVA_RPCDIR)/gen/__db_get_h_nelem_msg.java \ - $(JAVA_RPCDIR)/gen/__db_get_h_nelem_reply.java \ - $(JAVA_RPCDIR)/gen/__db_get_lorder_msg.java \ - $(JAVA_RPCDIR)/gen/__db_get_lorder_reply.java \ - $(JAVA_RPCDIR)/gen/__db_get_msg.java \ - $(JAVA_RPCDIR)/gen/__db_get_name_msg.java \ - $(JAVA_RPCDIR)/gen/__db_get_name_reply.java \ - $(JAVA_RPCDIR)/gen/__db_get_open_flags_msg.java \ - $(JAVA_RPCDIR)/gen/__db_get_open_flags_reply.java \ - $(JAVA_RPCDIR)/gen/__db_get_pagesize_msg.java \ - $(JAVA_RPCDIR)/gen/__db_get_pagesize_reply.java \ - $(JAVA_RPCDIR)/gen/__db_get_re_delim_msg.java \ - $(JAVA_RPCDIR)/gen/__db_get_re_delim_reply.java \ - $(JAVA_RPCDIR)/gen/__db_get_re_len_msg.java \ - $(JAVA_RPCDIR)/gen/__db_get_re_len_reply.java \ - $(JAVA_RPCDIR)/gen/__db_get_re_pad_msg.java \ - $(JAVA_RPCDIR)/gen/__db_get_re_pad_reply.java \ - $(JAVA_RPCDIR)/gen/__db_get_reply.java \ - $(JAVA_RPCDIR)/gen/__db_h_ffactor_msg.java \ - $(JAVA_RPCDIR)/gen/__db_h_ffactor_reply.java \ - $(JAVA_RPCDIR)/gen/__db_h_nelem_msg.java \ - $(JAVA_RPCDIR)/gen/__db_h_nelem_reply.java \ - $(JAVA_RPCDIR)/gen/__db_join_msg.java \ - $(JAVA_RPCDIR)/gen/__db_join_reply.java \ - $(JAVA_RPCDIR)/gen/__db_key_range_msg.java \ - $(JAVA_RPCDIR)/gen/__db_key_range_reply.java \ - $(JAVA_RPCDIR)/gen/__db_lorder_msg.java \ - $(JAVA_RPCDIR)/gen/__db_lorder_reply.java \ - $(JAVA_RPCDIR)/gen/__db_open_msg.java \ - $(JAVA_RPCDIR)/gen/__db_open_reply.java \ - $(JAVA_RPCDIR)/gen/__db_pagesize_msg.java \ - $(JAVA_RPCDIR)/gen/__db_pagesize_reply.java \ - $(JAVA_RPCDIR)/gen/__db_pget_msg.java \ - $(JAVA_RPCDIR)/gen/__db_pget_reply.java \ - $(JAVA_RPCDIR)/gen/__db_put_msg.java \ - $(JAVA_RPCDIR)/gen/__db_put_reply.java \ - $(JAVA_RPCDIR)/gen/__db_re_delim_msg.java \ - $(JAVA_RPCDIR)/gen/__db_re_delim_reply.java \ - $(JAVA_RPCDIR)/gen/__db_re_len_msg.java \ - $(JAVA_RPCDIR)/gen/__db_re_len_reply.java \ - $(JAVA_RPCDIR)/gen/__db_re_pad_msg.java \ - $(JAVA_RPCDIR)/gen/__db_re_pad_reply.java \ - $(JAVA_RPCDIR)/gen/__db_remove_msg.java \ - $(JAVA_RPCDIR)/gen/__db_remove_reply.java \ - $(JAVA_RPCDIR)/gen/__db_rename_msg.java \ - $(JAVA_RPCDIR)/gen/__db_rename_reply.java \ - $(JAVA_RPCDIR)/gen/__db_stat_msg.java \ - $(JAVA_RPCDIR)/gen/__db_stat_reply.java \ - $(JAVA_RPCDIR)/gen/__db_sync_msg.java \ - $(JAVA_RPCDIR)/gen/__db_sync_reply.java \ - $(JAVA_RPCDIR)/gen/__db_truncate_msg.java \ - $(JAVA_RPCDIR)/gen/__db_truncate_reply.java \ - $(JAVA_RPCDIR)/gen/__dbc_close_msg.java \ - $(JAVA_RPCDIR)/gen/__dbc_close_reply.java \ - $(JAVA_RPCDIR)/gen/__dbc_count_msg.java \ - $(JAVA_RPCDIR)/gen/__dbc_count_reply.java \ - $(JAVA_RPCDIR)/gen/__dbc_del_msg.java \ - $(JAVA_RPCDIR)/gen/__dbc_del_reply.java \ - $(JAVA_RPCDIR)/gen/__dbc_dup_msg.java \ - $(JAVA_RPCDIR)/gen/__dbc_dup_reply.java \ - $(JAVA_RPCDIR)/gen/__dbc_get_msg.java \ - $(JAVA_RPCDIR)/gen/__dbc_get_reply.java \ - $(JAVA_RPCDIR)/gen/__dbc_pget_msg.java \ - $(JAVA_RPCDIR)/gen/__dbc_pget_reply.java \ - $(JAVA_RPCDIR)/gen/__dbc_put_msg.java \ - $(JAVA_RPCDIR)/gen/__dbc_put_reply.java \ - $(JAVA_RPCDIR)/gen/__env_cachesize_msg.java \ - $(JAVA_RPCDIR)/gen/__env_cachesize_reply.java \ - $(JAVA_RPCDIR)/gen/__env_close_msg.java \ - $(JAVA_RPCDIR)/gen/__env_close_reply.java \ - $(JAVA_RPCDIR)/gen/__env_create_msg.java \ - $(JAVA_RPCDIR)/gen/__env_create_reply.java \ - $(JAVA_RPCDIR)/gen/__env_dbremove_msg.java \ - $(JAVA_RPCDIR)/gen/__env_dbremove_reply.java \ - $(JAVA_RPCDIR)/gen/__env_dbrename_msg.java \ - $(JAVA_RPCDIR)/gen/__env_dbrename_reply.java \ - $(JAVA_RPCDIR)/gen/__env_encrypt_msg.java \ - $(JAVA_RPCDIR)/gen/__env_encrypt_reply.java \ - $(JAVA_RPCDIR)/gen/__env_flags_msg.java \ - $(JAVA_RPCDIR)/gen/__env_flags_reply.java \ - $(JAVA_RPCDIR)/gen/__env_get_cachesize_msg.java \ - $(JAVA_RPCDIR)/gen/__env_get_cachesize_reply.java \ - $(JAVA_RPCDIR)/gen/__env_get_encrypt_flags_msg.java \ - $(JAVA_RPCDIR)/gen/__env_get_encrypt_flags_reply.java \ - $(JAVA_RPCDIR)/gen/__env_get_flags_msg.java \ - $(JAVA_RPCDIR)/gen/__env_get_flags_reply.java \ - $(JAVA_RPCDIR)/gen/__env_get_home_msg.java \ - $(JAVA_RPCDIR)/gen/__env_get_home_reply.java \ - $(JAVA_RPCDIR)/gen/__env_get_open_flags_msg.java \ - $(JAVA_RPCDIR)/gen/__env_get_open_flags_reply.java \ - $(JAVA_RPCDIR)/gen/__env_open_msg.java \ - $(JAVA_RPCDIR)/gen/__env_open_reply.java \ - $(JAVA_RPCDIR)/gen/__env_remove_msg.java \ - $(JAVA_RPCDIR)/gen/__env_remove_reply.java \ - $(JAVA_RPCDIR)/gen/__txn_abort_msg.java \ - $(JAVA_RPCDIR)/gen/__txn_abort_reply.java \ - $(JAVA_RPCDIR)/gen/__txn_begin_msg.java \ - $(JAVA_RPCDIR)/gen/__txn_begin_reply.java \ - $(JAVA_RPCDIR)/gen/__txn_commit_msg.java \ - $(JAVA_RPCDIR)/gen/__txn_commit_reply.java \ - $(JAVA_RPCDIR)/gen/__txn_discard_msg.java \ - $(JAVA_RPCDIR)/gen/__txn_discard_reply.java \ - $(JAVA_RPCDIR)/gen/__txn_prepare_msg.java \ - $(JAVA_RPCDIR)/gen/__txn_prepare_reply.java \ - $(JAVA_RPCDIR)/gen/__txn_recover_msg.java \ - $(JAVA_RPCDIR)/gen/__txn_recover_reply.java \ - $(JAVA_RPCDIR)/gen/db_server.java - 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_hotbackup \ + db_load db_printlog db_recover db_stat db_upgrade db_verify ################################################## # List of files installed into the library directory. @@ -674,7 +560,7 @@ LIB_INSTALL_FILE_LIST=\ ################################################## all: @BUILD_TARGET@ -install-strip install: all @INSTALL_TARGET@ +install: all @INSTALL_TARGET@ ################################################## # Library and standard utilities build. @@ -686,33 +572,33 @@ $(libdb): $(DEF_LIB) # Real static C library. $(libdb_version): $(C_OBJS) - $(ar) cr $@ $(C_OBJS) - test ! -f $(ranlib) || $(ranlib) $@ - $(rm) -f $(libdb) - $(ln) -s $(libdb_version) $(libdb) + $(AR) cr $@ $(C_OBJS) + test "$(RANLIB)" = "none" || $(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) + $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS) + $(RM) -f $(libdb) + $(LN) -s .libs/$(libdb_version) $(libdb) # Static C++ library named libdb_cxx.a. $(libcxx): $(DEF_LIB_CXX) # 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) + $(AR) cr $@ $(CXX_OBJS) $(C_OBJS) + test "$(RANLIB)" = "none" || $(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) + $(RM) -f $(libcxx) + $(LN) -s .libs/$(libcxx_version) $(libcxx) # Shared Java library. $(libjso_target): $(JAVA_OBJS) $(C_OBJS) @@ -732,26 +618,19 @@ java: $(libj_jarfile) $(libj_exjarfile) $(libj_jarfile): $(JAVA_DBSRCS) @test -d $(JAVA_CLASSTOP) || \ - ($(mkdir) -p $(JAVA_CLASSTOP) && $(chmod) $(dmode) $(JAVA_CLASSTOP)) + ($(MKDIR) -p $(JAVA_CLASSTOP) && \ + $(CHMOD) $(dmode) $(JAVA_CLASSTOP)) $(JAVAC) -d $(JAVA_CLASSTOP) $(JAVACFLAGS) $(JAVA_DBSRCS) cd $(JAVA_CLASSTOP) && $(JAR) cf ../$(libj_jarfile) ./com/sleepycat $(libj_exjarfile): $(libj_jarfile) $(JAVA_EXSRCS) @test -d $(JAVA_EXCLASSTOP) || \ - ($(mkdir) -p $(JAVA_EXCLASSTOP) && \ - $(chmod) $(dmode) $(JAVA_EXCLASSTOP)) + ($(MKDIR) -p $(JAVA_EXCLASSTOP) && \ + $(CHMOD) $(dmode) $(JAVA_EXCLASSTOP)) $(JAVAC) -classpath $(libj_jarfile) -d $(JAVA_EXCLASSTOP) \ $(JAVACFLAGS) $(JAVA_EXSRCS) cd $(JAVA_EXCLASSTOP) && $(JAR) cf ../$(libj_exjarfile) . -$(rpc_jarfile): $(libj_jarfile) $(RPC_JAVASRV_SRCS) - @test -d $(JAVA_RPCCLASSTOP) || \ - ($(mkdir) -p $(JAVA_RPCCLASSTOP) && \ - $(chmod) $(dmode) $(JAVA_RPCCLASSTOP)) - env CLASSPATH=$(CLASSPATH):$(JAVA_RPCDIR)/oncrpc.jar \ - @JAVAC@ -d $(JAVA_RPCCLASSTOP) $(JAVACFLAGS) $(RPC_JAVASRV_SRCS) - cd $(JAVA_RPCCLASSTOP) && $(JAR) cf ../$(rpc_jarfile) $(JAVA_RPCREL) - ################################################## # Utilities ################################################## @@ -765,14 +644,6 @@ berkeley_db_cxxsvc: $(RPC_CXXSRV_OBJS) util_log@o@ $(DEF_LIB_CXX) $(RPC_CXXSRV_OBJS) util_log@o@ $(DEF_LIB_CXX) $(LIBS) $(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.Server \$$@ >> $@ - chmod +x $@ - db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB) $(CCLINK) -o $@ $(LDFLAGS) \ db_archive@o@ util_sig@o@ $(DEF_LIB) $(LIBS) @@ -797,6 +668,11 @@ db_dump185: db_dump185@o@ @REPLACEMENT_OBJS@ $(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @REPLACEMENT_OBJS@ $(DB185LIB) $(POSTLINK) $@ +db_hotbackup: db_hotbackup@o@ util_sig@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) \ + db_hotbackup@o@ util_sig@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + db_load: db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(CCLINK) -o $@ $(LDFLAGS) \ db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS) @@ -837,118 +713,119 @@ uninstall: uninstall_include uninstall_lib uninstall_utilities uninstall_docs install_setup: @test -d $(DESTDIR)$(prefix) || \ - ($(mkdir) -p $(DESTDIR)$(prefix) && \ - $(chmod) $(dmode) $(DESTDIR)$(prefix)) + ($(MKDIR) -p $(DESTDIR)$(prefix) && \ + $(CHMOD) $(dmode) $(DESTDIR)$(prefix)) INCDOT= db.h db_cxx.h @ADDITIONAL_INCS@ install_include: @echo "Installing DB include files: $(DESTDIR)$(includedir) ..." @test -d $(DESTDIR)$(includedir) || \ - ($(mkdir) -p $(DESTDIR)$(includedir) && \ - $(chmod) $(dmode) $(DESTDIR)$(includedir)) - @cd $(DESTDIR)$(includedir) && $(rm) -f $(INCDOT) - @$(cp) -p $(INCDOT) $(DESTDIR)$(includedir) - @cd $(DESTDIR)$(includedir) && $(chmod) $(fmode) $(INCDOT) + ($(MKDIR) -p $(DESTDIR)$(includedir) && \ + $(CHMOD) $(dmode) $(DESTDIR)$(includedir)) + @cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT) + @$(CP) -p $(INCDOT) $(DESTDIR)$(includedir) + @cd $(DESTDIR)$(includedir) && $(CHMOD) $(fmode) $(INCDOT) uninstall_include: - @cd $(DESTDIR)$(includedir) && $(rm) -f $(INCDOT) + @cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT) install_lib: @echo "Installing DB library: $(DESTDIR)$(libdir) ..." @test -d $(DESTDIR)$(libdir) || \ - ($(mkdir) -p $(DESTDIR)$(libdir) && \ - $(chmod) $(dmode) $(DESTDIR)$(libdir)) - @cd $(DESTDIR)$(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST) + ($(MKDIR) -p $(DESTDIR)$(libdir) && \ + $(CHMOD) $(dmode) $(DESTDIR)$(libdir)) + @cd $(DESTDIR)$(libdir) && $(RM) -f $(LIB_INSTALL_FILE_LIST) @$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir) @(cd $(DESTDIR)$(libdir) && \ - test -f $(libso) && $(ln) -s $(libso) $(libso_default); \ - test -f $(libso) && $(ln) -s $(libso) $(libso_major); \ - test -f $(libxso) && $(ln) -s $(libxso) $(libxso_default); \ - test -f $(libxso) && $(ln) -s $(libxso) $(libxso_major); \ - test -f $(libtso) && $(ln) -s $(libtso) $(libtso_default); \ - test -f $(libtso) && $(ln) -s $(libtso) $(libtso_major); \ - test -f $(libjso) && $(ln) -s $(libjso) $(libjso_default); \ - test -f $(libjso) && $(ln) -s $(libjso) $(libjso_major); \ - test -f $(libjso) && $(ln) -s $(libjso) $(libjso_g)) || true + test -f $(libso) && $(LN) -s $(libso) $(libso_default); \ + test -f $(libso) && $(LN) -s $(libso) $(libso_major); \ + test -f $(libxso) && $(LN) -s $(libxso) $(libxso_default); \ + test -f $(libxso) && $(LN) -s $(libxso) $(libxso_major); \ + test -f $(libtso) && $(LN) -s $(libtso) $(libtso_default); \ + test -f $(libtso) && $(LN) -s $(libtso) $(libtso_major); \ + test -f $(libjso) && $(LN) -s $(libjso) $(libjso_default); \ + test -f $(libjso) && $(LN) -s $(libjso) $(libjso_major); \ + test -f $(libjso) && $(LN) -s $(libjso) $(libjso_g)) || exit 0 @(test -f $(libj_jarfile) && \ - $(cp) $(libj_jarfile) $(DESTDIR)$(libdir) && \ - $(chmod) $(fmode) $(DESTDIR)$(libdir)/$(libj_jarfile)) || true + $(CP) $(libj_jarfile) $(DESTDIR)$(libdir) && \ + $(CHMOD) $(fmode) $(DESTDIR)$(libdir)/$(libj_jarfile)) || exit 0 uninstall_lib: - @cd $(DESTDIR)$(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST) + @cd $(DESTDIR)$(libdir) && $(RM) -f $(LIB_INSTALL_FILE_LIST) install_utilities: @echo "Installing DB utilities: $(DESTDIR)$(bindir) ..." @test -d $(DESTDIR)$(bindir) || \ - ($(mkdir) -p $(DESTDIR)$(bindir) && \ - $(chmod) $(dmode) $(DESTDIR)$(bindir)) + ($(MKDIR) -p $(DESTDIR)$(bindir) && \ + $(CHMOD) $(dmode) $(DESTDIR)$(bindir)) @for i in $(UTIL_PROGS); do \ - $(rm) -f $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.exe; \ - test -f $$i.exe && i=$$i.exe || true; \ + test -f $$i.exe && i=$$i.exe || i=$$i; \ + $(RM) -f $(DESTDIR)$(bindir)/$$i; \ $(INSTALLER) $$i $(DESTDIR)$(bindir)/$$i; \ - test -f $(strip) && $(strip) $(DESTDIR)$(bindir)/$$i || true; \ - $(chmod) $(emode) $(DESTDIR)$(bindir)/$$i; \ + test "$(STRIP)" = "none" || $(STRIP) $(DESTDIR)$(bindir)/$$i; \ + $(CHMOD) $(emode) $(DESTDIR)$(bindir)/$$i; \ done uninstall_utilities: @(cd $(DESTDIR)$(bindir); for i in $(UTIL_PROGS); do \ - $(rm) -f $$i $$i.exe; \ + $(RM) -f $$i $$i.exe; \ done) -DOCLIST=api_c api_cxx api_tcl collections gsg images index.html java ref \ - sleepycat utility +DOCLIST=api_c api_cxx api_tcl collections gsg gsg_db_rep gsg_txn images \ + index.html java license ref utility install_docs: @echo "Installing documentation: $(DESTDIR)$(docdir) ..." @test -d $(DESTDIR)$(docdir) || \ - ($(mkdir) -p $(DESTDIR)$(docdir) && \ - $(chmod) $(dmode) $(DESTDIR)$(docdir)) - @cd $(DESTDIR)$(docdir) && $(rm) -rf $(DOCLIST) - @cd $(srcdir)/docs && $(cp) -pr $(DOCLIST) $(DESTDIR)$(docdir)/ + ($(MKDIR) -p $(DESTDIR)$(docdir) && \ + $(CHMOD) $(dmode) $(DESTDIR)$(docdir)) + @cd $(DESTDIR)$(docdir) && $(RM) -rf $(DOCLIST) + @cd $(srcdir)/docs && $(CP) -pr $(DOCLIST) $(DESTDIR)$(docdir)/ uninstall_docs: - @cd $(docdir) && $(rm) -rf $(DESTDIR)$(DOCLIST) + @cd $(DESTDIR)$(docdir) && $(RM) -rf $(DOCLIST) ################################################## # Remaining standard Makefile targets. ################################################## CLEAN_LIST=\ - 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 \ + TxnGuide TxnGuideInMemory bench_001 berkeley_db_cxxsvc \ + berkeley_db_svc db_dump185 db_perf db_reptest dbs ex_access \ + ex_apprec ex_btrec ex_dbclient ex_env ex_lock ex_mpool \ + ex_rep_base ex_rep_mgr 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 + excxx_repquote excxx_sequence excxx_tpcb txn_guide \ + txn_guide_inmemory mostly-clean clean: - $(rm) -rf $(C_OBJS) - $(rm) -rf $(CXX_OBJS) $(JAVA_OBJS) $(TCL_OBJS) - $(rm) -rf $(RPC_CLIENT_OBJS) $(RPC_SRV_OBJS) $(RPC_CXXSRV_OBJS) - $(rm) -rf $(UTIL_PROGS) *.exe $(CLEAN_LIST) - $(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.* PARALLEL_TESTDIR.* - $(rm) -rf RUN_LOG RUNQUEUE TESTDIR TESTDIR.A - $(rm) -rf TEST.LIST logtrack_seen.db tm .libs $(LIB_INSTALL_FILE_LIST) + $(RM) -rf $(C_OBJS) + $(RM) -rf $(CXX_OBJS) $(JAVA_OBJS) $(TCL_OBJS) + $(RM) -rf $(RPC_CLIENT_OBJS) $(RPC_SRV_OBJS) $(RPC_CXXSRV_OBJS) + $(RM) -rf $(UTIL_PROGS) *.exe $(CLEAN_LIST) + $(RM) -rf $(JAVA_CLASSTOP) $(JAVA_EXCLASSTOP) + $(RM) -rf tags *@o@ *.o *.o.lock *.lo core *.core + $(RM) -rf ALL.OUT.* PARALLEL_TESTDIR.* + $(RM) -rf RUN_LOG RUNQUEUE TESTDIR TESTDIR.A TEST.LIST + $(RM) -rf logtrack_seen.db tm .libs $(LIB_INSTALL_FILE_LIST) REALCLEAN_LIST=\ - Makefile confdefs.h config.cache config.log config.status \ + Makefile clib_port.h confdefs.h config.cache config.log config.status \ 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) - $(rm) -rf libtool + $(RM) -rf $(REALCLEAN_LIST) + $(RM) -rf libtool check depend dvi info obj TAGS: - @echo "$@: make target not supported" && true + @echo "make: $@ target not available" dist rpm rpmbuild: - @echo "$@: make target not supported" && false + @echo "make: $@ target not available" && exit 1 ################################################## # Multi-threaded testers, benchmarks. @@ -1038,6 +915,67 @@ db_perf: $(DBPERF_OBJS) $(DEF_LIB) $(LDFLAGS) $(DBPERF_OBJS) $(DEF_LIB) $(TEST_LIBS) $(LIBS) $(POSTLINK) $@ +db_reptest@o@: $(srcdir)/test_rep/db_reptest.c + $(CC) $(CFLAGS) $? +reptest_accept@o@: $(srcdir)/test_rep/reptest_accept.c + $(CC) $(CFLAGS) $? +reptest_client@o@: $(srcdir)/test_rep/reptest_client.c + $(CC) $(CFLAGS) $? +reptest_config@o@: $(srcdir)/test_rep/reptest_config.c + $(CC) $(CFLAGS) $? +reptest_dbs@o@: $(srcdir)/test_rep/reptest_dbs.c + $(CC) $(CFLAGS) $? +reptest_debug@o@: $(srcdir)/test_rep/reptest_debug.c + $(CC) $(CFLAGS) $? +reptest_elect@o@: $(srcdir)/test_rep/reptest_elect.c + $(CC) $(CFLAGS) $? +reptest_env@o@: $(srcdir)/test_rep/reptest_env.c + $(CC) $(CFLAGS) $? +reptest_exec@o@: $(srcdir)/test_rep/reptest_exec.c + $(CC) $(CFLAGS) $? +reptest_file@o@: $(srcdir)/test_rep/reptest_file.c + $(CC) $(CFLAGS) $? +reptest_key@o@: $(srcdir)/test_rep/reptest_key.c + $(CC) $(CFLAGS) $? +reptest_master@o@: $(srcdir)/test_rep/reptest_master.c + $(CC) $(CFLAGS) $? +reptest_misc@o@: $(srcdir)/test_rep/reptest_misc.c + $(CC) $(CFLAGS) $? +reptest_msg_thread@o@: $(srcdir)/test_rep/reptest_msg_thread.c + $(CC) $(CFLAGS) $? +reptest_op@o@: $(srcdir)/test_rep/reptest_op.c + $(CC) $(CFLAGS) $? +reptest_parse@o@: $(srcdir)/test_rep/reptest_parse.c + $(CC) $(CFLAGS) $? +reptest_send@o@: $(srcdir)/test_rep/reptest_send.c + $(CC) $(CFLAGS) $? +reptest_site@o@: $(srcdir)/test_rep/reptest_site.c + $(CC) $(CFLAGS) $? +reptest_socket@o@: $(srcdir)/test_rep/reptest_socket.c + $(CC) $(CFLAGS) $? +reptest_spawn@o@: $(srcdir)/test_rep/reptest_spawn.c + $(CC) $(CFLAGS) $? +reptest_thread@o@: $(srcdir)/test_rep/reptest_thread.c + $(CC) $(CFLAGS) $? +reptest_txn@o@: $(srcdir)/test_rep/reptest_txn.c + $(CC) $(CFLAGS) $? +reptest_util@o@: $(srcdir)/test_rep/reptest_util.c + $(CC) $(CFLAGS) $? +DBREPTEST_OBJS=\ + db_reptest@o@ perf_rand@o@ reptest_accept@o@ reptest_client@o@ \ + reptest_config@o@ reptest_dbs@o@ reptest_debug@o@ \ + reptest_elect@o@ reptest_env@o@ reptest_exec@o@ reptest_file@o@ \ + reptest_key@o@ reptest_master@o@ reptest_misc@o@ \ + reptest_msg_thread@o@ reptest_op@o@ reptest_parse@o@ \ + reptest_send@o@ reptest_site@o@ reptest_socket@o@ \ + reptest_spawn@o@ reptest_thread@o@ reptest_txn@o@ \ + reptest_util@o@ + +db_reptest: $(DBREPTEST_OBJS) $(DEF_LIB) + $(CCLINK) -o $@ \ + $(LDFLAGS) $(DBREPTEST_OBJS) $(DEF_LIB) $(TEST_LIBS) $(LIBS) + $(POSTLINK) $@ + tm@o@: $(srcdir)/mutex/tm.c $(CC) $(CFLAGS) $? tm: tm@o@ $(DEF_LIB) @@ -1063,9 +1001,12 @@ ex_apprec@o@: $(srcdir)/examples_c/ex_apprec/ex_apprec.c $(CC) $(CFLAGS) $? ex_apprec_auto@o@: $(srcdir)/examples_c/ex_apprec/ex_apprec_auto.c $(CC) $(CFLAGS) $? +ex_apprec_autop@o@: $(srcdir)/examples_c/ex_apprec/ex_apprec_autop.c + $(CC) $(CFLAGS) $? ex_apprec_rec@o@: $(srcdir)/examples_c/ex_apprec/ex_apprec_rec.c $(CC) $(CFLAGS) $? -EX_APPREC_OBJS=ex_apprec@o@ ex_apprec_auto@o@ ex_apprec_rec@o@ +EX_APPREC_OBJS=\ + ex_apprec@o@ ex_apprec_auto@o@ ex_apprec_autop@o@ ex_apprec_rec@o@ ex_apprec: $(EX_APPREC_OBJS) $(DEF_LIB) $(CCLINK) -o $@ \ $(LDFLAGS) $(EX_APPREC_OBJS) $(DEF_LIB) $(TEST_LIBS) $(LIBS) @@ -1100,21 +1041,28 @@ ex_mpool: ex_mpool@o@ $(DEF_LIB) $(CCLINK) -o $@ $(LDFLAGS) ex_mpool@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ -ex_rq_client@o@: $(srcdir)/examples_c/ex_repquote/ex_rq_client.c +rep_base@o@: $(srcdir)/examples_c/ex_rep/base/rep_base.c $(CC) $(CFLAGS) $? -ex_rq_main@o@: $(srcdir)/examples_c/ex_repquote/ex_rq_main.c +rep_common@o@: $(srcdir)/examples_c/ex_rep/common/rep_common.c $(CC) $(CFLAGS) $? -ex_rq_master@o@: $(srcdir)/examples_c/ex_repquote/ex_rq_master.c +rep_msg@o@: $(srcdir)/examples_c/ex_rep/base/rep_msg.c $(CC) $(CFLAGS) $? -ex_rq_net@o@: $(srcdir)/examples_c/ex_repquote/ex_rq_net.c +rep_net@o@: $(srcdir)/examples_c/ex_rep/base/rep_net.c $(CC) $(CFLAGS) $? -ex_rq_util@o@: $(srcdir)/examples_c/ex_repquote/ex_rq_util.c +EX_REP_BASE_OBJS=\ + rep_base@o@ rep_common@o@ rep_msg@o@ rep_net@o@ +ex_rep_base: $(EX_REP_BASE_OBJS) $(DEF_LIB) + $(CCLINK) -o $@ \ + $(LDFLAGS) $(EX_REP_BASE_OBJS) $(DEF_LIB) $(TEST_LIBS) $(LIBS) + $(POSTLINK) $@ + +rep_mgr@o@: $(srcdir)/examples_c/ex_rep/mgr/rep_mgr.c $(CC) $(CFLAGS) $? -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) +EX_REP_MGR_OBJS=\ + rep_common@o@ rep_mgr@o@ +ex_rep_mgr: $(EX_REP_MGR_OBJS) $(DEF_LIB) $(CCLINK) -o $@ \ - $(LDFLAGS) $(EX_RQ_OBJS) $(DEF_LIB) $(TEST_LIBS) $(LIBS) + $(LDFLAGS) $(EX_REP_MGR_OBJS) $(DEF_LIB) $(TEST_LIBS) $(LIBS) $(POSTLINK) $@ ex_sequence@o@: $(srcdir)/examples_c/ex_sequence.c @@ -1156,6 +1104,18 @@ example_database_read: example_database_read@o@ gettingstarted_common@o@ \ example_database_read@o@ gettingstarted_common@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ +txn_guide_inmemory@o@: $(srcdir)/examples_c/txn_guide/txn_guide_inmemory.c + $(CC) $(CFLAGS) $? +txn_guide_inmemory: txn_guide_inmemory@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) txn_guide_inmemory@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + +txn_guide@o@: $(srcdir)/examples_c/txn_guide/txn_guide.c + $(CC) $(CFLAGS) $? +txn_guide: txn_guide@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) txn_guide@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + ################################################## # Example programs for C++. ################################################## @@ -1189,6 +1149,15 @@ excxx_mpool: MpoolExample@o@ $(DEF_LIB_CXX) $(CXXLINK) -o $@ $(LDFLAGS) MpoolExample@o@ $(DEF_LIB_CXX) $(LIBS) $(POSTLINK) $@ +RepQuoteExample@o@: $(srcdir)/examples_cxx/excxx_repquote/RepQuoteExample.cpp + $(CXX) -I$(srcdir)/examples_cxx/excxx_repquote $(CXXFLAGS) $? +RepConfigInfo@o@: $(srcdir)/examples_cxx/excxx_repquote/RepConfigInfo.cpp + $(CXX) -I$(srcdir)/examples_cxx/excxx_repquote $(CXXFLAGS) $? +excxx_repquote: RepQuoteExample@o@ RepConfigInfo@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) \ + RepQuoteExample@o@ RepConfigInfo@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + SequenceExample@o@: $(srcdir)/examples_cxx/SequenceExample.cpp $(CXX) $(CXXFLAGS) $? excxx_sequence: SequenceExample@o@ $(DEF_LIB_CXX) @@ -1220,6 +1189,18 @@ excxx_example_database_read: \ excxx_example_database_read@o@ MyDb@o@ $(DEF_LIB_CXX) $(LIBS) $(POSTLINK) $@ +TxnGuideInMemory@o@: $(srcdir)/examples_cxx/txn_guide/TxnGuideInMemory.cpp + $(CXX) $(CXXFLAGS) $? +TxnGuideInMemory: TxnGuideInMemory@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) TxnGuideInMemory@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + +TxnGuide@o@: $(srcdir)/examples_cxx/txn_guide/TxnGuide.cpp + $(CXX) $(CXXFLAGS) $? +TxnGuide: TxnGuide@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) TxnGuide@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + ################################################## # C API build rules. ################################################## @@ -1255,6 +1236,8 @@ bt_split@o@: $(srcdir)/btree/bt_split.c $(CC) $(CFLAGS) $? bt_stat@o@: $(srcdir)/btree/bt_stat.c $(CC) $(CFLAGS) $? +bt_compact@o@: $(srcdir)/btree/bt_compact.c + $(CC) $(CFLAGS) $? bt_upgrade@o@: $(srcdir)/btree/bt_upgrade.c $(CC) $(CFLAGS) $? bt_verify@o@: $(srcdir)/btree/bt_verify.c @@ -1287,6 +1270,10 @@ db_byteorder@o@: $(srcdir)/common/db_byteorder.c $(CC) $(CFLAGS) $? db_cam@o@: $(srcdir)/db/db_cam.c $(CC) $(CFLAGS) $? +db_cds@o@: $(srcdir)/db/db_cds.c + $(CC) $(CFLAGS) $? +db_clock@o@: $(srcdir)/common/db_clock.c + $(CC) $(CFLAGS) $? db_conv@o@: $(srcdir)/db/db_conv.c $(CC) $(CFLAGS) $? db_dispatch@o@: $(srcdir)/db/db_dispatch.c @@ -1363,6 +1350,10 @@ dbreg_stat@o@: $(srcdir)/dbreg/dbreg_stat.c $(CC) $(CFLAGS) $? dbreg_util@o@: $(srcdir)/dbreg/dbreg_util.c $(CC) $(CFLAGS) $? +env_config@o@: $(srcdir)/env/env_config.c + $(CC) $(CFLAGS) $? +env_failchk@o@: $(srcdir)/env/env_failchk.c + $(CC) $(CFLAGS) $? env_file@o@: $(srcdir)/env/env_file.c $(CC) $(CFLAGS) $? env_method@o@: $(srcdir)/env/env_method.c @@ -1373,6 +1364,8 @@ env_recover@o@: $(srcdir)/env/env_recover.c $(CC) $(CFLAGS) $? env_region@o@: $(srcdir)/env/env_region.c $(CC) $(CFLAGS) $? +env_register@o@: $(srcdir)/env/env_register.c + $(CC) $(CFLAGS) $? env_stat@o@: $(srcdir)/env/env_stat.c $(CC) $(CFLAGS) $? fileops_auto@o@: $(srcdir)/fileops/fileops_auto.c @@ -1425,6 +1418,8 @@ lock@o@: $(srcdir)/lock/lock.c $(CC) $(CFLAGS) $? lock_deadlock@o@:$(srcdir)/lock/lock_deadlock.c $(CC) $(CFLAGS) $? +lock_failchk@o@:$(srcdir)/lock/lock_failchk.c + $(CC) $(CFLAGS) $? lock_id@o@:$(srcdir)/lock/lock_id.c $(CC) $(CFLAGS) $? lock_list@o@:$(srcdir)/lock/lock_list.c @@ -1445,6 +1440,8 @@ log_archive@o@: $(srcdir)/log/log_archive.c $(CC) $(CFLAGS) $? log_compare@o@: $(srcdir)/log/log_compare.c $(CC) $(CFLAGS) $? +log_debug@o@: $(srcdir)/log/log_debug.c + $(CC) $(CFLAGS) $? log_get@o@: $(srcdir)/log/log_get.c $(CC) $(CFLAGS) $? log_method@o@: $(srcdir)/log/log_method.c @@ -1453,6 +1450,8 @@ log_put@o@: $(srcdir)/log/log_put.c $(CC) $(CFLAGS) $? log_stat@o@: $(srcdir)/log/log_stat.c $(CC) $(CFLAGS) $? +mkpath@o@: $(srcdir)/common/mkpath.c + $(CC) $(CFLAGS) $? mp_alloc@o@: $(srcdir)/mp/mp_alloc.c $(CC) $(CFLAGS) $? mp_bh@o@: $(srcdir)/mp/mp_bh.c @@ -1469,6 +1468,8 @@ mp_fset@o@: $(srcdir)/mp/mp_fset.c $(CC) $(CFLAGS) $? mp_method@o@: $(srcdir)/mp/mp_method.c $(CC) $(CFLAGS) $? +mp_mvcc@o@: $(srcdir)/mp/mp_mvcc.c + $(CC) $(CFLAGS) $? mp_region@o@: $(srcdir)/mp/mp_region.c $(CC) $(CFLAGS) $? mp_register@o@: $(srcdir)/mp/mp_register.c @@ -1481,16 +1482,24 @@ mp_trickle@o@: $(srcdir)/mp/mp_trickle.c $(CC) $(CFLAGS) $? mt19937db@o@: $(srcdir)/crypto/mersenne/mt19937db.c $(CC) $(CFLAGS) $? +mut_alloc@o@: $(srcdir)/mutex/mut_alloc.c + $(CC) $(CFLAGS) $? +mut_failchk@o@: $(srcdir)/mutex/mut_failchk.c + $(CC) $(CFLAGS) $? mut_fcntl@o@: $(srcdir)/mutex/mut_fcntl.c $(CC) $(CFLAGS) $? +mut_method@o@: $(srcdir)/mutex/mut_method.c + $(CC) $(CFLAGS) $? mut_pthread@o@: $(srcdir)/mutex/mut_pthread.c $(CC) $(CFLAGS) $? +mut_region@o@: $(srcdir)/mutex/mut_region.c + $(CC) $(CFLAGS) $? +mut_stat@o@: $(srcdir)/mutex/mut_stat.c + $(CC) $(CFLAGS) $? mut_tas@o@: $(srcdir)/mutex/mut_tas.c $(CC) $(CFLAGS) $? mut_win32@o@: $(srcdir)/mutex/mut_win32.c $(CC) $(CFLAGS) $? -mutex@o@: $(srcdir)/mutex/mutex.c - $(CC) $(CFLAGS) $? os_abs@o@: $(srcdir)/@OSDIR@/os_abs.c $(CC) $(CFLAGS) $? os_alloc@o@: $(srcdir)/os/os_alloc.c @@ -1505,9 +1514,13 @@ os_errno@o@: $(srcdir)/@OSDIR@/os_errno.c $(CC) $(CFLAGS) $? os_fid@o@: $(srcdir)/@OSDIR@/os_fid.c $(CC) $(CFLAGS) $? +os_flock@o@: $(srcdir)/@OSDIR@/os_flock.c + $(CC) $(CFLAGS) $? os_fsync@o@: $(srcdir)/@OSDIR@/os_fsync.c $(CC) $(CFLAGS) $? -os_id@o@: $(srcdir)/os/os_id.c +os_fzero@o@: $(srcdir)/os/os_fzero.c + $(CC) $(CFLAGS) $? +os_getenv@o@: $(srcdir)/@OSDIR@/os_getenv.c $(CC) $(CFLAGS) $? os_handle@o@: $(srcdir)/@OSDIR@/os_handle.c $(CC) $(CFLAGS) $? @@ -1515,10 +1528,14 @@ os_map@o@: $(srcdir)/@OSDIR@/os_map.c $(CC) $(CFLAGS) $? os_method@o@: $(srcdir)/os/os_method.c $(CC) $(CFLAGS) $? +os_mkdir@o@: $(srcdir)/os/os_mkdir.c + $(CC) $(CFLAGS) $? os_oflags@o@: $(srcdir)/os/os_oflags.c $(CC) $(CFLAGS) $? os_open@o@: $(srcdir)/@OSDIR@/os_open.c $(CC) $(CFLAGS) $? +os_pid@o@: $(srcdir)/os/os_pid.c + $(CC) $(CFLAGS) $? os_region@o@: $(srcdir)/os/os_region.c $(CC) $(CFLAGS) $? os_rename@o@: $(srcdir)/@OSDIR@/os_rename.c @@ -1541,8 +1558,12 @@ os_tmpdir@o@: $(srcdir)/os/os_tmpdir.c $(CC) $(CFLAGS) $? os_truncate@o@: $(srcdir)/@OSDIR@/os_truncate.c $(CC) $(CFLAGS) $? +os_uid@o@: $(srcdir)/os/os_uid.c + $(CC) $(CFLAGS) $? os_unlink@o@: $(srcdir)/os/os_unlink.c $(CC) $(CFLAGS) $? +os_yield@o@: $(srcdir)/os/os_yield.c + $(CC) $(CFLAGS) $? qam@o@: $(srcdir)/qam/qam.c $(CC) $(CFLAGS) $? qam_auto@o@: $(srcdir)/qam/qam_auto.c @@ -1573,6 +1594,10 @@ rep_autop@o@: $(srcdir)/rep/rep_autop.c $(CC) $(CFLAGS) $? rep_backup@o@: $(srcdir)/rep/rep_backup.c $(CC) $(CFLAGS) $? +rep_elect@o@: $(srcdir)/rep/rep_elect.c + $(CC) $(CFLAGS) $? +rep_log@o@: $(srcdir)/rep/rep_log.c + $(CC) $(CFLAGS) $? rep_method@o@: $(srcdir)/rep/rep_method.c $(CC) $(CFLAGS) $? rep_record@o@: $(srcdir)/rep/rep_record.c @@ -1585,6 +1610,26 @@ rep_stat@o@: $(srcdir)/rep/rep_stat.c $(CC) $(CFLAGS) $? rep_util@o@: $(srcdir)/rep/rep_util.c $(CC) $(CFLAGS) $? +rep_verify@o@: $(srcdir)/rep/rep_verify.c + $(CC) $(CFLAGS) $? +repmgr_elect@o@: $(srcdir)/repmgr/repmgr_elect.c + $(CC) $(CFLAGS) $? +repmgr_method@o@: $(srcdir)/repmgr/repmgr_method.c + $(CC) $(CFLAGS) $? +repmgr_msg@o@: $(srcdir)/repmgr/repmgr_msg.c + $(CC) $(CFLAGS) $? +repmgr_net@o@: $(srcdir)/repmgr/repmgr_net.c + $(CC) $(CFLAGS) $? +repmgr_posix@o@: $(srcdir)/repmgr/repmgr_posix.c + $(CC) $(CFLAGS) $? +repmgr_queue@o@: $(srcdir)/repmgr/repmgr_queue.c + $(CC) $(CFLAGS) $? +repmgr_sel@o@: $(srcdir)/repmgr/repmgr_sel.c + $(CC) $(CFLAGS) $? +repmgr_stat@o@: $(srcdir)/repmgr/repmgr_stat.c + $(CC) $(CFLAGS) $? +repmgr_util@o@: $(srcdir)/repmgr/repmgr_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 @@ -1603,6 +1648,10 @@ txn_auto@o@: $(srcdir)/txn/txn_auto.c $(CC) $(CFLAGS) $? txn_autop@o@: $(srcdir)/txn/txn_autop.c $(CC) $(CFLAGS) $? +txn_chkpt@o@: $(srcdir)/txn/txn_chkpt.c + $(CC) $(CFLAGS) $? +txn_failchk@o@: $(srcdir)/txn/txn_failchk.c + $(CC) $(CFLAGS) $? txn_method@o@: $(srcdir)/txn/txn_method.c $(CC) $(CFLAGS) $? txn_rec@o@: $(srcdir)/txn/txn_rec.c @@ -1660,37 +1709,37 @@ cxx_txn@o@: $(srcdir)/cxx/cxx_txn.cpp # Java API build rules. ################################################## db_java_wrap@o@: $(srcdir)/libdb_java/db_java_wrap.c - $(CC) $(CFLAGS) $? + $(CC) $(CFLAGS) $(SWIGCFLAGS) $? ################################################## # Tcl API build rules. ################################################## tcl_compat@o@: $(srcdir)/tcl/tcl_compat.c - $(CC) $(CFLAGS) $(TCFLAGS) $? + $(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $? tcl_db@o@: $(srcdir)/tcl/tcl_db.c - $(CC) $(CFLAGS) $(TCFLAGS) $? + $(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $? tcl_db_pkg@o@: $(srcdir)/tcl/tcl_db_pkg.c - $(CC) $(CFLAGS) $(TCFLAGS) $? + $(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $? tcl_dbcursor@o@: $(srcdir)/tcl/tcl_dbcursor.c - $(CC) $(CFLAGS) $(TCFLAGS) $? + $(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $? tcl_env@o@: $(srcdir)/tcl/tcl_env.c - $(CC) $(CFLAGS) $(TCFLAGS) $? + $(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $? tcl_internal@o@: $(srcdir)/tcl/tcl_internal.c - $(CC) $(CFLAGS) $(TCFLAGS) $? + $(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $? tcl_lock@o@: $(srcdir)/tcl/tcl_lock.c - $(CC) $(CFLAGS) $(TCFLAGS) $? + $(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $? tcl_log@o@: $(srcdir)/tcl/tcl_log.c - $(CC) $(CFLAGS) $(TCFLAGS) $? + $(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $? tcl_mp@o@: $(srcdir)/tcl/tcl_mp.c - $(CC) $(CFLAGS) $(TCFLAGS) $? + $(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $? tcl_rep@o@: $(srcdir)/tcl/tcl_rep.c - $(CC) $(CFLAGS) $(TCFLAGS) $? + $(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $? tcl_seq@o@: $(srcdir)/tcl/tcl_seq.c - $(CC) $(CFLAGS) $(TCFLAGS) $? + $(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $? tcl_txn@o@: $(srcdir)/tcl/tcl_txn.c - $(CC) $(CFLAGS) $(TCFLAGS) $? + $(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $? tcl_util@o@: $(srcdir)/tcl/tcl_util.c - $(CC) $(CFLAGS) $(TCFLAGS) $? + $(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $? ################################################## # RPC build rules. @@ -1734,6 +1783,8 @@ db_dump@o@: $(srcdir)/db_dump/db_dump.c $(CC) $(CFLAGS) $? db_dump185@o@: $(srcdir)/db_dump185/db_dump185.c $(CC) $(DB185INC) $? +db_hotbackup@o@: $(srcdir)/db_hotbackup/db_hotbackup.c + $(CC) $(CFLAGS) $? db_load@o@: $(srcdir)/db_load/db_load.c $(CC) $(CFLAGS) $? db_printlog@o@: $(srcdir)/db_printlog/db_printlog.c @@ -1750,26 +1801,58 @@ db_verify@o@: $(srcdir)/db_verify/db_verify.c ################################################## # C library replacement files. ################################################## +atoi@o@: $(srcdir)/clib/atoi.c + $(CC) $(CFLAGS) $? +atol@o@: $(srcdir)/clib/atol.c + $(CC) $(CFLAGS) $? +ctime@o@: $(srcdir)/clib/ctime.c + $(CC) $(CFLAGS) $? +getaddrinfo@o@: $(srcdir)/clib/getaddrinfo.c + $(CC) $(CFLAGS) $? getcwd@o@: $(srcdir)/clib/getcwd.c $(CC) $(CFLAGS) $? getopt@o@: $(srcdir)/clib/getopt.c $(CC) $(CFLAGS) $? +isalpha@o@: $(srcdir)/clib/isalpha.c + $(CC) $(CFLAGS) $? +isdigit@o@: $(srcdir)/clib/isdigit.c + $(CC) $(CFLAGS) $? +isprint@o@: $(srcdir)/clib/isprint.c + $(CC) $(CFLAGS) $? +isspace@o@: $(srcdir)/clib/isspace.c + $(CC) $(CFLAGS) $? memcmp@o@: $(srcdir)/clib/memcmp.c $(CC) $(CFLAGS) $? memcpy@o@: $(srcdir)/clib/memmove.c $(CC) -DMEMCOPY $(CFLAGS) $? -o $@ memmove@o@: $(srcdir)/clib/memmove.c $(CC) -DMEMMOVE $(CFLAGS) $? +printf@o@: $(srcdir)/clib/printf.c + $(CC) $(CFLAGS) $? raise@o@: $(srcdir)/clib/raise.c $(CC) $(CFLAGS) $? +rand@o@: $(srcdir)/clib/rand.c + $(CC) $(CFLAGS) $? strcasecmp@o@: $(srcdir)/clib/strcasecmp.c $(CC) $(CFLAGS) $? strdup@o@: $(srcdir)/clib/strdup.c $(CC) $(CFLAGS) $? snprintf@o@: $(srcdir)/clib/snprintf.c $(CC) $(CFLAGS) $? +strcat@o@: $(srcdir)/clib/strcat.c + $(CC) $(CFLAGS) $? +strchr@o@: $(srcdir)/clib/strchr.c + $(CC) $(CFLAGS) $? strerror@o@: $(srcdir)/clib/strerror.c $(CC) $(CFLAGS) $? +strncat@o@: $(srcdir)/clib/strncat.c + $(CC) $(CFLAGS) $? +strncmp@o@: $(srcdir)/clib/strncmp.c + $(CC) $(CFLAGS) $? +strrchr@o@: $(srcdir)/clib/strrchr.c + $(CC) $(CFLAGS) $? +strsep@o@: $(srcdir)/clib/strsep.c + $(CC) $(CFLAGS) $? strtol@o@: $(srcdir)/clib/strtol.c $(CC) $(CFLAGS) $? strtoul@o@: $(srcdir)/clib/strtoul.c diff --git a/db/dist/RELEASE b/db/dist/RELEASE index 6de537058..0874a36d3 100644 --- a/db/dist/RELEASE +++ b/db/dist/RELEASE @@ -1,11 +1,11 @@ -# $Id: RELEASE,v 11.195 2004/11/09 01:30:41 bostic Exp $ +# $Id: RELEASE,v 12.38 2006/09/20 20:08:48 bostic Exp $ DB_VERSION_MAJOR=4 -DB_VERSION_MINOR=3 -DB_VERSION_PATCH=27 +DB_VERSION_MINOR=5 +DB_VERSION_PATCH=20 DB_VERSION="$DB_VERSION_MAJOR.$DB_VERSION_MINOR.$DB_VERSION_PATCH" DB_VERSION_UNIQUE_NAME=`printf "_%d%03d" $DB_VERSION_MAJOR $DB_VERSION_MINOR` DB_RELEASE_DATE=`date "+%B %e, %Y"` -DB_VERSION_STRING="Sleepycat Software: Berkeley DB $DB_VERSION: ($DB_RELEASE_DATE)" +DB_VERSION_STRING="Berkeley DB $DB_VERSION: ($DB_RELEASE_DATE)" diff --git a/db/dist/aclocal/config.ac b/db/dist/aclocal/config.ac index 717a0becc..3ae2ff2eb 100644 --- a/db/dist/aclocal/config.ac +++ b/db/dist/aclocal/config.ac @@ -15,47 +15,7 @@ AH_TEMPLATE(HAVE_FILESYSTEM_NOTZERO, AH_TEMPLATE(HAVE_UNLINK_WITH_OPEN_FAILURE, [Define to 1 if unlink of file with open file descriptors will fail.]) -AH_BOTTOM([/* - * Exit success/failure macros. - */ -#ifndef HAVE_EXIT_SUCCESS -#define EXIT_FAILURE 1 -#define EXIT_SUCCESS 0 -#endif - -/* - * Don't step on the namespace. Other libraries may have their own - * implementations of these functions, we don't want to use their - * implementations or force them to use ours based on the load order. - */ -#ifndef HAVE_GETCWD -#define getcwd __db_Cgetcwd -#endif -#ifndef HAVE_MEMCMP -#define memcmp __db_Cmemcmp -#endif -#ifndef HAVE_MEMCPY -#define memcpy __db_Cmemcpy -#endif -#ifndef HAVE_MEMMOVE -#define memmove __db_Cmemmove -#endif -#ifndef HAVE_RAISE -#define raise __db_Craise -#endif -#ifndef HAVE_SNPRINTF -#define snprintf __db_Csnprintf -#endif -#ifndef HAVE_STRCASECMP -#define strcasecmp __db_Cstrcasecmp -#define strncasecmp __db_Cstrncasecmp -#endif -#ifndef HAVE_STRERROR -#define strerror __db_Cstrerror -#endif -#ifndef HAVE_VSNPRINTF -#define vsnprintf __db_Cvsnprintf -#endif +AH_BOTTOM([#include "clib_port.h" #ifdef DB_WIN32 #include "win_db.h" diff --git a/db/dist/aclocal/libtool.ac b/db/dist/aclocal/libtool.ac index 71dae456a..0f53cb592 100644 --- a/db/dist/aclocal/libtool.ac +++ b/db/dist/aclocal/libtool.ac @@ -1,28 +1,13 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 +## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 ## Free Software Foundation, Inc. ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 ## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## -## As a special exception to the GNU General Public License, if you -## distribute this file as part of a program that contains a -## configuration script generated by Autoconf, you may include it under -## the same distribution terms that you use for the rest of that program. +## This file is free software; the Free Software Foundation gives +## unlimited permission to copy and/or distribute it, with or without +## modifications, as long as this notice is preserved. -# serial 47 AC_PROG_LIBTOOL +# serial 48 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -132,7 +117,7 @@ esac # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' +Xsed='sed -e 1s/^X//' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. @@ -152,7 +137,7 @@ rm="rm -f" default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except M$VC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -172,6 +157,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -191,16 +177,16 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +_LT_CC_BASENAME([$compiler]) # Only perform the check for file, if the check method requires it case $deplibs_check_method in @@ -242,11 +228,56 @@ AC_DEFUN([_LT_AC_SYS_COMPILER], # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +AC_DEFUN([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +AC_DEFUN([_LT_COMPILER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +AC_DEFUN([_LT_LINKER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_LINKER_BOILERPLATE + + # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -326,8 +357,8 @@ if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -496,7 +527,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in + case `/usr/bin/file conftest.o` in *32-bit*) case $host in x86_64-*linux*) @@ -547,6 +578,22 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -578,7 +625,7 @@ AC_CACHE_CHECK([$1], [$2], # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -588,8 +635,10 @@ AC_CACHE_CHECK([$1], [$2], echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi fi @@ -615,11 +664,16 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], LDFLAGS="$LDFLAGS $3" printf "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The compiler can only warn and ignore the option if not recognized + # The linker can only warn and ignore the option if not recognized # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi else $2=yes fi @@ -678,20 +732,50 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* ) + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` elif test -x /usr/sbin/sysctl; then lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` else - lt_cv_sys_max_cmd_len=65536 # usable default for *BSD + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs fi # And add a safety zone lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ;; - *) + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) # 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. @@ -722,7 +806,7 @@ fi # _LT_AC_CHECK_DLFCN -# -------------------- +# ------------------ AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h)dnl ])# _LT_AC_CHECK_DLFCN @@ -730,7 +814,7 @@ AC_DEFUN([_LT_AC_CHECK_DLFCN], # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ------------------------------------------------------------------ +# --------------------------------------------------------------------- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "$cross_compiling" = yes; then : @@ -796,17 +880,19 @@ int main () else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } + else + puts (dlerror ()); exit (status); }] EOF if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) $1 ;; x$lt_dlneed_uscore) $2 ;; - x$lt_unknown|x*) $3 ;; + x$lt_dlunknown|x*) $3 ;; esac else : # compilation failed @@ -818,7 +904,7 @@ rm -fr conftest* # AC_LIBTOOL_DLOPEN_SELF -# ------------------- +# ---------------------- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "x$enable_dlopen" != xyes; then @@ -889,7 +975,7 @@ else test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -902,7 +988,7 @@ else ]) if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl _LT_AC_TRY_DLOPEN_SELF( @@ -950,7 +1036,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -962,11 +1048,13 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - if test ! -s out/conftest.err; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi - chmod u+w . + chmod u+w . 2>&AS_MESSAGE_LOG_FD $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -1226,7 +1314,8 @@ cygwin* | mingw* | pw32*) dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -1256,7 +1345,7 @@ cygwin* | mingw* | pw32*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -1279,7 +1368,7 @@ darwin* | rhapsody*) soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. 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"` @@ -1314,8 +1403,17 @@ kfreebsd*-gnu) dynamic_linker='GNU ld.so' ;; -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[123]]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -1333,14 +1431,19 @@ freebsd*) freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[01]* | freebsdelf3.[01]*) + freebsd3.[[01]]* | freebsdelf3.[[01]]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -1360,7 +1463,7 @@ hpux9* | hpux10* | hpux11*) version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -1400,6 +1503,18 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -1459,7 +1574,7 @@ linux*) # 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' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -1521,8 +1636,13 @@ nto-qnx*) openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - need_version=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -1560,13 +1680,6 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -1592,7 +1705,7 @@ sunos4*) need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -1625,6 +1738,29 @@ sysv4*MP*) fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -1638,6 +1774,11 @@ uts4*) esac AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER @@ -1662,6 +1803,9 @@ if test -f "$ltmain" && test -n "$tagnames"; then AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) fi fi + if test -z "$LTCFLAGS"; then + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" + fi # Extract list of available tagged configurations in $ofile. # Note that this assumes the entire list is on one line. @@ -1688,7 +1832,9 @@ if test -f "$ltmain" && test -n "$tagnames"; then case $tagname in CXX) - if test -n "$CXX" && test "X$CXX" != "Xno"; then + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then AC_LIBTOOL_LANG_CXX_CONFIG else tagname="" @@ -1750,7 +1896,7 @@ AC_DEFUN([AC_LIBTOOL_DLOPEN], # AC_LIBTOOL_WIN32_DLL # -------------------- -# declare package support for building win32 dll's +# declare package support for building win32 DLLs AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) ])# AC_LIBTOOL_WIN32_DLL @@ -1788,7 +1934,7 @@ AC_ARG_ENABLE([shared], # AC_DISABLE_SHARED # ----------------- -#- set the default shared flag to --disable-shared +# set the default shared flag to --disable-shared AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_SHARED(no) @@ -1924,7 +2070,7 @@ dnl not every word. This closes a longstanding sh security hole. if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -2034,7 +2180,7 @@ AC_CACHE_VAL(lt_cv_path_LD, if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -2066,7 +2212,7 @@ AC_PROG_LD_GNU AC_DEFUN([AC_PROG_LD_GNU], [AC_REQUIRE([AC_PROG_EGREP])dnl AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +[# I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes @@ -2096,7 +2242,7 @@ 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' + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -2158,13 +2304,13 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu) +freebsd* | kfreebsd*-gnu | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -2180,7 +2326,7 @@ gnu*) hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case "$host_cpu" in + case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so @@ -2196,6 +2342,11 @@ hpux10.20* | hpux11*) esac ;; +interix3*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + irix5* | irix6* | nonstopux*) case $LD in *-32|*"-32 ") libmagic=32-bit;; @@ -2208,15 +2359,6 @@ irix5* | irix6* | nonstopux*) # This must be Linux ELF. linux*) - case $host_cpu in - 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 ;; @@ -2250,15 +2392,11 @@ osf3* | osf4* | osf5*) lt_cv_deplibs_check_method=pass_all ;; -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - solaris*) lt_cv_deplibs_check_method=pass_all ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) case $host_vendor in motorola) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' @@ -2279,10 +2417,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) siemens) lt_cv_deplibs_check_method=pass_all ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; esac @@ -2302,36 +2443,43 @@ AC_DEFUN([AC_PROG_NM], # Let the user override the test. lt_cv_path_NM="$NM" else - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/${ac_tool_prefix}nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" break ;; *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac ;; esac - esac - fi + fi + done + IFS="$lt_save_ifs" done - IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi]) NM="$lt_cv_path_NM" @@ -2363,13 +2511,13 @@ esac # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl convenience library and # LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If -# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. +# --enable-ltdl-convenience to the configure arguments. Note that +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +# it is assumed to be `libltdl'. LIBLTDL will be prefixed with +# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' +# (note the single quotes!). If your package is not flat and you're not +# using automake, define top_builddir and top_srcdir appropriately in +# the Makefiles. AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl case $enable_ltdl_convenience in @@ -2388,13 +2536,13 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE], # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl installable library and # LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that LIBLTDL -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If -# DIRECTORY is not provided and an installed libltdl is not found, it is -# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' -# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single -# quotes!). If your package is not flat and you're not using automake, -# define top_builddir and top_srcdir appropriately in the Makefiles. +# --enable-ltdl-install to the configure arguments. Note that +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +# and an installed libltdl is not found, it is assumed to be `libltdl'. +# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with +# '${top_srcdir}/' (note the single quotes!). If your package is not +# flat and you're not using automake, define top_builddir and top_srcdir +# appropriately in the Makefiles. # In the future, this macro may have to be called after AC_PROG_LIBTOOL. AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl @@ -2432,10 +2580,21 @@ AC_DEFUN([AC_LIBTOOL_CXX], # --------------- AC_DEFUN([_LT_AC_LANG_CXX], [AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) +AC_REQUIRE([_LT_AC_PROG_CXXCPP]) _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) ])# _LT_AC_LANG_CXX +# _LT_AC_PROG_CXXCPP +# ------------------ +AC_DEFUN([_LT_AC_PROG_CXXCPP], +[ +AC_REQUIRE([AC_PROG_CXX]) +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +fi +])# _LT_AC_PROG_CXXCPP # AC_LIBTOOL_F77 # -------------- @@ -2475,7 +2634,7 @@ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) # AC_LIBTOOL_RC -# -------------- +# ------------- # enable support for Windows resource files AC_DEFUN([AC_LIBTOOL_RC], [AC_REQUIRE([LT_AC_PROG_RC]) @@ -2508,36 +2667,9 @@ lt_simple_link_test_code='int main(){return(0);}\n' _LT_AC_SYS_COMPILER -# -# Check for any special shared library compilation flags. -# -_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= -if test "$GCC" = no; then - case $host_os in - sco3.2v5*) - _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' - ;; - esac -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 : - 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 - fi -fi - - -# -# Check to make sure the static flag actually works. -# -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), - $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) - +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -2551,9 +2683,9 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) +AC_LIBTOOL_DLOPEN_SELF -# Report which librarie types wil actually be built +# Report which library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) @@ -2562,7 +2694,7 @@ test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case "$host_os" in +case $host_os in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -2600,7 +2732,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], [AC_LANG_PUSH(C++) AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) +AC_REQUIRE([_LT_AC_PROG_CXXCPP]) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -2612,6 +2744,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= _LT_AC_TAGVAR(hardcode_minus_L, $1)=no +_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(hardcode_automatic, $1)=no _LT_AC_TAGVAR(module_cmds, $1)= _LT_AC_TAGVAR(module_expsym_cmds, $1)= @@ -2629,7 +2762,7 @@ _LT_AC_TAGVAR(postdeps, $1)= _LT_AC_TAGVAR(compiler_lib_search_path, $1)= # Source file extension for C++ test sources. -ac_ext=cc +ac_ext=cpp # Object file extension for compiled C++ test sources. objext=o @@ -2639,11 +2772,15 @@ _LT_AC_TAGVAR(objext, $1)=$objext lt_simple_compile_test_code="int some_variable = 0;\n" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + # Allow CC to be a program name with arguments. lt_save_CC=$CC lt_save_LD=$LD @@ -2654,18 +2791,18 @@ lt_save_path_LD=$lt_cv_path_LD if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx else - unset lt_cv_prog_gnu_ld + $as_unset lt_cv_prog_gnu_ld fi if test -n "${lt_cv_path_LDCXX+set}"; then lt_cv_path_LD=$lt_cv_path_LDCXX else - unset lt_cv_path_LD + $as_unset lt_cv_path_LD fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +_LT_CC_BASENAME([$compiler]) # We don't want -fno-exception wen compiling C++ code, so set the # no_builtin_flag separately @@ -2754,6 +2891,7 @@ case $host_os in ;; esac done + ;; esac exp_sym_flag='-bexport' @@ -2772,7 +2910,7 @@ case $host_os in _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -2791,8 +2929,12 @@ case $host_os in _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -2819,12 +2961,12 @@ case $host_os in _LT_AC_SYS_LIBPATH_AIX _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX @@ -2833,16 +2975,26 @@ case $host_os in # -berok will link without error, but may produce a broken library. _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - _LT_AC_TAGVAR(always_export_symbols, $1)=yes # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds it's shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach <jrb3@best.com> says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + chorus*) case $cc_basename in *) @@ -2852,7 +3004,6 @@ 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. @@ -2862,7 +3013,7 @@ case $host_os in _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -2871,13 +3022,13 @@ case $host_os in echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; darwin* | rhapsody*) - case "$host_os" in + case $host_os in rhapsody* | darwin1.[[012]]) _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ;; @@ -2915,7 +3066,7 @@ case $host_os in _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 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds if test "X$lt_int_apple_cc_single_mod" = Xyes ; then _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else @@ -2923,12 +3074,12 @@ case $host_os in 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 + 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 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $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}' ;; @@ -2941,11 +3092,11 @@ case $host_os in dgux*) case $cc_basename in - ec++) + ec++*) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - ghcx) + ghcx*) # Green Hills C++ Compiler # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -2956,14 +3107,14 @@ case $host_os in ;; esac ;; - freebsd[12]*) + freebsd[[12]]*) # C++ shared libraries reported to be fairly broken before switch to ELF _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; freebsd-elf*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_AC_TAGVAR(ld_shlibs, $1)=yes @@ -2980,11 +3131,11 @@ case $host_os in # location of the library. case $cc_basename in - CC) + CC*) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aCC) + aCC*) _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -2994,7 +3145,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) | grep "[-]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 @@ -3008,33 +3159,22 @@ case $host_os in ;; hpux10*|hpux11*) if test $with_gnu_ld = no; then - case "$host_cpu" in - hppa*64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ;; *) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; esac fi - case "$host_cpu" in - hppa*64*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - ia64*) + case $host_cpu in + hppa*64*|ia64*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. ;; *) _LT_AC_TAGVAR(hardcode_direct, $1)=yes @@ -3045,14 +3185,17 @@ case $host_os in esac case $cc_basename in - CC) + CC*) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aCC) - case "$host_cpu" in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + aCC*) + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' @@ -3071,9 +3214,12 @@ case $host_os in *) if test "$GXX" = yes; then if test $with_gnu_ld = no; then - case "$host_cpu" in - ia64*|hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' @@ -3087,11 +3233,25 @@ case $host_os in ;; esac ;; + interix3*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; irix5* | irix6*) case $cc_basename in - CC) + CC*) # SGI C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -3102,7 +3262,7 @@ case $host_os in *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' fi @@ -3115,7 +3275,7 @@ case $host_os in ;; linux*) case $cc_basename in - KCC) + KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -3140,7 +3300,7 @@ case $host_os in # "CC -Bstatic", where "CC" is the KAI C++ compiler. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - icpc) + icpc*) # Intel C++ with_gnu_ld=yes # version 8.0 and above of icpc choke on multiply defined symbols @@ -3152,8 +3312,12 @@ case $host_os in _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' + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no @@ -3161,7 +3325,16 @@ case $host_os in _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' ;; - cxx) + pgCC*) + # Portland Group C++ compiler + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) # Compaq C++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' @@ -3192,7 +3365,7 @@ case $host_os in ;; mvs*) case $cc_basename in - cxx) + cxx*) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; @@ -3218,6 +3391,8 @@ case $host_os in _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; openbsd*) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then @@ -3229,7 +3404,7 @@ case $host_os in ;; osf3*) case $cc_basename in - KCC) + KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -3245,14 +3420,14 @@ case $host_os in _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - RCC) + RCC*) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - cxx) + cxx*) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -3270,7 +3445,7 @@ case $host_os in *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -3289,7 +3464,7 @@ case $host_os in ;; osf4* | osf5*) case $cc_basename in - KCC) + KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -3304,17 +3479,17 @@ case $host_os in # the KAI C++ compiler. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - RCC) + RCC*) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - cxx) + cxx*) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ $rm $lib.exp' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -3333,7 +3508,7 @@ case $host_os in *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -3354,27 +3529,14 @@ case $host_os in # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - sco*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; sunos4*) case $cc_basename in - CC) + CC*) # Sun C++ 4.x # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - lcc) + lcc*) # Lucid # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -3387,36 +3549,33 @@ case $host_os in ;; solaris*) case $cc_basename in - CC) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ + _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The C++ compiler is used as linker so we must use $wl # flag to pass the commands to the underlying system - # linker. + # linker. We must also pass each convience library through + # to the system linker between allextract/defaultextract. + # The C++ compiler will combine linker options so we + # cannot just pass the convience library names through + # without $wl. # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; 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='echo' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -3424,7 +3583,7 @@ case $host_os in # in the archive. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ;; - gcx) + gcx*) # Green Hills C++ Compiler _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' @@ -3462,12 +3621,63 @@ case $host_os in ;; esac ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + # So that behaviour is only enabled if SCOABSPATH is set to a + # non-empty value in the environment. Most likely only useful for + # creating official distributions of packages. + # This is a hack until libtool officially supports absolute path + # names for shared libraries. + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -3504,8 +3714,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) AC_LIBTOOL_CONFIG($1) @@ -3523,7 +3731,7 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ])# AC_LIBTOOL_LANG_CXX_CONFIG # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------ +# ------------------------------------ # Figure out "hidden" library dependencies from verbose # compiler output when linking a shared library. # Parse the compiler output and extract the necessary @@ -3577,7 +3785,7 @@ if AC_TRY_EVAL(ac_compile); then # The `*' in the case matches for architectures that use `case' in # $output_verbose_cmd can trigger glob expansion during the loop # eval without this substitution. - output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" + output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` for p in `eval $output_verbose_link_cmd`; do case $p in @@ -3653,13 +3861,37 @@ fi $rm -f confest.$objext +# PORTME: override above test on systems where it is broken +ifelse([$1],[CXX], +[case $host_os in +interix3*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_AC_TAGVAR(predep_objects,$1)= + _LT_AC_TAGVAR(postdep_objects,$1)= + _LT_AC_TAGVAR(postdeps,$1)= + ;; + +solaris*) + case $cc_basename in + CC*) + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' + ;; + esac + ;; +esac +]) + case " $_LT_AC_TAGVAR(postdeps, $1) " in *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; esac ])# AC_LIBTOOL_POSTDEP_PREDEP # AC_LIBTOOL_LANG_F77_CONFIG -# ------------------------ +# -------------------------- # Ensure that the configuration vars for the C compiler are # suitably defined. Those variables are subsequently used by # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. @@ -3703,12 +3935,16 @@ lt_simple_link_test_code=" program t\n end\n" # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${F77-"f77"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +_LT_CC_BASENAME([$compiler]) AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) @@ -3718,7 +3954,7 @@ test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case "$host_os" in +case $host_os in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -3727,7 +3963,9 @@ aix3*) fi ;; aix4* | aix5*) - test "$enable_shared" = yes && enable_static=no + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi ;; esac AC_MSG_RESULT([$enable_shared]) @@ -3737,8 +3975,6 @@ AC_MSG_CHECKING([whether to build static libraries]) test "$enable_shared" = yes || enable_static=yes AC_MSG_RESULT([$enable_static]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - _LT_AC_TAGVAR(GCC, $1)="$G77" _LT_AC_TAGVAR(LD, $1)="$LD" @@ -3748,8 +3984,6 @@ 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_CONFIG($1) @@ -3778,20 +4012,27 @@ _LT_AC_TAGVAR(objext, $1)=$objext lt_simple_compile_test_code="class foo {}\n" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${GCJ-"gcj"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds + ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change ## the running order or otherwise move them around unless you know exactly @@ -3803,8 +4044,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) AC_LIBTOOL_CONFIG($1) @@ -3814,7 +4053,7 @@ CC="$lt_save_CC" # AC_LIBTOOL_LANG_RC_CONFIG -# -------------------------- +# ------------------------- # Ensure that the configuration vars for the Windows resource compiler are # suitably defined. Those variables are subsequently used by # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. @@ -3838,11 +4077,16 @@ lt_simple_link_test_code="$lt_simple_compile_test_code" # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes AC_LIBTOOL_CONFIG($1) @@ -3872,7 +4116,7 @@ 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 \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -3978,7 +4222,7 @@ ifelse([$1], [], # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -3989,7 +4233,7 @@ ifelse([$1], [], SED=$lt_SED # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e s/^X//" +Xsed="$SED -e 1s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. @@ -4024,6 +4268,12 @@ fast_install=$enable_fast_install # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -4035,6 +4285,9 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) @@ -4100,7 +4353,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -4374,9 +4627,6 @@ symcode='[[BCDEGRST]]' # Regexp to match symbols that can be accessed directly from C. sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -# Transform the above into a raw symbol and a C symbol. -symxfrm='\1 \2\3 \3' - # Transform an extracted symbol line into a proper C declaration lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" @@ -4398,15 +4648,31 @@ hpux*) # Its linker distinguishes data from code symbols lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; +linux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDGIRSTW]]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + fi + ;; irix* | nonstopux*) symcode='[[BCDEGRST]]' ;; osf*) symcode='[[BCDEGQRST]]' ;; -solaris* | sysv5*) +solaris*) symcode='[[BDRT]]' ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; sysv4) symcode='[[DFNSTU]]' ;; @@ -4429,8 +4695,11 @@ esac # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -4586,6 +4855,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) # DJGPP does not support shared libraries at all _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; sysv4*MP*) if test -d /usr/nec; then _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic @@ -4594,7 +4867,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) ;; *) @@ -4619,7 +4892,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; chorus*) case $cc_basename in - cxch68) + cxch68*) # Green Hills C++ Compiler # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ;; @@ -4628,7 +4901,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) darwin*) # PIC is the default on this platform # Common symbols not allowed in MH_DYLIB files - case "$cc_basename" in + case $cc_basename in xlc*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -4637,10 +4910,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; dgux*) case $cc_basename in - ec++) + ec++*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ;; - ghcx) + ghcx*) # Green Hills C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; @@ -4648,22 +4921,22 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; - freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) case $cc_basename in - CC) + CC*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; - aCC) + aCC*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - case "$host_cpu" in + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -4676,9 +4949,13 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; irix5* | irix6* | nonstopux*) case $cc_basename in - CC) + CC*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' # CC pic flag -KPIC is the default. @@ -4689,18 +4966,24 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; linux*) case $cc_basename in - KCC) + KCC*) # KAI C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; - icpc) + icpc* | ecpc*) # Intel C++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - cxx) + pgCC*) + # Portland Group C++ compiler. + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha # Linux and Compaq Tru64 Unix objects are PIC. @@ -4717,7 +5000,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; mvs*) case $cc_basename in - cxx) + cxx*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ;; *) @@ -4728,14 +5011,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; osf3* | osf4* | osf5*) case $cc_basename in - KCC) + KCC*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ;; - RCC) + RCC*) # Rational C++ 2.4.1 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; - cxx) + cxx*) # Digital/Compaq C++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # Make sure the PIC flag is empty. It appears that all Alpha @@ -4749,24 +5032,15 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; psos*) ;; - sco*) - case $cc_basename in - CC) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - *) - ;; - esac - ;; solaris*) case $cc_basename in - CC) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ;; - gcx) + gcx*) # Green Hills C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ;; @@ -4776,12 +5050,12 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; sunos4*) case $cc_basename in - CC) + CC*) # Sun C++ 4.x _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - lcc) + lcc*) # Lucid _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; @@ -4791,7 +5065,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ;; @@ -4799,7 +5073,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; - unixware*) + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac ;; vxworks*) ;; @@ -4846,6 +5127,11 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -4862,7 +5148,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -4891,7 +5177,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) darwin*) # PIC is the default on this platform # Common symbols not allowed in MH_DYLIB files - case "$cc_basename" in + case $cc_basename in xlc*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -4909,7 +5195,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -4933,12 +5219,19 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; linux*) - case $CC in + case $cc_basename in icc* | ecc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; ccc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # All Alpha code is PIC. @@ -4953,15 +5246,15 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - sco3.2v5*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' - ;; - solaris*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac ;; sunos4*) @@ -4970,7 +5263,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -4983,6 +5276,17 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + unicos*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + uts4*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -5010,7 +5314,7 @@ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= @@ -5019,6 +5323,16 @@ case "$host_os" in _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ;; esac + +# +# Check to make sure the static flag actually works. +# +wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" +AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ]) @@ -5043,7 +5357,7 @@ ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -5086,7 +5400,8 @@ ifelse([$1],[CXX],[ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= - + # Just being paranoid about ensuring that cc_basename is set. + _LT_CC_BASENAME([$compiler]) case $host_os in cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time @@ -5096,6 +5411,10 @@ ifelse([$1],[CXX],[ with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -5106,6 +5425,27 @@ ifelse([$1],[CXX],[ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -5156,10 +5496,10 @@ EOF _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -5168,9 +5508,55 @@ EOF echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else - ld_shlibs=no + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + interix3*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; @@ -5184,7 +5570,7 @@ EOF fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then _LT_AC_TAGVAR(ld_shlibs, $1)=no cat <<EOF 1>&2 @@ -5205,6 +5591,33 @@ EOF fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + sunos4*) _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -5212,31 +5625,6 @@ 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' @@ -5247,16 +5635,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ ;; esac - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi + if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -5268,7 +5651,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -5302,6 +5685,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ break fi done + ;; esac exp_sym_flag='-bexport' @@ -5320,7 +5704,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -5339,8 +5723,12 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -5348,11 +5736,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -5366,12 +5754,12 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX @@ -5380,13 +5768,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ # -berok will link without error, but may produce a broken library. _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - _LT_AC_TAGVAR(always_export_symbols, $1)=yes # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds it's shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -5420,12 +5806,12 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' + _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; darwin* | rhapsody*) - case "$host_os" in + case $host_os in rhapsody* | darwin1.[[012]]) _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ;; @@ -5454,16 +5840,16 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ 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 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - case "$cc_basename" in + 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 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $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}' ;; @@ -5504,7 +5890,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_direct, $1)=yes @@ -5527,47 +5913,62 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; *) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case "$host_cpu" in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; *) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' @@ -5661,7 +6062,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5669,21 +6070,15 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; - sco3.2v5*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' if test "$GCC" = yes; then + wlarc='${wl}' _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else + wlarc='' _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -5692,8 +6087,18 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; + *) + # The compiler driver will combine linker options so we + # cannot just pass the convience library names through + # without $wl, iff we do not link with $LD. + # Luckily, gcc supports the same syntax we need for Sun Studio. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; + *) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; + esac ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -5750,36 +6155,45 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ fi ;; - sysv4.2uw2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - sysv5*) - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -5797,11 +6211,6 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -5829,6 +6238,7 @@ x|xyes) libobjs=conftest.$ac_objext deplibs= wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) compiler_flags=-v linker_flags=-v verstring= @@ -5956,7 +6366,7 @@ lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && break + test ! -f $lt_ac_sed && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in diff --git a/db/dist/aclocal/mutex.ac b/db/dist/aclocal/mutex.ac index 959ed4ebe..31b3d2942 100644 --- a/db/dist/aclocal/mutex.ac +++ b/db/dist/aclocal/mutex.ac @@ -1,4 +1,4 @@ -# $Id: mutex.ac,v 11.46 2004/07/09 16:23:19 bostic Exp $ +# $Id: mutex.ac,v 12.18 2006/06/20 20:31:01 bostic Exp $ # POSIX pthreads tests: inter-process safe and intra-process only. AC_DEFUN(AM_PTHREADS_SHARED, [ @@ -105,18 +105,14 @@ orig_libs=$LIBS # *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. +# on Solaris, for two reasons: a bug in SunOS 5.7 causes applications to +# 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. Second, +# LWP mutexes are faster than POSIX pthread mutexes by some amount. # # 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 db_cv_mutex="posix_only"; fi @@ -353,6 +349,28 @@ AC_TRY_COMPILE(,[ ], [db_cv_mutex="ARM/gcc-assembly"]) fi +# MIPS/gcc: Linux +if test "$db_cv_mutex" = no; then +AC_TRY_COMPILE(,[ +#if (defined(__mips) || defined(__mips__)) && defined(__GNUC__) + exit(0); +#else + FAIL TO COMPILE/LINK +#endif +], [db_cv_mutex="MIPS/gcc-assembly"]) +fi + +# MIPS/gcc: Linux +if test "$db_cv_mutex" = no; then +AC_TRY_COMPILE(,[ +#if (defined(__mips) || defined(__mips__)) && defined(__GNUC__) + exit(0); +#else + FAIL TO COMPILE/LINK +#endif +], [db_cv_mutex="MIPS/gcc-assembly"]) +fi + # PaRisc/gcc: HP/UX if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ @@ -400,7 +418,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(__x86_64__)) && defined(__GNUC__) +#if (defined(i386) || defined(__i386__)) && defined(__GNUC__) exit(0); #else FAIL TO COMPILE/LINK @@ -408,6 +426,17 @@ AC_TRY_COMPILE(,[ ], [db_cv_mutex="x86/gcc-assembly"]) fi +# x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux +if test "$db_cv_mutex" = no; then +AC_TRY_COMPILE(,[ +#if (defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__) + exit(0); +#else + FAIL TO COMPILE/LINK +#endif +], [db_cv_mutex="x86_64/gcc-assembly"]) +fi + # S390/cc: IBM OS/390 Unix if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ @@ -430,7 +459,7 @@ AC_TRY_COMPILE(,[ ], [db_cv_mutex="S390/gcc-assembly"]) fi -# ia86/gcc: Linux +# ia64/gcc: Linux if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ #if defined(__ia64) && defined(__GNUC__) @@ -458,6 +487,10 @@ if test "$db_cv_mutex" = no; then fi ]) +AC_SUBST(thread_h_decl) +AC_SUBST(db_threadid_t_decl) +db_threadid_t_decl=notset + case "$db_cv_mutex" in 68K/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" AC_DEFINE(HAVE_MUTEX_68K_GCC_ASSEMBLY) @@ -502,17 +535,11 @@ POSIX/pthreads/private) ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS" AC_DEFINE(HAVE_MUTEX_THREAD_ONLY) 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" +POSIX/pthreads/library) 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, @@ -525,7 +552,7 @@ PPC/gcc-assembly) AC_DEFINE(HAVE_MUTEX_PPC_GCC_ASSEMBLY) AH_TEMPLATE(HAVE_MUTEX_PPC_GCC_ASSEMBLY, [Define to 1 to use the GCC compiler and PowerPC assembly language mutexes.]);; -ReliantUNIX/initspin) LIBS="$LIBS -lmproc" +ReliantUNIX/initspin) LIBSO_LIBS="$LIBSO_LIBS -lmproc" ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" AC_DEFINE(HAVE_MUTEX_RELIANTUNIX_INITSPIN) AH_TEMPLATE(HAVE_MUTEX_RELIANTUNIX_INITSPIN, @@ -562,13 +589,11 @@ Tru64/cc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" AC_DEFINE(HAVE_MUTEX_TRU64_CC_ASSEMBLY) AH_TEMPLATE(HAVE_MUTEX_TRU64_CC_ASSEMBLY, [Define to 1 to use the CC compiler and Tru64 assembly language mutexes.]);; - UI/threads) ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS" AC_DEFINE(HAVE_MUTEX_UI_THREADS) AH_TEMPLATE(HAVE_MUTEX_UI_THREADS, [Define to 1 to use the UNIX International mutexes.]);; -UI/threads/library) LIBS="$LIBS -lthread" - ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS" +UI/threads/library) ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS" AC_DEFINE(HAVE_MUTEX_UI_THREADS) AH_TEMPLATE(HAVE_MUTEX_UI_THREADS, [Define to 1 to use the UNIX International mutexes.]);; @@ -590,10 +615,18 @@ win32) ADDITIONAL_OBJS="mut_win32${o} $ADDITIONAL_OBJS" win32/gcc) ADDITIONAL_OBJS="mut_win32${o} $ADDITIONAL_OBJS" AC_DEFINE(HAVE_MUTEX_WIN32_GCC) AH_TEMPLATE(HAVE_MUTEX_WIN32_GCC, [Define to 1 to use the GCC compiler and Windows mutexes.]);; +MIPS/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" + AC_DEFINE(HAVE_MUTEX_MIPS_GCC_ASSEMBLY) + AH_TEMPLATE(HAVE_MUTEX_MIPS_GCC_ASSEMBLY, + [Define to 1 to use the GCC compiler and MIPS assembly language mutexes.]);; x86/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" AC_DEFINE(HAVE_MUTEX_X86_GCC_ASSEMBLY) AH_TEMPLATE(HAVE_MUTEX_X86_GCC_ASSEMBLY, [Define to 1 to use the GCC compiler and x86 assembly language mutexes.]);; +x86_64/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" + AC_DEFINE(HAVE_MUTEX_X86_64_GCC_ASSEMBLY) + AH_TEMPLATE(HAVE_MUTEX_X86_64_GCC_ASSEMBLY, + [Define to 1 to use the GCC compiler and amd64 assembly language mutexes.]);; UNIX/fcntl) AC_MSG_WARN( [NO FAST MUTEXES FOUND FOR THIS COMPILER/ARCHITECTURE.]) ADDITIONAL_OBJS="mut_fcntl${o} $ADDITIONAL_OBJS" @@ -603,10 +636,88 @@ UNIX/fcntl) AC_MSG_WARN( *) AC_MSG_ERROR([Unknown mutex interface: $db_cv_mutex]);; esac -if test "$db_cv_mutex" != "UNIX/fcntl"; then - AC_DEFINE(HAVE_MUTEX_THREADS) - AH_TEMPLATE(HAVE_MUTEX_THREADS, - [Define to 1 if fast mutexes are available.]) +# The mutex selection may require specific declarations -- we fill in most of +# them above, but here are the common ones. +# +# The mutex selection may tell us what kind of thread package we're using, +# which we use to figure out the thread type. +# +# If we're configured for the POSIX pthread API, then force the thread ID type +# and include function, regardless of the mutex selection. Ditto for the +# (default) Solaris lwp mutexes, because they don't have a way to return the +# thread ID. +# +# 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. +# For that reason always add -lpthread if we're using pthread calls or mutexes +# and there's 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. +case "$db_cv_mutex" in +POSIX/pthread*|Solaris/lwp) + thread_h_decl="#include <pthread.h>" + db_threadid_t_decl="typedef pthread_t db_threadid_t;" + AC_HAVE_LIBRARY(pthread, LIBSO_LIBS="$LIBSO_LIBS -lpthread");; +UI/threads*) + thread_h_decl="#include <thread.h>" + db_threadid_t_decl="typedef thread_t db_threadid_t;" + AC_HAVE_LIBRARY(thread, LIBSO_LIBS="$LIBSO_LIBS -lthread");; +*) + if test "$db_cv_pthread_api" = "yes"; then + thread_h_decl="#include <pthread.h>" + db_threadid_t_decl="typedef pthread_t db_threadid_t;" + AC_HAVE_LIBRARY(pthread, LIBSO_LIBS="$LIBSO_LIBS -lpthread") + fi;; +esac + +# We need to know if the thread ID type will fit into an integral type and we +# can compare it for equality and generally treat it like an int, or if it's a +# non-integral type and we have to treat it like a structure or other untyped +# block of bytes. For example, MVS typedef's pthread_t to a structure. +AH_TEMPLATE(HAVE_SIMPLE_THREAD_TYPE, + [Define to 1 if thread identifier type db_threadid_t is integral.]) +if test "$db_threadid_t_decl" = "notset"; then + db_threadid_t_decl="typedef uintmax_t db_threadid_t;" + AC_DEFINE(HAVE_SIMPLE_THREAD_TYPE) +else + AC_TRY_COMPILE( + #include <sys/types.h> + $thread_h_decl, [ + $db_threadid_t_decl + db_threadid_t a; + a = 0; + ], AC_DEFINE(HAVE_SIMPLE_THREAD_TYPE)) +fi + +# If we're building replication and configured with POSIX pthreads or were +# told to build using the POSIX API, build the replication manager framework. +db_cv_build_replication_mgr="no" +if test "$db_cv_build_replication" = "yes"; then + AH_TEMPLATE(HAVE_REPLICATION_THREADS, + [Define to 1 if building the Berkeley DB replication framework.]) + case "$db_cv_mutex" in + POSIX/pthread*|Solaris/lwp) + db_cv_build_replication_mgr="yes";; + esac + if test "$db_cv_pthread_api" = "yes"; then + db_cv_build_replication_mgr="yes" + fi + + if test "$db_cv_build_replication_mgr" = "yes"; then + AC_DEFINE(HAVE_REPLICATION_THREADS) + + # Solaris requires the socket and nsl libraries to build the + # replication manager. Don't add nsl regardless of the OS, + # it causes RPC to fail on AIX 4.3.3. + case "$host_os" in + solaris*) + AC_HAVE_LIBRARY(nsl, LIBSO_LIBS="$LIBSO_LIBS -lnsl") + AC_HAVE_LIBRARY(socket, + LIBSO_LIBS="$LIBSO_LIBS -lsocket");; + esac + fi fi # There are 3 classes of mutexes: diff --git a/db/dist/aclocal/options.ac b/db/dist/aclocal/options.ac index b770fc444..81e1361b8 100644 --- a/db/dist/aclocal/options.ac +++ b/db/dist/aclocal/options.ac @@ -1,4 +1,4 @@ -# $Id: options.ac,v 11.37 2004/06/10 16:38:18 bostic Exp $ +# $Id: options.ac,v 12.4 2006/04/07 15:08:58 bostic Exp $ # Process user-specified options. AC_DEFUN(AM_OPTIONS_SET, [ @@ -161,6 +161,28 @@ AC_ARG_ENABLE(posixmutexes, [db_cv_posixmutexes="$enable_posixmutexes"], [db_cv_posixmutexes="no"]) AC_MSG_RESULT($db_cv_posixmutexes) +AC_ARG_ENABLE(pthread_self, + [AC_HELP_STRING([--enable-pthread_self], + [Obsolete; use --enable-pthread_api instead.])], + [AC_MSG_ERROR( + [--enable-pthread_self no longer supported, use --enable-pthread_api])]) + +AC_MSG_CHECKING(if --enable-pthread_api option specified) +AC_ARG_ENABLE(pthread_api, + [AC_HELP_STRING([--enable-pthread_api], + [Configure Berkeley DB for POSIX pthread API.])], + [db_cv_pthread_api="$enable_pthread_api"], [db_cv_pthread_api="no"]) +# POSIX mutexes implies other POSIX APIs. +if test "$db_cv_posixmutexes" != "no"; then + db_cv_pthread_api="yes" +fi +AC_MSG_RESULT($db_cv_pthread_api) +AH_TEMPLATE(HAVE_PTHREAD_API, + [Define to 1 to configure Berkeley DB for POSIX pthread API.]) +if test "$db_cv_pthread_api" = "yes"; then + AC_DEFINE(HAVE_PTHREAD_API) +fi + AC_MSG_CHECKING(if --enable-rpc option specified) AC_ARG_ENABLE(rpc, [AC_HELP_STRING([--enable-rpc], @@ -224,20 +246,13 @@ if test "$with_mutex" != "no"; then fi AC_MSG_RESULT($with_mutex) -AH_TEMPLATE(MUTEX_ALIGN, - [Define to a value if using non-standard mutex alignment.]) -AC_MSG_CHECKING(if --with-mutexalign=ALIGNMENT option specified) +# --with-mutexalign=ALIGNMENT was the configuration option that Berkeley DB +# used before the DbEnv::mutex_set_align method was added. AC_ARG_WITH(mutexalign, [AC_HELP_STRING([--with-mutexalign=ALIGNMENT], - [Selection of non-standard mutex alignment.])], - [with_mutexalign="$withval"], [with_mutexalign="no"]) -if test "$with_mutexalign" = "yes"; then - AC_MSG_ERROR([--with-mutexalign requires a mutex alignment argument]) -fi -if test "$with_mutexalign" != "no"; then - AC_DEFINE_UNQUOTED(MUTEX_ALIGN, $with_mutexalign) -fi -AC_MSG_RESULT($with_mutexalign) + [Obsolete; use DbEnv::mutex_set_align instead.])], + [AC_MSG_ERROR( + [--with-mutexalign no longer supported, use DbEnv::mutex_set_align])]) AC_MSG_CHECKING([if --with-tcl=DIR option specified]) AC_ARG_WITH(tcl, @@ -273,20 +288,4 @@ 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 db6b4f03e..3fb61f045 100644 --- a/db/dist/aclocal/programs.ac +++ b/db/dist/aclocal/programs.ac @@ -1,71 +1,52 @@ -# $Id: programs.ac,v 11.22 2004/06/10 16:38:18 bostic Exp $ +# $Id: programs.ac,v 12.2 2006/07/06 14:00:28 bostic Exp $ # Check for programs used in building/installation. AC_DEFUN(AM_PROGRAMS_SET, [ -AC_CHECK_TOOL(db_cv_path_ar, ar, missing_ar) -if test "$db_cv_path_ar" = missing_ar; then - AC_MSG_ERROR([No ar utility found.]) -fi +AC_CHECK_TOOL(AR, ar, none) +test "$AR" = "none" && AC_MSG_ERROR([No ar utility found.]) -AC_CHECK_TOOL(db_cv_path_chmod, chmod, missing_chmod) -if test "$db_cv_path_chmod" = missing_chmod; then - AC_MSG_ERROR([No chmod utility found.]) -fi +AC_CHECK_TOOL(CHMOD, chmod, none) +test "$CHMOD" = "none" && AC_MSG_ERROR([No chmod utility found.]) -AC_CHECK_TOOL(db_cv_path_cp, cp, missing_cp) -if test "$db_cv_path_cp" = missing_cp; then - AC_MSG_ERROR([No cp utility found.]) -fi +AC_CHECK_TOOL(CP, cp, none) +test "$CP" = "none" && AC_MSG_ERROR([No cp utility found.]) -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.]) +# The Tcl test suite requires a kill utility. +if test "$db_cv_test" = "yes"; then + AC_CHECK_TOOL(KILL, kill, none) + test "$KILL" = "none" && AC_MSG_ERROR([No kill utility found.]) fi -AC_CHECK_TOOL(db_cv_path_mkdir, mkdir, missing_mkdir) -if test "$db_cv_path_mkdir" = missing_mkdir; then - AC_MSG_ERROR([No mkdir utility found.]) -fi +AC_CHECK_TOOL(LN, ln, none) +test "$LN" = "none" && AC_MSG_ERROR([No ln utility found.]) -# We need a complete path for ranlib, because it doesn't exist on some -# architectures because the ar utility packages the library itself. -AC_CHECK_TOOL(path_ranlib, ranlib, missing_ranlib) -AC_PATH_PROG(db_cv_path_ranlib, $path_ranlib, missing_ranlib) +AC_CHECK_TOOL(MKDIR, mkdir, none) +test "$MKDIR" = "none" && AC_MSG_ERROR([No mkdir utility found.]) -AC_CHECK_TOOL(db_cv_path_rm, rm, missing_rm) -if test "$db_cv_path_rm" = missing_rm; then - AC_MSG_ERROR([No rm utility found.]) -fi +# Ranlib doesn't exist on some architectures because the ar utility +# packages the library itself. +AC_CHECK_TOOL(RANLIB, ranlib, none) + +AC_CHECK_TOOL(RM, rm, none) +test "$RM" = "none" && AC_MSG_ERROR([No rm 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 + AC_CHECK_TOOL(RPCGEN, rpcgen, none) + test "$RPCGEN" = "none" && AC_MSG_ERROR([No rpcgen utility found.]) fi -# We need a complete path for sh, because some implementations of make -# get upset if SHELL is set to just the command name. -AC_CHECK_TOOL(path_sh, sh, missing_sh) -AC_PATH_PROG(db_cv_path_sh, $path_sh, missing_sh) -if test "$db_cv_path_sh" = missing_sh; then - AC_MSG_ERROR([No sh utility found.]) -fi +# We need a complete path for sh, because some make utility implementations get +# upset if SHELL is set to just the command name. Don't use the SHELL variable +# here because the user likely has the SHELL variable set to something other +# than the Bourne shell, which is what Make wants. +AC_PATH_TOOL(db_cv_path_sh, sh, none) +test "$db_cv_path_sh" = "none" && AC_MSG_ERROR([No sh utility found.]) # Don't strip the binaries if --enable-debug was specified. if test "$db_cv_debug" = yes; then - db_cv_path_strip=debug_build_no_strip + STRIP="none" else - AC_CHECK_TOOL(path_strip, strip, missing_strip) - AC_PATH_PROG(db_cv_path_strip, $path_strip, missing_strip) -fi - -if test "$db_cv_test" = "yes"; then - AC_CHECK_TOOL(db_cv_path_kill, kill, missing_kill) - if test "$db_cv_path_kill" = missing_kill; then - AC_MSG_ERROR([No kill utility found.]) - fi -fi - -]) + AC_CHECK_TOOL(STRIP, strip, none) + test "$STRIP" = "none" && AC_MSG_WARN([No strip utility found.]) +fi]) diff --git a/db/dist/aclocal/rpc.ac b/db/dist/aclocal/rpc.ac index 7d7f4dabe..11fb0e925 100644 --- a/db/dist/aclocal/rpc.ac +++ b/db/dist/aclocal/rpc.ac @@ -1,4 +1,4 @@ -# $Id: rpc.ac,v 11.9 2004/09/27 21:33:48 mjc Exp $ +# $Id: rpc.ac,v 12.1 2006/05/08 20:52:36 bostic Exp $ # Try and configure RPC support. AC_DEFUN(AM_RPC_CONFIGURE, [ @@ -71,13 +71,7 @@ AC_DEFUN(AM_RPC_CONFIGURE, [ 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 + # Solaris and HPUX need the nsl library to build RPC. + AC_CHECK_FUNC(svc_run,, + AC_HAVE_LIBRARY(nsl, LIBSO_LIBS="$LIBSO_LIBS -lnsl")) ]) diff --git a/db/dist/aclocal/sequence.ac b/db/dist/aclocal/sequence.ac index ca320b232..75cf19bfd 100644 --- a/db/dist/aclocal/sequence.ac +++ b/db/dist/aclocal/sequence.ac @@ -1,8 +1,9 @@ -# $Id: sequence.ac,v 1.3 2004/10/28 18:14:30 bostic Exp $ +# $Id: sequence.ac,v 12.3 2005/11/24 00:49:24 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 have found 64-bit types to support sequences. If we don't @@ -14,13 +15,27 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [ db_cv_build_sequence="no" fi - # 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 + # Figure out what type is the right size, and set the format. + AC_SUBST(INT64_FMT) + AC_SUBST(UINT64_FMT) + db_cv_seq_type="no" + if test "$db_cv_build_sequence" = "yes" -a\ + "$ac_cv_sizeof_long" -eq "8"; then + db_cv_seq_type="long" + db_cv_seq_fmt='"%ld"' + db_cv_seq_ufmt='"%lu"' + INT64_FMT='#define INT64_FMT "%ld"' + UINT64_FMT='#define UINT64_FMT "%lu"' + else if test "$db_cv_build_sequence" = "yes" -a\ + "$ac_cv_sizeof_long_long" -eq "8"; then + db_cv_seq_type="long long" + db_cv_seq_fmt='"%lld"' + db_cv_seq_ufmt='"%llu"' + INT64_FMT='#define INT64_FMT "%lld"' + UINT64_FMT='#define UINT64_FMT "%llu"' + else 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 @@ -29,45 +44,45 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [ if test "$db_cv_build_sequence" = "yes"; then AC_TRY_RUN([ main() { - long long l; - unsigned long long u; - char buf[100]; + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf@<:@100@:>@; - buf[0] = 'a'; + buf@<:@0@:>@ = 'a'; l = 9223372036854775807LL; - (void)snprintf(buf, sizeof(buf), "%lld", l); + (void)snprintf(buf, sizeof(buf), $db_cv_seq_fmt, l); if (strcmp(buf, "9223372036854775807")) return (1); u = 18446744073709551615ULL; - (void)snprintf(buf, sizeof(buf), "%llu", u); + (void)snprintf(buf, sizeof(buf), $db_cv_seq_ufmt, 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]; + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf@<:@100@:>@; - buf[0] = 'a'; + buf@<:@0@:>@ = 'a'; l = 9223372036854775807LL; - (void)snprintf(buf, sizeof(buf), "%lld", l); + (void)snprintf(buf, sizeof(buf), $db_cv_seq_fmt, l); if (strcmp(buf, "9223372036854775807")) return (1); u = 18446744073709551615ULL; - (void)snprintf(buf, sizeof(buf), "%llu", u); + (void)snprintf(buf, sizeof(buf), $db_cv_seq_ufmt, 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;"; + + AC_DEFINE(HAVE_64BIT_TYPES) + AH_TEMPLATE(HAVE_64BIT_TYPES, + [Define to 1 if 64-bit types are available.]) else # It still has to compile, but it won't run. db_seq_decl="typedef int db_seq_t;"; diff --git a/db/dist/aclocal/sosuffix.ac b/db/dist/aclocal/sosuffix.ac index 8864280f1..bd391e248 100644 --- a/db/dist/aclocal/sosuffix.ac +++ b/db/dist/aclocal/sosuffix.ac @@ -1,4 +1,4 @@ -# $Id: sosuffix.ac,v 1.4 2004/08/14 20:00:45 dda Exp $ +# $Id: sosuffix.ac,v 12.0 2004/11/17 03:43:38 bostic Exp $ # Determine shared object suffixes. # # Our method is to use the libtool variable $library_names_spec, diff --git a/db/dist/aclocal/tcl.ac b/db/dist/aclocal/tcl.ac index d28d36083..360cf62b1 100644 --- a/db/dist/aclocal/tcl.ac +++ b/db/dist/aclocal/tcl.ac @@ -1,4 +1,4 @@ -# $Id: tcl.ac,v 11.18 2004/03/11 20:11:17 bostic Exp $ +# $Id: tcl.ac,v 12.2 2005/06/28 20:45:25 gmf 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 @@ -93,12 +93,11 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [ AC_MSG_ERROR([Berkeley DB requires Tcl version 8.4 or better.]) 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}" + # The eval is required to do substitution (for example, the TCL_DBGX + # substitution in the TCL_LIB_FILE variable. + eval "TCL_INCLUDE_SPEC=\"${TCL_INCLUDE_SPEC}\"" + eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\"" + eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\"" eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\"" # @@ -115,8 +114,9 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [ LIBTSO_LIBS="$LIBTSO_LIBS $TCL_LIB_SPEC $TCL_LIB_FLAG";; esac AC_SUBST(TCL_BIN_DIR) - AC_SUBST(TCL_SRC_DIR) + AC_SUBST(TCL_INCLUDE_SPEC) AC_SUBST(TCL_LIB_FILE) + AC_SUBST(TCL_SRC_DIR) AC_SUBST(TCL_TCLSH) TCL_TCLSH="${TCL_PREFIX}/bin/tclsh${TCL_VERSION}" @@ -128,14 +128,8 @@ AC_DEFUN(AM_TCL_LOAD, [ AC_MSG_ERROR([Tcl requires shared libraries]) fi - AC_SUBST(TCFLAGS) - SC_PATH_TCLCONFIG SC_LOAD_TCLCONFIG - 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)" ]) diff --git a/db/dist/aclocal/types.ac b/db/dist/aclocal/types.ac index b5843385c..f9291386d 100644 --- a/db/dist/aclocal/types.ac +++ b/db/dist/aclocal/types.ac @@ -1,4 +1,4 @@ -# $Id: types.ac,v 11.18 2004/10/25 18:14:14 bostic Exp $ +# $Id: types.ac,v 12.3 2005/11/03 17:46:14 bostic Exp $ # Check the sizes we know about, and see if any of them match what's needed. # @@ -68,6 +68,11 @@ AC_CHECK_HEADER(stddef.h, [ db_includes="$db_includes #include <stddef.h>" stddef_h_decl="#include <stddef.h>"]) +AC_SUBST(unistd_h_decl) +AC_CHECK_HEADER(unistd.h, [ + db_includes="$db_includes +#include <unistd.h>" + unistd_h_decl="#include <unistd.h>"]) db_includes="$db_includes #include <stdio.h>" @@ -76,10 +81,6 @@ db_includes="$db_includes 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. AC_CHECK_SIZEOF(char,, $db_includes) AC_CHECK_SIZEOF(unsigned char,, $db_includes) @@ -148,6 +149,9 @@ AC_CHECK_TYPE(ssize_t,, [AM_SEARCH_SSIZES(ssize_t_decl, ssize_t, $ac_cv_sizeof_size_t)], $db_includes) +# So far, no autoconf'd systems lack pid_t. +AC_SUBST(pid_t_decl) + # Check for uintmax_t -- if none exists, first the largest unsigned integral # type available. AC_SUBST(uintmax_t_decl) diff --git a/db/dist/aclocal_java/ac_check_class.ac b/db/dist/aclocal_java/ac_check_class.ac index 915198af5..b12e7f02f 100644 --- a/db/dist/aclocal_java/ac_check_class.ac +++ b/db/dist/aclocal_java/ac_check_class.ac @@ -15,7 +15,7 @@ dnl The general documentation, as well as the sample configure.in, is dnl included in the AC_PROG_JAVA macro. dnl dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr> -dnl @version $Id: ac_check_class.ac,v 1.1 2001/08/23 16:58:42 dda Exp $ +dnl @version $Id: ac_check_class.ac,v 12.0 2004/11/17 03:43:38 bostic Exp $ dnl AC_DEFUN([AC_CHECK_CLASS],[ AC_REQUIRE([AC_PROG_JAVA]) diff --git a/db/dist/aclocal_java/ac_check_classpath.ac b/db/dist/aclocal_java/ac_check_classpath.ac index 4a78d0f87..b18d479b3 100644 --- a/db/dist/aclocal_java/ac_check_classpath.ac +++ b/db/dist/aclocal_java/ac_check_classpath.ac @@ -12,7 +12,7 @@ dnl The general documentation, as well as the sample configure.in, is dnl included in the AC_PROG_JAVA macro. dnl dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr> -dnl @version $Id: ac_check_classpath.ac,v 1.1 2001/08/23 16:58:42 dda Exp $ +dnl @version $Id: ac_check_classpath.ac,v 12.0 2004/11/17 03:43:38 bostic Exp $ dnl AC_DEFUN([AC_CHECK_CLASSPATH],[ if test "x$CLASSPATH" = x; then diff --git a/db/dist/aclocal_java/ac_check_junit.ac b/db/dist/aclocal_java/ac_check_junit.ac index 3b81d1dc3..cc02e3276 100644 --- a/db/dist/aclocal_java/ac_check_junit.ac +++ b/db/dist/aclocal_java/ac_check_junit.ac @@ -30,7 +30,7 @@ dnl echo "exec @JUNIT@ my.package.name.AllJunitTests" >> $@ dnl chmod +x $@ dnl dnl @author Luc Maisonobe -dnl @version $Id: ac_check_junit.ac,v 1.1 2001/08/23 16:58:43 dda Exp $ +dnl @version $Id: ac_check_junit.ac,v 12.0 2004/11/17 03:43:38 bostic Exp $ dnl AC_DEFUN([AC_CHECK_JUNIT],[ AC_CACHE_VAL(ac_cv_prog_JUNIT,[ diff --git a/db/dist/aclocal_java/ac_check_rqrd_class.ac b/db/dist/aclocal_java/ac_check_rqrd_class.ac index ab62e33c8..c7c26b877 100644 --- a/db/dist/aclocal_java/ac_check_rqrd_class.ac +++ b/db/dist/aclocal_java/ac_check_rqrd_class.ac @@ -14,7 +14,7 @@ dnl The general documentation, as well as the sample configure.in, is dnl included in the AC_PROG_JAVA macro. dnl dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr> -dnl @version $Id: ac_check_rqrd_class.ac,v 1.1 2001/08/23 16:58:43 dda Exp $ +dnl @version $Id: ac_check_rqrd_class.ac,v 12.0 2004/11/17 03:43:38 bostic Exp $ dnl AC_DEFUN([AC_CHECK_RQRD_CLASS],[ diff --git a/db/dist/aclocal_java/ac_java_options.ac b/db/dist/aclocal_java/ac_java_options.ac index 567afca7f..e71adfe68 100644 --- a/db/dist/aclocal_java/ac_java_options.ac +++ b/db/dist/aclocal_java/ac_java_options.ac @@ -12,7 +12,7 @@ dnl The general documentation, as well as the sample configure.in, is dnl included in the AC_PROG_JAVA macro. dnl dnl @author Devin Weaver <ktohg@tritarget.com> -dnl @version $Id: ac_java_options.ac,v 1.1 2001/08/23 16:58:43 dda Exp $ +dnl @version $Id: ac_java_options.ac,v 12.0 2004/11/17 03:43:38 bostic Exp $ dnl AC_DEFUN([AC_JAVA_OPTIONS],[ AC_ARG_WITH(java-prefix, diff --git a/db/dist/aclocal_java/ac_jni_include_dirs.ac b/db/dist/aclocal_java/ac_jni_include_dirs.ac index b70d108d6..177f62f85 100644 --- a/db/dist/aclocal_java/ac_jni_include_dirs.ac +++ b/db/dist/aclocal_java/ac_jni_include_dirs.ac @@ -27,8 +27,8 @@ dnl dnl Note: This macro can work with the autoconf M4 macros for Java programs. dnl This particular macro is not part of the original set of macros. dnl -dnl @author Don Anderson <dda@sleepycat.com> -dnl @version $Id: ac_jni_include_dirs.ac,v 1.12 2003/10/05 18:10:06 dda Exp $ +dnl @author Don Anderson +dnl @version $Id: ac_jni_include_dirs.ac,v 12.1 2006/08/24 14:45:36 bostic Exp $ dnl AC_DEFUN(AC_JNI_INCLUDE_DIR,[ diff --git a/db/dist/aclocal_java/ac_prog_jar.ac b/db/dist/aclocal_java/ac_prog_jar.ac index 9dfa1be6d..c60a79a85 100644 --- a/db/dist/aclocal_java/ac_prog_jar.ac +++ b/db/dist/aclocal_java/ac_prog_jar.ac @@ -22,7 +22,7 @@ dnl The general documentation of those macros, as well as the sample dnl configure.in, is included in the AC_PROG_JAVA macro. dnl dnl @author Egon Willighagen <egonw@sci.kun.nl> -dnl @version $Id: ac_prog_jar.ac,v 1.1 2001/08/23 16:58:43 dda Exp $ +dnl @version $Id: ac_prog_jar.ac,v 12.0 2004/11/17 03:43:38 bostic Exp $ dnl AC_DEFUN([AC_PROG_JAR],[ AC_REQUIRE([AC_EXEEXT])dnl diff --git a/db/dist/aclocal_java/ac_prog_java.ac b/db/dist/aclocal_java/ac_prog_java.ac index 67a879ffc..05c65e7c4 100644 --- a/db/dist/aclocal_java/ac_prog_java.ac +++ b/db/dist/aclocal_java/ac_prog_java.ac @@ -62,9 +62,9 @@ dnl dnl AC_OUTPUT(Makefile) dnl dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr> -dnl @version $Id: ac_prog_java.ac,v 1.2 2003/05/10 17:46:09 dda Exp $ +dnl @version $Id: ac_prog_java.ac,v 12.1 2006/08/24 14:45:36 bostic Exp $ dnl -dnl Note: Modified by dda@sleepycat.com to prefer java over kaffe. [#8059] +dnl Note: Modified to prefer java over kaffe. [#8059] dnl AC_DEFUN([AC_PROG_JAVA],[ AC_REQUIRE([AC_EXEEXT])dnl diff --git a/db/dist/aclocal_java/ac_prog_java_works.ac b/db/dist/aclocal_java/ac_prog_java_works.ac index 36acd2676..f0ff8c57f 100644 --- a/db/dist/aclocal_java/ac_prog_java_works.ac +++ b/db/dist/aclocal_java/ac_prog_java_works.ac @@ -11,7 +11,7 @@ dnl The general documentation, as well as the sample configure.in, is dnl included in the AC_PROG_JAVA macro. dnl dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr> -dnl @version $Id: ac_prog_java_works.ac,v 1.1 2001/08/23 16:58:44 dda Exp $ +dnl @version $Id: ac_prog_java_works.ac,v 12.0 2004/11/17 03:43:38 bostic Exp $ dnl AC_DEFUN([AC_PROG_JAVA_WORKS], [ AC_CHECK_PROG(uudecode, uudecode$EXEEXT, yes) diff --git a/db/dist/aclocal_java/ac_prog_javac.ac b/db/dist/aclocal_java/ac_prog_javac.ac index 5ded7d1b7..b3607dcf8 100644 --- a/db/dist/aclocal_java/ac_prog_javac.ac +++ b/db/dist/aclocal_java/ac_prog_javac.ac @@ -28,7 +28,7 @@ dnl The general documentation, as well as the sample configure.in, is dnl included in the AC_PROG_JAVA macro. dnl dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr> -dnl @version $Id: ac_prog_javac.ac,v 1.3 2001/08/23 17:08:22 dda Exp $ +dnl @version $Id: ac_prog_javac.ac,v 12.0 2004/11/17 03:43:38 bostic Exp $ dnl AC_DEFUN([AC_PROG_JAVAC],[ AC_REQUIRE([AC_EXEEXT])dnl diff --git a/db/dist/aclocal_java/ac_prog_javac_works.ac b/db/dist/aclocal_java/ac_prog_javac_works.ac index 139a99f98..0cfd1f213 100644 --- a/db/dist/aclocal_java/ac_prog_javac_works.ac +++ b/db/dist/aclocal_java/ac_prog_javac_works.ac @@ -11,7 +11,7 @@ dnl The general documentation, as well as the sample configure.in, is dnl included in the AC_PROG_JAVA macro. dnl dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr> -dnl @version $Id: ac_prog_javac_works.ac,v 1.1 2001/08/23 16:58:44 dda Exp $ +dnl @version $Id: ac_prog_javac_works.ac,v 12.0 2004/11/17 03:43:38 bostic Exp $ dnl AC_DEFUN([AC_PROG_JAVAC_WORKS],[ AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [ diff --git a/db/dist/aclocal_java/ac_prog_javadoc.ac b/db/dist/aclocal_java/ac_prog_javadoc.ac index 5154d3f1f..36b95bd00 100644 --- a/db/dist/aclocal_java/ac_prog_javadoc.ac +++ b/db/dist/aclocal_java/ac_prog_javadoc.ac @@ -22,7 +22,7 @@ dnl The general documentation of those macros, as well as the sample dnl configure.in, is included in the AC_PROG_JAVA macro. dnl dnl @author Egon Willighagen <egonw@sci.kun.nl> -dnl @version $Id: ac_prog_javadoc.ac,v 1.1 2001/08/23 16:58:44 dda Exp $ +dnl @version $Id: ac_prog_javadoc.ac,v 12.0 2004/11/17 03:43:38 bostic Exp $ dnl AC_DEFUN([AC_PROG_JAVADOC],[ AC_REQUIRE([AC_EXEEXT])dnl diff --git a/db/dist/aclocal_java/ac_prog_javah.ac b/db/dist/aclocal_java/ac_prog_javah.ac index 1b16d9e24..7563036c0 100644 --- a/db/dist/aclocal_java/ac_prog_javah.ac +++ b/db/dist/aclocal_java/ac_prog_javah.ac @@ -5,7 +5,7 @@ dnl and looks for the jni.h header file. If available, JAVAH is set to dnl the full path of javah and CPPFLAGS is updated accordingly. dnl dnl @author Luc Maisonobe -dnl @version $Id: ac_prog_javah.ac,v 1.1 2001/08/23 16:58:44 dda Exp $ +dnl @version $Id: ac_prog_javah.ac,v 12.0 2004/11/17 03:43:38 bostic Exp $ dnl AC_DEFUN([AC_PROG_JAVAH],[ AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl diff --git a/db/dist/aclocal_java/ac_try_compile_java.ac b/db/dist/aclocal_java/ac_try_compile_java.ac index 775569ba0..d22aeab42 100644 --- a/db/dist/aclocal_java/ac_try_compile_java.ac +++ b/db/dist/aclocal_java/ac_try_compile_java.ac @@ -14,7 +14,7 @@ dnl The general documentation, as well as the sample configure.in, is dnl included in the AC_PROG_JAVA macro. dnl dnl @author Devin Weaver <ktohg@tritarget.com> -dnl @version $Id: ac_try_compile_java.ac,v 1.1 2001/08/23 16:58:44 dda Exp $ +dnl @version $Id: ac_try_compile_java.ac,v 12.0 2004/11/17 03:43:38 bostic Exp $ dnl AC_DEFUN([AC_TRY_COMPILE_JAVA],[ AC_REQUIRE([AC_PROG_JAVAC])dnl diff --git a/db/dist/aclocal_java/ac_try_run_javac.ac b/db/dist/aclocal_java/ac_try_run_javac.ac index cf91306af..012493588 100644 --- a/db/dist/aclocal_java/ac_try_run_javac.ac +++ b/db/dist/aclocal_java/ac_try_run_javac.ac @@ -14,7 +14,7 @@ dnl The general documentation, as well as the sample configure.in, is dnl included in the AC_PROG_JAVA macro. dnl dnl @author Devin Weaver <ktohg@tritarget.com> -dnl @version $Id: ac_try_run_javac.ac,v 1.1 2001/08/23 16:58:45 dda Exp $ +dnl @version $Id: ac_try_run_javac.ac,v 12.0 2004/11/17 03:43:38 bostic Exp $ dnl AC_DEFUN([AC_TRY_RUN_JAVA],[ AC_REQUIRE([AC_PROG_JAVAC])dnl diff --git a/db/dist/buildrel b/db/dist/buildrel index 2537376a8..1d2263cb5 100644 --- a/db/dist/buildrel +++ b/db/dist/buildrel @@ -1,11 +1,12 @@ -# $Id: buildrel,v 1.65 2004/11/09 01:26:29 bostic Exp $ +# $Id: buildrel,v 12.14 2006/09/20 01:12:33 bostic Exp $ # # Build the distribution package. # # A set of commands intended to be cut and pasted into a csh window. -# Development tree, release home. -setenv D `pwd` +setenv D ~bostic/berkeleydb/db.rel +setenv DBCONF "~bostic/bin/dbconf thread" +setenv TARGETDIR ~bostic/berkeleydb/ # Update the release number. cd $D/dist @@ -24,7 +25,7 @@ cd $D/dist && sh s_all cd $D && cvs -q commit # Copy a development tree into a release tree. -setenv R /var/tmp/db-$VERSION +setenv R $TARGETDIR/db-$VERSION rm -rf $R && mkdir -p $R cd $D && cvs -q status | \ grep "Repository revision" | \ @@ -38,19 +39,25 @@ cd db_docs && sh build $D clean && sh build $D |& sed '/.html$/d' cd je/docs_src && sh build db ../../db rm -rf $R/docs && cp -r $D/docs $R/docs -# Remove source directories we don't distribute. -cd $R && rm -rf docs_src docs/api_java -cd $R && rm -rf test/TODO test/upgrade test_perf test_purify -cd $R && rm -rf test_server test_thread test_vxworks test_xa -cd $R && rm -rf java/src/com/sleepycat/xa +######################################## +# PATCH RELEASE: starting point. +######################################## # Fix symbolic links and permissions. cd $R/dist && sh s_perm cd $R/dist && sh s_symlink +# Remove source directories we don't distribute. +cd $R && rm -rf build_brew os_brew +cd $R && rm -rf docs_src docs/api_java docs/api_c/pindex.src +cd $R && rm -rf java/src/com/sleepycat/xa +cd $R && rm -rf rpc_server/java +cd $R && rm -rf test/TODO test/upgrade test_perf test_purify +cd $R && rm -rf test_rep test_server test_thread test_vxworks test_xa + # Build a version and smoke test. cd $R && rm -rf build_run && mkdir build_run -cd $R/build_run && ~bostic/bin/dbconf && make >& mklog +cd $R/build_run && $DBCONF && make >& mklog cd $R/build_run && make ex_access && ./ex_access # Check the install @@ -67,7 +74,7 @@ cd $R && rm -rf build_run # ACQUIRE ROOT PRIVILEGES cd $R && find . -type d | xargs chmod 775 cd $R && find . -type f | xargs chmod 444 -cd $R && chmod 664 build_win32/*.dsp +cd $R && chmod 664 build_windows/*.dsp cd $R/dist && sh s_perm chown -R 100 $R chgrp -R 100 $R @@ -88,14 +95,14 @@ awk '{ if (length() > 99) print "Path length: " length() " bytes: " $0;}' # Create the non-crypto tree. setenv RNC "$R/../db-$VERSION.NC" rm -rf $RNC $R/../__TMP && mkdir $R/../__TMP -cd $R/../__TMP && gzcat $T | tar xpf - && mv -i db-$VERSION $RNC +cd $R/../__TMP && gzcat $T | pax -r && mv -i db-$VERSION $RNC cd $R && rm -rf $R/../__TMP cd $RNC/dist && sh s_crypto # ACQUIRE ROOT PRIVILEGES cd $RNC && find . -type d | xargs chmod 775 cd $RNC && find . -type f | xargs chmod 444 -cd $RNC && chmod 664 build_win32/*.dsp +cd $RNC && chmod 664 build_windows/*.dsp cd $RNC/dist && sh s_perm chown -R 100 $RNC chgrp -R 100 $RNC @@ -112,17 +119,25 @@ awk '{ if (length() > 99) print "Path length: " length() " bytes: " $0;}' # Remove tags files. They're large and we don't want to store symbolic links # in the zip archive for portability reasons. +# +# Modify the text files to have Windows end-of-line characters. # ACQUIRE ROOT PRIVILEGES cd $R && rm -f `find . -name 'tags'` cd $RNC && rm -f `find . -name 'tags'` + +set t=__tmp +cd $R && awk '{print $0 "\r"}' < LICENSE > $t && cp $t LICENSE && rm -f $t +cd $R && awk '{print $0 "\r"}' < README > $t && cp $t README && rm -f $t +cd $RNC && awk '{print $0 "\r"}' < LICENSE > $t && cp $t LICENSE && rm -f $t +cd $RNC && awk '{print $0 "\r"}' < README > $t && cp $t README && rm -f $t # DISCARD ROOT PRIVILEGES # Create the crypto zip archive release. setenv T "$R/../db-$VERSION.zip" -cd $R/.. && zip -r - db-$VERSION > $T +cd $R/.. && zip -q -r - db-$VERSION > $T chmod 444 $T # Create the non-crypto zip archive release. setenv T "$R/../db-$VERSION.NC.zip" -cd $RNC/.. && zip -r - db-$VERSION.NC > $T +cd $RNC/.. && zip -q -r - db-$VERSION.NC > $T chmod 444 $T diff --git a/db/dist/clib_port.h b/db/dist/clib_port.h new file mode 100644 index 000000000..cfefbb37d --- /dev/null +++ b/db/dist/clib_port.h @@ -0,0 +1,97 @@ +/* + * Exit success/failure macros. + */ +#ifndef HAVE_EXIT_SUCCESS +#define EXIT_FAILURE 1 +#define EXIT_SUCCESS 0 +#endif + +/* + * Don't step on the namespace. Other libraries may have their own + * implementations of these functions, we don't want to use their + * implementations or force them to use ours based on the load order. + */ +#ifndef HAVE_ATOI +#define atoi __db_Catoi +#endif +#ifndef HAVE_ATOL +#define atol __db_Catol +#endif +#ifndef HAVE_GETADDRINFO +#define freeaddrinfo(a) __db_Cfreeaddrinfo(a) +#define getaddrinfo(a, b, c, d) __db_Cgetaddrinfo(a, b, c, d) +#endif +#ifndef HAVE_GETCWD +#define getcwd __db_Cgetcwd +#endif +#ifndef HAVE_GETOPT +#define getopt __db_Cgetopt +#define optarg __db_Coptarg +#define opterr __db_Copterr +#define optind __db_Coptind +#define optopt __db_Coptopt +#define optreset __db_Coptreset +#endif +#ifndef HAVE_ISSPACE +#define isspace __db_Cisspace +#endif +#ifndef HAVE_MEMCMP +#define memcmp __db_Cmemcmp +#endif +#ifndef HAVE_MEMCPY +#define memcpy __db_Cmemcpy +#endif +#ifndef HAVE_MEMMOVE +#define memmove __db_Cmemmove +#endif +#ifndef HAVE_PRINTF +#define printf __db_Cprintf +#define fprintf __db_Cfprintf +#endif +#ifndef HAVE_RAISE +#define raise __db_Craise +#endif +#ifndef HAVE_RAND +#define rand __db_Crand +#define srand __db_Csrand +#endif +#ifndef HAVE_SNPRINTF +#define snprintf __db_Csnprintf +#endif +#ifndef HAVE_STRCASECMP +#define strcasecmp __db_Cstrcasecmp +#define strncasecmp __db_Cstrncasecmp +#endif +#ifndef HAVE_STRCAT +#define strcat __db_Cstrcat +#endif +#ifndef HAVE_STRCHR +#define strchr __db_Cstrchr +#endif +#ifndef HAVE_STRDUP +#define strdup __db_Cstrdup +#endif +#ifndef HAVE_STRERROR +#define strerror __db_Cstrerror +#endif +#ifndef HAVE_STRNCAT +#define strncat __db_Cstrncat +#endif +#ifndef HAVE_STRNCMP +#define strncmp __db_Cstrncmp +#endif +#ifndef HAVE_STRRCHR +#define strrchr __db_Cstrrchr +#endif +#ifndef HAVE_STRSEP +#define strsep __db_Cstrsep +#endif +#ifndef HAVE_STRTOL +#define strtol __db_Cstrtol +#endif +#ifndef HAVE_STRTOUL +#define strtoul __db_Cstrtoul +#endif +#ifndef HAVE_VSNPRINTF +#define vsnprintf __db_Cvsnprintf +#endif diff --git a/db/dist/config.guess b/db/dist/config.guess index 7d0185e01..396482d6c 100755 --- a/db/dist/config.guess +++ b/db/dist/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2004-09-07' +timestamp='2006-07-02' # 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 @@ -17,13 +18,15 @@ timestamp='2004-09-07' # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Originally written by Per Bothner <per@bothner.com>. # Please send patches to <config-patches@gnu.org>. Submit a context # diff and a properly formatted ChangeLog entry. @@ -53,7 +56,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -66,11 +69,11 @@ Try \`$me --help' for more information." while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,7 +107,7 @@ set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -123,7 +126,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -196,55 +199,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # contains redundant information, the shorter form: # 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 ;; - 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 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -297,37 +268,43 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # 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/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit 0 ;; + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -335,32 +312,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -369,10 +346,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -384,10 +361,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -398,40 +375,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -455,32 +432,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -496,29 +474,29 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -526,7 +504,7 @@ EOF IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -541,14 +519,18 @@ EOF exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; + exit ;; *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then @@ -562,28 +544,28 @@ EOF IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -645,9 +627,19 @@ EOF esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -655,11 +647,11 @@ EOF fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -687,158 +679,179 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; 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 ;; + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; + exit ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; *: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 ;; + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit 0 ;; + exit ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit 0 ;; + exit ;; frv:Linux:*:*) echo frv-unknown-linux-gnu - exit 0 ;; + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -855,8 +868,12 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -874,15 +891,22 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit 0 ;; + exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit 0 ;; + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -896,7 +920,7 @@ EOF objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -904,25 +928,28 @@ EOF PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit 0 ;; + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -940,15 +967,15 @@ EOF ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; + exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -965,7 +992,7 @@ EOF LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -975,16 +1002,23 @@ EOF LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -992,27 +1026,27 @@ EOF # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:syllable:*:*) + exit ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1020,15 +1054,16 @@ EOF else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` @@ -1046,73 +1081,73 @@ EOF else echo ${UNAME_MACHINE}-pc-sysv32 fi - exit 0 ;; + exit ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. echo i386-pc-msdosdjgpp - exit 0 ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 - exit 0 ;; + exit ;; paragon:*:*:*) echo i860-intel-osf1 - exit 0 ;; + exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; + exit ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 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` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1120,69 +1155,72 @@ EOF else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel@ccMail.Census.GOV> echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes <hewes@openmarket.com>. # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1190,22 +1228,25 @@ EOF UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1216,38 +1257,47 @@ EOF UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; *:*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 + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1279,7 +1329,7 @@ main () #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1368,11 +1418,12 @@ main () } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1381,22 +1432,22 @@ then case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1407,7 +1458,9 @@ This script, last modified $timestamp, has failed to recognize the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess +and + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be diff --git a/db/dist/config.hin b/db/dist/config.hin index 28d618102..d4a3f3138 100644 --- a/db/dist/config.hin +++ b/db/dist/config.hin @@ -21,12 +21,30 @@ /* Define to 1 if you want a version with run-time diagnostic checking. */ #undef DIAGNOSTIC +/* Define to 1 if 64-bit types are available. */ +#undef HAVE_64BIT_TYPES + +/* Define to 1 if you have the `abort' function. */ +#undef HAVE_ABORT + +/* Define to 1 if you have the `atoi' function. */ +#undef HAVE_ATOI + +/* Define to 1 if you have the `atol' function. */ +#undef HAVE_ATOL + /* Define to 1 if you have the `clock_gettime' function. */ #undef HAVE_CLOCK_GETTIME /* Define to 1 if Berkeley DB release includes strong cryptography. */ #undef HAVE_CRYPTO +/* Define to 1 if you have the `ctime_r' function. */ +#undef HAVE_CTIME_R + +/* Define to 1 if ctime_r takes a buffer length as a third argument. */ +#undef HAVE_CTIME_R_3ARG + /* Define to 1 if you have the `directio' function. */ #undef HAVE_DIRECTIO @@ -40,6 +58,12 @@ /* Define to 1 if you have EXIT_SUCCESS/EXIT_FAILURE #defines. */ #undef HAVE_EXIT_SUCCESS +/* Define to 1 if you have the `fchmod' function. */ +#undef HAVE_FCHMOD + +/* Define to 1 if you have the `fcntl' function. */ +#undef HAVE_FCNTL + /* Define to 1 if fcntl/F_SETFD denies child access to file descriptors. */ #undef HAVE_FCNTL_F_SETFD @@ -52,9 +76,15 @@ /* Define to 1 if you have the `ftruncate' function. */ #undef HAVE_FTRUNCATE +/* Define to 1 if you have the `getaddrinfo' function. */ +#undef HAVE_GETADDRINFO + /* Define to 1 if you have the `getcwd' function. */ #undef HAVE_GETCWD +/* Define to 1 if you have the `getenv' function. */ +#undef HAVE_GETENV + /* Define to 1 if you have the `getopt' function. */ #undef HAVE_GETOPT @@ -73,11 +103,17 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the `nsl' library (-lnsl). */ -#undef HAVE_LIBNSL +/* Define to 1 if you have the `isalpha' function. */ +#undef HAVE_ISALPHA + +/* Define to 1 if you have the `isdigit' function. */ +#undef HAVE_ISDIGIT -/* Define to 1 if the system has the type `long long'. */ -#undef HAVE_LONG_LONG +/* Define to 1 if you have the `isprint' function. */ +#undef HAVE_ISPRINT + +/* Define to 1 if you have the `isspace' function. */ +#undef HAVE_ISSPACE /* Define to 1 if you have the `memcmp' function. */ #undef HAVE_MEMCMP @@ -97,6 +133,9 @@ /* Define to 1 if you have the `mmap' function. */ #undef HAVE_MMAP +/* Define to 1 if you have the `mprotect' function. */ +#undef HAVE_MPROTECT + /* Define to 1 if you have the `munlock' function. */ #undef HAVE_MUNLOCK @@ -131,6 +170,9 @@ /* Define to 1 to use the GCC compiler and IA64 assembly language mutexes. */ #undef HAVE_MUTEX_IA64_GCC_ASSEMBLY +/* Define to 1 to use the GCC compiler and MIPS assembly language mutexes. */ +#undef HAVE_MUTEX_MIPS_GCC_ASSEMBLY + /* Define to 1 to use the msem_XXX mutexes on systems other than HP-UX. */ #undef HAVE_MUTEX_MSEM_INIT @@ -172,9 +214,6 @@ /* Define to 1 if mutexes hold system resources. */ #undef HAVE_MUTEX_SYSTEM_RESOURCES -/* Define to 1 if fast mutexes are available. */ -#undef HAVE_MUTEX_THREADS - /* Define to 1 to configure mutexes intra-process only. */ #undef HAVE_MUTEX_THREAD_ONLY @@ -199,6 +238,9 @@ /* Define to 1 to use the GCC compiler and Windows mutexes. */ #undef HAVE_MUTEX_WIN32_GCC +/* Define to 1 to use the GCC compiler and amd64 assembly language mutexes. */ +#undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY + /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */ #undef HAVE_MUTEX_X86_GCC_ASSEMBLY @@ -211,9 +253,18 @@ /* Define to 1 if you have the `pread' function. */ #undef HAVE_PREAD +/* Define to 1 if you have the `printf' function. */ +#undef HAVE_PRINTF + /* Define to 1 if you have the `pstat_getdynamic' function. */ #undef HAVE_PSTAT_GETDYNAMIC +/* Define to 1 to configure Berkeley DB for POSIX pthread API. */ +#undef HAVE_PTHREAD_API + +/* Define to 1 if you have the `pthread_yield' function. */ +#undef HAVE_PTHREAD_YIELD + /* Define to 1 if you have the `pwrite' function. */ #undef HAVE_PWRITE @@ -232,6 +283,9 @@ /* Define to 1 if building replication support. */ #undef HAVE_REPLICATION +/* Define to 1 if building the Berkeley DB replication framework. */ +#undef HAVE_REPLICATION_THREADS + /* Define to 1 if building RPC client/server. */ #undef HAVE_RPC @@ -241,17 +295,20 @@ /* 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 `sigaction' function. */ +#undef HAVE_SIGACTION + +/* Define to 1 if thread identifier type db_threadid_t is integral. */ +#undef HAVE_SIMPLE_THREAD_TYPE + /* 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 you have the `stat' function. */ +#undef HAVE_STAT /* Define to 1 if building statistics support. */ #undef HAVE_STATISTICS @@ -265,18 +322,39 @@ /* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP +/* Define to 1 if you have the `strcat' function. */ +#undef HAVE_STRCAT + +/* Define to 1 if you have the `strchr' function. */ +#undef HAVE_STRCHR + /* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP /* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR +/* Define to 1 if you have the `strftime' function. */ +#undef HAVE_STRFTIME + /* Define to 1 if you have the <strings.h> header file. */ #undef HAVE_STRINGS_H /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the `strncat' function. */ +#undef HAVE_STRNCAT + +/* Define to 1 if you have the `strncmp' function. */ +#undef HAVE_STRNCMP + +/* Define to 1 if you have the `strrchr' function. */ +#undef HAVE_STRRCHR + +/* Define to 1 if you have the `strsep' function. */ +#undef HAVE_STRSEP + /* Define to 1 if you have the `strtol' function. */ #undef HAVE_STRTOL @@ -318,9 +396,6 @@ /* 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 @@ -336,9 +411,6 @@ /* Define to 1 if you have the `_fstati64' function. */ #undef HAVE__FSTATI64 -/* Define to a value if using non-standard mutex alignment. */ -#undef MUTEX_ALIGN - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -354,40 +426,40 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* The size of a `char', as computed by sizeof. */ +/* The size of `char', as computed by sizeof. */ #undef SIZEOF_CHAR -/* The size of a `char *', as computed by sizeof. */ +/* The size of `char *', as computed by sizeof. */ #undef SIZEOF_CHAR_P -/* The size of a `int', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of a `long long', as computed by sizeof. */ +/* The size of `long long', as computed by sizeof. */ #undef SIZEOF_LONG_LONG -/* The size of a `short', as computed by sizeof. */ +/* The size of `short', as computed by sizeof. */ #undef SIZEOF_SHORT -/* The size of a `size_t', as computed by sizeof. */ +/* The size of `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of a `unsigned char', as computed by sizeof. */ +/* The size of `unsigned char', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_CHAR -/* The size of a `unsigned int', as computed by sizeof. */ +/* The size of `unsigned int', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_INT -/* The size of a `unsigned long', as computed by sizeof. */ +/* The size of `unsigned long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG -/* The size of a `unsigned long long', as computed by sizeof. */ +/* The size of `unsigned long long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG_LONG -/* The size of a `unsigned short', as computed by sizeof. */ +/* The size of `unsigned short', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_SHORT /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ @@ -411,47 +483,7 @@ /* Define to empty if `const' does not conform to ANSI C. */ #undef const -/* - * Exit success/failure macros. - */ -#ifndef HAVE_EXIT_SUCCESS -#define EXIT_FAILURE 1 -#define EXIT_SUCCESS 0 -#endif - -/* - * Don't step on the namespace. Other libraries may have their own - * implementations of these functions, we don't want to use their - * implementations or force them to use ours based on the load order. - */ -#ifndef HAVE_GETCWD -#define getcwd __db_Cgetcwd -#endif -#ifndef HAVE_MEMCMP -#define memcmp __db_Cmemcmp -#endif -#ifndef HAVE_MEMCPY -#define memcpy __db_Cmemcpy -#endif -#ifndef HAVE_MEMMOVE -#define memmove __db_Cmemmove -#endif -#ifndef HAVE_RAISE -#define raise __db_Craise -#endif -#ifndef HAVE_SNPRINTF -#define snprintf __db_Csnprintf -#endif -#ifndef HAVE_STRCASECMP -#define strcasecmp __db_Cstrcasecmp -#define strncasecmp __db_Cstrncasecmp -#endif -#ifndef HAVE_STRERROR -#define strerror __db_Cstrerror -#endif -#ifndef HAVE_VSNPRINTF -#define vsnprintf __db_Cvsnprintf -#endif +#include "clib_port.h" #ifdef DB_WIN32 #include "win_db.h" diff --git a/db/dist/config.sub b/db/dist/config.sub index edb6b663c..53954dbe9 100755 --- a/db/dist/config.sub +++ b/db/dist/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2004-08-29' +timestamp='2006-08-14' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,14 +22,15 @@ timestamp='2004-08-29' # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Please send patches to <config-patches@gnu.org>. Submit a context # diff and a properly formatted ChangeLog entry. # @@ -70,7 +72,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, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -83,11 +85,11 @@ Try \`$me --help' for more information." while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +101,7 @@ while test $# -gt 0 ; do *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,8 +120,9 @@ 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 | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | 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/'` ;; @@ -170,6 +173,10 @@ case $os in -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -186,6 +193,10 @@ case $os in # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -230,14 +241,16 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -246,6 +259,7 @@ case $basic_machine in | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -254,20 +268,23 @@ case $basic_machine in | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -278,6 +295,9 @@ case $basic_machine in ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -297,8 +317,8 @@ case $basic_machine in | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ @@ -308,9 +328,9 @@ case $basic_machine in | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -319,6 +339,7 @@ case $basic_machine in | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -327,24 +348,27 @@ case $basic_machine in | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ + | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -489,6 +513,10 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -679,6 +707,9 @@ case $basic_machine in basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -754,9 +785,8 @@ case $basic_machine in basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff ;; os400) basic_machine=powerpc-ibm @@ -787,6 +817,12 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -843,6 +879,10 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -869,6 +909,10 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -1029,6 +1073,10 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1078,13 +1126,10 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1157,20 +1202,23 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -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* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -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* | -dragonfly*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1188,7 +1236,7 @@ case $os in os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1297,6 +1345,9 @@ case $os in -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) @@ -1319,6 +1370,9 @@ else # system, and we'll never get to this point. case $basic_machine in + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1328,9 +1382,9 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1374,6 +1428,9 @@ case $basic_machine in *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; @@ -1545,7 +1602,7 @@ case $basic_machine in esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/db/dist/configure b/db/dist/configure index 6cda7d877..b7af6f85c 100755 --- a/db/dist/configure +++ b/db/dist/configure @@ -1,10 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for Berkeley DB 4.3.27. +# Generated by GNU Autoconf 2.60 for Berkeley DB 4.5.20. # -# Report bugs to <support@sleepycat.com>. +# Report bugs to <Oracle Technology Network Berkeley DB forum>. # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -18,11 +19,35 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset @@ -31,8 +56,43 @@ else fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -46,18 +106,19 @@ do if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -65,157 +126,386 @@ fi # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no +fi + + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. fi +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || + chmod +x "$as_me.lineno" || { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -224,7 +514,19 @@ else as_mkdir_p=false fi -as_executable_p="test -f" +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" +else + as_executable_p=: +fi +rm -f conf$$.file # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -233,15 +535,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - # Check that we are running under the correct shell. @@ -287,8 +580,8 @@ if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -397,38 +690,35 @@ tagnames=${tagnames+${tagnames},}CXX tagnames=${tagnames+${tagnames},}F77 +exec 7<&0 </dev/null 6>&1 + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - # Identity of this package. PACKAGE_NAME='Berkeley DB' -PACKAGE_TARNAME='db-4.3.27' -PACKAGE_VERSION='4.3.27' -PACKAGE_STRING='Berkeley DB 4.3.27' -PACKAGE_BUGREPORT='support@sleepycat.com' +PACKAGE_TARNAME='db-4.5.20' +PACKAGE_VERSION='4.5.20' +PACKAGE_STRING='Berkeley DB 4.5.20' +PACKAGE_BUGREPORT='Oracle Technology Network Berkeley DB forum' ac_unique_file="../db/db.c" -ac_default_prefix=/usr/local/BerkeleyDB.4.3 +ac_default_prefix=/usr/local/BerkeleyDB.4.5 # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -457,17 +747,197 @@ ac_includes_default="\ #endif #if HAVE_INTTYPES_H # include <inttypes.h> -#else -# if HAVE_STDINT_H -# include <stdint.h> -# endif +#endif +#if HAVE_STDINT_H +# include <stdint.h> #endif #if HAVE_UNISTD_H # 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 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_vars='SHELL +PATH_SEPARATOR +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +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 +LIBCSO_LIBS +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 +SWIGCFLAGS +TEST_LIBS +db_int_def +o +platform_header +platform_footer +DB_VERSION_MAJOR +DB_VERSION_MINOR +DB_VERSION_PATCH +DB_VERSION_STRING +DB_VERSION_UNIQUE_NAME +AR +CHMOD +CP +KILL +LN +MKDIR +RANLIB +RM +RPCGEN +db_cv_path_sh +STRIP +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +CC +ac_ct_CC +EXEEXT +OBJEXT +DB_CONST +CCC +ac_ct_CXX +CXXCPP +cxx_have_stdheaders +GREP +EGREP +LN_S +ECHO +CPP +F77 +FFLAGS +ac_ct_F77 +SOSUFFIX +MODSUFFIX +JMODSUFFIX +JAVAC +JAVA +uudecode +_ACJNI_JAVAC +inttypes_h_decl +stdint_h_decl +stddef_h_decl +unistd_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 +pid_t_decl +uintmax_t_decl +uintptr_t_decl +thread_h_decl +db_threadid_t_decl +LIBOBJS +TCL_BIN_DIR +TCL_INCLUDE_SPEC +TCL_LIB_FILE +TCL_SRC_DIR +TCL_TCLSH +INT64_FMT +UINT64_FMT +db_seq_decl +LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +CPPFLAGS +CXX +CXXFLAGS +CCC +CXXCPP +CPP +F77 +FFLAGS' + # Initialize some variables set by options. ac_init_help= @@ -494,34 +964,48 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -543,12 +1027,18 @@ do --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. @@ -556,7 +1046,17 @@ do { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` @@ -565,11 +1065,7 @@ do { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -596,6 +1092,12 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -620,13 +1122,16 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -691,6 +1196,16 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -747,11 +1262,7 @@ do { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` @@ -760,7 +1271,7 @@ do { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -791,8 +1302,7 @@ Try \`$0 --help' for more information." >&2 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) @@ -812,27 +1322,19 @@ if test -n "$ac_prev"; then { (exit 1); exit 1; }; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -859,94 +1361,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$0" : 'X\(//\)[^/]' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } - fi fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_F77_set=${F77+set} -ac_env_F77_value=$F77 -ac_cv_env_F77_set=${F77+set} -ac_cv_env_F77_value=$F77 -ac_env_FFLAGS_set=${FFLAGS+set} -ac_env_FFLAGS_value=$FFLAGS -ac_cv_env_FFLAGS_set=${FFLAGS+set} -ac_cv_env_FFLAGS_value=$FFLAGS + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -955,7 +1439,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.3.27 to adapt to many kinds of systems. +\`configure' configures Berkeley DB 4.5.20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -975,9 +1459,6 @@ Configuration: -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] @@ -995,15 +1476,22 @@ Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/db-4.5.20] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1021,7 +1509,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Berkeley DB 4.3.27:";; + short | recursive ) echo "Configuration of Berkeley DB 4.5.20:";; esac cat <<\_ACEOF @@ -1046,16 +1534,16 @@ Optional Features: --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-pthread_self Obsolete; use --enable-pthread_api instead. + --enable-pthread_api Configure Berkeley DB for POSIX pthread API. --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 uninitialized memory read/writes. - --enable-shared[=PKGS] - build shared libraries [default=yes] - --enable-static[=PKGS] - build static libraries [default=yes] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) @@ -1066,22 +1554,21 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-mutex=MUTEX Selection of non-standard mutexes. --with-mutexalign=ALIGNMENT - Selection of non-standard mutex alignment. + Obsolete; use DbEnv::mutex_set_align instead. --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] --with-pic try to use only PIC/non-PIC objects [default=use both] - --with-tags[=TAGS] - include additional configurations [automatic] + --with-tags[=TAGS] include additional configurations [automatic] Some influential environment variables: CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir> - CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have - headers in a nonstandard directory <include dir> + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if + you have headers in a nonstandard directory <include dir> CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor @@ -1092,122 +1579,88 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <support@sleepycat.com>. +Report bugs to <Oracle Technology Network Berkeley DB forum>. _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || continue ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# 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;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Berkeley DB configure 4.3.27 -generated by GNU Autoconf 2.59 +Berkeley DB configure 4.5.20 +generated by GNU Autoconf 2.60 -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF +cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Berkeley DB $as_me 4.3.27, which was -generated by GNU Autoconf 2.59. Invocation command line was +It was created by Berkeley DB $as_me 4.5.20, which was +generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -1226,7 +1679,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown` /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -1240,6 +1693,7 @@ do test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done +IFS=$as_save_IFS } >&5 @@ -1261,7 +1715,6 @@ _ACEOF ac_configure_args= ac_configure_args0= ac_configure_args1= -ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1272,7 +1725,7 @@ do -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1294,9 +1747,7 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " + ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac done @@ -1307,8 +1758,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -1321,20 +1772,34 @@ trap 'exit_status=$? _ASBOX echo # The following way of writing the cache mishandles newlines in values, -{ +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo cat <<\_ASBOX @@ -1345,22 +1810,28 @@ _ASBOX echo for ac_var in $ac_subst_vars do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## +## ------------------- ## +## File substitutions. ## +## ------------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1372,26 +1843,24 @@ _ASBOX ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h | sort + cat confdefs.h echo fi test "$ac_signal" != 0 && echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h # Predefined preprocessor variables. @@ -1422,14 +1891,17 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in $CONFIG_SITE; do +shift +for ac_site_file +do if test -r "$ac_site_file"; then { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} @@ -1445,8 +1917,8 @@ if test -r "$cache_file"; then { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else @@ -1458,12 +1930,11 @@ fi # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +for ac_var in $ac_precious_vars; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 @@ -1488,8 +1959,7 @@ echo "$as_me: current value: $ac_new_val" >&2;} # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1506,12 +1976,6 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov { (exit 1); exit 1; }; } fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - @@ -1536,118 +2000,165 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_config_headers="$ac_config_headers db_config.h:config.hin" +ac_config_headers="$ac_config_headers db_config.h:config.hin" # Configure setup. ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} { (exit 1); exit 1; }; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + # Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} { (exit 1); exit 1; }; } +fi fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" + program_transform_name="s&\$&$program_suffix&;$program_transform_name" # Double any \ or $. echo might interpret backslashes. # By default was `s,x,x', remove it if useless. cat <<\_ACEOF >conftest.sed s/[\\$]/&&/g;s/;s,x,x,$// _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed +rm -f conftest.sed # Don't build in the top-level or dist directories. -echo "$as_me:$LINENO: checking if building in the top-level or dist directories" >&5 -echo $ECHO_N "checking if building in the top-level or dist directories... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if building in the top-level or dist directories" >&5 +echo $ECHO_N "checking if building in the top-level or dist directories... $ECHO_C" >&6; } if test -d db_archive -o -f configure.ac ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - { { echo "$as_me:$LINENO: error: Berkeley DB should not be built in the top-level or dist directories." >&5 -echo "$as_me: error: Berkeley DB should not be built in the top-level or dist directories." >&2;} + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + { { echo "$as_me:$LINENO: error: \ +Berkeley DB should not be built in the top-level or \"dist\" directories. \ +Change directory to the build_unix directory and run ../dist/configure \ +from there." >&5 +echo "$as_me: error: \ +Berkeley DB should not be built in the top-level or \"dist\" directories. \ +Change directory to the build_unix directory and run ../dist/configure \ +from there." >&2;} { (exit 1); exit 1; }; } + fi -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 +{ echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } # Substitution variables. @@ -1697,6 +2208,12 @@ echo "${ECHO_T}no" >&6 + + +# The Windows public header has two extra symbols we need to remove. + + + # Set the default installation location. @@ -1704,11 +2221,11 @@ echo "${ECHO_T}no" >&6 DB_VERSION_MAJOR="4" -DB_VERSION_MINOR="3" +DB_VERSION_MINOR="5" -DB_VERSION_PATCH="27" +DB_VERSION_PATCH="20" -DB_VERSION_STRING='"Sleepycat Software: Berkeley DB 4.3.27: (December 22, 2004)"' +DB_VERSION_STRING='"Berkeley DB 4.5.20: (September 20, 2006)"' # Process all options before using them. @@ -1716,285 +2233,317 @@ DB_VERSION_STRING='"Sleepycat Software: Berkeley DB 4.3.27: (December 22, 2004)" # --enable-bigfile was the configuration option that Berkeley DB used before # autoconf 2.50 was released (which had --enable-largefile integrated in). -# Check whether --enable-bigfile or --disable-bigfile was given. +# Check whether --enable-bigfile was given. if test "${enable_bigfile+set}" = set; then - enableval="$enable_bigfile" - { { echo "$as_me:$LINENO: error: --enable-bigfile no longer supported, use --enable-largefile" >&5 + enableval=$enable_bigfile; { { echo "$as_me:$LINENO: error: --enable-bigfile no longer supported, use --enable-largefile" >&5 echo "$as_me: error: --enable-bigfile no longer supported, use --enable-largefile" >&2;} { (exit 1); exit 1; }; } -fi; +fi -echo "$as_me:$LINENO: checking if --disable-cryptography option specified" >&5 -echo $ECHO_N "checking if --disable-cryptography option specified... $ECHO_C" >&6 -# Check whether --enable-cryptography or --disable-cryptography was given. -if test "${enable_cryptography+set}" = set; then - enableval="$enable_cryptography" +{ echo "$as_me:$LINENO: checking if --disable-cryptography option specified" >&5 +echo $ECHO_N "checking if --disable-cryptography option specified... $ECHO_C" >&6; } +# Check whether --enable-cryptography was given. +if test "${enable_cryptography+set}" = set; then + enableval=$enable_cryptography; else enableval="yes" -fi; +fi + db_cv_build_cryptography="$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;; + 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-hash option specified" >&5 -echo $ECHO_N "checking if --disable-hash option specified... $ECHO_C" >&6 -# Check whether --enable-hash or --disable-hash was given. +{ echo "$as_me:$LINENO: checking if --disable-hash option specified" >&5 +echo $ECHO_N "checking if --disable-hash option specified... $ECHO_C" >&6; } +# Check whether --enable-hash was given. if test "${enable_hash+set}" = set; then - enableval="$enable_hash" - + enableval=$enable_hash; else enableval="yes" -fi; +fi + db_cv_build_hash="$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;; + 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-queue option specified" >&5 -echo $ECHO_N "checking if --disable-queue option specified... $ECHO_C" >&6 -# Check whether --enable-queue or --disable-queue was given. +{ echo "$as_me:$LINENO: checking if --disable-queue option specified" >&5 +echo $ECHO_N "checking if --disable-queue option specified... $ECHO_C" >&6; } +# Check whether --enable-queue was given. if test "${enable_queue+set}" = set; then - enableval="$enable_queue" - + enableval=$enable_queue; else enableval="yes" -fi; +fi + db_cv_build_queue="$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;; + 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-replication option specified" >&5 -echo $ECHO_N "checking if --disable-replication option specified... $ECHO_C" >&6 -# Check whether --enable-replication or --disable-replication was given. +{ echo "$as_me:$LINENO: checking if --disable-replication option specified" >&5 +echo $ECHO_N "checking if --disable-replication option specified... $ECHO_C" >&6; } +# Check whether --enable-replication was given. if test "${enable_replication+set}" = set; then - enableval="$enable_replication" - + enableval=$enable_replication; else enableval="yes" -fi; +fi + db_cv_build_replication="$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;; + 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-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. +{ 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 was given. if test "${enable_statistics+set}" = set; then - enableval="$enable_statistics" - + enableval=$enable_statistics; else enableval="yes" -fi; +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;; + 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. +{ 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 was given. if test "${enable_verify+set}" = set; then - enableval="$enable_verify" - + enableval=$enable_verify; else enableval="yes" -fi; +fi + db_cv_build_verify="$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;; + 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 --enable-compat185 option specified" >&5 -echo $ECHO_N "checking if --enable-compat185 option specified... $ECHO_C" >&6 -# Check whether --enable-compat185 or --disable-compat185 was given. +{ echo "$as_me:$LINENO: checking if --enable-compat185 option specified" >&5 +echo $ECHO_N "checking if --enable-compat185 option specified... $ECHO_C" >&6; } +# Check whether --enable-compat185 was given. if test "${enable_compat185+set}" = set; then - enableval="$enable_compat185" - db_cv_compat185="$enable_compat185" + enableval=$enable_compat185; db_cv_compat185="$enable_compat185" else db_cv_compat185="no" -fi; -echo "$as_me:$LINENO: result: $db_cv_compat185" >&5 -echo "${ECHO_T}$db_cv_compat185" >&6 +fi -echo "$as_me:$LINENO: checking if --enable-cxx option specified" >&5 -echo $ECHO_N "checking if --enable-cxx option specified... $ECHO_C" >&6 -# Check whether --enable-cxx or --disable-cxx was given. +{ echo "$as_me:$LINENO: result: $db_cv_compat185" >&5 +echo "${ECHO_T}$db_cv_compat185" >&6; } + +{ echo "$as_me:$LINENO: checking if --enable-cxx option specified" >&5 +echo $ECHO_N "checking if --enable-cxx option specified... $ECHO_C" >&6; } +# Check whether --enable-cxx was given. if test "${enable_cxx+set}" = set; then - enableval="$enable_cxx" - db_cv_cxx="$enable_cxx" + enableval=$enable_cxx; db_cv_cxx="$enable_cxx" else db_cv_cxx="no" -fi; -echo "$as_me:$LINENO: result: $db_cv_cxx" >&5 -echo "${ECHO_T}$db_cv_cxx" >&6 +fi -echo "$as_me:$LINENO: checking if --enable-debug option specified" >&5 -echo $ECHO_N "checking if --enable-debug option specified... $ECHO_C" >&6 -# Check whether --enable-debug or --disable-debug was given. +{ echo "$as_me:$LINENO: result: $db_cv_cxx" >&5 +echo "${ECHO_T}$db_cv_cxx" >&6; } + +{ echo "$as_me:$LINENO: checking if --enable-debug option specified" >&5 +echo $ECHO_N "checking if --enable-debug option specified... $ECHO_C" >&6; } +# Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - db_cv_debug="$enable_debug" + enableval=$enable_debug; db_cv_debug="$enable_debug" else db_cv_debug="no" -fi; -echo "$as_me:$LINENO: result: $db_cv_debug" >&5 -echo "${ECHO_T}$db_cv_debug" >&6 +fi -echo "$as_me:$LINENO: checking if --enable-debug_rop option specified" >&5 -echo $ECHO_N "checking if --enable-debug_rop option specified... $ECHO_C" >&6 -# Check whether --enable-debug_rop or --disable-debug_rop was given. +{ echo "$as_me:$LINENO: result: $db_cv_debug" >&5 +echo "${ECHO_T}$db_cv_debug" >&6; } + +{ echo "$as_me:$LINENO: checking if --enable-debug_rop option specified" >&5 +echo $ECHO_N "checking if --enable-debug_rop option specified... $ECHO_C" >&6; } +# Check whether --enable-debug_rop was given. if test "${enable_debug_rop+set}" = set; then - enableval="$enable_debug_rop" - db_cv_debug_rop="$enable_debug_rop" + enableval=$enable_debug_rop; db_cv_debug_rop="$enable_debug_rop" else db_cv_debug_rop="no" -fi; -echo "$as_me:$LINENO: result: $db_cv_debug_rop" >&5 -echo "${ECHO_T}$db_cv_debug_rop" >&6 +fi -echo "$as_me:$LINENO: checking if --enable-debug_wop option specified" >&5 -echo $ECHO_N "checking if --enable-debug_wop option specified... $ECHO_C" >&6 -# Check whether --enable-debug_wop or --disable-debug_wop was given. +{ echo "$as_me:$LINENO: result: $db_cv_debug_rop" >&5 +echo "${ECHO_T}$db_cv_debug_rop" >&6; } + +{ echo "$as_me:$LINENO: checking if --enable-debug_wop option specified" >&5 +echo $ECHO_N "checking if --enable-debug_wop option specified... $ECHO_C" >&6; } +# Check whether --enable-debug_wop was given. if test "${enable_debug_wop+set}" = set; then - enableval="$enable_debug_wop" - db_cv_debug_wop="$enable_debug_wop" + enableval=$enable_debug_wop; db_cv_debug_wop="$enable_debug_wop" else db_cv_debug_wop="no" -fi; -echo "$as_me:$LINENO: result: $db_cv_debug_wop" >&5 -echo "${ECHO_T}$db_cv_debug_wop" >&6 +fi -echo "$as_me:$LINENO: checking if --enable-diagnostic option specified" >&5 -echo $ECHO_N "checking if --enable-diagnostic option specified... $ECHO_C" >&6 -# Check whether --enable-diagnostic or --disable-diagnostic was given. +{ echo "$as_me:$LINENO: result: $db_cv_debug_wop" >&5 +echo "${ECHO_T}$db_cv_debug_wop" >&6; } + +{ echo "$as_me:$LINENO: checking if --enable-diagnostic option specified" >&5 +echo $ECHO_N "checking if --enable-diagnostic option specified... $ECHO_C" >&6; } +# Check whether --enable-diagnostic was given. if test "${enable_diagnostic+set}" = set; then - enableval="$enable_diagnostic" - db_cv_diagnostic="$enable_diagnostic" + enableval=$enable_diagnostic; db_cv_diagnostic="$enable_diagnostic" else db_cv_diagnostic="no" -fi; +fi + if test "$db_cv_diagnostic" = "yes"; then - echo "$as_me:$LINENO: result: $db_cv_diagnostic" >&5 -echo "${ECHO_T}$db_cv_diagnostic" >&6 + { echo "$as_me:$LINENO: result: $db_cv_diagnostic" >&5 +echo "${ECHO_T}$db_cv_diagnostic" >&6; } fi if test "$db_cv_diagnostic" = "no" -a "$db_cv_debug_rop" = "yes"; then db_cv_diagnostic="yes" - echo "$as_me:$LINENO: result: by --enable-debug_rop" >&5 -echo "${ECHO_T}by --enable-debug_rop" >&6 + { echo "$as_me:$LINENO: result: by --enable-debug_rop" >&5 +echo "${ECHO_T}by --enable-debug_rop" >&6; } fi if test "$db_cv_diagnostic" = "no" -a "$db_cv_debug_wop" = "yes"; then db_cv_diagnostic="yes" - echo "$as_me:$LINENO: result: by --enable-debug_wop" >&5 -echo "${ECHO_T}by --enable-debug_wop" >&6 + { echo "$as_me:$LINENO: result: by --enable-debug_wop" >&5 +echo "${ECHO_T}by --enable-debug_wop" >&6; } fi if test "$db_cv_diagnostic" = "no"; then - echo "$as_me:$LINENO: result: $db_cv_diagnostic" >&5 -echo "${ECHO_T}$db_cv_diagnostic" >&6 + { echo "$as_me:$LINENO: result: $db_cv_diagnostic" >&5 +echo "${ECHO_T}$db_cv_diagnostic" >&6; } fi -echo "$as_me:$LINENO: checking if --enable-dump185 option specified" >&5 -echo $ECHO_N "checking if --enable-dump185 option specified... $ECHO_C" >&6 -# Check whether --enable-dump185 or --disable-dump185 was given. +{ echo "$as_me:$LINENO: checking if --enable-dump185 option specified" >&5 +echo $ECHO_N "checking if --enable-dump185 option specified... $ECHO_C" >&6; } +# Check whether --enable-dump185 was given. if test "${enable_dump185+set}" = set; then - enableval="$enable_dump185" - db_cv_dump185="$enable_dump185" + enableval=$enable_dump185; db_cv_dump185="$enable_dump185" else db_cv_dump185="no" -fi; -echo "$as_me:$LINENO: result: $db_cv_dump185" >&5 -echo "${ECHO_T}$db_cv_dump185" >&6 +fi -echo "$as_me:$LINENO: checking if --enable-java option specified" >&5 -echo $ECHO_N "checking if --enable-java option specified... $ECHO_C" >&6 -# Check whether --enable-java or --disable-java was given. +{ echo "$as_me:$LINENO: result: $db_cv_dump185" >&5 +echo "${ECHO_T}$db_cv_dump185" >&6; } + +{ echo "$as_me:$LINENO: checking if --enable-java option specified" >&5 +echo $ECHO_N "checking if --enable-java option specified... $ECHO_C" >&6; } +# Check whether --enable-java was given. if test "${enable_java+set}" = set; then - enableval="$enable_java" - db_cv_java="$enable_java" + enableval=$enable_java; db_cv_java="$enable_java" else db_cv_java="no" -fi; -echo "$as_me:$LINENO: result: $db_cv_java" >&5 -echo "${ECHO_T}$db_cv_java" >&6 +fi -echo "$as_me:$LINENO: checking if --enable-mingw option specified" >&5 -echo $ECHO_N "checking if --enable-mingw option specified... $ECHO_C" >&6 -# Check whether --enable-mingw or --disable-mingw was given. +{ echo "$as_me:$LINENO: result: $db_cv_java" >&5 +echo "${ECHO_T}$db_cv_java" >&6; } + +{ echo "$as_me:$LINENO: checking if --enable-mingw option specified" >&5 +echo $ECHO_N "checking if --enable-mingw option specified... $ECHO_C" >&6; } +# Check whether --enable-mingw was given. if test "${enable_mingw+set}" = set; then - enableval="$enable_mingw" - db_cv_mingw="$enable_mingw" + enableval=$enable_mingw; db_cv_mingw="$enable_mingw" else db_cv_mingw="no" -fi; -echo "$as_me:$LINENO: result: $db_cv_mingw" >&5 -echo "${ECHO_T}$db_cv_mingw" >&6 +fi -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. +{ 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 was given. if test "${enable_o_direct+set}" = set; then - enableval="$enable_o_direct" - db_cv_o_direct="$enable_o_direct" + 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 +fi -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. +{ 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 was given. if test "${enable_posixmutexes+set}" = set; then - enableval="$enable_posixmutexes" - db_cv_posixmutexes="$enable_posixmutexes" + enableval=$enable_posixmutexes; db_cv_posixmutexes="$enable_posixmutexes" else db_cv_posixmutexes="no" -fi; -echo "$as_me:$LINENO: result: $db_cv_posixmutexes" >&5 -echo "${ECHO_T}$db_cv_posixmutexes" >&6 +fi + +{ echo "$as_me:$LINENO: result: $db_cv_posixmutexes" >&5 +echo "${ECHO_T}$db_cv_posixmutexes" >&6; } -echo "$as_me:$LINENO: checking if --enable-rpc option specified" >&5 -echo $ECHO_N "checking if --enable-rpc option specified... $ECHO_C" >&6 -# Check whether --enable-rpc or --disable-rpc was given. +# Check whether --enable-pthread_self was given. +if test "${enable_pthread_self+set}" = set; then + enableval=$enable_pthread_self; { { echo "$as_me:$LINENO: error: --enable-pthread_self no longer supported, use --enable-pthread_api" >&5 +echo "$as_me: error: --enable-pthread_self no longer supported, use --enable-pthread_api" >&2;} + { (exit 1); exit 1; }; } +fi + + +{ echo "$as_me:$LINENO: checking if --enable-pthread_api option specified" >&5 +echo $ECHO_N "checking if --enable-pthread_api option specified... $ECHO_C" >&6; } +# Check whether --enable-pthread_api was given. +if test "${enable_pthread_api+set}" = set; then + enableval=$enable_pthread_api; db_cv_pthread_api="$enable_pthread_api" +else + db_cv_pthread_api="no" +fi + +# POSIX mutexes implies other POSIX APIs. +if test "$db_cv_posixmutexes" != "no"; then + db_cv_pthread_api="yes" +fi +{ echo "$as_me:$LINENO: result: $db_cv_pthread_api" >&5 +echo "${ECHO_T}$db_cv_pthread_api" >&6; } + + +if test "$db_cv_pthread_api" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_PTHREAD_API 1 +_ACEOF + +fi + +{ echo "$as_me:$LINENO: checking if --enable-rpc option specified" >&5 +echo $ECHO_N "checking if --enable-rpc option specified... $ECHO_C" >&6; } +# Check whether --enable-rpc was given. if test "${enable_rpc+set}" = set; then - enableval="$enable_rpc" - db_cv_rpc="$enable_rpc" + enableval=$enable_rpc; db_cv_rpc="$enable_rpc" else db_cv_rpc="no" -fi; -echo "$as_me:$LINENO: result: $db_cv_rpc" >&5 -echo "${ECHO_T}$db_cv_rpc" >&6 +fi -echo "$as_me:$LINENO: checking if --enable-smallbuild option specified" >&5 -echo $ECHO_N "checking if --enable-smallbuild option specified... $ECHO_C" >&6 -# Check whether --enable-smallbuild or --disable-smallbuild was given. +{ echo "$as_me:$LINENO: result: $db_cv_rpc" >&5 +echo "${ECHO_T}$db_cv_rpc" >&6; } + +{ echo "$as_me:$LINENO: checking if --enable-smallbuild option specified" >&5 +echo $ECHO_N "checking if --enable-smallbuild option specified... $ECHO_C" >&6; } +# Check whether --enable-smallbuild was given. if test "${enable_smallbuild+set}" = set; then - enableval="$enable_smallbuild" - db_cv_smallbuild="$enable_smallbuild" + enableval=$enable_smallbuild; db_cv_smallbuild="$enable_smallbuild" else db_cv_smallbuild="no" -fi; +fi + if test "$db_cv_smallbuild" = "yes"; then db_cv_build_cryptography="no" db_cv_build_hash="no" @@ -2003,67 +2552,67 @@ if test "$db_cv_smallbuild" = "yes"; then db_cv_build_statistics="no" db_cv_build_verify="no" fi -echo "$as_me:$LINENO: result: $db_cv_smallbuild" >&5 -echo "${ECHO_T}$db_cv_smallbuild" >&6 +{ echo "$as_me:$LINENO: result: $db_cv_smallbuild" >&5 +echo "${ECHO_T}$db_cv_smallbuild" >&6; } -echo "$as_me:$LINENO: checking if --enable-tcl option specified" >&5 -echo $ECHO_N "checking if --enable-tcl option specified... $ECHO_C" >&6 -# Check whether --enable-tcl or --disable-tcl was given. +{ echo "$as_me:$LINENO: checking if --enable-tcl option specified" >&5 +echo $ECHO_N "checking if --enable-tcl option specified... $ECHO_C" >&6; } +# Check whether --enable-tcl was given. if test "${enable_tcl+set}" = set; then - enableval="$enable_tcl" - db_cv_tcl="$enable_tcl" + enableval=$enable_tcl; db_cv_tcl="$enable_tcl" else db_cv_tcl="no" -fi; -echo "$as_me:$LINENO: result: $db_cv_tcl" >&5 -echo "${ECHO_T}$db_cv_tcl" >&6 +fi -echo "$as_me:$LINENO: checking if --enable-test option specified" >&5 -echo $ECHO_N "checking if --enable-test option specified... $ECHO_C" >&6 -# Check whether --enable-test or --disable-test was given. +{ echo "$as_me:$LINENO: result: $db_cv_tcl" >&5 +echo "${ECHO_T}$db_cv_tcl" >&6; } + +{ echo "$as_me:$LINENO: checking if --enable-test option specified" >&5 +echo $ECHO_N "checking if --enable-test option specified... $ECHO_C" >&6; } +# Check whether --enable-test was given. if test "${enable_test+set}" = set; then - enableval="$enable_test" - db_cv_test="$enable_test" + enableval=$enable_test; db_cv_test="$enable_test" else db_cv_test="no" -fi; -echo "$as_me:$LINENO: result: $db_cv_test" >&5 -echo "${ECHO_T}$db_cv_test" >&6 +fi -echo "$as_me:$LINENO: checking if --enable-uimutexes option specified" >&5 -echo $ECHO_N "checking if --enable-uimutexes option specified... $ECHO_C" >&6 -# Check whether --enable-uimutexes or --disable-uimutexes was given. +{ echo "$as_me:$LINENO: result: $db_cv_test" >&5 +echo "${ECHO_T}$db_cv_test" >&6; } + +{ echo "$as_me:$LINENO: checking if --enable-uimutexes option specified" >&5 +echo $ECHO_N "checking if --enable-uimutexes option specified... $ECHO_C" >&6; } +# Check whether --enable-uimutexes was given. if test "${enable_uimutexes+set}" = set; then - enableval="$enable_uimutexes" - db_cv_uimutexes="$enable_uimutexes" + enableval=$enable_uimutexes; db_cv_uimutexes="$enable_uimutexes" else db_cv_uimutexes="no" -fi; -echo "$as_me:$LINENO: result: $db_cv_uimutexes" >&5 -echo "${ECHO_T}$db_cv_uimutexes" >&6 +fi -echo "$as_me:$LINENO: checking if --enable-umrw option specified" >&5 -echo $ECHO_N "checking if --enable-umrw option specified... $ECHO_C" >&6 -# Check whether --enable-umrw or --disable-umrw was given. +{ echo "$as_me:$LINENO: result: $db_cv_uimutexes" >&5 +echo "${ECHO_T}$db_cv_uimutexes" >&6; } + +{ echo "$as_me:$LINENO: checking if --enable-umrw option specified" >&5 +echo $ECHO_N "checking if --enable-umrw option specified... $ECHO_C" >&6; } +# Check whether --enable-umrw was given. if test "${enable_umrw+set}" = set; then - enableval="$enable_umrw" - db_cv_umrw="$enable_umrw" + enableval=$enable_umrw; db_cv_umrw="$enable_umrw" else db_cv_umrw="no" -fi; -echo "$as_me:$LINENO: result: $db_cv_umrw" >&5 -echo "${ECHO_T}$db_cv_umrw" >&6 +fi -echo "$as_me:$LINENO: checking if --with-mutex=MUTEX option specified" >&5 -echo $ECHO_N "checking if --with-mutex=MUTEX option specified... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: result: $db_cv_umrw" >&5 +echo "${ECHO_T}$db_cv_umrw" >&6; } -# Check whether --with-mutex or --without-mutex was given. +{ echo "$as_me:$LINENO: checking if --with-mutex=MUTEX option specified" >&5 +echo $ECHO_N "checking if --with-mutex=MUTEX option specified... $ECHO_C" >&6; } + +# Check whether --with-mutex was given. if test "${with_mutex+set}" = set; then - withval="$with_mutex" - with_mutex="$withval" + withval=$with_mutex; with_mutex="$withval" else with_mutex="no" -fi; +fi + if test "$with_mutex" = "yes"; then { { echo "$as_me:$LINENO: error: --with-mutex requires a mutex name argument" >&5 echo "$as_me: error: --with-mutex requires a mutex name argument" >&2;} @@ -2072,75 +2621,60 @@ fi if test "$with_mutex" != "no"; then db_cv_mutex="$with_mutex" fi -echo "$as_me:$LINENO: result: $with_mutex" >&5 -echo "${ECHO_T}$with_mutex" >&6 - - +{ echo "$as_me:$LINENO: result: $with_mutex" >&5 +echo "${ECHO_T}$with_mutex" >&6; } -echo "$as_me:$LINENO: checking if --with-mutexalign=ALIGNMENT option specified" >&5 -echo $ECHO_N "checking if --with-mutexalign=ALIGNMENT option specified... $ECHO_C" >&6 +# --with-mutexalign=ALIGNMENT was the configuration option that Berkeley DB +# used before the DbEnv::mutex_set_align method was added. -# Check whether --with-mutexalign or --without-mutexalign was given. +# Check whether --with-mutexalign was given. if test "${with_mutexalign+set}" = set; then - withval="$with_mutexalign" - with_mutexalign="$withval" -else - with_mutexalign="no" -fi; -if test "$with_mutexalign" = "yes"; then - { { echo "$as_me:$LINENO: error: --with-mutexalign requires a mutex alignment argument" >&5 -echo "$as_me: error: --with-mutexalign requires a mutex alignment argument" >&2;} + withval=$with_mutexalign; { { echo "$as_me:$LINENO: error: --with-mutexalign no longer supported, use DbEnv::mutex_set_align" >&5 +echo "$as_me: error: --with-mutexalign no longer supported, use DbEnv::mutex_set_align" >&2;} { (exit 1); exit 1; }; } fi -if test "$with_mutexalign" != "no"; then - cat >>confdefs.h <<_ACEOF -#define MUTEX_ALIGN $with_mutexalign -_ACEOF -fi -echo "$as_me:$LINENO: result: $with_mutexalign" >&5 -echo "${ECHO_T}$with_mutexalign" >&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 +{ 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; } -# Check whether --with-tcl or --without-tcl was given. +# Check whether --with-tcl was given. if test "${with_tcl+set}" = set; then - withval="$with_tcl" - with_tclconfig="$withval" + withval=$with_tcl; with_tclconfig="$withval" else with_tclconfig="no" -fi; -echo "$as_me:$LINENO: result: $with_tclconfig" >&5 -echo "${ECHO_T}$with_tclconfig" >&6 +fi + +{ echo "$as_me:$LINENO: result: $with_tclconfig" >&5 +echo "${ECHO_T}$with_tclconfig" >&6; } if test "$with_tclconfig" != "no"; then db_cv_tcl="yes" fi -echo "$as_me:$LINENO: checking if --with-uniquename=NAME option specified" >&5 -echo $ECHO_N "checking if --with-uniquename=NAME option specified... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if --with-uniquename=NAME option specified" >&5 +echo $ECHO_N "checking if --with-uniquename=NAME option specified... $ECHO_C" >&6; } -# Check whether --with-uniquename or --without-uniquename was given. +# Check whether --with-uniquename was given. if test "${with_uniquename+set}" = set; then - withval="$with_uniquename" - with_uniquename="$withval" + withval=$with_uniquename; with_uniquename="$withval" else with_uniquename="no" -fi; +fi + if test "$with_uniquename" = "no"; then db_cv_uniquename="no" DB_VERSION_UNIQUE_NAME="" - echo "$as_me:$LINENO: result: $with_uniquename" >&5 -echo "${ECHO_T}$with_uniquename" >&6 + { echo "$as_me:$LINENO: result: $with_uniquename" >&5 +echo "${ECHO_T}$with_uniquename" >&6; } else db_cv_uniquename="yes" if test "$with_uniquename" = "yes"; then - DB_VERSION_UNIQUE_NAME="_4003" + DB_VERSION_UNIQUE_NAME="_4005" else DB_VERSION_UNIQUE_NAME="$with_uniquename" fi - echo "$as_me:$LINENO: result: $DB_VERSION_UNIQUE_NAME" >&5 -echo "${ECHO_T}$DB_VERSION_UNIQUE_NAME" >&6 + { echo "$as_me:$LINENO: result: $DB_VERSION_UNIQUE_NAME" >&5 +echo "${ECHO_T}$DB_VERSION_UNIQUE_NAME" >&6; } fi # Test requires Tcl @@ -2152,25 +2686,6 @@ 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 @@ -2220,13 +2735,13 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_db_cv_path_ar+set}" = set; then +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$db_cv_path_ar"; then - ac_cv_prog_db_cv_path_ar="$db_cv_path_ar" # Let the user override the test. + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2234,37 +2749,39 @@ 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_db_cv_path_ar="${ac_tool_prefix}ar" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi -db_cv_path_ar=$ac_cv_prog_db_cv_path_ar -if test -n "$db_cv_path_ar"; then - echo "$as_me:$LINENO: result: $db_cv_path_ar" >&5 -echo "${ECHO_T}$db_cv_path_ar" >&6 +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi -if test -z "$ac_cv_prog_db_cv_path_ar"; then - ac_ct_db_cv_path_ar=$db_cv_path_ar +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_db_cv_path_ar+set}" = set; then +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_db_cv_path_ar"; then - ac_cv_prog_ac_ct_db_cv_path_ar="$ac_ct_db_cv_path_ar" # Let the user override the test. + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2272,47 +2789,59 @@ 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_db_cv_path_ar="ar" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_db_cv_path_ar" && ac_cv_prog_ac_ct_db_cv_path_ar="missing_ar" fi fi -ac_ct_db_cv_path_ar=$ac_cv_prog_ac_ct_db_cv_path_ar -if test -n "$ac_ct_db_cv_path_ar"; then - echo "$as_me:$LINENO: result: $ac_ct_db_cv_path_ar" >&5 -echo "${ECHO_T}$ac_ct_db_cv_path_ar" >&6 +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - db_cv_path_ar=$ac_ct_db_cv_path_ar + if test "x$ac_ct_AR" = x; then + AR="none" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi else - db_cv_path_ar="$ac_cv_prog_db_cv_path_ar" + AR="$ac_cv_prog_AR" fi -if test "$db_cv_path_ar" = missing_ar; then - { { echo "$as_me:$LINENO: error: No ar utility found." >&5 +test "$AR" = "none" && { { echo "$as_me:$LINENO: error: No ar utility found." >&5 echo "$as_me: error: No ar utility found." >&2;} { (exit 1); exit 1; }; } -fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}chmod", so it can be a program name with args. set dummy ${ac_tool_prefix}chmod; 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_chmod+set}" = set; then +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CHMOD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$db_cv_path_chmod"; then - ac_cv_prog_db_cv_path_chmod="$db_cv_path_chmod" # Let the user override the test. + if test -n "$CHMOD"; then + ac_cv_prog_CHMOD="$CHMOD" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2320,37 +2849,39 @@ 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_db_cv_path_chmod="${ac_tool_prefix}chmod" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CHMOD="${ac_tool_prefix}chmod" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi -db_cv_path_chmod=$ac_cv_prog_db_cv_path_chmod -if test -n "$db_cv_path_chmod"; then - echo "$as_me:$LINENO: result: $db_cv_path_chmod" >&5 -echo "${ECHO_T}$db_cv_path_chmod" >&6 +CHMOD=$ac_cv_prog_CHMOD +if test -n "$CHMOD"; then + { echo "$as_me:$LINENO: result: $CHMOD" >&5 +echo "${ECHO_T}$CHMOD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi -if test -z "$ac_cv_prog_db_cv_path_chmod"; then - ac_ct_db_cv_path_chmod=$db_cv_path_chmod +if test -z "$ac_cv_prog_CHMOD"; then + ac_ct_CHMOD=$CHMOD # Extract the first word of "chmod", so it can be a program name with args. set dummy chmod; 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_chmod+set}" = set; then +{ 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_CHMOD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_db_cv_path_chmod"; then - ac_cv_prog_ac_ct_db_cv_path_chmod="$ac_ct_db_cv_path_chmod" # Let the user override the test. + if test -n "$ac_ct_CHMOD"; then + ac_cv_prog_ac_ct_CHMOD="$ac_ct_CHMOD" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2358,47 +2889,59 @@ 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_db_cv_path_chmod="chmod" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CHMOD="chmod" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_db_cv_path_chmod" && ac_cv_prog_ac_ct_db_cv_path_chmod="missing_chmod" fi fi -ac_ct_db_cv_path_chmod=$ac_cv_prog_ac_ct_db_cv_path_chmod -if test -n "$ac_ct_db_cv_path_chmod"; then - echo "$as_me:$LINENO: result: $ac_ct_db_cv_path_chmod" >&5 -echo "${ECHO_T}$ac_ct_db_cv_path_chmod" >&6 +ac_ct_CHMOD=$ac_cv_prog_ac_ct_CHMOD +if test -n "$ac_ct_CHMOD"; then + { echo "$as_me:$LINENO: result: $ac_ct_CHMOD" >&5 +echo "${ECHO_T}$ac_ct_CHMOD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - db_cv_path_chmod=$ac_ct_db_cv_path_chmod + if test "x$ac_ct_CHMOD" = x; then + CHMOD="none" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CHMOD=$ac_ct_CHMOD + fi else - db_cv_path_chmod="$ac_cv_prog_db_cv_path_chmod" + CHMOD="$ac_cv_prog_CHMOD" fi -if test "$db_cv_path_chmod" = missing_chmod; then - { { echo "$as_me:$LINENO: error: No chmod utility found." >&5 +test "$CHMOD" = "none" && { { echo "$as_me:$LINENO: error: No chmod utility found." >&5 echo "$as_me: error: No chmod utility found." >&2;} { (exit 1); exit 1; }; } -fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cp", so it can be a program name with args. set dummy ${ac_tool_prefix}cp; 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_cp+set}" = set; then +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$db_cv_path_cp"; then - ac_cv_prog_db_cv_path_cp="$db_cv_path_cp" # Let the user override the test. + if test -n "$CP"; then + ac_cv_prog_CP="$CP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2406,37 +2949,39 @@ 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_db_cv_path_cp="${ac_tool_prefix}cp" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CP="${ac_tool_prefix}cp" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi -db_cv_path_cp=$ac_cv_prog_db_cv_path_cp -if test -n "$db_cv_path_cp"; then - echo "$as_me:$LINENO: result: $db_cv_path_cp" >&5 -echo "${ECHO_T}$db_cv_path_cp" >&6 +CP=$ac_cv_prog_CP +if test -n "$CP"; then + { echo "$as_me:$LINENO: result: $CP" >&5 +echo "${ECHO_T}$CP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi -if test -z "$ac_cv_prog_db_cv_path_cp"; then - ac_ct_db_cv_path_cp=$db_cv_path_cp +if test -z "$ac_cv_prog_CP"; then + ac_ct_CP=$CP # Extract the first word of "cp", so it can be a program name with args. set dummy cp; 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_cp+set}" = set; then +{ 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_CP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_db_cv_path_cp"; then - ac_cv_prog_ac_ct_db_cv_path_cp="$ac_ct_db_cv_path_cp" # Let the user override the test. + if test -n "$ac_ct_CP"; then + ac_cv_prog_ac_ct_CP="$ac_ct_CP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2444,47 +2989,61 @@ 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_db_cv_path_cp="cp" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CP="cp" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_db_cv_path_cp" && ac_cv_prog_ac_ct_db_cv_path_cp="missing_cp" fi fi -ac_ct_db_cv_path_cp=$ac_cv_prog_ac_ct_db_cv_path_cp -if test -n "$ac_ct_db_cv_path_cp"; then - echo "$as_me:$LINENO: result: $ac_ct_db_cv_path_cp" >&5 -echo "${ECHO_T}$ac_ct_db_cv_path_cp" >&6 +ac_ct_CP=$ac_cv_prog_ac_ct_CP +if test -n "$ac_ct_CP"; then + { echo "$as_me:$LINENO: result: $ac_ct_CP" >&5 +echo "${ECHO_T}$ac_ct_CP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - db_cv_path_cp=$ac_ct_db_cv_path_cp + if test "x$ac_ct_CP" = x; then + CP="none" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CP=$ac_ct_CP + fi else - db_cv_path_cp="$ac_cv_prog_db_cv_path_cp" + CP="$ac_cv_prog_CP" fi -if test "$db_cv_path_cp" = missing_cp; then - { { echo "$as_me:$LINENO: error: No cp utility found." >&5 +test "$CP" = "none" && { { echo "$as_me:$LINENO: error: No cp utility found." >&5 echo "$as_me: error: No cp utility found." >&2;} { (exit 1); exit 1; }; } -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 -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_ln+set}" = set; then +# The Tcl test suite requires a kill utility. +if test "$db_cv_test" = "yes"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}kill", so it can be a program name with args. +set dummy ${ac_tool_prefix}kill; 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_KILL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$db_cv_path_ln"; then - ac_cv_prog_db_cv_path_ln="$db_cv_path_ln" # Let the user override the test. + if test -n "$KILL"; then + ac_cv_prog_KILL="$KILL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2492,37 +3051,39 @@ 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_db_cv_path_ln="${ac_tool_prefix}ln" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_KILL="${ac_tool_prefix}kill" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi -db_cv_path_ln=$ac_cv_prog_db_cv_path_ln -if test -n "$db_cv_path_ln"; then - echo "$as_me:$LINENO: result: $db_cv_path_ln" >&5 -echo "${ECHO_T}$db_cv_path_ln" >&6 +KILL=$ac_cv_prog_KILL +if test -n "$KILL"; then + { echo "$as_me:$LINENO: result: $KILL" >&5 +echo "${ECHO_T}$KILL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi -if test -z "$ac_cv_prog_db_cv_path_ln"; then - ac_ct_db_cv_path_ln=$db_cv_path_ln - # Extract the first word of "ln", so it can be a program name with args. -set dummy ln; 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_ln+set}" = set; then +if test -z "$ac_cv_prog_KILL"; then + ac_ct_KILL=$KILL + # Extract the first word of "kill", so it can be a program name with args. +set dummy kill; 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_KILL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_db_cv_path_ln"; then - ac_cv_prog_ac_ct_db_cv_path_ln="$ac_ct_db_cv_path_ln" # Let the user override the test. + if test -n "$ac_ct_KILL"; then + ac_cv_prog_ac_ct_KILL="$ac_ct_KILL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2530,47 +3091,60 @@ 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_db_cv_path_ln="ln" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_KILL="kill" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_db_cv_path_ln" && ac_cv_prog_ac_ct_db_cv_path_ln="missing_ln" fi fi -ac_ct_db_cv_path_ln=$ac_cv_prog_ac_ct_db_cv_path_ln -if test -n "$ac_ct_db_cv_path_ln"; then - echo "$as_me:$LINENO: result: $ac_ct_db_cv_path_ln" >&5 -echo "${ECHO_T}$ac_ct_db_cv_path_ln" >&6 +ac_ct_KILL=$ac_cv_prog_ac_ct_KILL +if test -n "$ac_ct_KILL"; then + { echo "$as_me:$LINENO: result: $ac_ct_KILL" >&5 +echo "${ECHO_T}$ac_ct_KILL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - db_cv_path_ln=$ac_ct_db_cv_path_ln + if test "x$ac_ct_KILL" = x; then + KILL="none" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + KILL=$ac_ct_KILL + fi else - db_cv_path_ln="$ac_cv_prog_db_cv_path_ln" + KILL="$ac_cv_prog_KILL" fi -if test "$db_cv_path_ln" = missing_ln; then - { { echo "$as_me:$LINENO: error: No ln utility found." >&5 -echo "$as_me: error: No ln utility found." >&2;} + test "$KILL" = "none" && { { echo "$as_me:$LINENO: error: No kill utility found." >&5 +echo "$as_me: error: No kill utility found." >&2;} { (exit 1); exit 1; }; } fi if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}mkdir", so it can be a program name with args. -set dummy ${ac_tool_prefix}mkdir; 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_mkdir+set}" = set; 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 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_LN+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$db_cv_path_mkdir"; then - ac_cv_prog_db_cv_path_mkdir="$db_cv_path_mkdir" # Let the user override the test. + if test -n "$LN"; then + ac_cv_prog_LN="$LN" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2578,37 +3152,39 @@ 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_db_cv_path_mkdir="${ac_tool_prefix}mkdir" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LN="${ac_tool_prefix}ln" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi -db_cv_path_mkdir=$ac_cv_prog_db_cv_path_mkdir -if test -n "$db_cv_path_mkdir"; then - echo "$as_me:$LINENO: result: $db_cv_path_mkdir" >&5 -echo "${ECHO_T}$db_cv_path_mkdir" >&6 +LN=$ac_cv_prog_LN +if test -n "$LN"; then + { echo "$as_me:$LINENO: result: $LN" >&5 +echo "${ECHO_T}$LN" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi -if test -z "$ac_cv_prog_db_cv_path_mkdir"; then - ac_ct_db_cv_path_mkdir=$db_cv_path_mkdir - # Extract the first word of "mkdir", so it can be a program name with args. -set dummy mkdir; 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_mkdir+set}" = set; then +if test -z "$ac_cv_prog_LN"; then + ac_ct_LN=$LN + # Extract the first word of "ln", so it can be a program name with args. +set dummy ln; 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_LN+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_db_cv_path_mkdir"; then - ac_cv_prog_ac_ct_db_cv_path_mkdir="$ac_ct_db_cv_path_mkdir" # Let the user override the test. + if test -n "$ac_ct_LN"; then + ac_cv_prog_ac_ct_LN="$ac_ct_LN" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2616,49 +3192,59 @@ 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_db_cv_path_mkdir="mkdir" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_LN="ln" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_db_cv_path_mkdir" && ac_cv_prog_ac_ct_db_cv_path_mkdir="missing_mkdir" fi fi -ac_ct_db_cv_path_mkdir=$ac_cv_prog_ac_ct_db_cv_path_mkdir -if test -n "$ac_ct_db_cv_path_mkdir"; then - echo "$as_me:$LINENO: result: $ac_ct_db_cv_path_mkdir" >&5 -echo "${ECHO_T}$ac_ct_db_cv_path_mkdir" >&6 +ac_ct_LN=$ac_cv_prog_ac_ct_LN +if test -n "$ac_ct_LN"; then + { echo "$as_me:$LINENO: result: $ac_ct_LN" >&5 +echo "${ECHO_T}$ac_ct_LN" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - db_cv_path_mkdir=$ac_ct_db_cv_path_mkdir + if test "x$ac_ct_LN" = x; then + LN="none" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + LN=$ac_ct_LN + fi else - db_cv_path_mkdir="$ac_cv_prog_db_cv_path_mkdir" + LN="$ac_cv_prog_LN" fi -if test "$db_cv_path_mkdir" = missing_mkdir; then - { { echo "$as_me:$LINENO: error: No mkdir utility found." >&5 -echo "$as_me: error: No mkdir utility found." >&2;} +test "$LN" = "none" && { { echo "$as_me:$LINENO: error: No ln utility found." >&5 +echo "$as_me: error: No ln utility found." >&2;} { (exit 1); exit 1; }; } -fi -# We need a complete path for ranlib, because it doesn't exist on some -# architectures because the ar utility packages the library itself. if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_path_ranlib+set}" = set; then + # Extract the first word of "${ac_tool_prefix}mkdir", so it can be a program name with args. +set dummy ${ac_tool_prefix}mkdir; 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_MKDIR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$path_ranlib"; then - ac_cv_prog_path_ranlib="$path_ranlib" # Let the user override the test. + if test -n "$MKDIR"; then + ac_cv_prog_MKDIR="$MKDIR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2666,37 +3252,39 @@ 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_ranlib="${ac_tool_prefix}ranlib" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MKDIR="${ac_tool_prefix}mkdir" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi -path_ranlib=$ac_cv_prog_path_ranlib -if test -n "$path_ranlib"; then - echo "$as_me:$LINENO: result: $path_ranlib" >&5 -echo "${ECHO_T}$path_ranlib" >&6 +MKDIR=$ac_cv_prog_MKDIR +if test -n "$MKDIR"; then + { echo "$as_me:$LINENO: result: $MKDIR" >&5 +echo "${ECHO_T}$MKDIR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi -if test -z "$ac_cv_prog_path_ranlib"; then - ac_ct_path_ranlib=$path_ranlib - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_path_ranlib+set}" = set; then +if test -z "$ac_cv_prog_MKDIR"; then + ac_ct_MKDIR=$MKDIR + # Extract the first word of "mkdir", so it can be a program name with args. +set dummy mkdir; 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_MKDIR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_path_ranlib"; then - ac_cv_prog_ac_ct_path_ranlib="$ac_ct_path_ranlib" # Let the user override the test. + if test -n "$ac_ct_MKDIR"; then + ac_cv_prog_ac_ct_MKDIR="$ac_ct_MKDIR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2704,82 +3292,61 @@ 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_ranlib="ranlib" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_MKDIR="mkdir" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_path_ranlib" && ac_cv_prog_ac_ct_path_ranlib="missing_ranlib" fi fi -ac_ct_path_ranlib=$ac_cv_prog_ac_ct_path_ranlib -if test -n "$ac_ct_path_ranlib"; then - echo "$as_me:$LINENO: result: $ac_ct_path_ranlib" >&5 -echo "${ECHO_T}$ac_ct_path_ranlib" >&6 +ac_ct_MKDIR=$ac_cv_prog_ac_ct_MKDIR +if test -n "$ac_ct_MKDIR"; then + { echo "$as_me:$LINENO: result: $ac_ct_MKDIR" >&5 +echo "${ECHO_T}$ac_ct_MKDIR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - path_ranlib=$ac_ct_path_ranlib -else - path_ranlib="$ac_cv_prog_path_ranlib" -fi - -# Extract the first word of "$path_ranlib", so it can be a program name with args. -set dummy $path_ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_db_cv_path_ranlib+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $db_cv_path_ranlib in - [\\/]* | ?:[\\/]*) - ac_cv_path_db_cv_path_ranlib="$db_cv_path_ranlib" # 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_ranlib="$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_ranlib" && ac_cv_path_db_cv_path_ranlib="missing_ranlib" - ;; + if test "x$ac_ct_MKDIR" = x; then + MKDIR="none" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; esac -fi -db_cv_path_ranlib=$ac_cv_path_db_cv_path_ranlib - -if test -n "$db_cv_path_ranlib"; then - echo "$as_me:$LINENO: result: $db_cv_path_ranlib" >&5 -echo "${ECHO_T}$db_cv_path_ranlib" >&6 + MKDIR=$ac_ct_MKDIR + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + MKDIR="$ac_cv_prog_MKDIR" fi +test "$MKDIR" = "none" && { { echo "$as_me:$LINENO: error: No mkdir utility found." >&5 +echo "$as_me: error: No mkdir utility found." >&2;} + { (exit 1); exit 1; }; } +# Ranlib doesn't exist on some architectures because the ar utility +# packages the library itself. if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}rm", so it can be a program name with args. -set dummy ${ac_tool_prefix}rm; 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_rm+set}" = set; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$db_cv_path_rm"; then - ac_cv_prog_db_cv_path_rm="$db_cv_path_rm" # Let the user override the test. + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2787,37 +3354,39 @@ 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_db_cv_path_rm="${ac_tool_prefix}rm" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi -db_cv_path_rm=$ac_cv_prog_db_cv_path_rm -if test -n "$db_cv_path_rm"; then - echo "$as_me:$LINENO: result: $db_cv_path_rm" >&5 -echo "${ECHO_T}$db_cv_path_rm" >&6 +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi -if test -z "$ac_cv_prog_db_cv_path_rm"; then - ac_ct_db_cv_path_rm=$db_cv_path_rm - # Extract the first word of "rm", so it can be a program name with args. -set dummy rm; 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_rm+set}" = set; then +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_db_cv_path_rm"; then - ac_cv_prog_ac_ct_db_cv_path_rm="$ac_ct_db_cv_path_rm" # Let the user override the test. + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2825,48 +3394,56 @@ 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_db_cv_path_rm="rm" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_db_cv_path_rm" && ac_cv_prog_ac_ct_db_cv_path_rm="missing_rm" fi fi -ac_ct_db_cv_path_rm=$ac_cv_prog_ac_ct_db_cv_path_rm -if test -n "$ac_ct_db_cv_path_rm"; then - echo "$as_me:$LINENO: result: $ac_ct_db_cv_path_rm" >&5 -echo "${ECHO_T}$ac_ct_db_cv_path_rm" >&6 +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - db_cv_path_rm=$ac_ct_db_cv_path_rm + if test "x$ac_ct_RANLIB" = x; then + RANLIB="none" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else - db_cv_path_rm="$ac_cv_prog_db_cv_path_rm" + RANLIB="$ac_cv_prog_RANLIB" fi -if test "$db_cv_path_rm" = missing_rm; then - { { echo "$as_me:$LINENO: error: No rm utility found." >&5 -echo "$as_me: error: No rm utility found." >&2;} - { (exit 1); exit 1; }; } -fi -if test "$db_cv_rpc" = "yes"; then - if test -n "$ac_tool_prefix"; then - # 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_rpcgen+set}" = set; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}rm", so it can be a program name with args. +set dummy ${ac_tool_prefix}rm; 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_RM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - 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. + if test -n "$RM"; then + ac_cv_prog_RM="$RM" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2874,37 +3451,39 @@ 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_db_cv_path_rpcgen="${ac_tool_prefix}rpcgen" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RM="${ac_tool_prefix}rm" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi -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 +RM=$ac_cv_prog_RM +if test -n "$RM"; then + { echo "$as_me:$LINENO: result: $RM" >&5 +echo "${ECHO_T}$RM" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi -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_rpcgen+set}" = set; then +if test -z "$ac_cv_prog_RM"; then + ac_ct_RM=$RM + # Extract the first word of "rm", so it can be a program name with args. +set dummy rm; 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_RM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - 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. + if test -n "$ac_ct_RM"; then + ac_cv_prog_ac_ct_RM="$ac_ct_RM" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2912,50 +3491,60 @@ 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_db_cv_path_rpcgen="rpcgen" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RM="rm" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_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_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 +ac_ct_RM=$ac_cv_prog_ac_ct_RM +if test -n "$ac_ct_RM"; then + { echo "$as_me:$LINENO: result: $ac_ct_RM" >&5 +echo "${ECHO_T}$ac_ct_RM" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - db_cv_path_rpcgen=$ac_ct_db_cv_path_rpcgen + if test "x$ac_ct_RM" = x; then + RM="none" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RM=$ac_ct_RM + fi else - db_cv_path_rpcgen="$ac_cv_prog_db_cv_path_rpcgen" + RM="$ac_cv_prog_RM" fi - 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;} +test "$RM" = "none" && { { echo "$as_me:$LINENO: error: No rm utility found." >&5 +echo "$as_me: error: No rm utility found." >&2;} { (exit 1); exit 1; }; } - fi -fi -# We need a complete path for sh, because some implementations of make -# get upset if SHELL is set to just the command name. -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}sh", so it can be a program name with args. -set dummy ${ac_tool_prefix}sh; 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_sh+set}" = set; then +if test "$db_cv_rpc" = "yes"; then + if test -n "$ac_tool_prefix"; then + # 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_RPCGEN+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$path_sh"; then - ac_cv_prog_path_sh="$path_sh" # Let the user override the test. + if test -n "$RPCGEN"; then + ac_cv_prog_RPCGEN="$RPCGEN" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2963,37 +3552,39 @@ 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_sh="${ac_tool_prefix}sh" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RPCGEN="${ac_tool_prefix}rpcgen" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi -path_sh=$ac_cv_prog_path_sh -if test -n "$path_sh"; then - echo "$as_me:$LINENO: result: $path_sh" >&5 -echo "${ECHO_T}$path_sh" >&6 +RPCGEN=$ac_cv_prog_RPCGEN +if test -n "$RPCGEN"; then + { echo "$as_me:$LINENO: result: $RPCGEN" >&5 +echo "${ECHO_T}$RPCGEN" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi -if test -z "$ac_cv_prog_path_sh"; then - ac_ct_path_sh=$path_sh - # Extract the first word of "sh", so it can be a program name with args. -set dummy sh; 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_sh+set}" = set; then +if test -z "$ac_cv_prog_RPCGEN"; then + ac_ct_RPCGEN=$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_RPCGEN+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_path_sh"; then - ac_cv_prog_ac_ct_path_sh="$ac_ct_path_sh" # Let the user override the test. + if test -n "$ac_ct_RPCGEN"; then + ac_cv_prog_ac_ct_RPCGEN="$ac_ct_RPCGEN" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -3001,35 +3592,59 @@ 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_sh="sh" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RPCGEN="rpcgen" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_path_sh" && ac_cv_prog_ac_ct_path_sh="missing_sh" fi fi -ac_ct_path_sh=$ac_cv_prog_ac_ct_path_sh -if test -n "$ac_ct_path_sh"; then - echo "$as_me:$LINENO: result: $ac_ct_path_sh" >&5 -echo "${ECHO_T}$ac_ct_path_sh" >&6 +ac_ct_RPCGEN=$ac_cv_prog_ac_ct_RPCGEN +if test -n "$ac_ct_RPCGEN"; then + { echo "$as_me:$LINENO: result: $ac_ct_RPCGEN" >&5 +echo "${ECHO_T}$ac_ct_RPCGEN" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - path_sh=$ac_ct_path_sh + if test "x$ac_ct_RPCGEN" = x; then + RPCGEN="none" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RPCGEN=$ac_ct_RPCGEN + fi else - path_sh="$ac_cv_prog_path_sh" + RPCGEN="$ac_cv_prog_RPCGEN" fi -# Extract the first word of "$path_sh", so it can be a program name with args. -set dummy $path_sh; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + test "$RPCGEN" = "none" && { { echo "$as_me:$LINENO: error: No rpcgen utility found." >&5 +echo "$as_me: error: No rpcgen utility found." >&2;} + { (exit 1); exit 1; }; } +fi + +# We need a complete path for sh, because some make utility implementations get +# upset if SHELL is set to just the command name. Don't use the SHELL variable +# here because the user likely has the SHELL variable set to something other +# than the Bourne shell, which is what Make wants. +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}sh", so it can be a program name with args. +set dummy ${ac_tool_prefix}sh; 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_sh+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3044,128 +3659,41 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_db_cv_path_sh="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_path_db_cv_path_sh" && ac_cv_path_db_cv_path_sh="missing_sh" ;; esac fi db_cv_path_sh=$ac_cv_path_db_cv_path_sh - if test -n "$db_cv_path_sh"; then - echo "$as_me:$LINENO: result: $db_cv_path_sh" >&5 -echo "${ECHO_T}$db_cv_path_sh" >&6 + { echo "$as_me:$LINENO: result: $db_cv_path_sh" >&5 +echo "${ECHO_T}$db_cv_path_sh" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -if test "$db_cv_path_sh" = missing_sh; then - { { echo "$as_me:$LINENO: error: No sh utility found." >&5 -echo "$as_me: error: No sh utility found." >&2;} - { (exit 1); exit 1; }; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -# Don't strip the binaries if --enable-debug was specified. -if test "$db_cv_debug" = yes; then - db_cv_path_strip=debug_build_no_strip -else - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_path_strip+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$path_strip"; then - ac_cv_prog_path_strip="$path_strip" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_path_strip="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done fi -fi -path_strip=$ac_cv_prog_path_strip -if test -n "$path_strip"; then - echo "$as_me:$LINENO: result: $path_strip" >&5 -echo "${ECHO_T}$path_strip" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_path_strip"; then - ac_ct_path_strip=$path_strip - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_path_strip+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_path_strip"; then - ac_cv_prog_ac_ct_path_strip="$ac_ct_path_strip" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_path_strip="strip" - 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_strip" && ac_cv_prog_ac_ct_path_strip="missing_strip" -fi -fi -ac_ct_path_strip=$ac_cv_prog_ac_ct_path_strip -if test -n "$ac_ct_path_strip"; then - echo "$as_me:$LINENO: result: $ac_ct_path_strip" >&5 -echo "${ECHO_T}$ac_ct_path_strip" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - path_strip=$ac_ct_path_strip -else - path_strip="$ac_cv_prog_path_strip" -fi - - # Extract the first word of "$path_strip", so it can be a program name with args. -set dummy $path_strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_db_cv_path_strip+set}" = set; then +if test -z "$ac_cv_path_db_cv_path_sh"; then + ac_pt_db_cv_path_sh=$db_cv_path_sh + # Extract the first word of "sh", so it can be a program name with args. +set dummy sh; 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_ac_pt_db_cv_path_sh+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $db_cv_path_strip in + case $ac_pt_db_cv_path_sh in [\\/]* | ?:[\\/]*) - ac_cv_path_db_cv_path_strip="$db_cv_path_strip" # Let the user override the test with a path. + ac_cv_path_ac_pt_db_cv_path_sh="$ac_pt_db_cv_path_sh" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3174,41 +3702,64 @@ 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_strip="$as_dir/$ac_word$ac_exec_ext" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_db_cv_path_sh="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_path_db_cv_path_strip" && ac_cv_path_db_cv_path_strip="missing_strip" ;; esac fi -db_cv_path_strip=$ac_cv_path_db_cv_path_strip - -if test -n "$db_cv_path_strip"; then - echo "$as_me:$LINENO: result: $db_cv_path_strip" >&5 -echo "${ECHO_T}$db_cv_path_strip" >&6 +ac_pt_db_cv_path_sh=$ac_cv_path_ac_pt_db_cv_path_sh +if test -n "$ac_pt_db_cv_path_sh"; then + { echo "$as_me:$LINENO: result: $ac_pt_db_cv_path_sh" >&5 +echo "${ECHO_T}$ac_pt_db_cv_path_sh" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "x$ac_pt_db_cv_path_sh" = x; then + db_cv_path_sh="none" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + db_cv_path_sh=$ac_pt_db_cv_path_sh + fi +else + db_cv_path_sh="$ac_cv_path_db_cv_path_sh" fi -if test "$db_cv_test" = "yes"; then +test "$db_cv_path_sh" = "none" && { { echo "$as_me:$LINENO: error: No sh utility found." >&5 +echo "$as_me: error: No sh utility found." >&2;} + { (exit 1); exit 1; }; } + +# Don't strip the binaries if --enable-debug was specified. +if test "$db_cv_debug" = yes; then + STRIP="none" +else if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}kill", so it can be a program name with args. -set dummy ${ac_tool_prefix}kill; 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_kill+set}" = set; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$db_cv_path_kill"; then - ac_cv_prog_db_cv_path_kill="$db_cv_path_kill" # Let the user override the test. + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -3216,37 +3767,39 @@ 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_db_cv_path_kill="${ac_tool_prefix}kill" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi -db_cv_path_kill=$ac_cv_prog_db_cv_path_kill -if test -n "$db_cv_path_kill"; then - echo "$as_me:$LINENO: result: $db_cv_path_kill" >&5 -echo "${ECHO_T}$db_cv_path_kill" >&6 +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi -if test -z "$ac_cv_prog_db_cv_path_kill"; then - ac_ct_db_cv_path_kill=$db_cv_path_kill - # Extract the first word of "kill", so it can be a program name with args. -set dummy kill; 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_kill+set}" = set; then +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_db_cv_path_kill"; then - ac_cv_prog_ac_ct_db_cv_path_kill="$ac_ct_db_cv_path_kill" # Let the user override the test. + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -3254,39 +3807,48 @@ 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_db_cv_path_kill="kill" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_db_cv_path_kill" && ac_cv_prog_ac_ct_db_cv_path_kill="missing_kill" fi fi -ac_ct_db_cv_path_kill=$ac_cv_prog_ac_ct_db_cv_path_kill -if test -n "$ac_ct_db_cv_path_kill"; then - echo "$as_me:$LINENO: result: $ac_ct_db_cv_path_kill" >&5 -echo "${ECHO_T}$ac_ct_db_cv_path_kill" >&6 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - db_cv_path_kill=$ac_ct_db_cv_path_kill + if test "x$ac_ct_STRIP" = x; then + STRIP="none" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else - db_cv_path_kill="$ac_cv_prog_db_cv_path_kill" + STRIP="$ac_cv_prog_STRIP" fi - if test "$db_cv_path_kill" = missing_kill; then - { { echo "$as_me:$LINENO: error: No kill utility found." >&5 -echo "$as_me: error: No kill utility found." >&2;} - { (exit 1); exit 1; }; } - fi + test "$STRIP" = "none" && { echo "$as_me:$LINENO: WARNING: No strip utility found." >&5 +echo "$as_me: WARNING: No strip utility found." >&2;} fi - - # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -3300,8 +3862,8 @@ fi # 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 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3323,7 +3885,7 @@ 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 -f "$as_dir/$ac_prog$ac_exec_ext" && $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. @@ -3342,21 +3904,22 @@ case $as_dir/ in ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -3384,15 +3947,15 @@ INSTALL_TARGET="library_install" # because the makefile CC may be set to use $(LIBTOOL). # # Don't override anything if it's already set from the environment. -optimize_def="-O" +optimize_debug="-O" case "$host_os" in aix4.3.*|aix5*) - optimize_def="-O2" + optimize_debug="-O2" CC=${CC-"xlc_r"} CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" LDFLAGS="$LDFLAGS -Wl,-brtl";; bsdi3*) CC=${CC-"shlicc2"} - LIBS="$LIBS -lipc";; + LIBSO_LIBS="$LIBSO_LIBS -lipc";; cygwin*) CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; freebsd*) @@ -3401,10 +3964,10 @@ freebsd*) gnu*|k*bsd*-gnu|linux*) CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; hpux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT";; -irix*) optimize_def="-O2" +irix*) optimize_debug="-O2" CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";; mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE" - LIBS="$LIBS -lsocket -lsvipc";; + LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";; osf*) CPPFLAGS="$CPPFLAGS -pthread";; *qnx*) cat >>confdefs.h <<\_ACEOF #define HAVE_QNX 1 @@ -3413,20 +3976,14 @@ _ACEOF ;; solaris*) - CPPFLAGS="$CPPFLAGS -D_REENTRANT";; + CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS ";; esac -# Set CFLAGS/CXXFLAGS. We MUST set the flags before we call autoconf -# compiler configuration macros, because if we don't, they set CFLAGS -# to no optimization and -g, which isn't what we want. -CFLAGS=${CFLAGS-$optimize_def} -CXXFLAGS=${CXXFLAGS-"$CFLAGS"} - -# If the user wants a debugging environment, add -g to the CFLAGS value. -# -# XXX -# Some compilers can't mix optimizing and debug flags. The only way to -# handle this is to specify CFLAGS in the environment before configuring. +# If the user wants a debugging environment, change any compiler optimization +# flags to -g. We used to add -g to the -O compiler flags, but compilers are +# good enough at code re-organization that debugging with -O no longer works. +# If you want to compile with a different set of flags, specify CFLAGS in the +# environment before configuring. if test "$db_cv_debug" = "yes"; then cat >>confdefs.h <<\_ACEOF #define DEBUG 1 @@ -3435,13 +3992,14 @@ _ACEOF - CFLAGS="$CFLAGS -g" - CXXFLAGS="$CXXFLAGS -g" - db_cv_build_type=debug -else - db_cv_build_type=release + optimize_debug="-g" fi +# Set CFLAGS/CXXFLAGS. We MUST set the flags before we call autoconf +# compiler configuration macros, because if we don't, they set CFLAGS +# to no optimization and -g, which isn't what we want. +CFLAGS=${CFLAGS-$optimize_debug} +CXXFLAGS=${CXXFLAGS-"$CFLAGS"} # The default compiler is cc (NOT gcc), the default CFLAGS is as specified # above, NOT what is set by AC_PROG_CC, as it won't set optimization flags @@ -3456,8 +4014,8 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3470,25 +4028,27 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CC" && break done fi @@ -3498,8 +4058,8 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3512,29 +4072,45 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi @@ -3545,21 +4121,35 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 +echo "$as_me:$LINENO: checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 - (eval $ac_compiler --version </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 - (eval $ac_compiler -v </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 - (eval $ac_compiler -V </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -3584,46 +4174,70 @@ 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 file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $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 +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; [ab].out ) # 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 + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. break;; * ) break;; esac done +test "$ac_cv_exeext" = no && ac_cv_exeext= + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3636,19 +4250,23 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -3667,22 +4285,27 @@ See \`config.log' for more details." >&2;} fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } + +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then @@ -3693,9 +4316,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext break;; * ) break;; esac @@ -3709,14 +4331,14 @@ See \`config.log' for more details." >&2;} fi rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3736,14 +4358,20 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@ -3761,12 +4389,12 @@ fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3789,24 +4417,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -3815,24 +4455,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3848,24 +4492,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -3874,12 +4530,131 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -3895,12 +4670,12 @@ else CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3934,12 +4709,17 @@ static char *f (char * (*g) (char **, int), char **p, ...) /* 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 + as 'x'. The following induces an error, until -std is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ + that's true only with -std. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -3954,205 +4734,74 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" 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>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break + ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f conftest.$ac_ext CC=$ac_save_CC fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_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 - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include <stdlib.h> -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - 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 - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - 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 - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -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' @@ -4160,11 +4809,19 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Set specific per-compiler flags. +# We know what compiler we're going to use, now. Set per-compiler flags. if test "$GCC" = "yes"; then - # We want -O2 if we're using gcc. + # Use -O3 if we're using gcc, unless we're doing a small build, in + # which case we use -Os alone. The code size for -O3 is quite a + # bit larger than -O2: a compromise is "-Os -finline-functions", + # it's smaller and explicitly inlining the functions helps Berkeley + # DB. CFLAGS="$CFLAGS " - CFLAGS=`echo "$CFLAGS" | sed 's/-O /-O2 /g'` + if test "$db_cv_smallbuild" = "yes"; then + CFLAGS=`echo "$CFLAGS" | sed 's/-O /-Os /g'` + else + CFLAGS=`echo "$CFLAGS" | sed 's/-O /-O3 /g'` + fi else case "$host_os" in hpux11.0*) ;; @@ -4184,8 +4841,8 @@ else fi -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4225,6 +4882,7 @@ main () char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; + if (s) return 0; } { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ int x[] = {25, 17}; @@ -4243,7 +4901,9 @@ main () } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; + if (!foo) return 0; } + return !x[0] && !zero.x; #endif ; @@ -4251,24 +4911,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4277,12 +4949,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_c_const=no + ac_cv_c_const=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then cat >>confdefs.h <<\_ACEOF @@ -4317,8 +4990,8 @@ if test "$db_cv_cxx" = "yes"; then aix*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}xlC_r", so it can be a program name with args. set dummy ${ac_tool_prefix}xlC_r; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CCC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4331,32 +5004,34 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CCC="${ac_tool_prefix}xlC_r" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CCC=$ac_cv_prog_CCC if test -n "$CCC"; then - echo "$as_me:$LINENO: result: $CCC" >&5 -echo "${ECHO_T}$CCC" >&6 + { echo "$as_me:$LINENO: result: $CCC" >&5 +echo "${ECHO_T}$CCC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CCC"; then ac_ct_CCC=$CCC # Extract the first word of "xlC_r", so it can be a program name with args. set dummy xlC_r; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ 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_CCC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4369,37 +5044,52 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CCC="xlC_r" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CCC=$ac_cv_prog_ac_ct_CCC if test -n "$ac_ct_CCC"; then - echo "$as_me:$LINENO: result: $ac_ct_CCC" >&5 -echo "${ECHO_T}$ac_ct_CCC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CCC" >&5 +echo "${ECHO_T}$ac_ct_CCC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CCC=$ac_ct_CCC + if test "x$ac_ct_CCC" = x; then + CCC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CCC=$ac_ct_CCC + fi else CCC="$ac_cv_prog_CCC" fi LIBXSO_LIBS="-lC_r $LIBXSO_LIBS" - LIBS="-lC_r $LIBS";; + LIBSO_LIBS="-lC_r $LIBSO_LIBS";; hpux*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}aCC", so it can be a program name with args. set dummy ${ac_tool_prefix}aCC; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CCC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4412,32 +5102,34 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CCC="${ac_tool_prefix}aCC" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CCC=$ac_cv_prog_CCC if test -n "$CCC"; then - echo "$as_me:$LINENO: result: $CCC" >&5 -echo "${ECHO_T}$CCC" >&6 + { echo "$as_me:$LINENO: result: $CCC" >&5 +echo "${ECHO_T}$CCC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CCC"; then ac_ct_CCC=$CCC # Extract the first word of "aCC", so it can be a program name with args. set dummy aCC; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ 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_CCC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4450,26 +5142,41 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CCC="aCC" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CCC=$ac_cv_prog_ac_ct_CCC if test -n "$ac_ct_CCC"; then - echo "$as_me:$LINENO: result: $ac_ct_CCC" >&5 -echo "${ECHO_T}$ac_ct_CCC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CCC" >&5 +echo "${ECHO_T}$ac_ct_CCC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CCC=$ac_ct_CCC + if test "x$ac_ct_CCC" = x; then + CCC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CCC=$ac_ct_CCC + fi else CCC="$ac_cv_prog_CCC" fi @@ -4477,8 +5184,8 @@ fi irix*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}CC", so it can be a program name with args. set dummy ${ac_tool_prefix}CC; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CCC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4491,32 +5198,34 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CCC="${ac_tool_prefix}CC" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CCC=$ac_cv_prog_CCC if test -n "$CCC"; then - echo "$as_me:$LINENO: result: $CCC" >&5 -echo "${ECHO_T}$CCC" >&6 + { echo "$as_me:$LINENO: result: $CCC" >&5 +echo "${ECHO_T}$CCC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CCC"; then ac_ct_CCC=$CCC # Extract the first word of "CC", so it can be a program name with args. set dummy CC; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ 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_CCC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4529,26 +5238,41 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CCC="CC" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CCC=$ac_cv_prog_ac_ct_CCC if test -n "$ac_ct_CCC"; then - echo "$as_me:$LINENO: result: $ac_ct_CCC" >&5 -echo "${ECHO_T}$ac_ct_CCC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CCC" >&5 +echo "${ECHO_T}$ac_ct_CCC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CCC=$ac_ct_CCC + if test "x$ac_ct_CCC" = x; then + CCC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CCC=$ac_ct_CCC + fi else CCC="$ac_cv_prog_CCC" fi @@ -4556,8 +5280,8 @@ fi osf*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cxx", so it can be a program name with args. set dummy ${ac_tool_prefix}cxx; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CCC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4570,32 +5294,34 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CCC="${ac_tool_prefix}cxx" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CCC=$ac_cv_prog_CCC if test -n "$CCC"; then - echo "$as_me:$LINENO: result: $CCC" >&5 -echo "${ECHO_T}$CCC" >&6 + { echo "$as_me:$LINENO: result: $CCC" >&5 +echo "${ECHO_T}$CCC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CCC"; then ac_ct_CCC=$CCC # Extract the first word of "cxx", so it can be a program name with args. set dummy cxx; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ 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_CCC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4608,26 +5334,41 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CCC="cxx" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CCC=$ac_cv_prog_ac_ct_CCC if test -n "$ac_ct_CCC"; then - echo "$as_me:$LINENO: result: $ac_ct_CCC" >&5 -echo "${ECHO_T}$ac_ct_CCC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CCC" >&5 +echo "${ECHO_T}$ac_ct_CCC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CCC=$ac_ct_CCC + if test "x$ac_ct_CCC" = x; then + CCC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CCC=$ac_ct_CCC + fi else CCC="$ac_cv_prog_CCC" fi @@ -4635,8 +5376,8 @@ fi solaris*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}CC", so it can be a program name with args. set dummy ${ac_tool_prefix}CC; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CCC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4649,32 +5390,34 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CCC="${ac_tool_prefix}CC" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CCC=$ac_cv_prog_CCC if test -n "$CCC"; then - echo "$as_me:$LINENO: result: $CCC" >&5 -echo "${ECHO_T}$CCC" >&6 + { echo "$as_me:$LINENO: result: $CCC" >&5 +echo "${ECHO_T}$CCC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CCC"; then ac_ct_CCC=$CCC # Extract the first word of "CC", so it can be a program name with args. set dummy CC; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ 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_CCC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4687,44 +5430,63 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CCC="CC" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CCC=$ac_cv_prog_ac_ct_CCC if test -n "$ac_ct_CCC"; then - echo "$as_me:$LINENO: result: $ac_ct_CCC" >&5 -echo "${ECHO_T}$ac_ct_CCC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CCC" >&5 +echo "${ECHO_T}$ac_ct_CCC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CCC=$ac_ct_CCC + if test "x$ac_ct_CCC" = x; then + CCC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CCC=$ac_ct_CCC + fi else CCC="$ac_cv_prog_CCC" fi ;; esac fi - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4737,36 +5499,38 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ 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_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4779,55 +5543,85 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CXX" && break done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - CXX=$ac_ct_CXX + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi fi - + fi +fi # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 - (eval $ac_compiler --version </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 - (eval $ac_compiler -v </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 - (eval $ac_compiler -V </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4850,24 +5644,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4876,24 +5682,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4909,24 +5719,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4935,70 +5757,53 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no -fi -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 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration -#include <stdlib.h> + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5007,61 +5812,91 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - break + ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5069,13 +5904,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ###### WORKAROUND: SEE SR #7938 - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5105,8 +5940,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5131,9 +5971,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5143,8 +5984,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5171,6 +6017,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5188,8 +6035,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -5212,8 +6059,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5238,9 +6090,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5250,8 +6103,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5278,6 +6136,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5303,14 +6162,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking whether C++ supports the ISO C++ standard includes" >&5 -echo $ECHO_N "checking whether C++ supports the ISO C++ standard includes... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether C++ supports the ISO C++ standard includes" >&5 +echo $ECHO_N "checking whether C++ supports the ISO C++ standard includes... $ECHO_C" >&6; } if test "${db_cv_cxx_have_stdheaders+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5333,24 +6191,36 @@ std::ostream *o; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5359,9 +6229,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -db_cv_cxx_have_stdheaders=no + db_cv_cxx_have_stdheaders=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core 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' @@ -5370,8 +6241,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:$LINENO: result: $db_cv_cxx_have_stdheaders" >&5 -echo "${ECHO_T}$db_cv_cxx_have_stdheaders" >&6 +{ echo "$as_me:$LINENO: result: $db_cv_cxx_have_stdheaders" >&5 +echo "${ECHO_T}$db_cv_cxx_have_stdheaders" >&6; } if test "$db_cv_cxx_have_stdheaders" = yes; then cxx_have_stdheaders="#define HAVE_CXX_STDHEADERS 1" fi @@ -5381,8 +6252,8 @@ fi # Do some gcc specific configuration. -echo "$as_me:$LINENO: checking whether we are using gcc version 2.96" >&5 -echo $ECHO_N "checking whether we are using gcc version 2.96... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using gcc version 2.96" >&5 +echo $ECHO_N "checking whether we are using gcc version 2.96... $ECHO_C" >&6; } if test "${db_cv_gcc_2_96+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5396,8 +6267,8 @@ if test "$GCC" = "yes"; then esac fi fi -echo "$as_me:$LINENO: result: $db_cv_gcc_2_96" >&5 -echo "${ECHO_T}$db_cv_gcc_2_96" >&6 +{ echo "$as_me:$LINENO: result: $db_cv_gcc_2_96" >&5 +echo "${ECHO_T}$db_cv_gcc_2_96" >&6; } if test "$db_cv_gcc_2_96" = "yes"; then CFLAGS=`echo "$CFLAGS" | sed 's/-O2/-O/'` CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-O2/-O/'` @@ -5407,8 +6278,8 @@ echo "$as_me: WARNING: INSTALLED GCC COMPILER HAS SERIOUS BUGS; PLEASE UPGRADE." echo "$as_me: WARNING: GCC OPTIMIZATION LEVEL SET TO -O." >&2;} fi -echo "$as_me:$LINENO: checking whether g++ requires -fhandle-exceptions" >&5 -echo $ECHO_N "checking whether g++ requires -fhandle-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether g++ requires -fhandle-exceptions" >&5 +echo $ECHO_N "checking whether g++ requires -fhandle-exceptions... $ECHO_C" >&6; } if test "${db_cv_gxx_except+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5422,8 +6293,8 @@ if test "$GXX" = "yes"; then esac fi fi -echo "$as_me:$LINENO: result: $db_cv_gxx_except" >&5 -echo "${ECHO_T}$db_cv_gxx_except" >&6 +{ echo "$as_me:$LINENO: result: $db_cv_gxx_except" >&5 +echo "${ECHO_T}$db_cv_gxx_except" >&6; } if test "$db_cv_gxx_except" = "yes"; then CXXFLAGS="$CXXFLAGS -fhandle-exceptions" fi @@ -5447,10 +6318,9 @@ export CC CCC CCC=CXX # Libtool configuration. -# Check whether --enable-shared or --disable-shared was given. +# Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} + enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; no) enable_shared=no ;; @@ -5469,12 +6339,12 @@ if test "${enable_shared+set}" = set; then esac else enable_shared=yes -fi; +fi -# Check whether --enable-static or --disable-static was given. + +# Check whether --enable-static was given. if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} + enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; no) enable_static=no ;; @@ -5493,12 +6363,12 @@ if test "${enable_static+set}" = set; then esac else enable_static=yes -fi; +fi -# Check whether --enable-fast-install or --disable-fast-install was given. + +# Check whether --enable-fast-install was given. if test "${enable_fast_install+set}" = set; then - enableval="$enable_fast_install" - p=${PACKAGE-default} + enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; no) enable_fast_install=no ;; @@ -5517,10 +6387,11 @@ if test "${enable_fast_install+set}" = set; then esac else enable_fast_install=yes -fi; +fi -echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 + +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } if test "${lt_cv_path_SED+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5544,7 +6415,7 @@ lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && break + test ! -f $lt_ac_sed && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -5573,37 +6444,184 @@ done fi SED=$lt_cv_path_SED -echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6 +{ echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6; } -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_GREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_GREP=$GREP +fi + + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_EGREP=$EGREP +fi + + + fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -# Check whether --with-gnu-ld or --without-gnu-ld was given. + +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -5632,11 +6650,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5649,7 +6667,7 @@ else if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -5669,21 +6687,21 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes @@ -5693,20 +6711,20 @@ case `$LD -v 2>&1 </dev/null` in ;; esac fi -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -5716,15 +6734,15 @@ 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' + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi ;; esac -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5732,56 +6750,63 @@ else # Let the user override the test. lt_cv_path_NM="$NM" else - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/${ac_tool_prefix}nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" break ;; *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac ;; esac - esac - fi + fi + done + IFS="$lt_save_ifs" done - IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi -echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +echo "${ECHO_T}$lt_cv_path_NM" >&6; } NM="$lt_cv_path_NM" -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } fi -echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5831,13 +6856,13 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu) +freebsd* | kfreebsd*-gnu | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -5853,7 +6878,7 @@ gnu*) hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case "$host_cpu" in + case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so @@ -5869,6 +6894,11 @@ hpux10.20* | hpux11*) esac ;; +interix3*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; + irix5* | irix6* | nonstopux*) case $LD in *-32|*"-32 ") libmagic=32-bit;; @@ -5881,15 +6911,6 @@ irix5* | irix6* | nonstopux*) # This must be Linux ELF. linux*) - case $host_cpu in - 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 ;; @@ -5923,15 +6944,11 @@ osf3* | osf4* | osf5*) lt_cv_deplibs_check_method=pass_all ;; -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - solaris*) lt_cv_deplibs_check_method=pass_all ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) case $host_vendor in motorola) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' @@ -5952,17 +6969,20 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) siemens) lt_cv_deplibs_check_method=pass_all ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*) +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; esac fi -echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -5973,14 +6993,17 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good @@ -6007,7 +7030,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6010 "configure"' > conftest.$ac_ext + echo '#line 7033 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6050,7 +7073,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - case "`/usr/bin/file conftest.o`" in + case `/usr/bin/file conftest.o` in *32-bit*) case $host in x86_64-*linux*) @@ -6092,8 +7115,8 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6119,24 +7142,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -6145,9 +7180,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -6156,13 +7192,33 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + esac @@ -6174,8 +7230,8 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -6209,8 +7265,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -6235,9 +7296,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6247,8 +7309,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -6275,6 +7342,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -6292,8 +7360,8 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -6316,8 +7384,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -6342,9 +7415,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6354,8 +7428,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -6382,6 +7461,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -6404,8 +7484,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6429,24 +7509,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -6455,9 +7547,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. @@ -6513,6 +7606,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ctype.h> +#include <stdlib.h> #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -6532,18 +7626,27 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -6556,12 +7659,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -6584,9 +7689,9 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -6600,24 +7705,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -6626,12 +7743,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core 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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -6646,18 +7765,19 @@ done for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -6668,24 +7788,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -6694,15 +7826,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -6711,8 +7844,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -6736,9 +7874,10 @@ 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 +{ 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 @@ -6762,25 +7901,24 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ 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 support@sleepycat.com ## -## ------------------------------------ ## + ( cat <<\_ASBOX +## ---------------------------------------------------------- ## +## Report this to Oracle Technology Network Berkeley DB forum ## +## ---------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -6792,17 +7930,278 @@ fi done + + +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } +if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + # <limits.h> exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; 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 +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <ac_nonexistent.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; 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 +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CXXCPP=$CXXCPP + +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + # <limits.h> exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; 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 +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <ac_nonexistent.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; 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 +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +fi + ac_ext=f ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6815,36 +8214,38 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi F77=$ac_cv_prog_F77 if test -n "$F77"; then - echo "$as_me:$LINENO: result: $F77" >&5 -echo "${ECHO_T}$F77" >&6 + { echo "$as_me:$LINENO: result: $F77" >&5 +echo "${ECHO_T}$F77" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$F77" && break done fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6857,48 +8258,78 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then - echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -echo "${ECHO_T}$ac_ct_F77" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +echo "${ECHO_T}$ac_ct_F77" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_F77" && break done - F77=$ac_ct_F77 + if test "x$ac_ct_F77" = x; then + F77="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + F77=$ac_ct_F77 + fi fi # Provide some information about the compiler. -echo "$as_me:6887:" \ - "checking for Fortran 77 compiler version" >&5 +echo "$as_me:$LINENO: 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 - (eval $ac_compiler --version </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 - (eval $ac_compiler -v </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 - (eval $ac_compiler -V </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -6908,8 +8339,8 @@ rm -f a.out # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F -echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } if test "${ac_cv_f77_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6922,24 +8353,36 @@ else end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -6948,20 +8391,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } ac_ext=$ac_save_ext ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= -echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_f77_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6972,24 +8416,36 @@ cat >conftest.$ac_ext <<_ACEOF end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -6998,13 +8454,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_f77_g=no + ac_cv_prog_f77_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then @@ -7033,8 +8490,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # find the maximum length of command line arguments -echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } if test "${lt_cv_sys_max_cmd_len+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7074,20 +8531,50 @@ else lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* ) + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` elif test -x /usr/sbin/sysctl; then lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` else - lt_cv_sys_max_cmd_len=65536 # usable default for *BSD + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs fi # And add a safety zone lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 ;; - *) + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) # 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. @@ -7112,19 +8599,19 @@ else fi if test -n $lt_cv_sys_max_cmd_len ; then - echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 + { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } else - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } fi # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7138,9 +8625,6 @@ symcode='[BCDEGRST]' # Regexp to match symbols that can be accessed directly from C. sympat='\([_A-Za-z][_A-Za-z0-9]*\)' -# Transform the above into a raw symbol and a C symbol. -symxfrm='\1 \2\3 \3' - # Transform an extracted symbol line into a proper C declaration lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" @@ -7162,15 +8646,31 @@ hpux*) # Its linker distinguishes data from code symbols lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; +linux*) + if test "$host_cpu" = ia64; then + symcode='[ABCDGIRSTW]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + fi + ;; irix* | nonstopux*) symcode='[BCDEGRST]' ;; osf*) symcode='[BCDEGQRST]' ;; -solaris* | sysv5*) +solaris*) symcode='[BDRT]' ;; +sco3.2v5*) + symcode='[DT]' + ;; +sysv4.2uw2*) + symcode='[DT]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' + ;; sysv4) symcode='[DFNSTU]' ;; @@ -7193,8 +8693,11 @@ esac # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -7312,15 +8815,15 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 + { echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; } else - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } fi -echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for objdir" >&5 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } if test "${lt_cv_objdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7334,8 +8837,8 @@ else fi rmdir .libs 2>/dev/null fi -echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +echo "${ECHO_T}$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -7356,7 +8859,7 @@ esac # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' +Xsed='sed -e 1s/^X//' sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' # Same as above, but do not quote variable references. @@ -7376,7 +8879,7 @@ rm="rm -f" default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except M$VC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -7386,8 +8889,8 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7400,32 +8903,34 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6 + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7438,27 +8943,41 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - AR=$ac_ct_AR + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi else AR="$ac_cv_prog_AR" fi @@ -7466,8 +8985,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7480,32 +8999,34 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7518,27 +9039,41 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - RANLIB=$ac_ct_RANLIB + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else RANLIB="$ac_cv_prog_RANLIB" fi @@ -7546,8 +9081,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7560,32 +9095,34 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7598,27 +9135,41 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -7633,6 +9184,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -7652,23 +9204,32 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7688,7 +9249,7 @@ else if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -7720,17 +9281,17 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for file" >&5 +echo $ECHO_N "checking for file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7750,7 +9311,7 @@ else if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -7782,11 +9343,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi else @@ -7801,21 +9362,21 @@ esac enable_dlopen=no enable_win32_dll=no -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Check whether --with-pic or --without-pic was given. +# Check whether --with-pic was given. if test "${with_pic+set}" = set; then - withval="$with_pic" - pic_mode="$withval" + withval=$with_pic; pic_mode="$withval" else pic_mode=default -fi; +fi + test -z "$pic_mode" && pic_mode=default # Use C for the default configuration in the libtool script @@ -7845,68 +9406,25 @@ lt_simple_link_test_code='int main(){return(0);}\n' # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC -# -# Check for any special shared library compilation flags. -# -lt_prog_cc_shlib= -if test "$GCC" = no; then - case $host_os in - sco3.2v5*) - lt_prog_cc_shlib='-belf' - ;; - esac -fi -if test -n "$lt_prog_cc_shlib"; then - { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5 -echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;} - if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then : - else - { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 -echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} - lt_cv_prog_cc_can_build_shared=no - fi -fi - - -# -# Check to make sure the static flag actually works. -# -echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6 -if test "${lt_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_prog_compiler_static" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - else - lt_prog_compiler_static_works=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 - -if test x"$lt_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* ## CAVEAT EMPTOR: @@ -7920,8 +9438,8 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7935,26 +9453,28 @@ else # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7941: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9459: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7945: \$? = $ac_status" >&5 + echo "$as_me:9463: \$? = $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 - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes fi fi $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -7968,8 +9488,8 @@ lt_prog_compiler_wl= lt_prog_compiler_pic= lt_prog_compiler_static= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -8007,6 +9527,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -8023,7 +9548,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -8052,7 +9577,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 darwin*) # PIC is the default on this platform # Common symbols not allowed in MH_DYLIB files - case "$cc_basename" in + case $cc_basename in xlc*) lt_prog_compiler_pic='-qnocommon' lt_prog_compiler_wl='-Wl,' @@ -8070,7 +9595,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_wl='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -8094,12 +9619,19 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; linux*) - case $CC in + case $cc_basename in icc* | ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; ccc*) lt_prog_compiler_wl='-Wl,' # All Alpha code is PIC. @@ -8114,15 +9646,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic='-Kpic' - lt_prog_compiler_static='-dn' - ;; - solaris*) - lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac ;; sunos4*) @@ -8131,7 +9663,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' @@ -8144,6 +9676,17 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; + uts4*) lt_prog_compiler_pic='-pic' lt_prog_compiler_static='-Bstatic' @@ -8155,16 +9698,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +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 $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8178,26 +9721,28 @@ else # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8184: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9727: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8188: \$? = $ac_status" >&5 + echo "$as_me:9731: \$? = $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 - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works=yes fi fi $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } if test x"$lt_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -8210,7 +9755,7 @@ else fi fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= @@ -8220,8 +9765,50 @@ case "$host_os" in ;; esac -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works=yes + fi + else + lt_prog_compiler_static_works=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } + +if test x"$lt_prog_compiler_static_works" = xyes; then + : +else + lt_prog_compiler_static= +fi + + +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8238,23 +9825,25 @@ else # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8244: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9831: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8248: \$? = $ac_status" >&5 + echo "$as_me:9835: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - if test ! -s out/conftest.err; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes fi fi - chmod u+w . + chmod u+w . 2>&5 $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -8265,23 +9854,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -8291,8 +9880,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag= @@ -8330,6 +9919,16 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -8340,6 +9939,10 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -8350,6 +9953,27 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -8400,10 +10024,10 @@ EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -8412,7 +10036,53 @@ EOF echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; + + interix3*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + 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'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi else ld_shlibs=no fi @@ -8428,7 +10098,7 @@ EOF fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs=no cat <<EOF 1>&2 @@ -8449,6 +10119,33 @@ EOF fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; + sunos4*) archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -8456,31 +10153,6 @@ 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' @@ -8491,16 +10163,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ ;; esac - if test "$ld_shlibs" = yes; then - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -8512,7 +10179,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -8546,6 +10213,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ break fi done + ;; esac exp_sym_flag='-bexport' @@ -8564,7 +10232,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ link_all_deplibs=yes if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -8583,8 +10251,12 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ hardcode_libdir_flag_spec='-L$libdir' hardcode_libdir_separator= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -8592,11 +10264,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -8624,24 +10296,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -8655,18 +10339,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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" - archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -8685,24 +10371,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -8716,8 +10414,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8726,13 +10426,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec=' ' + whole_archive_flag_spec='$convenience' archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -8771,7 +10469,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; darwin* | rhapsody*) - case "$host_os" in + case $host_os in rhapsody* | darwin1.[012]) allow_undefined_flag='${wl}-undefined ${wl}suppress' ;; @@ -8800,16 +10498,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 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 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - case "$cc_basename" in + 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 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $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}' ;; @@ -8850,7 +10548,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* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -8873,47 +10571,62 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + hardcode_direct=yes + export_dynamic_flag_spec='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; + ia64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; *) archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + case $host_cpu in + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_libdir_separator=: - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - ia64*) - hardcode_libdir_flag_spec='-L$libdir' hardcode_direct=no hardcode_shlibpath_var=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes ;; *) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: hardcode_direct=yes export_dynamic_flag_spec='${wl}-E' @@ -9007,7 +10720,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi allow_undefined_flag=' -expect_unresolved \*' archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -9015,21 +10728,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_separator=: ;; - sco3.2v5*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) no_undefined_flag=' -z text' if test "$GCC" = yes; then + wlarc='${wl}' archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else + wlarc='' archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -9038,8 +10745,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; + *) + # The compiler driver will combine linker options so we + # cannot just pass the convience library names through + # without $wl, iff we do not link with $LD. + # Luckily, gcc supports the same syntax we need for Sun Studio. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; + *) + whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; + esac ;; esac link_all_deplibs=yes ;; @@ -9096,36 +10813,45 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4.2uw2*) - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - no_undefined_flag='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no ;; - sysv5*) - no_undefined_flag=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -9140,15 +10866,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +echo "${ECHO_T}$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -9166,8 +10887,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -9181,6 +10902,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic compiler_flags=-v linker_flags=-v verstring= @@ -9203,16 +10925,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +echo "${ECHO_T}$archive_cmds_need_lc" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ 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= @@ -9341,7 +11063,8 @@ cygwin* | mingw* | pw32*) dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -9371,7 +11094,7 @@ cygwin* | mingw* | pw32*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -9394,7 +11117,7 @@ darwin* | rhapsody*) soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. 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"` @@ -9429,8 +11152,17 @@ kfreebsd*-gnu) dynamic_linker='GNU ld.so' ;; -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -9448,14 +11180,19 @@ freebsd*) freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -9475,7 +11212,7 @@ hpux9* | hpux10* | hpux11*) version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -9515,6 +11252,18 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -9574,7 +11323,7 @@ linux*) # 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' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -9636,8 +11385,13 @@ nto-qnx*) openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - need_version=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -9675,13 +11429,6 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -9707,7 +11454,7 @@ sunos4*) need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -9740,6 +11487,29 @@ sysv4*MP*) fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -9751,12 +11521,17 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ 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 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var" || \ @@ -9780,8 +11555,8 @@ else # directories. hardcode_action=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 +{ 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 @@ -9794,29 +11569,29 @@ 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 +{ 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 + { 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 + { 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 + { 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 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ;; esac fi @@ -9848,8 +11623,8 @@ else darwin*) # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9862,40 +11637,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9904,14 +11691,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -9925,8 +11713,8 @@ fi ;; *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9953,53 +11741,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef shl_load -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) +#if defined __stub_shl_load || defined __stub___shl_load choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shl_load; +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -10008,18 +11802,19 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_shl_load=no + ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10032,40 +11827,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); int main () { -shl_load (); +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -10074,19 +11881,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_shl_load=no + ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10113,53 +11921,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef dlopen -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) +#if defined __stub_dlopen || defined __stub___dlopen choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != dlopen; +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -10168,18 +11982,19 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_dlopen=no + ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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 +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10192,40 +12007,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -10234,19 +12061,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10259,40 +12087,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -10301,19 +12141,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10326,40 +12167,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dld_link (); int main () { -dld_link (); +return dld_link (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -10368,14 +12221,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi @@ -10410,13 +12264,13 @@ fi test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10426,7 +12280,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10429 "configure" +#line 12283 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10483,6 +12337,8 @@ int main () else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } + else + puts (dlerror ()); exit (status); } @@ -10492,12 +12348,12 @@ EOF ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null + (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self=no ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; esac else : # compilation failed @@ -10508,13 +12364,13 @@ rm -fr conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10524,7 +12380,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10527 "configure" +#line 12383 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10581,6 +12437,8 @@ int main () else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } + else + puts (dlerror ()); exit (status); } @@ -10590,12 +12448,12 @@ EOF ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null + (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; esac else : # compilation failed @@ -10606,8 +12464,8 @@ rm -fr conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -10628,19 +12486,19 @@ echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 fi -# Report which librarie types wil actually be built -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +# Report which library types will actually be built +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case "$host_os" in +case $host_os in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -10655,15 +12513,15 @@ aix4* | aix5*) fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -10678,7 +12536,7 @@ 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 \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -10782,7 +12640,7 @@ echo "$as_me: creating $ofile" >&6;} # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -10793,7 +12651,7 @@ echo "$as_me: creating $ofile" >&6;} SED=$lt_SED # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e s/^X//" +Xsed="$SED -e 1s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. @@ -10827,6 +12685,12 @@ fast_install=$enable_fast_install # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -10838,6 +12702,9 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler @@ -10903,7 +12770,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -11146,11 +13013,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CC="$lt_save_CC" -# Check whether --with-tags or --without-tags was given. +# Check whether --with-tags was given. if test "${with_tags+set}" = set; then - withval="$with_tags" - tagnames="$withval" -fi; + withval=$with_tags; tagnames="$withval" +fi + if test -f "$ltmain" && test -n "$tagnames"; then if test ! -f "${ofile}"; then @@ -11168,6 +13035,9 @@ echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} fi fi + if test -z "$LTCFLAGS"; then + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" + fi # Extract list of available tagged configurations in $ofile. # Note that this assumes the entire list is on one line. @@ -11198,8 +13068,10 @@ echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} case $tagname in CXX) - if test -n "$CXX" && test "X$CXX" != "Xno"; then - ac_ext=cc + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -11218,6 +13090,7 @@ hardcode_libdir_flag_spec_CXX= hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no +hardcode_shlibpath_var_CXX=unsupported hardcode_automatic_CXX=no module_cmds_CXX= module_expsym_cmds_CXX= @@ -11235,7 +13108,7 @@ postdeps_CXX= compiler_lib_search_path_CXX= # Source file extension for C++ test sources. -ac_ext=cc +ac_ext=cpp # Object file extension for compiled C++ test sources. objext=o @@ -11245,17 +13118,34 @@ objext_CXX=$objext lt_simple_compile_test_code="int some_variable = 0;\n" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* + + # Allow CC to be a program name with arguments. lt_save_CC=$CC lt_save_LD=$LD @@ -11266,18 +13156,27 @@ lt_save_path_LD=$lt_cv_path_LD if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx else - unset lt_cv_prog_gnu_ld + $as_unset lt_cv_prog_gnu_ld fi if test -n "${lt_cv_path_LDCXX+set}"; then lt_cv_path_LD=$lt_cv_path_LDCXX else - unset lt_cv_path_LD + $as_unset lt_cv_path_LD fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} compiler=$CC compiler_CXX=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + # We don't want -fno-exception wen compiling C++ code, so set the # no_builtin_flag separately @@ -11291,18 +13190,18 @@ if test "$GXX" = yes; then # Set up default GNU C++ configuration -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -11331,11 +13230,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11348,7 +13247,7 @@ else if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -11368,21 +13267,21 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes @@ -11392,8 +13291,8 @@ case `$LD -v 2>&1 </dev/null` in ;; esac fi -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -11443,8 +13342,8 @@ else fi # PORTME: fill in a description of your system's C++ link characteristics -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ld_shlibs_CXX=yes case $host_os in aix3*) @@ -11473,6 +13372,7 @@ case $host_os in ;; esac done + ;; esac exp_sym_flag='-bexport' @@ -11491,7 +13391,7 @@ case $host_os in link_all_deplibs_CXX=yes if test "$GXX" = yes; then - case $host_os in aix4.012|aix4.012.*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -11510,8 +13410,12 @@ case $host_os in hardcode_libdir_flag_spec_CXX='-L$libdir' hardcode_libdir_separator_CXX= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -11551,24 +13455,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -11582,19 +13498,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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" - archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -11613,24 +13531,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -11644,8 +13574,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -11654,16 +13586,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # -berok will link without error, but may produce a broken library. no_undefined_flag_CXX=' ${wl}-bernotok' allow_undefined_flag_CXX=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols_CXX=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX=' ' + whole_archive_flag_spec_CXX='$convenience' archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_CXX=unsupported + # Joseph Beckenbach <jrb3@best.com> says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs_CXX=no + fi + ;; + chorus*) case $cc_basename in *) @@ -11673,7 +13615,6 @@ 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. @@ -11683,7 +13624,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi enable_shared_with_static_runtimes_CXX=yes if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -11692,13 +13633,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs_CXX=no fi ;; darwin* | rhapsody*) - case "$host_os" in + case $host_os in rhapsody* | darwin1.[012]) allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' ;; @@ -11736,7 +13677,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 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 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds if test "X$lt_int_apple_cc_single_mod" = Xyes ; then archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else @@ -11744,12 +13685,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 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 + 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 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $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}' ;; @@ -11762,11 +13703,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi dgux*) case $cc_basename in - ec++) + ec++*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - ghcx) + ghcx*) # Green Hills C++ Compiler # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -11777,14 +13718,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac ;; - freebsd12*) + freebsd[12]*) # C++ shared libraries reported to be fairly broken before switch to ELF ld_shlibs_CXX=no ;; freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -11801,11 +13742,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # location of the library. case $cc_basename in - CC) + CC*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aCC) + aCC*) archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -11815,7 +13756,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) | grep "-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 @@ -11829,33 +13770,22 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; hpux10*|hpux11*) if test $with_gnu_ld = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + case $host_cpu in + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld_CXX='+b $libdir' - hardcode_libdir_separator_CXX=: - ;; - ia64*) - hardcode_libdir_flag_spec_CXX='-L$libdir' ;; *) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: export_dynamic_flag_spec_CXX='${wl}-E' ;; esac fi - case "$host_cpu" in - hppa*64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - ia64*) + case $host_cpu in + hppa*64*|ia64*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. ;; *) hardcode_direct_CXX=yes @@ -11866,14 +13796,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac case $cc_basename in - CC) + CC*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aCC) - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + aCC*) + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' @@ -11892,9 +13825,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test $with_gnu_ld = no; then - case "$host_cpu" in - ia64*|hppa*64*) - archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' @@ -11908,11 +13844,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac ;; + interix3*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; irix5* | irix6*) case $cc_basename in - CC) + CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -11923,7 +13873,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' fi @@ -11936,7 +13886,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; linux*) case $cc_basename in - KCC) + KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -11961,7 +13911,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # "CC -Bstatic", where "CC" is the KAI C++ compiler. old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - icpc) + icpc*) # Intel C++ with_gnu_ld=yes # version 8.0 and above of icpc choke on multiply defined symbols @@ -11973,8 +13923,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 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' + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ;; esac archive_cmds_need_lc_CXX=no @@ -11982,7 +13936,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec_CXX='${wl}--export-dynamic' whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - cxx) + pgCC*) + # Portland Group C++ compiler + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) # Compaq C++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' @@ -12013,7 +13976,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; mvs*) case $cc_basename in - cxx) + cxx*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; @@ -12039,6 +14002,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_CXX=no ;; openbsd*) + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then @@ -12050,7 +14015,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; osf3*) case $cc_basename in - KCC) + KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -12066,14 +14031,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - RCC) + RCC*) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - cxx) + cxx*) allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -12091,7 +14056,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -12110,7 +14075,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; osf4* | osf5*) case $cc_basename in - KCC) + KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file @@ -12125,17 +14090,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # the KAI C++ compiler. old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; - RCC) + RCC*) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - cxx) + cxx*) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ $rm $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -12154,7 +14119,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -12175,27 +14140,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - sco*) - archive_cmds_need_lc_CXX=no - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; sunos4*) case $cc_basename in - CC) + CC*) # Sun C++ 4.x # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - lcc) + lcc*) # Lucid # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -12208,36 +14160,33 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; solaris*) case $cc_basename in - CC) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ + archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_shlibpath_var_CXX=no case $host_os in - solaris2.0-5 | solaris2.0-5.*) ;; + solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The C++ compiler is used as linker so we must use $wl # flag to pass the commands to the underlying system - # linker. + # linker. We must also pass each convience library through + # to the system linker between allextract/defaultextract. + # The C++ compiler will combine linker options so we + # cannot just pass the convience library names through + # without $wl. # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; esac link_all_deplibs_CXX=yes - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; 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='echo' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -12245,7 +14194,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # in the archive. old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' ;; - gcx) + gcx*) # Green Hills C++ Compiler archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' @@ -12283,12 +14232,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_CXX='${wl}-z,text' archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + # So that behaviour is only enabled if SCOABSPATH is set to a + # non-empty value in the environment. Most likely only useful for + # creating official distributions of packages. + # This is a hack until libtool officially supports absolute path + # names for shared libraries. + no_undefined_flag_CXX='${wl}-z,text' + allow_undefined_flag_CXX='${wl}-z,nodefs' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + export_dynamic_flag_spec_CXX='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -12308,8 +14308,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_CXX=no ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no GCC_CXX="$GXX" @@ -12345,7 +14345,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 # The `*' in the case matches for architectures that use `case' in # $output_verbose_cmd can trigger glob expansion during the loop # eval without this substitution. - output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" + output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` for p in `eval $output_verbose_link_cmd`; do case $p in @@ -12421,6 +14421,29 @@ fi $rm -f confest.$objext +# PORTME: override above test on systems where it is broken +case $host_os in +interix3*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + predep_objects_CXX= + postdep_objects_CXX= + postdeps_CXX= + ;; + +solaris*) + case $cc_basename in + CC*) + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + postdeps_CXX='-lCstd -lCrun' + ;; + esac + ;; +esac + + case " $postdeps_CXX " in *" -lc "*) archive_cmds_need_lc_CXX=no ;; esac @@ -12429,8 +14452,8 @@ lt_prog_compiler_wl_CXX= lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -12468,6 +14491,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; sysv4*MP*) if test -d /usr/nec; then lt_prog_compiler_pic_CXX=-Kconform_pic @@ -12476,7 +14503,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) ;; *) @@ -12501,7 +14528,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; chorus*) case $cc_basename in - cxch68) + cxch68*) # Green Hills C++ Compiler # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ;; @@ -12510,7 +14537,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 darwin*) # PIC is the default on this platform # Common symbols not allowed in MH_DYLIB files - case "$cc_basename" in + case $cc_basename in xlc*) lt_prog_compiler_pic_CXX='-qnocommon' lt_prog_compiler_wl_CXX='-Wl,' @@ -12519,10 +14546,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; dgux*) case $cc_basename in - ec++) + ec++*) lt_prog_compiler_pic_CXX='-KPIC' ;; - ghcx) + ghcx*) # Green Hills C++ Compiler lt_prog_compiler_pic_CXX='-pic' ;; @@ -12530,22 +14557,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; - freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) case $cc_basename in - CC) + CC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' if test "$host_cpu" != ia64; then lt_prog_compiler_pic_CXX='+Z' fi ;; - aCC) + aCC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - case "$host_cpu" in + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -12558,9 +14585,13 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; irix5* | irix6* | nonstopux*) case $cc_basename in - CC) + CC*) lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_static_CXX='-non_shared' # CC pic flag -KPIC is the default. @@ -12571,18 +14602,24 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; linux*) case $cc_basename in - KCC) + KCC*) # KAI C++ Compiler lt_prog_compiler_wl_CXX='--backend -Wl,' lt_prog_compiler_pic_CXX='-fPIC' ;; - icpc) + icpc* | ecpc*) # Intel C++ lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-static' ;; - cxx) + pgCC*) + # Portland Group C++ compiler. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fpic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + cxx*) # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha # Linux and Compaq Tru64 Unix objects are PIC. @@ -12599,7 +14636,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; mvs*) case $cc_basename in - cxx) + cxx*) lt_prog_compiler_pic_CXX='-W c,exportall' ;; *) @@ -12610,14 +14647,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; osf3* | osf4* | osf5*) case $cc_basename in - KCC) + KCC*) lt_prog_compiler_wl_CXX='--backend -Wl,' ;; - RCC) + RCC*) # Rational C++ 2.4.1 lt_prog_compiler_pic_CXX='-pic' ;; - cxx) + cxx*) # Digital/Compaq C++ lt_prog_compiler_wl_CXX='-Wl,' # Make sure the PIC flag is empty. It appears that all Alpha @@ -12631,24 +14668,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; psos*) ;; - sco*) - case $cc_basename in - CC) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - *) - ;; - esac - ;; solaris*) case $cc_basename in - CC) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' lt_prog_compiler_wl_CXX='-Qoption ld ' ;; - gcx) + gcx*) # Green Hills C++ Compiler lt_prog_compiler_pic_CXX='-PIC' ;; @@ -12658,12 +14686,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; sunos4*) case $cc_basename in - CC) + CC*) # Sun C++ 4.x lt_prog_compiler_pic_CXX='-pic' lt_prog_compiler_static_CXX='-Bstatic' ;; - lcc) + lcc*) # Lucid lt_prog_compiler_pic_CXX='-pic' ;; @@ -12673,7 +14701,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 lt_prog_compiler_pic_CXX='-KPIC' ;; @@ -12681,7 +14709,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; - unixware*) + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + esac ;; vxworks*) ;; @@ -12691,16 +14726,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +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 $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 +{ 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 else @@ -12714,26 +14749,28 @@ else # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12720: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14755: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12724: \$? = $ac_status" >&5 + echo "$as_me:14759: \$? = $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 - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works_CXX=yes fi fi $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in @@ -12746,7 +14783,7 @@ else fi fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_CXX= @@ -12756,8 +14793,50 @@ case "$host_os" in ;; esac -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_CXX=yes + fi + else + lt_prog_compiler_static_works_CXX=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } + +if test x"$lt_prog_compiler_static_works_CXX" = xyes; then + : +else + lt_prog_compiler_static_CXX= +fi + + +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12774,23 +14853,25 @@ else # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12780: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14859: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12784: \$? = $ac_status" >&5 + echo "$as_me:14863: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - if test ! -s out/conftest.err; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes fi fi - chmod u+w . + chmod u+w . 2>&5 $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -12801,23 +14882,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -12827,8 +14908,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -12845,22 +14926,17 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar export_symbols_cmds_CXX="$ltdll_cmds" ;; cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -12878,8 +14954,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -12893,6 +14969,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX compiler_flags=-v linker_flags=-v verstring= @@ -12915,16 +14992,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ 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= @@ -13053,7 +15130,8 @@ cygwin* | mingw* | pw32*) dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -13083,7 +15161,7 @@ cygwin* | mingw* | pw32*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -13106,7 +15184,7 @@ darwin* | rhapsody*) soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. 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"` @@ -13141,8 +15219,17 @@ kfreebsd*-gnu) dynamic_linker='GNU ld.so' ;; -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -13160,14 +15247,19 @@ freebsd*) freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -13187,7 +15279,7 @@ hpux9* | hpux10* | hpux11*) version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -13227,6 +15319,18 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -13286,7 +15390,7 @@ linux*) # 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' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -13348,8 +15452,13 @@ nto-qnx*) openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - need_version=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -13387,13 +15496,6 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -13419,7 +15521,7 @@ sunos4*) need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -13452,6 +15554,29 @@ sysv4*MP*) fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -13463,12 +15588,17 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ 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 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ test -n "$runpath_var_CXX" || \ @@ -13492,8 +15622,8 @@ else # directories. hardcode_action_CXX=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6 +{ 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 @@ -13504,841 +15634,6 @@ elif test "$shlibpath_overrides_runpath" = yes || 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 - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - - ;; - - *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* 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" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) -choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != shl_load; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_shl_load=no -fi -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 -if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" -else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -int -main () -{ -shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dld_shl_load=no -fi -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 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 -if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef dlopen - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) -choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != dlopen; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_dlopen=no -fi -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 -if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" -else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_svld_dlopen=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_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 -if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any 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 dld_link (); -int -main () -{ -dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dld_dld_link=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 -if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -fi - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF -#line 14141 "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include <dlfcn.h> -#endif - -#include <stdio.h> - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 - - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF -#line 14239 "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include <dlfcn.h> -#endif - -#include <stdio.h> - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -14353,7 +15648,7 @@ 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 \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -14454,6 +15749,12 @@ fast_install=$enable_fast_install # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -14465,6 +15766,9 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_CXX @@ -14530,7 +15834,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -14807,29 +16111,55 @@ lt_simple_link_test_code=" program t\n end\n" # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* + + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${F77-"f77"} compiler=$CC compiler_F77=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case "$host_os" in +case $host_os in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -14838,20 +16168,20 @@ aix3*) fi ;; aix4* | aix5*) - test "$enable_shared" = yes && enable_static=no + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 - -test "$ld_shlibs_F77" = no && can_build_shared=no +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } GCC_F77="$G77" LD_F77="$LD" @@ -14860,8 +16190,8 @@ lt_prog_compiler_wl_F77= lt_prog_compiler_pic_F77= lt_prog_compiler_static_F77= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_F77='-Wl,' @@ -14899,6 +16229,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic_F77='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -14915,7 +16250,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -14944,7 +16279,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 darwin*) # PIC is the default on this platform # Common symbols not allowed in MH_DYLIB files - case "$cc_basename" in + case $cc_basename in xlc*) lt_prog_compiler_pic_F77='-qnocommon' lt_prog_compiler_wl_F77='-Wl,' @@ -14962,7 +16297,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_wl_F77='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -14986,12 +16321,19 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; linux*) - case $CC in + case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-static' ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-fpic' + lt_prog_compiler_static_F77='-Bstatic' + ;; ccc*) lt_prog_compiler_wl_F77='-Wl,' # All Alpha code is PIC. @@ -15006,15 +16348,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_F77='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic_F77='-Kpic' - lt_prog_compiler_static_F77='-dn' - ;; - solaris*) - lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl_F77='-Qoption ld ';; + *) + lt_prog_compiler_wl_F77='-Wl,';; + esac ;; sunos4*) @@ -15023,7 +16365,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_F77='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' @@ -15036,6 +16378,17 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_can_build_shared_F77=no + ;; + uts4*) lt_prog_compiler_pic_F77='-pic' lt_prog_compiler_static_F77='-Bstatic' @@ -15047,16 +16400,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +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 $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 +{ 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 else @@ -15070,26 +16423,28 @@ else # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15076: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16429: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15080: \$? = $ac_status" >&5 + echo "$as_me:16433: \$? = $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 - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works_F77=yes fi fi $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } if test x"$lt_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in @@ -15102,7 +16457,7 @@ else fi fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_F77= @@ -15112,8 +16467,50 @@ case "$host_os" in ;; esac -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_F77=yes + fi + else + lt_prog_compiler_static_works_F77=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } + +if test x"$lt_prog_compiler_static_works_F77" = xyes; then + : +else + lt_prog_compiler_static_F77= +fi + + +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15130,23 +16527,25 @@ else # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15136: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16533: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15140: \$? = $ac_status" >&5 + echo "$as_me:16537: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - if test ! -s out/conftest.err; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_F77=yes fi fi - chmod u+w . + chmod u+w . 2>&5 $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -15157,23 +16556,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -15183,8 +16582,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_F77= @@ -15222,6 +16621,16 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -15232,6 +16641,10 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -15242,6 +16655,27 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_F77='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_F77= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -15292,10 +16726,10 @@ EOF allow_undefined_flag_F77=unsupported always_export_symbols_F77=no enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -15304,9 +16738,55 @@ EOF echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else - ld_shlibs=no + ld_shlibs_F77=no + fi + ;; + + interix3*) + hardcode_direct_F77=no + hardcode_shlibpath_var_F77=no + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + export_dynamic_flag_spec_F77='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + else + ld_shlibs_F77=no fi ;; @@ -15320,7 +16800,7 @@ EOF fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs_F77=no cat <<EOF 1>&2 @@ -15341,6 +16821,33 @@ EOF fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs_F77=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs_F77=no + fi + ;; + esac + ;; + sunos4*) archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -15348,31 +16855,6 @@ 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' @@ -15383,16 +16865,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ ;; esac - if test "$ld_shlibs_F77" = yes; then - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_F77='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_F77= - fi + if test "$ld_shlibs_F77" = no; then + runpath_var= + hardcode_libdir_flag_spec_F77= + export_dynamic_flag_spec_F77= + whole_archive_flag_spec_F77= fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -15404,7 +16881,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L_F77=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct_F77=unsupported @@ -15438,6 +16915,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ break fi done + ;; esac exp_sym_flag='-bexport' @@ -15456,7 +16934,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ link_all_deplibs_F77=yes if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -15475,8 +16953,12 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_libdir_separator_F77= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -15484,11 +16966,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -15506,24 +16988,36 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -15537,18 +17031,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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" - archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_F77="-z nodefs" - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -15557,24 +17053,36 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -15588,8 +17096,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -15598,13 +17108,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # -berok will link without error, but may produce a broken library. no_undefined_flag_F77=' ${wl}-bernotok' allow_undefined_flag_F77=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols_F77=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_F77=' ' + whole_archive_flag_spec_F77='$convenience' archive_cmds_need_lc_F77=yes - # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -15638,12 +17146,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi old_archive_From_new_cmds_F77='true' # FIXME: Should let the user specify the lib program. old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' + fix_srcfile_path_F77='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_F77=yes ;; darwin* | rhapsody*) - case "$host_os" in + case $host_os in rhapsody* | darwin1.[012]) allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' ;; @@ -15672,16 +17180,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 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 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - case "$cc_basename" in + 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 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $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}' ;; @@ -15722,7 +17230,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* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes @@ -15745,47 +17253,62 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec_F77='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) + archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: + + hardcode_direct_F77=yes + export_dynamic_flag_spec_F77='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; + ia64*) + archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; *) archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + case $host_cpu in + hppa*64*) + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: + + case $host_cpu in + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld_F77='+b $libdir' - hardcode_libdir_separator_F77=: - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - ;; - ia64*) - hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_direct_F77=no hardcode_shlibpath_var_F77=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes ;; *) - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: hardcode_direct_F77=yes export_dynamic_flag_spec_F77='${wl}-E' @@ -15879,7 +17402,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi allow_undefined_flag_F77=' -expect_unresolved \*' archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec_F77='-rpath $libdir' @@ -15887,21 +17410,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_separator_F77=: ;; - sco3.2v5*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - export_dynamic_flag_spec_F77='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) no_undefined_flag_F77=' -z text' if test "$GCC" = yes; then + wlarc='${wl}' archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else + wlarc='' archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -15910,8 +17427,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var_F77=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; + *) + # The compiler driver will combine linker options so we + # cannot just pass the convience library names through + # without $wl, iff we do not link with $LD. + # Luckily, gcc supports the same syntax we need for Sun Studio. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; + *) + whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; + esac ;; esac link_all_deplibs_F77=yes ;; @@ -15968,36 +17495,45 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4.2uw2*) - archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_minus_L_F77=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag_F77='${wl}-z,text' + archive_cmds_need_lc_F77=no hardcode_shlibpath_var_F77=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - no_undefined_flag_F77='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_F77=no ;; - sysv5*) - no_undefined_flag_F77=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec_F77= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_F77='${wl}-z,text' + allow_undefined_flag_F77='${wl}-z,nodefs' + archive_cmds_need_lc_F77=no hardcode_shlibpath_var_F77=no + hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_F77=':' + link_all_deplibs_F77=yes + export_dynamic_flag_spec_F77='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -16012,15 +17548,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -echo "${ECHO_T}$ld_shlibs_F77" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +echo "${ECHO_T}$ld_shlibs_F77" >&6; } test "$ld_shlibs_F77" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -16038,8 +17569,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -16053,6 +17584,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_F77 + pic_flag=$lt_prog_compiler_pic_F77 compiler_flags=-v linker_flags=-v verstring= @@ -16075,16 +17607,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ 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= @@ -16213,7 +17745,8 @@ cygwin* | mingw* | pw32*) dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -16243,7 +17776,7 @@ cygwin* | mingw* | pw32*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -16266,7 +17799,7 @@ darwin* | rhapsody*) soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. 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"` @@ -16301,8 +17834,17 @@ kfreebsd*-gnu) dynamic_linker='GNU ld.so' ;; -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -16320,14 +17862,19 @@ freebsd*) freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -16347,7 +17894,7 @@ hpux9* | hpux10* | hpux11*) version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -16387,6 +17934,18 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -16446,7 +18005,7 @@ linux*) # 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' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -16508,8 +18067,13 @@ nto-qnx*) openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - need_version=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -16547,13 +18111,6 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -16579,7 +18136,7 @@ sunos4*) need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -16612,6 +18169,29 @@ sysv4*MP*) fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -16623,12 +18203,17 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ 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 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ test -n "$runpath_var_F77" || \ @@ -16652,8 +18237,8 @@ else # directories. hardcode_action_F77=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6 +{ 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 @@ -16664,36 +18249,6 @@ elif test "$shlibpath_overrides_runpath" = yes || 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 @@ -16708,7 +18263,7 @@ 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 \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -16809,6 +18364,12 @@ fast_install=$enable_fast_install # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -16820,6 +18381,9 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_F77 @@ -16885,7 +18449,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -17111,7 +18675,6 @@ CC="$lt_save_CC" if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - # Source file extension for Java test sources. ac_ext=java @@ -17123,26 +18686,55 @@ objext_GCJ=$objext lt_simple_compile_test_code="class foo {}\n" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* + + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${GCJ-"gcj"} compiler=$CC compiler_GCJ=$CC +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + # GCJ did not exist at the time GCC didn't implicitly link libc in. archive_cmds_need_lc_GCJ=no +old_archive_cmds_GCJ=$old_archive_cmds + ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change ## the running order or otherwise move them around unless you know exactly @@ -17154,8 +18746,8 @@ 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 $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17169,26 +18761,28 @@ else # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17175: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18767: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17179: \$? = $ac_status" >&5 + echo "$as_me:18771: \$? = $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 - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes fi fi $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" @@ -17202,8 +18796,8 @@ lt_prog_compiler_wl_GCJ= lt_prog_compiler_pic_GCJ= lt_prog_compiler_static_GCJ= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_GCJ='-Wl,' @@ -17241,6 +18835,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic_GCJ='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -17257,7 +18856,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -17286,7 +18885,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 darwin*) # PIC is the default on this platform # Common symbols not allowed in MH_DYLIB files - case "$cc_basename" in + case $cc_basename in xlc*) lt_prog_compiler_pic_GCJ='-qnocommon' lt_prog_compiler_wl_GCJ='-Wl,' @@ -17304,7 +18903,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_wl_GCJ='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -17328,12 +18927,19 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; linux*) - case $CC in + case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-static' ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-fpic' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; ccc*) lt_prog_compiler_wl_GCJ='-Wl,' # All Alpha code is PIC. @@ -17348,15 +18954,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_GCJ='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic_GCJ='-Kpic' - lt_prog_compiler_static_GCJ='-dn' - ;; - solaris*) - lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl_GCJ='-Qoption ld ';; + *) + lt_prog_compiler_wl_GCJ='-Wl,';; + esac ;; sunos4*) @@ -17365,7 +18971,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_GCJ='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' @@ -17378,6 +18984,17 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_can_build_shared_GCJ=no + ;; + uts4*) lt_prog_compiler_pic_GCJ='-pic' lt_prog_compiler_static_GCJ='-Bstatic' @@ -17389,16 +19006,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +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 $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17412,26 +19029,28 @@ else # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17418: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19035: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17422: \$? = $ac_status" >&5 + echo "$as_me:19039: \$? = $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 - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works_GCJ=yes fi fi $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in @@ -17444,7 +19063,7 @@ else fi fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_GCJ= @@ -17454,8 +19073,50 @@ case "$host_os" in ;; esac -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_GCJ=yes + fi + else + lt_prog_compiler_static_works_GCJ=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } + +if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then + : +else + lt_prog_compiler_static_GCJ= +fi + + +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17472,23 +19133,25 @@ else # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17478: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19139: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17482: \$? = $ac_status" >&5 + echo "$as_me:19143: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - if test ! -s out/conftest.err; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_GCJ=yes fi fi - chmod u+w . + chmod u+w . 2>&5 $rm conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation @@ -17499,23 +19162,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -17525,8 +19188,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_GCJ= @@ -17564,6 +19227,16 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -17574,6 +19247,10 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -17584,6 +19261,27 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_GCJ= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -17634,10 +19332,10 @@ EOF allow_undefined_flag_GCJ=unsupported always_export_symbols_GCJ=no enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -17646,9 +19344,55 @@ EOF echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else - ld_shlibs=no + ld_shlibs_GCJ=no + fi + ;; + + interix3*) + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + export_dynamic_flag_spec_GCJ='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + else + ld_shlibs_GCJ=no fi ;; @@ -17662,7 +19406,7 @@ EOF fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs_GCJ=no cat <<EOF 1>&2 @@ -17683,6 +19427,33 @@ EOF fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs_GCJ=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs_GCJ=no + fi + ;; + esac + ;; + sunos4*) archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -17690,31 +19461,6 @@ 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' @@ -17725,16 +19471,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ ;; esac - if test "$ld_shlibs_GCJ" = yes; then - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_GCJ= - fi + if test "$ld_shlibs_GCJ" = no; then + runpath_var= + hardcode_libdir_flag_spec_GCJ= + export_dynamic_flag_spec_GCJ= + whole_archive_flag_spec_GCJ= fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -17746,7 +19487,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L_GCJ=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct_GCJ=unsupported @@ -17780,6 +19521,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ break fi done + ;; esac exp_sym_flag='-bexport' @@ -17798,7 +19540,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ link_all_deplibs_GCJ=yes if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -17817,8 +19559,12 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ hardcode_libdir_flag_spec_GCJ='-L$libdir' hardcode_libdir_separator_GCJ= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -17826,11 +19572,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then + if test "$aix_use_runtimelinking" = yes; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' - fi + fi fi fi @@ -17858,24 +19604,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -17889,18 +19647,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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" - archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_GCJ="-z nodefs" - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -17919,24 +19679,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -17950,8 +19722,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -17960,13 +19734,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # -berok will link without error, but may produce a broken library. no_undefined_flag_GCJ=' ${wl}-bernotok' allow_undefined_flag_GCJ=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols_GCJ=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_GCJ=' ' + whole_archive_flag_spec_GCJ='$convenience' archive_cmds_need_lc_GCJ=yes - # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -18000,12 +19772,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi old_archive_From_new_cmds_GCJ='true' # FIXME: Should let the user specify the lib program. old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' + fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_GCJ=yes ;; darwin* | rhapsody*) - case "$host_os" in + case $host_os in rhapsody* | darwin1.[012]) allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' ;; @@ -18034,16 +19806,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 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 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - case "$cc_basename" in + 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 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $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}' ;; @@ -18084,7 +19856,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* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes @@ -18107,47 +19879,62 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec_GCJ='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) + archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + + hardcode_direct_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; + ia64*) + archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; *) archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + case $host_cpu in + hppa*64*) + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + + case $host_cpu in + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' - hardcode_libdir_separator_GCJ=: hardcode_direct_GCJ=no hardcode_shlibpath_var_GCJ=no ;; - ia64*) - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - ;; *) - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: hardcode_direct_GCJ=yes export_dynamic_flag_spec_GCJ='${wl}-E' @@ -18241,7 +20028,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi allow_undefined_flag_GCJ=' -expect_unresolved \*' archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec_GCJ='-rpath $libdir' @@ -18249,21 +20036,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_separator_GCJ=: ;; - sco3.2v5*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_GCJ=no - export_dynamic_flag_spec_GCJ='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) no_undefined_flag_GCJ=' -z text' if test "$GCC" = yes; then + wlarc='${wl}' archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else + wlarc='' archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -18272,8 +20053,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var_GCJ=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; + *) + # The compiler driver will combine linker options so we + # cannot just pass the convience library names through + # without $wl, iff we do not link with $LD. + # Luckily, gcc supports the same syntax we need for Sun Studio. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; + *) + whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; + esac ;; esac link_all_deplibs_GCJ=yes ;; @@ -18330,36 +20121,45 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4.2uw2*) - archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag_GCJ='${wl}-z,text' + archive_cmds_need_lc_GCJ=no hardcode_shlibpath_var_GCJ=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - no_undefined_flag_GCJ='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_GCJ=no ;; - sysv5*) - no_undefined_flag_GCJ=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec_GCJ= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_GCJ='${wl}-z,text' + allow_undefined_flag_GCJ='${wl}-z,nodefs' + archive_cmds_need_lc_GCJ=no hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_GCJ=':' + link_all_deplibs_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -18374,15 +20174,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } test "$ld_shlibs_GCJ" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -18400,8 +20195,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -18415,6 +20210,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_GCJ + pic_flag=$lt_prog_compiler_pic_GCJ compiler_flags=-v linker_flags=-v verstring= @@ -18437,16 +20233,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ 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= @@ -18575,7 +20371,8 @@ cygwin* | mingw* | pw32*) dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -18605,7 +20402,7 @@ cygwin* | mingw* | pw32*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -18628,7 +20425,7 @@ darwin* | rhapsody*) soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. 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"` @@ -18663,8 +20460,17 @@ kfreebsd*-gnu) dynamic_linker='GNU ld.so' ;; -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -18682,14 +20488,19 @@ freebsd*) freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -18709,7 +20520,7 @@ hpux9* | hpux10* | hpux11*) version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) shrext_cmds='.so' hardcode_into_libs=yes @@ -18749,6 +20560,18 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -18808,7 +20631,7 @@ linux*) # 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' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -18870,8 +20693,13 @@ nto-qnx*) openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - need_version=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -18909,13 +20737,6 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -18941,7 +20762,7 @@ sunos4*) need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -18974,6 +20795,29 @@ sysv4*MP*) fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -18985,12 +20829,17 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ 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 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ test -n "$runpath_var_GCJ" || \ @@ -19014,8 +20863,8 @@ else # directories. hardcode_action_GCJ=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 +{ 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 @@ -19026,841 +20875,6 @@ elif test "$shlibpath_overrides_runpath" = yes || 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 - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - - ;; - - *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* 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" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) -choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != shl_load; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_shl_load=no -fi -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 -if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" -else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -int -main () -{ -shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dld_shl_load=no -fi -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 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 -if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef dlopen - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) -choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != dlopen; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_dlopen=no -fi -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 -if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" -else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_svld_dlopen=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_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 -if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any 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 dld_link (); -int -main () -{ -dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dld_dld_link=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 -if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -fi - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF -#line 19663 "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include <dlfcn.h> -#endif - -#include <stdio.h> - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 - - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF -#line 19761 "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include <dlfcn.h> -#endif - -#include <stdio.h> - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -19875,7 +20889,7 @@ 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 \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -19976,6 +20990,12 @@ fast_install=$enable_fast_install # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -19987,6 +21007,9 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_GCJ @@ -20052,7 +21075,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -20277,7 +21300,6 @@ CC="$lt_save_CC" RC) - # Source file extension for RC test sources. ac_ext=rc @@ -20296,15 +21318,42 @@ lt_simple_link_test_code="$lt_simple_compile_test_code" # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* + + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC compiler_RC=$CC +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + lt_cv_prog_compiler_c_o_RC=yes # The else clause should only fire when bootstrapping the @@ -20320,7 +21369,7 @@ 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 \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -20421,6 +21470,12 @@ fast_install=$enable_fast_install # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -20432,6 +21487,9 @@ AR_FLAGS=$lt_AR_FLAGS # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_RC @@ -20497,7 +21555,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -20778,8 +21836,8 @@ LIBTOOL_PROG="${SHELL} ./libtool" # Set SOSUFFIX and friends - echo "$as_me:$LINENO: checking SOSUFFIX from libtool" >&5 -echo $ECHO_N "checking SOSUFFIX from libtool... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking SOSUFFIX from libtool" >&5 +echo $ECHO_N "checking SOSUFFIX from libtool... $ECHO_C" >&6; } module=no versuffix="" @@ -20800,13 +21858,13 @@ echo "$as_me: WARNING: assuming $_SUFFIX suffix for dynamic libraries." >&2;} fi SOSUFFIX=$_SOSUFFIX - echo "$as_me:$LINENO: result: $SOSUFFIX" >&5 -echo "${ECHO_T}$SOSUFFIX" >&6 + { echo "$as_me:$LINENO: result: $SOSUFFIX" >&5 +echo "${ECHO_T}$SOSUFFIX" >&6; } - echo "$as_me:$LINENO: checking MODSUFFIX from libtool" >&5 -echo $ECHO_N "checking MODSUFFIX from libtool... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking MODSUFFIX from libtool" >&5 +echo $ECHO_N "checking MODSUFFIX from libtool... $ECHO_C" >&6; } module=yes versuffix="" @@ -20827,13 +21885,13 @@ echo "$as_me: WARNING: assuming $_SUFFIX suffix for dynamic libraries." >&2;} fi MODSUFFIX=$_SOSUFFIX - echo "$as_me:$LINENO: result: $MODSUFFIX" >&5 -echo "${ECHO_T}$MODSUFFIX" >&6 + { echo "$as_me:$LINENO: result: $MODSUFFIX" >&5 +echo "${ECHO_T}$MODSUFFIX" >&6; } - echo "$as_me:$LINENO: checking JMODSUFFIX from libtool" >&5 -echo $ECHO_N "checking JMODSUFFIX from libtool... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking JMODSUFFIX from libtool" >&5 +echo $ECHO_N "checking JMODSUFFIX from libtool... $ECHO_C" >&6; } module=yes versuffix="" @@ -20858,8 +21916,8 @@ echo "$as_me: WARNING: assuming $_SUFFIX suffix for dynamic libraries." >&2;} else JMODSUFFIX=$_SOSUFFIX fi - echo "$as_me:$LINENO: result: $JMODSUFFIX" >&5 -echo "${ECHO_T}$JMODSUFFIX" >&6 + { echo "$as_me:$LINENO: result: $JMODSUFFIX" >&5 +echo "${ECHO_T}$JMODSUFFIX" >&6; } @@ -20905,7 +21963,7 @@ case "$host_os" in ;; *) LIBTSO_MODULE="-module" - LIBTSO_MODSUFFIX=@MODSUFFIX@ + LIBTSO_MODSUFFIX=$MODSUFFIX ;; esac @@ -20956,8 +22014,8 @@ if test "x$JAVAPREFIX" = x; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_JAVAC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20970,25 +22028,27 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_JAVAC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi JAVAC=$ac_cv_prog_JAVAC if test -n "$JAVAC"; then - echo "$as_me:$LINENO: result: $JAVAC" >&5 -echo "${ECHO_T}$JAVAC" >&6 + { echo "$as_me:$LINENO: result: $JAVAC" >&5 +echo "${ECHO_T}$JAVAC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$JAVAC" && break done @@ -20997,8 +22057,8 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_JAVAC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21011,25 +22071,27 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_JAVAC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi JAVAC=$ac_cv_prog_JAVAC if test -n "$JAVAC"; then - echo "$as_me:$LINENO: result: $JAVAC" >&5 -echo "${ECHO_T}$JAVAC" >&6 + { echo "$as_me:$LINENO: result: $JAVAC" >&5 +echo "${ECHO_T}$JAVAC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$JAVAC" && break done test -n "$JAVAC" || JAVAC="$JAVAPREFIX" @@ -21039,8 +22101,8 @@ test "x$JAVAC" = x && { { echo "$as_me:$LINENO: error: no acceptable Java compil echo "$as_me: error: no acceptable Java compiler found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if $JAVAC works" >&5 -echo $ECHO_N "checking if $JAVAC works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $JAVAC works" >&5 +echo $ECHO_N "checking if $JAVAC works... $ECHO_C" >&6; } if test "${ac_cv_prog_javac_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21048,7 +22110,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 21051 "configure" */ +/* #line 22113 "configure" */ public class Test { } EOF @@ -21069,8 +22131,8 @@ fi rm -f $JAVA_TEST $CLASS_TEST fi -echo "$as_me:$LINENO: result: $ac_cv_prog_javac_works" >&5 -echo "${ECHO_T}$ac_cv_prog_javac_works" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_javac_works" >&5 +echo "${ECHO_T}$ac_cv_prog_javac_works" >&6; } @@ -21079,8 +22141,8 @@ if test "x$JAVAPREFIX" = x; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_JAR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21093,25 +22155,27 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_JAR="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi JAR=$ac_cv_prog_JAR if test -n "$JAR"; then - echo "$as_me:$LINENO: result: $JAR" >&5 -echo "${ECHO_T}$JAR" >&6 + { echo "$as_me:$LINENO: result: $JAR" >&5 +echo "${ECHO_T}$JAR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$JAR" && break done @@ -21120,8 +22184,8 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_JAR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21134,25 +22198,27 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_JAR="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi JAR=$ac_cv_prog_JAR if test -n "$JAR"; then - echo "$as_me:$LINENO: result: $JAR" >&5 -echo "${ECHO_T}$JAR" >&6 + { echo "$as_me:$LINENO: result: $JAR" >&5 +echo "${ECHO_T}$JAR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$JAR" && break done test -n "$JAR" || JAR="$JAVAPREFIX" @@ -21168,8 +22234,8 @@ if test x$JAVAPREFIX = x; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_JAVA+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21182,25 +22248,27 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_JAVA="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi JAVA=$ac_cv_prog_JAVA if test -n "$JAVA"; then - echo "$as_me:$LINENO: result: $JAVA" >&5 -echo "${ECHO_T}$JAVA" >&6 + { echo "$as_me:$LINENO: result: $JAVA" >&5 +echo "${ECHO_T}$JAVA" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$JAVA" && break done @@ -21209,8 +22277,8 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_JAVA+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21223,25 +22291,27 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_JAVA="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi JAVA=$ac_cv_prog_JAVA if test -n "$JAVA"; then - echo "$as_me:$LINENO: result: $JAVA" >&5 -echo "${ECHO_T}$JAVA" >&6 + { echo "$as_me:$LINENO: result: $JAVA" >&5 +echo "${ECHO_T}$JAVA" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$JAVA" && break done test -n "$JAVA" || JAVA="$JAVAPREFIX" @@ -21253,8 +22323,8 @@ echo "$as_me: error: no acceptable Java virtual machine found in \$PATH" >&2;} # Extract the first word of "uudecode$EXEEXT", so it can be a program name with args. set dummy uudecode$EXEEXT; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_uudecode+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21267,28 +22337,30 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_uudecode="yes" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi uudecode=$ac_cv_prog_uudecode if test -n "$uudecode"; then - echo "$as_me:$LINENO: result: $uudecode" >&5 -echo "${ECHO_T}$uudecode" >&6 + { echo "$as_me:$LINENO: result: $uudecode" >&5 +echo "${ECHO_T}$uudecode" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test x$uudecode = xyes; then -echo "$as_me:$LINENO: checking if uudecode can decode base 64 file" >&5 -echo $ECHO_N "checking if uudecode can decode base 64 file... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if uudecode can decode base 64 file" >&5 +echo $ECHO_N "checking if uudecode can decode base 64 file... $ECHO_C" >&6; } if test "${ac_cv_prog_uudecode_base64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21307,15 +22379,15 @@ EOF if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 21310: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 22382: 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 fi rm -f Test.uue fi -echo "$as_me:$LINENO: result: $ac_cv_prog_uudecode_base64" >&5 -echo "${ECHO_T}$ac_cv_prog_uudecode_base64" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_uudecode_base64" >&5 +echo "${ECHO_T}$ac_cv_prog_uudecode_base64" >&6; } fi if test x$ac_cv_prog_uudecode_base64 != xyes; then rm -f Test.class @@ -21333,8 +22405,8 @@ if test "x$JAVAPREFIX" = x; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_JAVAC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21347,25 +22419,27 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_JAVAC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi JAVAC=$ac_cv_prog_JAVAC if test -n "$JAVAC"; then - echo "$as_me:$LINENO: result: $JAVAC" >&5 -echo "${ECHO_T}$JAVAC" >&6 + { echo "$as_me:$LINENO: result: $JAVAC" >&5 +echo "${ECHO_T}$JAVAC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$JAVAC" && break done @@ -21374,8 +22448,8 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_JAVAC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21388,25 +22462,27 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_JAVAC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi JAVAC=$ac_cv_prog_JAVAC if test -n "$JAVAC"; then - echo "$as_me:$LINENO: result: $JAVAC" >&5 -echo "${ECHO_T}$JAVAC" >&6 + { echo "$as_me:$LINENO: result: $JAVAC" >&5 +echo "${ECHO_T}$JAVAC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$JAVAC" && break done test -n "$JAVAC" || JAVAC="$JAVAPREFIX" @@ -21416,8 +22492,8 @@ test "x$JAVAC" = x && { { echo "$as_me:$LINENO: error: no acceptable Java compil echo "$as_me: error: no acceptable Java compiler found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if $JAVAC works" >&5 -echo $ECHO_N "checking if $JAVAC works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $JAVAC works" >&5 +echo $ECHO_N "checking if $JAVAC works... $ECHO_C" >&6; } if test "${ac_cv_prog_javac_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21425,7 +22501,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 21428 "configure" */ +/* #line 22504 "configure" */ public class Test { } EOF @@ -21446,14 +22522,14 @@ fi rm -f $JAVA_TEST $CLASS_TEST fi -echo "$as_me:$LINENO: result: $ac_cv_prog_javac_works" >&5 -echo "${ECHO_T}$ac_cv_prog_javac_works" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_javac_works" >&5 +echo "${ECHO_T}$ac_cv_prog_javac_works" >&6; } fi fi -echo "$as_me:$LINENO: checking if $JAVA works" >&5 -echo $ECHO_N "checking if $JAVA works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $JAVA works" >&5 +echo $ECHO_N "checking if $JAVA works... $ECHO_C" >&6; } if test "${ac_cv_prog_java_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21462,7 +22538,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 21465 "configure" */ +/* [#]line 22541 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -21501,8 +22577,8 @@ fi rm -fr $JAVA_TEST $CLASS_TEST Test.uue fi -echo "$as_me:$LINENO: result: $ac_cv_prog_java_works" >&5 -echo "${ECHO_T}$ac_cv_prog_java_works" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_java_works" >&5 +echo "${ECHO_T}$ac_cv_prog_java_works" >&6; } @@ -21515,8 +22591,8 @@ echo "$as_me: error: '$JAVAC' undefined" >&2;} { (exit 1); exit 1; }; } # Extract the first word of "$JAVAC", so it can be a program name with args. set dummy $JAVAC; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path__ACJNI_JAVAC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21531,36 +22607,37 @@ 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 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path__ACJNI_JAVAC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path__ACJNI_JAVAC" && ac_cv_path__ACJNI_JAVAC="$JAVAC" ;; esac fi _ACJNI_JAVAC=$ac_cv_path__ACJNI_JAVAC - if test -n "$_ACJNI_JAVAC"; then - echo "$as_me:$LINENO: result: $_ACJNI_JAVAC" >&5 -echo "${ECHO_T}$_ACJNI_JAVAC" >&6 + { echo "$as_me:$LINENO: result: $_ACJNI_JAVAC" >&5 +echo "${ECHO_T}$_ACJNI_JAVAC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test ! -x "$_ACJNI_JAVAC" && { { echo "$as_me:$LINENO: error: $JAVAC could not be found in path" >&5 echo "$as_me: error: $JAVAC could not be found in path" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking absolute path of $JAVAC" >&5 -echo $ECHO_N "checking absolute path of $JAVAC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking absolute path of $JAVAC" >&5 +echo $ECHO_N "checking absolute path of $JAVAC... $ECHO_C" >&6; } case "$_ACJNI_JAVAC" in -/*) echo "$as_me:$LINENO: result: $_ACJNI_JAVAC" >&5 -echo "${ECHO_T}$_ACJNI_JAVAC" >&6;; +/*) { echo "$as_me:$LINENO: result: $_ACJNI_JAVAC" >&5 +echo "${ECHO_T}$_ACJNI_JAVAC" >&6; };; *) { { echo "$as_me:$LINENO: error: $_ACJNI_JAVAC is not an absolute path name" >&5 echo "$as_me: error: $_ACJNI_JAVAC is not an absolute path name" >&2;} { (exit 1); exit 1; }; };; @@ -21570,16 +22647,16 @@ esac # find the include directory relative to the javac executable _cur=""$_ACJNI_JAVAC"" while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do - echo "$as_me:$LINENO: checking symlink for $_cur" >&5 -echo $ECHO_N "checking symlink for $_cur... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking symlink for $_cur" >&5 +echo $ECHO_N "checking symlink for $_cur... $ECHO_C" >&6; } _slink=`ls -ld "$_cur" | sed 's/.* -> //'` case "$_slink" in /*) _cur="$_slink";; # 'X' avoids triggering unwanted echo options. *) _cur=`echo "X$_cur" | sed -e 's/^X//' -e 's:[^/]*$::'`"$_slink";; esac - echo "$as_me:$LINENO: result: $_cur" >&5 -echo "${ECHO_T}$_cur" >&6 + { echo "$as_me:$LINENO: result: $_cur" >&5 +echo "${ECHO_T}$_cur" >&6; } done _ACJNI_FOLLOWED="$_cur" @@ -21632,8 +22709,8 @@ do done - echo "$as_me:$LINENO: checking java version" >&5 -echo $ECHO_N "checking java version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking java version" >&5 +echo $ECHO_N "checking java version... $ECHO_C" >&6; } case "$JAVA" in *kaffe* ) JAVA_VERSION=`$JAVA -version 2>&1 | @@ -21641,8 +22718,8 @@ echo $ECHO_N "checking java version... $ECHO_C" >&6 * ) JAVA_VERSION=`$JAVA -version 2>&1 | sed -e '/ version /!d' -e 's/.*"\(.*\)".*/\1/'` ;; esac - echo "$as_me:$LINENO: result: $JAVA_VERSION" >&5 -echo "${ECHO_T}$JAVA_VERSION" >&6 + { echo "$as_me:$LINENO: result: $JAVA_VERSION" >&5 +echo "${ECHO_T}$JAVA_VERSION" >&6; } case "$JAVA_VERSION" in 1.[3456789]* | 1.[1-9][0-9]* | [23456789]* ) ;; * ) @@ -21651,6 +22728,14 @@ echo "$as_me: error: Java version 1.3 or higher required, got $JAVA_VERSION" >&2 { (exit 1); exit 1; }; } ;; esac + # Because of the code that SWIG generates to cast between pointers and + # integers, we need to add the flag "-fno-strict-aliasing" to the gcc + # command line when compiling the JNI code. This is documented in + # [#14953] and at http://www.swig.org/Doc1.3/Java.html + if test ${GCC} = "yes"; then + SWIGCFLAGS="-fno-strict-aliasing" + fi + for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS do CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR" @@ -21664,7 +22749,7 @@ fi # MinGW support. if test "$db_cv_mingw" = "yes"; then - OSDIR=os_win32 + OSDIR=os_windows PATH_SEPARATOR="\\\\/:" cat >>confdefs.h <<\_ACEOF @@ -21681,8 +22766,8 @@ else 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 +{ 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; } if test "${ac_cv_header_stat_broken+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21695,25 +22780,25 @@ cat >>conftest.$ac_ext <<_ACEOF #include <sys/types.h> #include <sys/stat.h> -#if defined(S_ISBLK) && defined(S_IFDIR) +#if defined S_ISBLK && defined S_IFDIR # if S_ISBLK (S_IFDIR) You lose. # endif #endif -#if defined(S_ISBLK) && defined(S_IFCHR) +#if defined S_ISBLK && defined S_IFCHR # if S_ISBLK (S_IFCHR) You lose. # endif #endif -#if defined(S_ISLNK) && defined(S_IFREG) +#if defined S_ISLNK && defined S_IFREG # if S_ISLNK (S_IFREG) You lose. # endif #endif -#if defined(S_ISSOCK) && defined(S_IFREG) +#if defined S_ISSOCK && defined S_IFREG # if S_ISSOCK (S_IFREG) You lose. # endif @@ -21729,8 +22814,8 @@ fi rm -f conftest* fi -echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5 -echo "${ECHO_T}$ac_cv_header_stat_broken" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5 +echo "${ECHO_T}$ac_cv_header_stat_broken" >&6; } if test $ac_cv_header_stat_broken = yes; then cat >>confdefs.h <<\_ACEOF @@ -21739,8 +22824,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21764,24 +22849,36 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21790,12 +22887,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_time=no + ac_cv_header_time=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6; } if test $ac_cv_header_time = yes; then cat >>confdefs.h <<\_ACEOF @@ -21812,9 +22910,9 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -21836,24 +22934,36 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21862,12 +22972,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core 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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 @@ -21879,13 +22991,12 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21893,126 +23004,99 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char opendir (); int main () { -opendir (); +return opendir (); ; 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 +for ac_lib in '' dir; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_opendir="none required" + ac_cv_search_opendir=$ac_res 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_opendir" = no; then - for ac_lib in dir; 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 opendir (); -int -main () -{ -opendir (); - ; - 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_search_opendir="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then + break fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done +done +if test "${ac_cv_search_opendir+set}" = set; then + : +else + ac_cv_search_opendir=no fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22020,115 +23104,89 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char opendir (); int main () { -opendir (); +return opendir (); ; 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 +for ac_lib in '' x; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_opendir="none required" + ac_cv_search_opendir=$ac_res 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_opendir" = no; then - for ac_lib in x; 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 opendir (); -int -main () -{ -opendir (); - ; - 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_search_opendir="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then + break fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done +done +if test "${ac_cv_search_opendir+set}" = set; then + : +else + ac_cv_search_opendir=no fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -22140,18 +23198,19 @@ fi for ac_header in sys/select.h sys/time.h sys/fcntl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22162,24 +23221,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22188,15 +23259,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22205,8 +23277,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22230,9 +23307,10 @@ 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 +{ 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 @@ -22256,25 +23334,24 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ 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 support@sleepycat.com ## -## ------------------------------------ ## + ( cat <<\_ASBOX +## ---------------------------------------------------------- ## +## Report this to Oracle Technology Network Berkeley DB forum ## +## ---------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -22286,8 +23363,8 @@ fi done -echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5 -echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5 +echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; } if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22309,24 +23386,36 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22335,7 +23424,7 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22353,24 +23442,36 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22379,14 +23480,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct_stat_st_blksize=no + ac_cv_member_struct_stat_st_blksize=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5 -echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5 +echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6; } if test $ac_cv_member_struct_stat_st_blksize = yes; then cat >>confdefs.h <<_ACEOF @@ -22411,17 +23514,17 @@ fi 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 + { echo "$as_me:$LINENO: checking for inttypes.h" >&5 +echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; } if test "${ac_cv_header_inttypes_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_inttypes_h" >&5 -echo "${ECHO_T}$ac_cv_header_inttypes_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_inttypes_h" >&5 +echo "${ECHO_T}$ac_cv_header_inttypes_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking inttypes.h usability" >&5 -echo $ECHO_N "checking inttypes.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking inttypes.h usability" >&5 +echo $ECHO_N "checking inttypes.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22432,24 +23535,36 @@ $ac_includes_default #include <inttypes.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22458,15 +23573,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking inttypes.h presence" >&5 -echo $ECHO_N "checking inttypes.h presence... $ECHO_C" >&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 /* confdefs.h. */ _ACEOF @@ -22475,8 +23591,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <inttypes.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22500,9 +23621,10 @@ 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 +{ 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 @@ -22526,25 +23648,23 @@ echo "$as_me: WARNING: inttypes.h: section \"Present But Cannot Be Compiled\ 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 support@sleepycat.com ## -## ------------------------------------ ## + ( cat <<\_ASBOX +## ---------------------------------------------------------- ## +## Report this to Oracle Technology Network Berkeley DB forum ## +## ---------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for inttypes.h" >&5 -echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for inttypes.h" >&5 +echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; } if test "${ac_cv_header_inttypes_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_inttypes_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_inttypes_h" >&5 -echo "${ECHO_T}$ac_cv_header_inttypes_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_inttypes_h" >&5 +echo "${ECHO_T}$ac_cv_header_inttypes_h" >&6; } fi if test $ac_cv_header_inttypes_h = yes; then @@ -22557,17 +23677,17 @@ 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 + { 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 +{ 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 +{ 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 @@ -22578,24 +23698,36 @@ $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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22604,15 +23736,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking stdint.h presence" >&5 -echo $ECHO_N "checking stdint.h presence... $ECHO_C" >&6 +{ 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 @@ -22621,8 +23754,13 @@ 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 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22646,9 +23784,10 @@ 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 +{ 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 @@ -22672,25 +23811,23 @@ echo "$as_me: WARNING: stdint.h: section \"Present But Cannot Be Compiled\"" 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 ## -## ------------------------------------ ## + ( cat <<\_ASBOX +## ---------------------------------------------------------- ## +## Report this to Oracle Technology Network Berkeley DB forum ## +## ---------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | 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 +{ 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 +{ 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 @@ -22703,17 +23840,17 @@ 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 + { 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 +{ 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 +{ 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 @@ -22724,24 +23861,36 @@ $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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22750,15 +23899,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking stddef.h presence" >&5 -echo $ECHO_N "checking stddef.h presence... $ECHO_C" >&6 +{ 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 @@ -22767,8 +23917,13 @@ 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 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22792,9 +23947,10 @@ 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 +{ 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 @@ -22818,25 +23974,23 @@ echo "$as_me: WARNING: stddef.h: section \"Present But Cannot Be Compiled\"" 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 ## -## ------------------------------------ ## + ( cat <<\_ASBOX +## ---------------------------------------------------------- ## +## Report this to Oracle Technology Network Berkeley DB forum ## +## ---------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | 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 +{ 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 +{ 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 @@ -22847,147 +24001,177 @@ if test $ac_cv_header_stddef_h = yes; then 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 +if test "${ac_cv_header_unistd_h+set}" = set; then + { echo "$as_me:$LINENO: checking for unistd.h" >&5 +echo $ECHO_N "checking for unistd.h... $ECHO_C" >&6; } +if test "${ac_cv_header_unistd_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_unistd_h" >&5 +echo "${ECHO_T}$ac_cv_header_unistd_h" >&6; } else - cat >conftest.$ac_ext <<_ACEOF + # Is the header compilable? +{ echo "$as_me:$LINENO: checking unistd.h usability" >&5 +echo $ECHO_N "checking unistd.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. */ -$db_includes - -int -main () -{ -if ((off_t *) 0) - return 0; -if (sizeof (off_t)) - return 0; - ; - return 0; -} +$ac_includes_default +#include <unistd.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_off_t=yes + ac_header_compiler=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; }; } + ac_header_compiler=no 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 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking unistd.h presence" >&5 +echo $ECHO_N "checking unistd.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. */ -$db_includes - -int -main () -{ -if ((size_t *) 0) - return 0; -if (sizeof (size_t)) - return 0; - ; - return 0; -} +#include <unistd.h> _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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 + (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_cv_type_size_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_header_preproc=no 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 - : + +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: unistd.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: unistd.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: unistd.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: unistd.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: unistd.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: unistd.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: unistd.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: unistd.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: unistd.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: unistd.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: unistd.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: unistd.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: unistd.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: unistd.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: unistd.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: unistd.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ---------------------------------------------------------- ## +## Report this to Oracle Technology Network Berkeley DB forum ## +## ---------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for unistd.h" >&5 +echo $ECHO_N "checking for unistd.h... $ECHO_C" >&6; } +if test "${ac_cv_header_unistd_h+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;} - { (exit 1); exit 1; }; } + ac_cv_header_unistd_h=$ac_header_preproc fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_unistd_h" >&5 +echo "${ECHO_T}$ac_cv_header_unistd_h" >&6; } +fi +if test $ac_cv_header_unistd_h = yes; then -# 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 + db_includes="$db_includes +#include <unistd.h>" + unistd_h_decl="#include <unistd.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 @@ -22998,61 +24182,75 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef off_t ac__type_new_; int main () { -if ((long long *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (long long)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_long_long=yes + ac_cv_type_off_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_long_long=no + 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_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 - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 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 "$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 @@ -23063,63 +24261,76 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef size_t ac__type_new_; int main () { -if ((unsigned long long *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (unsigned long long)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_unsigned_long_long=yes + ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_unsigned_long_long=no + 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_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 - +rm -f core 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 # We need to know the sizes of various objects on this system. -echo "$as_me:$LINENO: checking for char" >&5 -echo $ECHO_N "checking for char... $ECHO_C" >&6 +{ 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 @@ -23131,36 +24342,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef char ac__type_new_; int main () { -if ((char *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (char)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23169,20 +24393,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_char=no + ac_cv_type_char=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5 -echo "${ECHO_T}$ac_cv_type_char" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5 +echo "${ECHO_T}$ac_cv_type_char" >&6; } -echo "$as_me:$LINENO: checking size of char" >&5 -echo $ECHO_N "checking size of char... $ECHO_C" >&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+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_char" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. @@ -23196,10 +24421,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -23207,24 +24433,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23238,10 +24476,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -23249,24 +24488,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23275,20 +24526,21 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23296,10 +24548,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -23307,24 +24560,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23338,10 +24603,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -23349,24 +24615,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23375,24 +24653,27 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -23404,10 +24685,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -23415,24 +24697,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23441,26 +24735,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_char=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char), 77 +echo "$as_me: error: cannot compute sizeof (char) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } ;; 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 @@ -23469,8 +24757,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes -long longval () { return (long) (sizeof (char)); } -unsigned long ulongval () { return (long) (sizeof (char)); } + typedef char ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include <stdio.h> #include <stdlib.h> int @@ -23479,35 +24768,44 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (char))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (char)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (char)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23518,29 +24816,28 @@ 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 (char) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char), 77 +echo "$as_me: error: cannot compute sizeof (char) 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 + { (exit 77); exit 77; }; } fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val else ac_cv_sizeof_char=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 -echo "${ECHO_T}$ac_cv_sizeof_char" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 +echo "${ECHO_T}$ac_cv_sizeof_char" >&6; } cat >>confdefs.h <<_ACEOF #define SIZEOF_CHAR $ac_cv_sizeof_char _ACEOF -echo "$as_me:$LINENO: checking for unsigned char" >&5 -echo $ECHO_N "checking for unsigned char... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for unsigned char" >&5 +echo $ECHO_N "checking for unsigned char... $ECHO_C" >&6; } if test "${ac_cv_type_unsigned_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23552,36 +24849,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef unsigned char ac__type_new_; int main () { -if ((unsigned char *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (unsigned char)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23590,20 +24900,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_unsigned_char=no + ac_cv_type_unsigned_char=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_char" >&5 -echo "${ECHO_T}$ac_cv_type_unsigned_char" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_char" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_char" >&6; } -echo "$as_me:$LINENO: checking size of unsigned char" >&5 -echo $ECHO_N "checking size of unsigned char... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking size of unsigned char" >&5 +echo $ECHO_N "checking size of unsigned char... $ECHO_C" >&6; } if test "${ac_cv_sizeof_unsigned_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_unsigned_char" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. @@ -23617,10 +24928,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned char))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -23628,24 +24940,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23659,10 +24983,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned char))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -23670,24 +24995,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23696,20 +25033,21 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23717,10 +25055,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned char))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -23728,24 +25067,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23759,10 +25110,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned char))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -23770,24 +25122,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23796,24 +25160,27 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -23825,10 +25192,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned char))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -23836,24 +25204,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23862,26 +25242,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_unsigned_char=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned char), 77 +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned char) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned char), 77 +echo "$as_me: error: cannot compute sizeof (unsigned char) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } ;; 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 @@ -23890,8 +25264,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes -long longval () { return (long) (sizeof (unsigned char)); } -unsigned long ulongval () { return (long) (sizeof (unsigned char)); } + typedef unsigned char ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include <stdio.h> #include <stdlib.h> int @@ -23900,35 +25275,44 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (unsigned char))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (unsigned char)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (unsigned char)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23939,29 +25323,28 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned char), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned char) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned char), 77 +echo "$as_me: error: cannot compute sizeof (unsigned char) 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 + { (exit 77); exit 77; }; } fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val else ac_cv_sizeof_unsigned_char=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_char" >&5 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_char" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_char" >&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_char" >&6; } cat >>confdefs.h <<_ACEOF #define SIZEOF_UNSIGNED_CHAR $ac_cv_sizeof_unsigned_char _ACEOF -echo "$as_me:$LINENO: checking for short" >&5 -echo $ECHO_N "checking for short... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for short" >&5 +echo $ECHO_N "checking for short... $ECHO_C" >&6; } if test "${ac_cv_type_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23973,36 +25356,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef short ac__type_new_; int main () { -if ((short *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (short)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24011,20 +25407,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_short=no + ac_cv_type_short=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 -echo "${ECHO_T}$ac_cv_type_short" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 +echo "${ECHO_T}$ac_cv_type_short" >&6; } -echo "$as_me:$LINENO: checking size of short" >&5 -echo $ECHO_N "checking size of short... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking size of short" >&5 +echo $ECHO_N "checking size of short... $ECHO_C" >&6; } if test "${ac_cv_sizeof_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_short" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. @@ -24038,10 +25435,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -24049,24 +25447,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24080,10 +25490,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -24091,24 +25502,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24117,20 +25540,21 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24138,10 +25562,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -24149,24 +25574,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24180,10 +25617,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -24191,24 +25629,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24217,24 +25667,27 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -24246,10 +25699,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -24257,24 +25711,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24283,26 +25749,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_short=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (short), 77 +echo "$as_me: error: cannot compute sizeof (short) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } ;; 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 @@ -24311,8 +25771,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes -long longval () { return (long) (sizeof (short)); } -unsigned long ulongval () { return (long) (sizeof (short)); } + typedef short ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include <stdio.h> #include <stdlib.h> int @@ -24321,35 +25782,44 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (short))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (short)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (short)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24360,29 +25830,28 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (short), 77 +echo "$as_me: error: cannot compute sizeof (short) 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 + { (exit 77); exit 77; }; } fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val else ac_cv_sizeof_short=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 +echo "${ECHO_T}$ac_cv_sizeof_short" >&6; } cat >>confdefs.h <<_ACEOF #define SIZEOF_SHORT $ac_cv_sizeof_short _ACEOF -echo "$as_me:$LINENO: checking for unsigned short" >&5 -echo $ECHO_N "checking for unsigned short... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for unsigned short" >&5 +echo $ECHO_N "checking for unsigned short... $ECHO_C" >&6; } if test "${ac_cv_type_unsigned_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24394,36 +25863,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef unsigned short ac__type_new_; int main () { -if ((unsigned short *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (unsigned short)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24432,20 +25914,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_unsigned_short=no + ac_cv_type_unsigned_short=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_short" >&5 -echo "${ECHO_T}$ac_cv_type_unsigned_short" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_short" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_short" >&6; } -echo "$as_me:$LINENO: checking size of unsigned short" >&5 -echo $ECHO_N "checking size of unsigned short... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking size of unsigned short" >&5 +echo $ECHO_N "checking size of unsigned short... $ECHO_C" >&6; } if test "${ac_cv_sizeof_unsigned_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_unsigned_short" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. @@ -24459,10 +25942,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned short))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -24470,24 +25954,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24501,10 +25997,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -24512,24 +26009,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24538,20 +26047,21 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24559,10 +26069,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned short))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -24570,24 +26081,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24601,10 +26124,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned short))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -24612,24 +26136,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24638,24 +26174,27 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -24667,10 +26206,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -24678,24 +26218,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24704,26 +26256,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_unsigned_short=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned short), 77 +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned short) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned short), 77 +echo "$as_me: error: cannot compute sizeof (unsigned short) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } ;; 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 @@ -24732,8 +26278,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes -long longval () { return (long) (sizeof (unsigned short)); } -unsigned long ulongval () { return (long) (sizeof (unsigned short)); } + typedef unsigned short ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include <stdio.h> #include <stdlib.h> int @@ -24742,35 +26289,44 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (unsigned short))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (unsigned short)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (unsigned short)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24781,29 +26337,28 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned short), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned short) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned short), 77 +echo "$as_me: error: cannot compute sizeof (unsigned short) 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 + { (exit 77); exit 77; }; } fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val else ac_cv_sizeof_unsigned_short=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_short" >&5 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_short" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_short" >&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_short" >&6; } cat >>confdefs.h <<_ACEOF #define SIZEOF_UNSIGNED_SHORT $ac_cv_sizeof_unsigned_short _ACEOF -echo "$as_me:$LINENO: checking for int" >&5 -echo $ECHO_N "checking for int... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for int" >&5 +echo $ECHO_N "checking for int... $ECHO_C" >&6; } if test "${ac_cv_type_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24815,36 +26370,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef int ac__type_new_; int main () { -if ((int *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (int)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24853,20 +26421,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_int=no + ac_cv_type_int=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 -echo "${ECHO_T}$ac_cv_type_int" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 +echo "${ECHO_T}$ac_cv_type_int" >&6; } -echo "$as_me:$LINENO: checking size of int" >&5 -echo $ECHO_N "checking size of int... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking size of int" >&5 +echo $ECHO_N "checking size of int... $ECHO_C" >&6; } if test "${ac_cv_sizeof_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_int" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. @@ -24880,10 +26449,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -24891,24 +26461,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24922,10 +26504,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -24933,24 +26516,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24959,20 +26554,21 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24980,10 +26576,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -24991,24 +26588,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25022,10 +26631,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -25033,24 +26643,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25059,24 +26681,27 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -25088,10 +26713,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25099,24 +26725,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25125,26 +26763,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_int=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (int), 77 +echo "$as_me: error: cannot compute sizeof (int) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } ;; 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 @@ -25153,8 +26785,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes -long longval () { return (long) (sizeof (int)); } -unsigned long ulongval () { return (long) (sizeof (int)); } + typedef int ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include <stdio.h> #include <stdlib.h> int @@ -25163,35 +26796,44 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (int))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (int)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (int)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25202,29 +26844,28 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (int), 77 +echo "$as_me: error: cannot compute sizeof (int) 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 + { (exit 77); exit 77; }; } fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val else ac_cv_sizeof_int=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 +echo "${ECHO_T}$ac_cv_sizeof_int" >&6; } cat >>confdefs.h <<_ACEOF #define SIZEOF_INT $ac_cv_sizeof_int _ACEOF -echo "$as_me:$LINENO: checking for unsigned int" >&5 -echo $ECHO_N "checking for unsigned int... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for unsigned int" >&5 +echo $ECHO_N "checking for unsigned int... $ECHO_C" >&6; } if test "${ac_cv_type_unsigned_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25236,36 +26877,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef unsigned int ac__type_new_; int main () { -if ((unsigned int *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (unsigned int)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25274,20 +26928,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_unsigned_int=no + ac_cv_type_unsigned_int=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_int" >&5 -echo "${ECHO_T}$ac_cv_type_unsigned_int" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_int" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_int" >&6; } -echo "$as_me:$LINENO: checking size of unsigned int" >&5 -echo $ECHO_N "checking size of unsigned int... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking size of unsigned int" >&5 +echo $ECHO_N "checking size of unsigned int... $ECHO_C" >&6; } if test "${ac_cv_sizeof_unsigned_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_unsigned_int" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. @@ -25301,10 +26956,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -25312,24 +26968,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25343,10 +27011,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25354,24 +27023,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25380,20 +27061,21 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25401,10 +27083,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -25412,24 +27095,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25443,10 +27138,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -25454,24 +27150,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25480,24 +27188,27 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -25509,10 +27220,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25520,24 +27232,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25546,26 +27270,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_unsigned_int=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int), 77 +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned int), 77 +echo "$as_me: error: cannot compute sizeof (unsigned int) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } ;; 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 @@ -25574,8 +27292,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes -long longval () { return (long) (sizeof (unsigned int)); } -unsigned long ulongval () { return (long) (sizeof (unsigned int)); } + typedef unsigned int ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include <stdio.h> #include <stdlib.h> int @@ -25584,35 +27303,44 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (unsigned int))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (unsigned int)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (unsigned int)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25623,29 +27351,28 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned int), 77 +echo "$as_me: error: cannot compute sizeof (unsigned int) 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 + { (exit 77); exit 77; }; } fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val else ac_cv_sizeof_unsigned_int=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_int" >&5 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_int" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_int" >&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_int" >&6; } cat >>confdefs.h <<_ACEOF #define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int _ACEOF -echo "$as_me:$LINENO: checking for long" >&5 -echo $ECHO_N "checking for long... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for long" >&5 +echo $ECHO_N "checking for long... $ECHO_C" >&6; } if test "${ac_cv_type_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25657,36 +27384,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef long ac__type_new_; int main () { -if ((long *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (long)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25695,20 +27435,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_long=no + ac_cv_type_long=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 -echo "${ECHO_T}$ac_cv_type_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 +echo "${ECHO_T}$ac_cv_type_long" >&6; } -echo "$as_me:$LINENO: checking size of long" >&5 -echo $ECHO_N "checking size of long... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking size of long" >&5 +echo $ECHO_N "checking size of long... $ECHO_C" >&6; } if test "${ac_cv_sizeof_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_long" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. @@ -25722,10 +27463,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -25733,24 +27475,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25764,10 +27518,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25775,24 +27530,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25801,20 +27568,21 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25822,10 +27590,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -25833,24 +27602,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25864,10 +27645,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -25875,24 +27657,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25901,24 +27695,27 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -25930,10 +27727,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25941,24 +27739,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25967,26 +27777,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long), 77 +echo "$as_me: error: cannot compute sizeof (long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } ;; 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 @@ -25995,8 +27799,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes -long longval () { return (long) (sizeof (long)); } -unsigned long ulongval () { return (long) (sizeof (long)); } + typedef long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include <stdio.h> #include <stdlib.h> int @@ -26005,35 +27810,44 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (long))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (long)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (long)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26044,29 +27858,28 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long), 77 +echo "$as_me: error: cannot compute sizeof (long) 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 + { (exit 77); exit 77; }; } fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val else ac_cv_sizeof_long=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6; } cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG $ac_cv_sizeof_long _ACEOF -echo "$as_me:$LINENO: checking for unsigned long" >&5 -echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for unsigned long" >&5 +echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; } if test "${ac_cv_type_unsigned_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26078,36 +27891,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef unsigned long ac__type_new_; int main () { -if ((unsigned long *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (unsigned long)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26116,20 +27942,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_unsigned_long=no + ac_cv_type_unsigned_long=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 -echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; } -echo "$as_me:$LINENO: checking size of unsigned long" >&5 -echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking size of unsigned long" >&5 +echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; } if test "${ac_cv_sizeof_unsigned_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_unsigned_long" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. @@ -26143,10 +27970,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -26154,24 +27982,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26185,10 +28025,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -26196,24 +28037,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26222,20 +28075,21 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26243,10 +28097,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -26254,24 +28109,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26285,10 +28152,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -26296,24 +28164,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26322,24 +28202,27 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -26351,10 +28234,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -26362,24 +28246,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26388,26 +28284,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_unsigned_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned long), 77 +echo "$as_me: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } ;; 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 @@ -26416,8 +28306,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes -long longval () { return (long) (sizeof (unsigned long)); } -unsigned long ulongval () { return (long) (sizeof (unsigned long)); } + typedef unsigned long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include <stdio.h> #include <stdlib.h> int @@ -26426,35 +28317,44 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (unsigned long))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (unsigned long)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (unsigned long)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26465,29 +28365,28 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned long), 77 +echo "$as_me: error: cannot compute sizeof (unsigned long) 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 + { (exit 77); exit 77; }; } fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val else ac_cv_sizeof_unsigned_long=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; } cat >>confdefs.h <<_ACEOF #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long _ACEOF -echo "$as_me:$LINENO: checking for long long" >&5 -echo $ECHO_N "checking for long long... $ECHO_C" >&6 +{ 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 @@ -26499,36 +28398,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef long long ac__type_new_; int main () { -if ((long long *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (long long)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26537,20 +28449,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_long_long=no + ac_cv_type_long_long=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 -echo "${ECHO_T}$ac_cv_type_long_long" >&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 long long" >&5 -echo $ECHO_N "checking size of long long... $ECHO_C" >&6 +{ 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_long_long" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. @@ -26564,10 +28477,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef long long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -26575,24 +28489,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26606,10 +28532,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef long long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -26617,24 +28544,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26643,20 +28582,21 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26664,10 +28604,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef long long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -26675,24 +28616,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26706,10 +28659,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef long long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -26717,24 +28671,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26743,24 +28709,27 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -26772,10 +28741,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef long long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -26783,24 +28753,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26809,26 +28791,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_long_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long long), 77 +echo "$as_me: error: cannot compute sizeof (long long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } ;; 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 @@ -26837,8 +28813,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes -long longval () { return (long) (sizeof (long long)); } -unsigned long ulongval () { return (long) (sizeof (long long)); } + typedef long long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include <stdio.h> #include <stdlib.h> int @@ -26847,35 +28824,44 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (long long))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (long long)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (long long)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26886,29 +28872,28 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long long), 77 +echo "$as_me: error: cannot compute sizeof (long long) 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 + { (exit 77); exit 77; }; } fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val else ac_cv_sizeof_long_long=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long_long" >&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_LONG_LONG $ac_cv_sizeof_long_long _ACEOF -echo "$as_me:$LINENO: checking for unsigned long long" >&5 -echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6 +{ 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 @@ -26920,36 +28905,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef unsigned long long ac__type_new_; int main () { -if ((unsigned long long *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (unsigned long long)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26958,20 +28956,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_unsigned_long_long=no + ac_cv_type_unsigned_long_long=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5 -echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&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 unsigned long long" >&5 -echo $ECHO_N "checking size of unsigned long long... $ECHO_C" >&6 +{ 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_unsigned_long_long" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. @@ -26985,10 +28984,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned long long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -26996,24 +28996,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27027,10 +29039,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned long long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -27038,24 +29051,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27064,20 +29089,21 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27085,10 +29111,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned long long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -27096,24 +29123,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27127,10 +29166,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned long long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -27138,24 +29178,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27164,24 +29216,27 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -27193,10 +29248,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef unsigned long long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -27204,24 +29260,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27230,26 +29298,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_unsigned_long_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long), 77 +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned long long), 77 +echo "$as_me: error: cannot compute sizeof (unsigned long long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } ;; 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 @@ -27258,8 +29320,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes -long longval () { return (long) (sizeof (unsigned long long)); } -unsigned long ulongval () { return (long) (sizeof (unsigned long long)); } + typedef unsigned long long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include <stdio.h> #include <stdlib.h> int @@ -27268,35 +29331,44 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (unsigned long long))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (unsigned long long)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (unsigned long long)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27307,29 +29379,28 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned long long), 77 +echo "$as_me: error: cannot compute sizeof (unsigned long long) 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 + { (exit 77); exit 77; }; } fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val else ac_cv_sizeof_unsigned_long_long=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long" >&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_UNSIGNED_LONG_LONG $ac_cv_sizeof_unsigned_long_long _ACEOF -echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +{ 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 @@ -27341,36 +29412,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef size_t ac__type_new_; int main () { -if ((size_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (size_t)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27379,20 +29463,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_size_t=no + ac_cv_type_size_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 +{ 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 +{ 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 if test "$ac_cv_type_size_t" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. @@ -27406,10 +29491,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -27417,24 +29503,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27448,10 +29546,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -27459,24 +29558,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27485,20 +29596,21 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27506,10 +29618,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -27517,24 +29630,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27548,10 +29673,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -27559,24 +29685,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27585,24 +29723,27 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -27614,10 +29755,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -27625,24 +29767,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27651,26 +29805,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core 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 +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (size_t), 77 +echo "$as_me: error: cannot compute sizeof (size_t) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } ;; 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 @@ -27679,8 +29827,9 @@ 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)); } + typedef size_t ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include <stdio.h> #include <stdlib.h> int @@ -27689,35 +29838,44 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (size_t))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (size_t)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (size_t)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27728,29 +29886,28 @@ 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 (size_t) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (size_t), 77 +echo "$as_me: error: cannot compute sizeof (size_t) 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 + { (exit 77); exit 77; }; } fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val 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 +{ 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 char *" >&5 -echo $ECHO_N "checking for char *... $ECHO_C" >&6 +{ 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 @@ -27762,36 +29919,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef char * ac__type_new_; int main () { -if ((char * *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (char *)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27800,20 +29970,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_char_p=no + ac_cv_type_char_p=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5 -echo "${ECHO_T}$ac_cv_type_char_p" >&6 +{ 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 +{ 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 if test "$ac_cv_type_char_p" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. @@ -27827,10 +29998,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -27838,24 +30010,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27869,10 +30053,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -27880,24 +30065,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27906,20 +30103,21 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27927,10 +30125,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -27938,24 +30137,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27969,10 +30180,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -27980,24 +30192,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28006,24 +30230,27 @@ 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` + 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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -28035,10 +30262,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -28046,24 +30274,36 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28072,26 +30312,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core 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 +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char *), 77 +echo "$as_me: error: cannot compute sizeof (char *) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } ;; 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 @@ -28100,8 +30334,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes -long longval () { return (long) (sizeof (char *)); } -unsigned long ulongval () { return (long) (sizeof (char *)); } + typedef char * ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include <stdio.h> #include <stdlib.h> int @@ -28110,35 +30345,44 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (char *))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (char *)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (char *)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28149,22 +30393,21 @@ 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 (char *) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char *), 77 +echo "$as_me: error: cannot compute sizeof (char *) 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 + { (exit 77); exit 77; }; } fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val 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 +{ 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 @@ -28174,8 +30417,8 @@ _ACEOF # We look for u_char, u_short, u_int, u_long -- if we can't find them, # we create our own. -echo "$as_me:$LINENO: checking for u_char" >&5 -echo $ECHO_N "checking for u_char... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for u_char" >&5 +echo $ECHO_N "checking for u_char... $ECHO_C" >&6; } if test "${ac_cv_type_u_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28187,36 +30430,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef u_char ac__type_new_; int main () { -if ((u_char *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (u_char)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28225,12 +30481,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_u_char=no + ac_cv_type_u_char=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_u_char" >&5 -echo "${ECHO_T}$ac_cv_type_u_char" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_char" >&5 +echo "${ECHO_T}$ac_cv_type_u_char" >&6; } if test $ac_cv_type_u_char = yes; then : else @@ -28239,8 +30496,8 @@ fi -echo "$as_me:$LINENO: checking for u_short" >&5 -echo $ECHO_N "checking for u_short... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for u_short" >&5 +echo $ECHO_N "checking for u_short... $ECHO_C" >&6; } if test "${ac_cv_type_u_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28252,36 +30509,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef u_short ac__type_new_; int main () { -if ((u_short *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (u_short)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28290,12 +30560,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_u_short=no + ac_cv_type_u_short=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_u_short" >&5 -echo "${ECHO_T}$ac_cv_type_u_short" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_short" >&5 +echo "${ECHO_T}$ac_cv_type_u_short" >&6; } if test $ac_cv_type_u_short = yes; then : else @@ -28304,8 +30575,8 @@ fi -echo "$as_me:$LINENO: checking for u_int" >&5 -echo $ECHO_N "checking for u_int... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for u_int" >&5 +echo $ECHO_N "checking for u_int... $ECHO_C" >&6; } if test "${ac_cv_type_u_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28317,36 +30588,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef u_int ac__type_new_; int main () { -if ((u_int *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (u_int)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28355,12 +30639,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_u_int=no + ac_cv_type_u_int=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_u_int" >&5 -echo "${ECHO_T}$ac_cv_type_u_int" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int" >&5 +echo "${ECHO_T}$ac_cv_type_u_int" >&6; } if test $ac_cv_type_u_int = yes; then : else @@ -28369,8 +30654,8 @@ fi -echo "$as_me:$LINENO: checking for u_long" >&5 -echo $ECHO_N "checking for u_long... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for u_long" >&5 +echo $ECHO_N "checking for u_long... $ECHO_C" >&6; } if test "${ac_cv_type_u_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28382,36 +30667,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef u_long ac__type_new_; int main () { -if ((u_long *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (u_long)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28420,12 +30718,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_u_long=no + ac_cv_type_u_long=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_u_long" >&5 -echo "${ECHO_T}$ac_cv_type_u_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_long" >&5 +echo "${ECHO_T}$ac_cv_type_u_long" >&6; } if test $ac_cv_type_u_long = yes; then : else @@ -28435,8 +30734,8 @@ 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 +{ echo "$as_me:$LINENO: checking for u_int8_t" >&5 +echo $ECHO_N "checking for u_int8_t... $ECHO_C" >&6; } if test "${ac_cv_type_u_int8_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28448,36 +30747,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef u_int8_t ac__type_new_; int main () { -if ((u_int8_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (u_int8_t)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28486,12 +30798,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_u_int8_t=no + ac_cv_type_u_int8_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_u_int8_t" >&5 -echo "${ECHO_T}$ac_cv_type_u_int8_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int8_t" >&5 +echo "${ECHO_T}$ac_cv_type_u_int8_t" >&6; } if test $ac_cv_type_u_int8_t = yes; then : else @@ -28518,8 +30831,8 @@ fi -echo "$as_me:$LINENO: checking for u_int16_t" >&5 -echo $ECHO_N "checking for u_int16_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for u_int16_t" >&5 +echo $ECHO_N "checking for u_int16_t... $ECHO_C" >&6; } if test "${ac_cv_type_u_int16_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28531,36 +30844,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef u_int16_t ac__type_new_; int main () { -if ((u_int16_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (u_int16_t)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28569,12 +30895,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_u_int16_t=no + ac_cv_type_u_int16_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_u_int16_t" >&5 -echo "${ECHO_T}$ac_cv_type_u_int16_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int16_t" >&5 +echo "${ECHO_T}$ac_cv_type_u_int16_t" >&6; } if test $ac_cv_type_u_int16_t = yes; then : else @@ -28601,8 +30928,8 @@ fi -echo "$as_me:$LINENO: checking for int16_t" >&5 -echo $ECHO_N "checking for int16_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for int16_t" >&5 +echo $ECHO_N "checking for int16_t... $ECHO_C" >&6; } if test "${ac_cv_type_int16_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28614,36 +30941,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef int16_t ac__type_new_; int main () { -if ((int16_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (int16_t)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28652,12 +30992,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_int16_t=no + ac_cv_type_int16_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5 -echo "${ECHO_T}$ac_cv_type_int16_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5 +echo "${ECHO_T}$ac_cv_type_int16_t" >&6; } if test $ac_cv_type_int16_t = yes; then : else @@ -28684,8 +31025,8 @@ fi -echo "$as_me:$LINENO: checking for u_int32_t" >&5 -echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for u_int32_t" >&5 +echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6; } if test "${ac_cv_type_u_int32_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28697,36 +31038,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef u_int32_t ac__type_new_; int main () { -if ((u_int32_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (u_int32_t)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28735,12 +31089,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_u_int32_t=no + ac_cv_type_u_int32_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5 -echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5 +echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6; } if test $ac_cv_type_u_int32_t = yes; then : else @@ -28767,8 +31122,8 @@ fi -echo "$as_me:$LINENO: checking for int32_t" >&5 -echo $ECHO_N "checking for int32_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for int32_t" >&5 +echo $ECHO_N "checking for int32_t... $ECHO_C" >&6; } if test "${ac_cv_type_int32_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28780,36 +31135,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef int32_t ac__type_new_; int main () { -if ((int32_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (int32_t)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28818,12 +31186,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_int32_t=no + ac_cv_type_int32_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5 -echo "${ECHO_T}$ac_cv_type_int32_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5 +echo "${ECHO_T}$ac_cv_type_int32_t" >&6; } if test $ac_cv_type_int32_t = yes; then : else @@ -28850,8 +31219,8 @@ fi -echo "$as_me:$LINENO: checking for u_int64_t" >&5 -echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6 +{ 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 @@ -28863,36 +31232,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef u_int64_t ac__type_new_; int main () { -if ((u_int64_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (u_int64_t)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28901,12 +31283,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_u_int64_t=no + ac_cv_type_u_int64_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_u_int64_t" >&5 -echo "${ECHO_T}$ac_cv_type_u_int64_t" >&6 +{ 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 @@ -28933,8 +31316,8 @@ fi -echo "$as_me:$LINENO: checking for int64_t" >&5 -echo $ECHO_N "checking for int64_t... $ECHO_C" >&6 +{ 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 @@ -28946,36 +31329,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef int64_t ac__type_new_; int main () { -if ((int64_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (int64_t)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28984,12 +31380,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_int64_t=no + ac_cv_type_int64_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5 -echo "${ECHO_T}$ac_cv_type_int64_t" >&6 +{ 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 @@ -29018,8 +31415,8 @@ fi # Check for ssize_t -- if none exists, find a signed integral type that's # the same size as a size_t. -echo "$as_me:$LINENO: checking for ssize_t" >&5 -echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ssize_t" >&5 +echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; } if test "${ac_cv_type_ssize_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29031,36 +31428,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef ssize_t ac__type_new_; int main () { -if ((ssize_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (ssize_t)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29069,12 +31479,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_ssize_t=no + ac_cv_type_ssize_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 -echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 +echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; } if test $ac_cv_type_ssize_t = yes; then : else @@ -29100,11 +31511,14 @@ echo "$as_me: error: No signed $ac_cv_sizeof_size_t-byte integral type" >&2;} fi +# So far, no autoconf'd systems lack pid_t. + + # Check for uintmax_t -- if none exists, first the largest unsigned integral # type available. -echo "$as_me:$LINENO: checking for uintmax_t" >&5 -echo $ECHO_N "checking for uintmax_t... $ECHO_C" >&6 +{ 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 @@ -29115,36 +31529,49 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef uintmax_t ac__type_new_; int main () { -if ((uintmax_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (uintmax_t)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29153,17 +31580,18 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_uintmax_t=no + ac_cv_type_uintmax_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_uintmax_t" >&5 -echo "${ECHO_T}$ac_cv_type_uintmax_t" >&6 +{ 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 + { 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 @@ -29175,36 +31603,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes +typedef unsigned long long ac__type_new_; int main () { -if ((unsigned long long *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (unsigned long long)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29213,12 +31654,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_unsigned_long_long=no + ac_cv_type_unsigned_long_long=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5 -echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6 +{ 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 uintmax_t_decl="typedef unsigned long long uintmax_t;" else @@ -29231,8 +31673,8 @@ fi # 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 +{ 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 @@ -29243,36 +31685,49 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef uintptr_t ac__type_new_; int main () { -if ((uintptr_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (uintptr_t)) +if (sizeof (ac__type_new_)) 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29281,12 +31736,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_uintptr_t=no + ac_cv_type_uintptr_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5 -echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6 +{ 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 @@ -29313,8 +31769,8 @@ fi -echo "$as_me:$LINENO: checking for ANSI C exit success/failure values" >&5 -echo $ECHO_N "checking for ANSI C exit success/failure values... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ANSI C exit success/failure values" >&5 +echo $ECHO_N "checking for ANSI C exit success/failure values... $ECHO_C" >&6; } if test "${db_cv_exit_defines+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29335,24 +31791,36 @@ return (EXIT_SUCCESS); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29361,12 +31829,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -db_cv_exit_defines=no + db_cv_exit_defines=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core 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 +{ echo "$as_me:$LINENO: result: $db_cv_exit_defines" >&5 +echo "${ECHO_T}$db_cv_exit_defines" >&6; } if test "$db_cv_exit_defines" = "yes"; then cat >>confdefs.h <<\_ACEOF #define HAVE_EXIT_SUCCESS 1 @@ -29376,540 +31845,8 @@ _ACEOF fi -# 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 - 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. */ - -/* 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 () -{ -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>conftest.er1 - ac_status=$? - 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 () -{ -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>conftest.er1 - ac_status=$? - 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="-l$ac_lib" -break -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 - done -fi -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"; - LIBSO_LIBS="$LIBSO_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 -else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_sched_yield=no -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 sched_yield (); -int -main () -{ -sched_yield (); - ; - 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_search_sched_yield="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_sched_yield" = 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 sched_yield (); -int -main () -{ -sched_yield (); - ; - 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_search_sched_yield="-l$ac_lib" -break -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 - done -fi -LIBS=$ac_func_search_save_LIBS -fi -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" - -fi - - -# !!! -# 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 -# 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 - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_pthread_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_pthread_main=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_pthread_main" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6 -if test $ac_cv_lib_pthread_main = yes; then - TEST_LIBS="$TEST_LIBS -lpthread" -fi -ac_cv_lib_pthread=ac_cv_lib_pthread_main - - -# !!! -# 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 - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_m_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_m_main=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_m_main" >&5 -echo "${ECHO_T}$ac_cv_lib_m_main" >&6 -if test $ac_cv_lib_m_main = yes; then - TEST_LIBS="$TEST_LIBS -lm" -fi -ac_cv_lib_m=ac_cv_lib_m_main - -echo "$as_me:$LINENO: checking for main in -lsocket" >&5 -echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_socket_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_socket_main=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_socket_main" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_main" >&6 -if test $ac_cv_lib_socket_main = yes; then - TEST_LIBS="$TEST_LIBS -lsocket" -fi -ac_cv_lib_socket=ac_cv_lib_socket_main - -echo "$as_me:$LINENO: checking for main in -lnsl" >&5 -echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_main+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. */ - - -int -main () -{ -main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - 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_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_nsl_main=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_main" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6 -if test $ac_cv_lib_nsl_main = yes; then - TEST_LIBS="$TEST_LIBS -lnsl" -fi -ac_cv_lib_nsl=ac_cv_lib_nsl_main - - # Check for mutexes. -# We do this here because it changes $LIBS. +# We do this first because it changes $LIBSO_LIBS. # Mutexes we don't test for, but want the #defines to exist for @@ -29919,8 +31856,8 @@ ac_cv_lib_nsl=ac_cv_lib_nsl_main -echo "$as_me:$LINENO: checking for mutexes" >&5 -echo $ECHO_N "checking for mutexes... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for mutexes" >&5 +echo $ECHO_N "checking for mutexes... $ECHO_C" >&6; } if test "${db_cv_mutex+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29939,18 +31876,14 @@ orig_libs=$LIBS # *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. +# on Solaris, for two reasons: a bug in SunOS 5.7 causes applications to +# 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. Second, +# LWP mutexes are faster than POSIX pthread mutexes by some amount. # # 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 db_cv_mutex="posix_only"; fi @@ -29990,24 +31923,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30016,8 +31961,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -30064,24 +32011,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30090,8 +32049,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF @@ -30123,13 +32084,22 @@ main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30140,8 +32110,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + LIBS="$orig_libs" fi if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then @@ -30182,24 +32154,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30208,8 +32192,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF @@ -30241,13 +32227,22 @@ main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30258,8 +32253,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi if test "$db_cv_mutex" = "posix_only"; then @@ -30297,24 +32294,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30323,8 +32332,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF @@ -30354,13 +32365,22 @@ main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30371,8 +32391,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi if test "$db_cv_mutex" = "posix_only"; then LIBS="$LIBS -lpthread" @@ -30411,24 +32433,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30437,8 +32471,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF @@ -30468,13 +32504,22 @@ main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30485,8 +32530,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + LIBS="$orig_libs" fi if test "$db_cv_mutex" = "posix_only"; then @@ -30525,24 +32572,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30551,8 +32610,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$orig_libs" fi @@ -30584,24 +32645,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30610,8 +32683,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi if test "$db_cv_mutex" = "ui_only"; then @@ -30651,24 +32726,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30677,8 +32764,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -30709,24 +32798,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30735,8 +32836,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -30766,24 +32869,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30792,8 +32907,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$orig_libs" fi @@ -30822,24 +32939,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30848,8 +32977,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi # abilock_t: SGI @@ -30877,24 +33008,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30903,8 +33046,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -30936,24 +33081,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30962,8 +33119,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -30995,24 +33154,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31021,8 +33192,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -31049,24 +33222,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31075,8 +33260,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -31102,24 +33289,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31128,8 +33327,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -31157,24 +33358,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31183,8 +33396,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi # Alpha/gcc @@ -31211,24 +33426,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31237,8 +33464,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi # ARM/gcc: Linux @@ -31265,24 +33494,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31291,8 +33532,146 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +# MIPS/gcc: Linux +if test "$db_cv_mutex" = no; 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 () +{ + +#if (defined(__mips) || defined(__mips__)) && defined(__GNUC__) + exit(0); +#else + FAIL TO COMPILE/LINK +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + db_cv_mutex="MIPS/gcc-assembly" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +# MIPS/gcc: Linux +if test "$db_cv_mutex" = no; 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 () +{ + +#if (defined(__mips) || defined(__mips__)) && defined(__GNUC__) + exit(0); +#else + FAIL TO COMPILE/LINK +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + db_cv_mutex="MIPS/gcc-assembly" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi # PaRisc/gcc: HP/UX @@ -31319,24 +33698,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31345,8 +33736,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi # PPC/gcc: @@ -31373,24 +33766,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31399,8 +33804,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi # Sparc/gcc: SunOS, Solaris @@ -31427,24 +33834,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31453,8 +33872,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi # 68K/gcc: SunOS @@ -31481,24 +33902,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31507,8 +33940,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi # x86/gcc: FreeBSD, NetBSD, BSD/OS, Linux @@ -31524,7 +33959,7 @@ int main () { -#if (defined(i386) || defined(__i386__) || defined(__x86_64__)) && defined(__GNUC__) +#if (defined(i386) || defined(__i386__)) && defined(__GNUC__) exit(0); #else FAIL TO COMPILE/LINK @@ -31535,24 +33970,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31561,8 +34008,78 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +# x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux +if test "$db_cv_mutex" = no; 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 () +{ + +#if (defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__) + exit(0); +#else + FAIL TO COMPILE/LINK +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + db_cv_mutex="x86_64/gcc-assembly" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi # S390/cc: IBM OS/390 Unix @@ -31589,24 +34106,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31615,8 +34144,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi # S390/gcc: Linux @@ -31643,24 +34174,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31669,11 +34212,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -# ia86/gcc: Linux +# ia64/gcc: Linux if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -31697,24 +34242,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31723,8 +34280,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi # uts/cc: UTS @@ -31751,24 +34310,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31777,8 +34348,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi # default to UNIX fcntl system call mutexes. @@ -31787,8 +34360,12 @@ if test "$db_cv_mutex" = no; then fi fi -echo "$as_me:$LINENO: result: $db_cv_mutex" >&5 -echo "${ECHO_T}$db_cv_mutex" >&6 +{ echo "$as_me:$LINENO: result: $db_cv_mutex" >&5 +echo "${ECHO_T}$db_cv_mutex" >&6; } + + + +db_threadid_t_decl=notset case "$db_cv_mutex" in 68K/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" @@ -31867,10 +34444,7 @@ _ACEOF ;; -POSIX/pthreads/library) LIBS="$LIBS -lpthread" - LIBJSO_LIBS="$LIBJSO_LIBS -lpthread" - LIBTSO_LIBS="$LIBTSO_LIBS -lpthread" - ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS" +POSIX/pthreads/library) ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS" cat >>confdefs.h <<\_ACEOF #define HAVE_MUTEX_PTHREADS 1 _ACEOF @@ -31878,9 +34452,6 @@ _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 @@ -31902,7 +34473,7 @@ _ACEOF ;; -ReliantUNIX/initspin) LIBS="$LIBS -lmproc" +ReliantUNIX/initspin) LIBSO_LIBS="$LIBSO_LIBS -lmproc" ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" cat >>confdefs.h <<\_ACEOF #define HAVE_MUTEX_RELIANTUNIX_INITSPIN 1 @@ -31966,7 +34537,6 @@ _ACEOF ;; - UI/threads) ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS" cat >>confdefs.h <<\_ACEOF #define HAVE_MUTEX_UI_THREADS 1 @@ -31974,8 +34544,7 @@ _ACEOF ;; -UI/threads/library) LIBS="$LIBS -lthread" - ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS" +UI/threads/library) ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS" cat >>confdefs.h <<\_ACEOF #define HAVE_MUTEX_UI_THREADS 1 _ACEOF @@ -32017,6 +34586,13 @@ _ACEOF ;; +MIPS/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" + cat >>confdefs.h <<\_ACEOF +#define HAVE_MUTEX_MIPS_GCC_ASSEMBLY 1 +_ACEOF + + +;; x86/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" cat >>confdefs.h <<\_ACEOF #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1 @@ -32024,6 +34600,13 @@ _ACEOF ;; +x86_64/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" + cat >>confdefs.h <<\_ACEOF +#define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1 +_ACEOF + + +;; UNIX/fcntl) { echo "$as_me:$LINENO: WARNING: NO FAST MUTEXES FOUND FOR THIS COMPILER/ARCHITECTURE." >&5 echo "$as_me: WARNING: NO FAST MUTEXES FOUND FOR THIS COMPILER/ARCHITECTURE." >&2;} ADDITIONAL_OBJS="mut_fcntl${o} $ADDITIONAL_OBJS" @@ -32038,13 +34621,527 @@ echo "$as_me: error: Unknown mutex interface: $db_cv_mutex" >&2;} { (exit 1); exit 1; }; };; esac -if test "$db_cv_mutex" != "UNIX/fcntl"; then +# The mutex selection may require specific declarations -- we fill in most of +# them above, but here are the common ones. +# +# The mutex selection may tell us what kind of thread package we're using, +# which we use to figure out the thread type. +# +# If we're configured for the POSIX pthread API, then force the thread ID type +# and include function, regardless of the mutex selection. Ditto for the +# (default) Solaris lwp mutexes, because they don't have a way to return the +# thread ID. +# +# 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. +# For that reason always add -lpthread if we're using pthread calls or mutexes +# and there's 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. +case "$db_cv_mutex" in +POSIX/pthread*|Solaris/lwp) + thread_h_decl="#include <pthread.h>" + db_threadid_t_decl="typedef pthread_t db_threadid_t;" + { 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 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pthread_main=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_pthread_main=no +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5 +echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6; } +if test $ac_cv_lib_pthread_main = yes; then + LIBSO_LIBS="$LIBSO_LIBS -lpthread" +fi +ac_cv_lib_pthread=ac_cv_lib_pthread_main +;; +UI/threads*) + thread_h_decl="#include <thread.h>" + db_threadid_t_decl="typedef thread_t db_threadid_t;" + { echo "$as_me:$LINENO: checking for main in -lthread" >&5 +echo $ECHO_N "checking for main in -lthread... $ECHO_C" >&6; } +if test "${ac_cv_lib_thread_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lthread $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_thread_main=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_thread_main=no +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_thread_main" >&5 +echo "${ECHO_T}$ac_cv_lib_thread_main" >&6; } +if test $ac_cv_lib_thread_main = yes; then + LIBSO_LIBS="$LIBSO_LIBS -lthread" +fi +ac_cv_lib_thread=ac_cv_lib_thread_main +;; +*) + if test "$db_cv_pthread_api" = "yes"; then + thread_h_decl="#include <pthread.h>" + db_threadid_t_decl="typedef pthread_t db_threadid_t;" + { 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 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pthread_main=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_pthread_main=no +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5 +echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6; } +if test $ac_cv_lib_pthread_main = yes; then + LIBSO_LIBS="$LIBSO_LIBS -lpthread" +fi +ac_cv_lib_pthread=ac_cv_lib_pthread_main + + fi;; +esac + +# We need to know if the thread ID type will fit into an integral type and we +# can compare it for equality and generally treat it like an int, or if it's a +# non-integral type and we have to treat it like a structure or other untyped +# block of bytes. For example, MVS typedef's pthread_t to a structure. + + +if test "$db_threadid_t_decl" = "notset"; then + db_threadid_t_decl="typedef uintmax_t db_threadid_t;" cat >>confdefs.h <<\_ACEOF -#define HAVE_MUTEX_THREADS 1 +#define HAVE_SIMPLE_THREAD_TYPE 1 +_ACEOF + +else + 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> + $thread_h_decl +int +main () +{ + + $db_threadid_t_decl + db_threadid_t a; + a = 0; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_SIMPLE_THREAD_TYPE 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +# If we're building replication and configured with POSIX pthreads or were +# told to build using the POSIX API, build the replication manager framework. +db_cv_build_replication_mgr="no" +if test "$db_cv_build_replication" = "yes"; then + + + case "$db_cv_mutex" in + POSIX/pthread*|Solaris/lwp) + db_cv_build_replication_mgr="yes";; + esac + if test "$db_cv_pthread_api" = "yes"; then + db_cv_build_replication_mgr="yes" + fi + + if test "$db_cv_build_replication_mgr" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_REPLICATION_THREADS 1 +_ACEOF + + + # Solaris requires the socket and nsl libraries to build the + # replication manager. Don't add nsl regardless of the OS, + # it causes RPC to fail on AIX 4.3.3. + case "$host_os" in + solaris*) + { echo "$as_me:$LINENO: checking for main in -lnsl" >&5 +echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6; } +if test "${ac_cv_lib_nsl_main+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. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_main=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_nsl_main=no +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6; } +if test $ac_cv_lib_nsl_main = yes; then + LIBSO_LIBS="$LIBSO_LIBS -lnsl" +fi +ac_cv_lib_nsl=ac_cv_lib_nsl_main + + { echo "$as_me:$LINENO: checking for main in -lsocket" >&5 +echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6; } +if test "${ac_cv_lib_socket_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_main=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_socket_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_main" >&6; } +if test $ac_cv_lib_socket_main = yes; then + LIBSO_LIBS="$LIBSO_LIBS -lsocket" +fi +ac_cv_lib_socket=ac_cv_lib_socket_main +;; + esac + fi fi # There are 3 classes of mutexes: @@ -32075,127 +35172,549 @@ _ACEOF ;; esac -# Checks for system functions for which we have replacements. +# Test for various functions/libraries -- do tests that change library values +# first. # -# XXX -# The only portable getcwd call is getcwd(char *, size_t), where the -# buffer is non-NULL -- Solaris can't handle a NULL buffer, and they -# deleted getwd(). +# The yield function on Solaris is almost certainly pthread_yield (LWP threads +# or POSIX pthreads), or thr_yield (UI threads). There's an outside chance it +# is sched_yield() though, only available in -lrt on Solaris. +# +# The Berkeley DB library calls fdatasync, only available in -lrt on Solaris. +# See if we can find either without additional libraries or in -lrt. If found +# in -lrt and we haven't yet added -lrt, add it to the shared library list. +{ 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 + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fdatasync (); +int +main () +{ +return fdatasync (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_fdatasync=$ac_res +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_fdatasync+set}" = set; then + break +fi +done +if test "${ac_cv_search_fdatasync+set}" = set; then + : +else + ac_cv_search_fdatasync=no +fi +rm conftest.$ac_ext +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; } +ac_res=$ac_cv_search_fdatasync +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + if test "$ac_cv_search_fdatasync" != "none required" ; then + LIBSO_LIBS="$LIBSO_LIBS -lrt"; + fi +else + { 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 +else + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sched_yield (); +int +main () +{ +return sched_yield (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_sched_yield=$ac_res +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -for ac_func in getcwd getopt memcmp memcpy memmove raise -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 +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_sched_yield+set}" = set; then + break +fi +done +if test "${ac_cv_search_sched_yield+set}" = set; then + : +else + ac_cv_search_sched_yield=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_search_sched_yield" >&5 +echo "${ECHO_T}$ac_cv_search_sched_yield" >&6; } +ac_res=$ac_cv_search_sched_yield +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + if test "$ac_cv_search_sched_yield" != "none required" ; then + LIBSO_LIBS="$LIBSO_LIBS -lrt"; + fi +fi + +fi + + +# !!! +# 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 echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* 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 +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_m_main=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -#undef $ac_func + ac_cv_lib_m_main=no +fi -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5 +echo "${ECHO_T}$ac_cv_lib_m_main" >&6; } +if test $ac_cv_lib_m_main = yes; then + TEST_LIBS="$TEST_LIBS -lm" +fi +ac_cv_lib_m=ac_cv_lib_m_main + +{ echo "$as_me:$LINENO: checking for main in -lnsl" >&5 +echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6; } +if test "${ac_cv_lib_nsl_main+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. */ + + +int +main () { -#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 +return main (); + ; + return 0; } -#endif +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_main=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_nsl_main=no +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6; } +if test $ac_cv_lib_nsl_main = yes; then + TEST_LIBS="$TEST_LIBS -lnsl" +fi +ac_cv_lib_nsl=ac_cv_lib_nsl_main + +{ 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 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + int main () { -return f != $ac_func; +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + ac_cv_lib_pthread_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + ac_cv_lib_pthread_main=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: `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 +{ 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 + TEST_LIBS="$TEST_LIBS -lpthread" +fi +ac_cv_lib_pthread=ac_cv_lib_pthread_main +{ echo "$as_me:$LINENO: checking for main in -lsocket" >&5 +echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6; } +if test "${ac_cv_lib_socket_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - 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" ;; + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_main=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_socket_main=no fi -done + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_main" >&6; } +if test $ac_cv_lib_socket_main = yes; then + TEST_LIBS="$TEST_LIBS -lsocket" +fi +ac_cv_lib_socket=ac_cv_lib_socket_main + + +# Update LIBS so that the rest of our tests are run with the libraries we'll +# load against. +LIBS="$LIBSO_LIBS" + +# Checks for system functions for which we have replacements. +# +# The only portable getcwd call is getcwd(char *, size_t), where the +# buffer is non-NULL -- Solaris can't handle a NULL buffer, and they +# deleted getwd(). + + + + + + + + + + + + @@ -32203,12 +35722,23 @@ done -for ac_func in strcasecmp strdup strerror strtol strtoul + + + + + + + + +for ac_func in \ + abort atoi atol getcwd getenv getopt isalpha isdigit isprint isspace\ + memcmp memcpy memmove printf raise rand strcasecmp strcat strchr\ + strdup strerror strncat strncmp strrchr strsep strtol strtoul 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 "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -32234,53 +35764,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $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) +#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 $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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -32289,25 +35825,25 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF else - case $LIBOBJS in - "$ac_func.$ac_objext" | \ - *" $ac_func.$ac_objext" | \ - "$ac_func.$ac_objext "* | \ + case " $LIBOBJS " in *" $ac_func.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; + *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + ;; esac fi @@ -32322,12 +35858,32 @@ done -for ac_func in _fstati64 clock_gettime directio fdatasync ftruncate getrusage + + + + + + + + + + + + + + + + +for ac_func in \ + _fstati64 clock_gettime directio fchmod fcntl fdatasync getaddrinfo\ + getrusage gettimeofday getuid mprotect pstat_getdynamic pthread_yield\ + sched_yield select sigaction snprintf stat strftime 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 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -32353,53 +35909,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $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) +#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 $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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -32408,13 +35970,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -32424,16 +35988,14 @@ fi done +# Replication can't run correctly if ftruncate isn't available. - - - -for ac_func in gettimeofday getuid pstat_getdynamic rand sched_yield +for ac_func in ftruncate 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 "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -32459,53 +36021,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $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) +#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 $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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -32514,13 +36082,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -32529,18 +36099,25 @@ _ACEOF fi done +if test \ + "$db_cv_build_replication" = "yes" -a "$ac_cv_func_ftruncate" = "no"; then + db_cv_build_replication=no + { echo "$as_me:$LINENO: WARNING: replication requires ftruncate, replication disabled." >&5 +echo "$as_me: WARNING: replication requires ftruncate, replication disabled." >&2;} +fi +# ctime_r -- +# +# There are two versions of ctime_r, one of which takes a buffer length as a +# third argument, and one which only takes two arguments. (There is also a +# difference in return values, but we handle that in the code itself.) - - - - -for ac_func in select snprintf srand sysconf vsnprintf yield +for ac_func in ctime_r 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 "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -32566,53 +36143,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $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) +#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 $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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -32621,13 +36204,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -32636,6 +36221,87 @@ _ACEOF fi done +if test "$ac_cv_func_ctime_r" = "yes"; then +{ echo "$as_me:$LINENO: checking for 2 or 3 argument version of ctime_r" >&5 +echo $ECHO_N "checking for 2 or 3 argument version of ctime_r... $ECHO_C" >&6; } +if test "${db_cv_ctime_r_3arg+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <time.h> +int +main () +{ + + ctime_r(NULL, NULL, 100); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + db_cv_ctime_r_3arg="3-argument" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + db_cv_ctime_r_3arg="2-argument" +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $db_cv_ctime_r_3arg" >&5 +echo "${ECHO_T}$db_cv_ctime_r_3arg" >&6; } +fi +if test "$db_cv_ctime_r_3arg" = "3-argument"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_CTIME_R_3ARG 1 +_ACEOF + + + +fi # Pread/pwrite. # HP-UX has pread/pwrite, but it doesn't work with largefile support. @@ -32650,9 +36316,9 @@ echo "$as_me: WARNING: pread/pwrite interfaces ignored on $host_os-$host_vendor. for ac_func in pread pwrite 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 "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -32678,53 +36344,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $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) +#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 $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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -32733,13 +36405,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -32751,8 +36425,8 @@ done esac # Check for fcntl(2) to deny child process access to file descriptors. -echo "$as_me:$LINENO: checking for fcntl/F_SETFD" >&5 -echo $ECHO_N "checking for fcntl/F_SETFD... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for fcntl/F_SETFD" >&5 +echo $ECHO_N "checking for fcntl/F_SETFD... $ECHO_C" >&6; } if test "${db_cv_fcntl_f_setfd+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32777,24 +36451,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -32803,13 +36489,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -db_cv_fcntl_f_setfd=no + db_cv_fcntl_f_setfd=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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 +{ echo "$as_me:$LINENO: result: $db_cv_fcntl_f_setfd" >&5 +echo "${ECHO_T}$db_cv_fcntl_f_setfd" >&6; } if test "$db_cv_fcntl_f_setfd" = "yes"; then cat >>confdefs.h <<\_ACEOF #define HAVE_FCNTL_F_SETFD 1 @@ -32821,12 +36508,10 @@ fi # A/UX has a broken getopt(3). case "$host_os" in -aux*) case $LIBOBJS in - "getopt.$ac_objext" | \ - *" getopt.$ac_objext" | \ - "getopt.$ac_objext "* | \ +aux*) case " $LIBOBJS " in *" getopt.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS getopt.$ac_objext" ;; + *) LIBOBJS="$LIBOBJS getopt.$ac_objext" + ;; esac ;; esac @@ -32835,8 +36520,8 @@ esac # 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 + { 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 @@ -32861,24 +36546,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -32887,13 +36584,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -db_cv_open_o_direct=no + db_cv_open_o_direct=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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 +{ echo "$as_me:$LINENO: result: $db_cv_open_o_direct" >&5 +echo "${ECHO_T}$db_cv_open_o_direct" >&6; } if test \ "$db_cv_o_direct" = "yes" -a "$db_cv_open_o_direct" = "yes"; then cat >>confdefs.h <<\_ACEOF @@ -32906,15 +36604,15 @@ _ACEOF fi # Check for largefile support. -# Check whether --enable-largefile or --disable-largefile was given. +# Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then - enableval="$enable_largefile" + enableval=$enable_largefile; +fi -fi; if test "$enable_largefile" != no; then - echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 +echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32922,8 +36620,8 @@ else if test "$GCC" != yes; then ac_save_CC=$CC 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. + # 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 /* confdefs.h. */ _ACEOF @@ -32947,25 +36645,37 @@ main () return 0; } _ACEOF - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -32974,28 +36684,42 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -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>conftest.er1 + +rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -33004,22 +36728,24 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext + +rm -f core conftest.err conftest.$ac_objext break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -33049,24 +36775,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -33075,8 +36813,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -33102,24 +36842,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -33128,13 +36880,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } if test "$ac_cv_sys_file_offset_bits" != no; then cat >>confdefs.h <<_ACEOF @@ -33143,8 +36897,8 @@ _ACEOF fi rm -f conftest* - echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 -echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 +echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -33174,24 +36928,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -33200,8 +36966,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -33227,24 +36995,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -33253,13 +37033,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -echo "${ECHO_T}$ac_cv_sys_large_files" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } if test "$ac_cv_sys_large_files" != no; then cat >>confdefs.h <<_ACEOF @@ -33293,9 +37075,9 @@ echo "$as_me: WARNING: mlock(2) interface ignored on $host_os-$host_vendor." >&2 for ac_func in mmap munmap 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 "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33321,53 +37103,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $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) +#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 $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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -33376,13 +37164,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -33403,9 +37193,9 @@ echo "$as_me: WARNING: mmap(2) interface ignored on $host_os-$host_vendor." >&2; for ac_func in mlock munlock 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 "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33431,53 +37221,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $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) +#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 $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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -33486,13 +37282,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -33506,9 +37304,9 @@ done for ac_func in mmap munmap 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 "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33534,53 +37332,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $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) +#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 $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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -33589,13 +37393,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -33623,9 +37429,9 @@ echo "$as_me: WARNING: shmget(2) interface ignored on $host_os-$host_vendor." >& for ac_func in shmget 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 "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33651,53 +37457,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $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) +#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 $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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -33706,13 +37518,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -33748,21 +37562,21 @@ _ACEOF # 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 + { 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: 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 + { 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: 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; }; } @@ -33785,8 +37599,8 @@ echo "$as_me: error: Unable to build RPC support: $RPCGEN failed." >&2;} < $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 + { 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"/' \ @@ -33802,7 +37616,6 @@ echo "${ECHO_T}yes" >&6 -e 's/^}/__dbsrv_timeout(0);}/' \ -e '}' \ -e '1,/^#include/s/^#include/#include "db_config.h"\ -#include "db_int_def.h"\ &/' > db_server_svc.c $RPCGEN -c $XDR_FILE | @@ -33814,10 +37627,9 @@ echo "${ECHO_T}yes" >&6 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 + # Solaris and HPUX need the nsl library to build RPC. + { 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 @@ -33844,53 +37656,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef svc_run -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char 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) +#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 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -33899,19 +37717,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_svc_run=no + ac_cv_func_svc_run=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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 +{ 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 "$as_me:$LINENO: checking for main in -lnsl" >&5 +echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6; } +if test "${ac_cv_lib_nsl_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -33923,234 +37742,70 @@ 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 main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_svc_run=yes + ac_cv_lib_nsl_main=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 + ac_cv_lib_nsl_main=no 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 \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_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" - +{ 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 + LIBSO_LIBS="$LIBSO_LIBS -lnsl" fi +ac_cv_lib_nsl=ac_cv_lib_nsl_main fi -;; - esac + fi @@ -34164,8 +37819,6 @@ echo "$as_me: error: Tcl requires shared libraries" >&2;} fi - - if test "${ac_cv_c_tclconfig+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -34206,16 +37859,16 @@ echo "$as_me: error: can't find Tcl configuration definitions" >&2;} 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 + { 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 + { 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 + { echo "$as_me:$LINENO: result: file not found" >&5 +echo "${ECHO_T}file not found" >&6; } fi # DB requires at least version 8.4. @@ -34226,12 +37879,11 @@ 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}" + # The eval is required to do substitution (for example, the TCL_DBGX + # substitution in the TCL_LIB_FILE variable. + eval "TCL_INCLUDE_SPEC=\"${TCL_INCLUDE_SPEC}\"" + eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\"" + eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\"" eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\"" # @@ -34252,12 +37904,9 @@ echo "$as_me: error: Berkeley DB requires Tcl version 8.4 or better." >&2;} - TCL_TCLSH="${TCL_PREFIX}/bin/tclsh${TCL_VERSION}" + 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)" @@ -34265,8 +37914,9 @@ 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 + { 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 have found 64-bit types to support sequences. If we don't @@ -34278,13 +37928,27 @@ echo $ECHO_N "checking for 64-bit integral type support for sequences... $ECHO_C db_cv_build_sequence="no" fi - # 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 + # Figure out what type is the right size, and set the format. + + + db_cv_seq_type="no" + if test "$db_cv_build_sequence" = "yes" -a\ + "$ac_cv_sizeof_long" -eq "8"; then + db_cv_seq_type="long" + db_cv_seq_fmt='"%ld"' + db_cv_seq_ufmt='"%lu"' + INT64_FMT='#define INT64_FMT "%ld"' + UINT64_FMT='#define UINT64_FMT "%lu"' + else if test "$db_cv_build_sequence" = "yes" -a\ + "$ac_cv_sizeof_long_long" -eq "8"; then + db_cv_seq_type="long long" + db_cv_seq_fmt='"%lld"' + db_cv_seq_ufmt='"%llu"' + INT64_FMT='#define INT64_FMT "%lld"' + UINT64_FMT='#define UINT64_FMT "%llu"' + else 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 @@ -34303,17 +37967,17 @@ int main () { - long long l; - unsigned long long u; - char buf100; + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf[100]; - buf0 = 'a'; + buf[0] = 'a'; l = 9223372036854775807LL; - (void)snprintf(buf, sizeof(buf), "%lld", l); + (void)snprintf(buf, sizeof(buf), $db_cv_seq_fmt, l); if (strcmp(buf, "9223372036854775807")) return (1); u = 18446744073709551615ULL; - (void)snprintf(buf, sizeof(buf), "%llu", u); + (void)snprintf(buf, sizeof(buf), $db_cv_seq_ufmt, u); if (strcmp(buf, "18446744073709551615")) return (1); return (0); @@ -34323,24 +37987,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -34349,9 +38025,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -db_cv_build_sequence="no" + db_cv_build_sequence="no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF @@ -34362,30 +38039,39 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ main() { - long long l; - unsigned long long u; + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; char buf[100]; buf[0] = 'a'; l = 9223372036854775807LL; - (void)snprintf(buf, sizeof(buf), "%lld", l); + (void)snprintf(buf, sizeof(buf), $db_cv_seq_fmt, l); if (strcmp(buf, "9223372036854775807")) return (1); u = 18446744073709551615ULL; - (void)snprintf(buf, sizeof(buf), "%llu", u); + (void)snprintf(buf, sizeof(buf), $db_cv_seq_ufmt, 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -34398,25 +38084,27 @@ 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 +rm -f core *.core core.conftest.* 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;"; + cat >>confdefs.h <<\_ACEOF +#define HAVE_64BIT_TYPES 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 + { echo "$as_me:$LINENO: result: $db_cv_build_sequence" >&5 +echo "${ECHO_T}$db_cv_build_sequence" >&6; } # Optional DB 1.85 compatibility API. @@ -34478,6 +38166,10 @@ _ACEOF ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(REP_OBJS)" + + if test "$db_cv_build_replication_mgr" = "yes"; then + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(REPMGR_OBJS)" + fi else ADDITIONAL_OBJS="$ADDITIONAL_OBJS rep_stub${o}" fi @@ -34519,6 +38211,12 @@ else CRYPTO_OBJS="crypto_stub${o}" fi +# If DIAGNOSTIC is defined, include the log print routines in the library +# itself, various diagnostic modes use them. +if test "$db_cv_diagnostic" = "yes"; then + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(PRINT_OBJS)" +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 @@ -34540,6 +38238,7 @@ LTLIBOBJS=`echo "$LIBOBJS" | CREATE_LIST="Makefile db_cxx.h:$srcdir/../dbinc/db_cxx.in db_int.h:$srcdir/../dbinc/db_int.in + clib_port.h:$srcdir/../dist/clib_port.h include.tcl:$srcdir/../test/include.tcl" # MinGW needs win_db.h. @@ -34583,7 +38282,7 @@ if test "$db_cv_compat185" = "yes"; then fi fi - ac_config_files="$ac_config_files $CREATE_LIST" +ac_config_files="$ac_config_files $CREATE_LIST" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -34603,39 +38302,58 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -34644,32 +38362,18 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - 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' + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -34707,11 +38411,35 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset @@ -34720,8 +38448,43 @@ else fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -34735,18 +38498,19 @@ do if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -34754,159 +38518,120 @@ fi # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -34915,7 +38640,19 @@ else as_mkdir_p=false fi -as_executable_p="test -f" +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" +else + as_executable_p=: +fi +rm -f conf$$.file # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -34924,31 +38661,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - exec 6>&1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to +# Save the log message, to keep $[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - -This file was extended by Berkeley DB $as_me 4.3.27, which was -generated by GNU Autoconf 2.59. Invocation command line was +# values after options handling. +ac_log=" +This file was extended by Berkeley DB $as_me 4.5.20, which was +generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -34956,30 +38676,19 @@ generated by GNU Autoconf 2.59. Invocation command line was CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF +cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi +config_files="$ac_config_files" +config_headers="$ac_config_headers" -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. @@ -35003,19 +38712,21 @@ Configuration headers: $config_headers Report bugs to <bug-autoconf@gnu.org>." -_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Berkeley DB config.status 4.3.27 -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +Berkeley DB config.status 4.5.20 +configured by $0, generated by GNU Autoconf 2.60, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -35026,39 +38737,24 @@ while test $# != 0 do case $1 in --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - -*) + *) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; esac case $ac_option in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift @@ -35068,18 +38764,24 @@ Try \`$0 --help' for more information." >&2;} $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + { echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; esac shift @@ -35095,29 +38797,43 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 - - - +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "$CREATE_LIST" ) CONFIG_FILES="$CONFIG_FILES $CREATE_LIST" ;; - "db_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS db_config.h:config.hin" ;; + case $ac_config_target in + "db_config.h") CONFIG_HEADERS="$CONFIG_HEADERS db_config.h:config.hin" ;; + "$CREATE_LIST") CONFIG_FILES="$CONFIG_FILES $CREATE_LIST" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -35128,678 +38844,660 @@ if $ac_need_defaults; then fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, +# simply because there is no reason against having it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } - # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - # -# CONFIG_FILES section. +# Set up the sed scripts for CONFIG_FILES section. # # No need to generate the scripts if there are no CONFIG_FILES. # This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@ADDITIONAL_INCS@,$ADDITIONAL_INCS,;t t -s,@ADDITIONAL_LANG@,$ADDITIONAL_LANG,;t t -s,@ADDITIONAL_OBJS@,$ADDITIONAL_OBJS,;t t -s,@ADDITIONAL_PROGS@,$ADDITIONAL_PROGS,;t t -s,@BUILD_TARGET@,$BUILD_TARGET,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@CONFIGURATION_ARGS@,$CONFIGURATION_ARGS,;t t -s,@CONFIGURATION_PATH@,$CONFIGURATION_PATH,;t t -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 -s,@INSTALL_LIBS@,$INSTALL_LIBS,;t t -s,@INSTALL_TARGET@,$INSTALL_TARGET,;t t -s,@JAR@,$JAR,;t t -s,@JAVACFLAGS@,$JAVACFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@LIBJSO_LIBS@,$LIBJSO_LIBS,;t t -s,@LIBSO_LIBS@,$LIBSO_LIBS,;t t -s,@LIBTOOL@,$LIBTOOL,;t t -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,@MAKEFILE_CC@,$MAKEFILE_CC,;t t -s,@MAKEFILE_CCLINK@,$MAKEFILE_CCLINK,;t t -s,@MAKEFILE_CXX@,$MAKEFILE_CXX,;t t -s,@MAKEFILE_CXXLINK@,$MAKEFILE_CXXLINK,;t t -s,@MAKEFILE_SOLINK@,$MAKEFILE_SOLINK,;t t -s,@MAKEFILE_XSOLINK@,$MAKEFILE_XSOLINK,;t t -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,@RPC_SERVER_H@,$RPC_SERVER_H,;t t -s,@SOFLAGS@,$SOFLAGS,;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 -s,@DB_VERSION_MINOR@,$DB_VERSION_MINOR,;t t -s,@DB_VERSION_PATCH@,$DB_VERSION_PATCH,;t t -s,@DB_VERSION_STRING@,$DB_VERSION_STRING,;t t -s,@DB_VERSION_UNIQUE_NAME@,$DB_VERSION_UNIQUE_NAME,;t t -s,@db_cv_path_ar@,$db_cv_path_ar,;t t -s,@ac_ct_db_cv_path_ar@,$ac_ct_db_cv_path_ar,;t t -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,@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 -s,@ac_ct_db_cv_path_mkdir@,$ac_ct_db_cv_path_mkdir,;t t -s,@path_ranlib@,$path_ranlib,;t t -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_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 -s,@path_strip@,$path_strip,;t t -s,@ac_ct_path_strip@,$ac_ct_path_strip,;t t -s,@db_cv_path_strip@,$db_cv_path_strip,;t t -s,@db_cv_path_kill@,$db_cv_path_kill,;t t -s,@ac_ct_db_cv_path_kill@,$ac_ct_db_cv_path_kill,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@db_cv_build_type@,$db_cv_build_type,;t t -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_CONST@,$DB_CONST,;t t -s,@CCC@,$CCC,;t t -s,@ac_ct_CCC@,$ac_ct_CCC,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@CXXCPP@,$CXXCPP,;t t -s,@cxx_have_stdheaders@,$cxx_have_stdheaders,;t t -s,@EGREP@,$EGREP,;t t -s,@LN_S@,$LN_S,;t t -s,@ECHO@,$ECHO,;t t -s,@AR@,$AR,;t t -s,@ac_ct_AR@,$ac_ct_AR,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@CPP@,$CPP,;t t -s,@F77@,$F77,;t t -s,@FFLAGS@,$FFLAGS,;t t -s,@ac_ct_F77@,$ac_ct_F77,;t t -s,@SOSUFFIX@,$SOSUFFIX,;t t -s,@MODSUFFIX@,$MODSUFFIX,;t t -s,@JMODSUFFIX@,$JMODSUFFIX,;t t -s,@JAVAC@,$JAVAC,;t t -s,@JAVA@,$JAVA,;t t -s,@uudecode@,$uudecode,;t t -s,@_ACJNI_JAVAC@,$_ACJNI_JAVAC,;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 -s,@u_long_decl@,$u_long_decl,;t t -s,@u_int8_decl@,$u_int8_decl,;t t -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,@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 - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat +if test -n "$CONFIG_FILES"; then + +_ACEOF + + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +ADDITIONAL_INCS!$ADDITIONAL_INCS$ac_delim +ADDITIONAL_LANG!$ADDITIONAL_LANG$ac_delim +ADDITIONAL_OBJS!$ADDITIONAL_OBJS$ac_delim +ADDITIONAL_PROGS!$ADDITIONAL_PROGS$ac_delim +BUILD_TARGET!$BUILD_TARGET$ac_delim +CFLAGS!$CFLAGS$ac_delim +CONFIGURATION_ARGS!$CONFIGURATION_ARGS$ac_delim +CONFIGURATION_PATH!$CONFIGURATION_PATH$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +CRYPTO_OBJS!$CRYPTO_OBJS$ac_delim +CXX!$CXX$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +DB_PROTO1!$DB_PROTO1$ac_delim +DB_PROTO2!$DB_PROTO2$ac_delim +DEFAULT_LIB!$DEFAULT_LIB$ac_delim +DEFAULT_LIB_CXX!$DEFAULT_LIB_CXX$ac_delim +INSTALLER!$INSTALLER$ac_delim +INSTALL_LIBS!$INSTALL_LIBS$ac_delim +INSTALL_TARGET!$INSTALL_TARGET$ac_delim +JAR!$JAR$ac_delim +JAVACFLAGS!$JAVACFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +LIBCSO_LIBS!$LIBCSO_LIBS$ac_delim +LIBJSO_LIBS!$LIBJSO_LIBS$ac_delim +LIBSO_LIBS!$LIBSO_LIBS$ac_delim +LIBTOOL!$LIBTOOL$ac_delim +LIBTSO_LIBS!$LIBTSO_LIBS$ac_delim +LIBTSO_MODSUFFIX!$LIBTSO_MODSUFFIX$ac_delim +LIBTSO_MODULE!$LIBTSO_MODULE$ac_delim +LIBXSO_LIBS!$LIBXSO_LIBS$ac_delim +MAKEFILE_CC!$MAKEFILE_CC$ac_delim +MAKEFILE_CCLINK!$MAKEFILE_CCLINK$ac_delim +MAKEFILE_CXX!$MAKEFILE_CXX$ac_delim +MAKEFILE_CXXLINK!$MAKEFILE_CXXLINK$ac_delim +MAKEFILE_SOLINK!$MAKEFILE_SOLINK$ac_delim +MAKEFILE_XSOLINK!$MAKEFILE_XSOLINK$ac_delim +OSDIR!$OSDIR$ac_delim +POSTLINK!$POSTLINK$ac_delim +REPLACEMENT_OBJS!$REPLACEMENT_OBJS$ac_delim +RPC_CLIENT_OBJS!$RPC_CLIENT_OBJS$ac_delim +RPC_SERVER_H!$RPC_SERVER_H$ac_delim +SOFLAGS!$SOFLAGS$ac_delim +SWIGCFLAGS!$SWIGCFLAGS$ac_delim +TEST_LIBS!$TEST_LIBS$ac_delim +db_int_def!$db_int_def$ac_delim +o!$o$ac_delim +platform_header!$platform_header$ac_delim +platform_footer!$platform_footer$ac_delim +DB_VERSION_MAJOR!$DB_VERSION_MAJOR$ac_delim +DB_VERSION_MINOR!$DB_VERSION_MINOR$ac_delim +DB_VERSION_PATCH!$DB_VERSION_PATCH$ac_delim +DB_VERSION_STRING!$DB_VERSION_STRING$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -fi # test -n "$CONFIG_FILES" +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS <conf$$subs.sed +rm -f conf$$subs.sed +cat >>$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +DB_VERSION_UNIQUE_NAME!$DB_VERSION_UNIQUE_NAME$ac_delim +AR!$AR$ac_delim +CHMOD!$CHMOD$ac_delim +CP!$CP$ac_delim +KILL!$KILL$ac_delim +LN!$LN$ac_delim +MKDIR!$MKDIR$ac_delim +RANLIB!$RANLIB$ac_delim +RM!$RM$ac_delim +RPCGEN!$RPCGEN$ac_delim +db_cv_path_sh!$db_cv_path_sh$ac_delim +STRIP!$STRIP$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +CC!$CC$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +DB_CONST!$DB_CONST$ac_delim +CCC!$CCC$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim +CXXCPP!$CXXCPP$ac_delim +cxx_have_stdheaders!$cxx_have_stdheaders$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +LN_S!$LN_S$ac_delim +ECHO!$ECHO$ac_delim +CPP!$CPP$ac_delim +F77!$F77$ac_delim +FFLAGS!$FFLAGS$ac_delim +ac_ct_F77!$ac_ct_F77$ac_delim +SOSUFFIX!$SOSUFFIX$ac_delim +MODSUFFIX!$MODSUFFIX$ac_delim +JMODSUFFIX!$JMODSUFFIX$ac_delim +JAVAC!$JAVAC$ac_delim +JAVA!$JAVA$ac_delim +uudecode!$uudecode$ac_delim +_ACJNI_JAVAC!$_ACJNI_JAVAC$ac_delim +inttypes_h_decl!$inttypes_h_decl$ac_delim +stdint_h_decl!$stdint_h_decl$ac_delim +stddef_h_decl!$stddef_h_decl$ac_delim +unistd_h_decl!$unistd_h_decl$ac_delim +u_char_decl!$u_char_decl$ac_delim +u_short_decl!$u_short_decl$ac_delim +u_int_decl!$u_int_decl$ac_delim +u_long_decl!$u_long_decl$ac_delim +u_int8_decl!$u_int8_decl$ac_delim +u_int16_decl!$u_int16_decl$ac_delim +int16_decl!$int16_decl$ac_delim +u_int32_decl!$u_int32_decl$ac_delim +int32_decl!$int32_decl$ac_delim +u_int64_decl!$u_int64_decl$ac_delim +int64_decl!$int64_decl$ac_delim +ssize_t_decl!$ssize_t_decl$ac_delim +pid_t_decl!$pid_t_decl$ac_delim +uintmax_t_decl!$uintmax_t_decl$ac_delim +uintptr_t_decl!$uintptr_t_decl$ac_delim +thread_h_decl!$thread_h_decl$ac_delim +db_threadid_t_decl!$db_threadid_t_decl$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim +TCL_INCLUDE_SPEC!$TCL_INCLUDE_SPEC$ac_delim +TCL_LIB_FILE!$TCL_LIB_FILE$ac_delim +TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim +TCL_TCLSH!$TCL_TCLSH$ac_delim +INT64_FMT!$INT64_FMT$ac_delim +UINT64_FMT!$UINT64_FMT$ac_delim +db_seq_decl!$db_seq_decl$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS <conf$$subs.sed +rm -f conf$$subs.sed +cat >>$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof _ACEOF + + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; +fi # test -n "$CONFIG_FILES" + + +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; esac - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# 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 $ac_mode in + :F) + # + # CONFIG_FILE + # case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac +_ACEOF - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# 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_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} + + rm -f "$tmp/stdin" case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; esac + ;; + :H) + # + # CONFIG_HEADER + # +_ACEOF - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # 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 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -_ACEOF - -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -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 -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed - -# This sed command replaces #undef with comments. This is necessary, for +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +# NAME is the cpp macro being defined, VALUE is the value it is being given. +# PARAMS is the parameter list in the macro definition--in most cases, it's +# just an empty string. +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +ac_dB='\\)[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' + +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines + +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -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 there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines + +# Break up conftest.defines: +ac_max_sed_lines=50 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' + +while : do - # Write a 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 - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def +_ACEOF + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break rm -f conftest.defines mv conftest.tail conftest.defines done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs 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 #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -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 - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs +rm -f conftest.defines conftest.tail +echo "ac_result=$ac_in" >>$CONFIG_STATUS cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - 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 || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - rm -f $ac_file - mv $tmp/config.h $ac_file + mv "$tmp/config.h" $ac_file fi else - cat $tmp/config.h - rm -f $tmp/config.h + echo "/* $configure_input */" + cat "$ac_result" fi -done -_ACEOF + rm -f "$tmp/out12" + ;; + + + esac + +done # for ac_tag -cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF diff --git a/db/dist/configure.ac b/db/dist/configure.ac index 8106d51d0..592fb5511 100644 --- a/db/dist/configure.ac +++ b/db/dist/configure.ac @@ -1,9 +1,10 @@ -# $Id: configure.ac,v 11.221 2004/11/16 01:07:57 mjc Exp $ +# $Id: configure.ac,v 12.46 2006/09/19 00:33:58 bostic Exp $ # Process this file with autoconf to produce a configure script. PACKAGE=db -AC_INIT(Berkeley DB, - __EDIT_DB_VERSION__, support@sleepycat.com, db-__EDIT_DB_VERSION__) +AC_INIT(Berkeley DB, __EDIT_DB_VERSION__, + [Oracle Technology Network Berkeley DB forum], + db-__EDIT_DB_VERSION__) AC_CONFIG_SRCDIR([../db/db.c]) AC_CONFIG_HEADERS([db_config.h:config.hin]) @@ -15,8 +16,11 @@ AC_ARG_PROGRAM() AC_MSG_CHECKING(if building in the top-level or dist directories) if [ test -d db_archive -o -f configure.ac ] ; then AC_MSG_RESULT(yes) - AC_MSG_ERROR( - [Berkeley DB should not be built in the top-level or dist directories.]) + AC_MSG_ERROR([\ +Berkeley DB should not be built in the top-level or "dist" directories. \ +Change directory to the build_unix directory and run ../dist/configure \ +from there.]) + fi AC_MSG_RESULT(no) @@ -43,6 +47,7 @@ AC_SUBST(INSTALL_TARGET) AC_SUBST(JAR) AC_SUBST(JAVACFLAGS) AC_SUBST(LDFLAGS) +AC_SUBST(LIBCSO_LIBS) AC_SUBST(LIBJSO_LIBS) AC_SUBST(LIBS) AC_SUBST(LIBSO_LIBS) @@ -64,10 +69,15 @@ AC_SUBST(REPLACEMENT_OBJS) AC_SUBST(RPC_CLIENT_OBJS) AC_SUBST(RPC_SERVER_H) AC_SUBST(SOFLAGS) +AC_SUBST(SWIGCFLAGS) AC_SUBST(TEST_LIBS) AC_SUBST(db_int_def) AC_SUBST(o) +# The Windows public header has two extra symbols we need to remove. +AC_SUBST(platform_header) +AC_SUBST(platform_footer) + # Set the default installation location. AC_PREFIX_DEFAULT(/usr/local/BerkeleyDB.__EDIT_DB_VERSION_MAJOR__.__EDIT_DB_VERSION_MINOR__) @@ -134,15 +144,15 @@ INSTALL_TARGET="library_install" # because the makefile CC may be set to use $(LIBTOOL). # # Don't override anything if it's already set from the environment. -optimize_def="-O" +optimize_debug="-O" case "$host_os" in aix4.3.*|aix5*) - optimize_def="-O2" + optimize_debug="-O2" CC=${CC-"xlc_r"} CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" LDFLAGS="$LDFLAGS -Wl,-brtl";; bsdi3*) CC=${CC-"shlicc2"} - LIBS="$LIBS -lipc";; + LIBSO_LIBS="$LIBSO_LIBS -lipc";; cygwin*) CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; freebsd*) @@ -151,50 +161,53 @@ freebsd*) gnu*|k*bsd*-gnu|linux*) CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; hpux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT";; -irix*) optimize_def="-O2" +irix*) optimize_debug="-O2" CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";; mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE" - LIBS="$LIBS -lsocket -lsvipc";; + LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";; osf*) CPPFLAGS="$CPPFLAGS -pthread";; *qnx*) AC_DEFINE(HAVE_QNX) AH_TEMPLATE(HAVE_QNX, [Define to 1 if building on QNX.]);; solaris*) - CPPFLAGS="$CPPFLAGS -D_REENTRANT";; + CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS ";; esac -# Set CFLAGS/CXXFLAGS. We MUST set the flags before we call autoconf -# compiler configuration macros, because if we don't, they set CFLAGS -# to no optimization and -g, which isn't what we want. -CFLAGS=${CFLAGS-$optimize_def} -CXXFLAGS=${CXXFLAGS-"$CFLAGS"} - -# If the user wants a debugging environment, add -g to the CFLAGS value. -# -# XXX -# Some compilers can't mix optimizing and debug flags. The only way to -# handle this is to specify CFLAGS in the environment before configuring. +# If the user wants a debugging environment, change any compiler optimization +# flags to -g. We used to add -g to the -O compiler flags, but compilers are +# good enough at code re-organization that debugging with -O no longer works. +# If you want to compile with a different set of flags, specify CFLAGS in the +# environment before configuring. if test "$db_cv_debug" = "yes"; then AC_DEFINE(DEBUG) AH_TEMPLATE(DEBUG, [Define to 1 if you want a debugging version.]) - CFLAGS="$CFLAGS -g" - CXXFLAGS="$CXXFLAGS -g" - db_cv_build_type=debug -else - db_cv_build_type=release + optimize_debug="-g" fi -AC_SUBST(db_cv_build_type) + +# Set CFLAGS/CXXFLAGS. We MUST set the flags before we call autoconf +# compiler configuration macros, because if we don't, they set CFLAGS +# to no optimization and -g, which isn't what we want. +CFLAGS=${CFLAGS-$optimize_debug} +CXXFLAGS=${CXXFLAGS-"$CFLAGS"} # The default compiler is cc (NOT gcc), the default CFLAGS is as specified # above, NOT what is set by AC_PROG_CC, as it won't set optimization flags # for any compiler other than gcc. AC_PROG_CC(cc gcc) -# Set specific per-compiler flags. +# We know what compiler we're going to use, now. Set per-compiler flags. if test "$GCC" = "yes"; then - # We want -O2 if we're using gcc. + # Use -O3 if we're using gcc, unless we're doing a small build, in + # which case we use -Os alone. The code size for -O3 is quite a + # bit larger than -O2: a compromise is "-Os -finline-functions", + # it's smaller and explicitly inlining the functions helps Berkeley + # DB. CFLAGS="$CFLAGS " - CFLAGS=`echo "$CFLAGS" | sed 's/-O /-O2 /g'` + if test "$db_cv_smallbuild" = "yes"; then + CFLAGS=`echo "$CFLAGS" | sed 's/-O /-Os /g'` + else + CFLAGS=`echo "$CFLAGS" | sed 's/-O /-O3 /g'` + fi else case "$host_os" in hpux11.0*) ;; @@ -239,7 +252,7 @@ if test "$db_cv_cxx" = "yes"; then case "$host_os" in aix*) AC_CHECK_TOOL(CCC, xlC_r) LIBXSO_LIBS="-lC_r $LIBXSO_LIBS" - LIBS="-lC_r $LIBS";; + LIBSO_LIBS="-lC_r $LIBSO_LIBS";; hpux*) AC_CHECK_TOOL(CCC, aCC);; irix*) AC_CHECK_TOOL(CCC, CC);; osf*) AC_CHECK_TOOL(CCC, cxx);; @@ -330,7 +343,7 @@ case "$host_os" in ;; *) LIBTSO_MODULE="-module" - LIBTSO_MODSUFFIX=@MODSUFFIX@ + LIBTSO_MODSUFFIX=$MODSUFFIX ;; esac @@ -393,6 +406,14 @@ if test "$db_cv_java" = "yes"; then AC_MSG_ERROR([Java version 1.3 or higher required, got $JAVA_VERSION]) ;; esac + # Because of the code that SWIG generates to cast between pointers and + # integers, we need to add the flag "-fno-strict-aliasing" to the gcc + # command line when compiling the JNI code. This is documented in + # [#14953] and at http://www.swig.org/Doc1.3/Java.html + if test ${GCC} = "yes"; then + SWIGCFLAGS="-fno-strict-aliasing" + fi + for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS do CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR" @@ -406,7 +427,7 @@ fi # MinGW support. if test "$db_cv_mingw" = "yes"; then - OSDIR=os_win32 + OSDIR=os_windows PATH_SEPARATOR="\\\\/:" AC_DEFINE(DB_WIN32) @@ -433,58 +454,84 @@ if test "$db_cv_exit_defines" = "yes"; then [Define to 1 if you have EXIT_SUCCESS/EXIT_FAILURE #defines.]) fi +# Check for mutexes. +# We do this first because it changes $LIBSO_LIBS. +AM_DEFINE_MUTEXES + # 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. +# The yield function on Solaris is almost certainly pthread_yield (LWP threads +# or POSIX pthreads), or thr_yield (UI threads). There's an outside chance it +# is sched_yield() though, only available in -lrt on Solaris. +# +# The Berkeley DB library calls fdatasync, only available in -lrt on Solaris. +# See if we can find either without additional libraries or in -lrt. If found +# in -lrt and we haven't yet added -lrt, add it to the shared library list. AC_SEARCH_LIBS(fdatasync, rt, [dnl if test "$ac_cv_search_fdatasync" != "none required" ; then - LIBJSO_LIBS="$LIBJSO_LIBS -lrt"; - LIBSO_LIBS="$LIBSO_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 -# 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") + LIBSO_LIBS="$LIBSO_LIBS -lrt"; + fi], [dnl + AC_SEARCH_LIBS(sched_yield, rt, [dnl + if test "$ac_cv_search_sched_yield" != "none required" ; then + LIBSO_LIBS="$LIBSO_LIBS -lrt"; + fi])]) # !!! # 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") +AC_HAVE_LIBRARY(pthread, TEST_LIBS="$TEST_LIBS -lpthread") +AC_HAVE_LIBRARY(socket, TEST_LIBS="$TEST_LIBS -lsocket") -# Check for mutexes. -# We do this here because it changes $LIBS. -AM_DEFINE_MUTEXES +# Update LIBS so that the rest of our tests are run with the libraries we'll +# load against. +LIBS="$LIBSO_LIBS" # Checks for system functions for which we have replacements. # -# XXX # The only portable getcwd call is getcwd(char *, size_t), where the # 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(strcasecmp strdup strerror strtol strtoul) +AC_REPLACE_FUNCS(\ + abort atoi atol getcwd getenv getopt isalpha isdigit isprint isspace\ + memcmp memcpy memmove printf raise rand strcasecmp strcat strchr\ + strdup strerror strncat strncmp strrchr strsep strtol strtoul) # Check for system functions we optionally use. -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 sysconf vsnprintf yield) +AC_CHECK_FUNCS(\ + _fstati64 clock_gettime directio fchmod fcntl fdatasync getaddrinfo\ + getrusage gettimeofday getuid mprotect pstat_getdynamic pthread_yield\ + sched_yield select sigaction snprintf stat strftime sysconf vsnprintf\ + yield) + +# Replication can't run correctly if ftruncate isn't available. +AC_CHECK_FUNCS(ftruncate) +if test \ + "$db_cv_build_replication" = "yes" -a "$ac_cv_func_ftruncate" = "no"; then + db_cv_build_replication=no + AC_MSG_WARN([replication requires ftruncate, replication disabled.]) +fi + +# ctime_r -- +# +# There are two versions of ctime_r, one of which takes a buffer length as a +# third argument, and one which only takes two arguments. (There is also a +# difference in return values, but we handle that in the code itself.) +AC_CHECK_FUNCS(ctime_r) +if test "$ac_cv_func_ctime_r" = "yes"; then +AC_CACHE_CHECK([for 2 or 3 argument version of ctime_r], db_cv_ctime_r_3arg, [ +AC_TRY_LINK([ +#include <time.h>], [ + ctime_r(NULL, NULL, 100); +], [db_cv_ctime_r_3arg="3-argument"], [db_cv_ctime_r_3arg="2-argument"])]) +fi +if test "$db_cv_ctime_r_3arg" = "3-argument"; then + AC_DEFINE(HAVE_CTIME_R_3ARG) + AH_TEMPLATE(HAVE_CTIME_R_3ARG, + [Define to 1 if ctime_r takes a buffer length as a third argument.]) +fi # Pread/pwrite. # HP-UX has pread/pwrite, but it doesn't work with largefile support. @@ -640,6 +687,10 @@ if test "$db_cv_build_replication" = "yes"; then AH_TEMPLATE(HAVE_REPLICATION, [Define to 1 if building replication support.]) ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(REP_OBJS)" + + if test "$db_cv_build_replication_mgr" = "yes"; then + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(REPMGR_OBJS)" + fi else ADDITIONAL_OBJS="$ADDITIONAL_OBJS rep_stub${o}" fi @@ -672,6 +723,12 @@ else CRYPTO_OBJS="crypto_stub${o}" fi +# If DIAGNOSTIC is defined, include the log print routines in the library +# itself, various diagnostic modes use them. +if test "$db_cv_diagnostic" = "yes"; then + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(PRINT_OBJS)" +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 @@ -693,6 +750,7 @@ AC_SUBST(LTLIBOBJS) CREATE_LIST="Makefile db_cxx.h:$srcdir/../dbinc/db_cxx.in db_int.h:$srcdir/../dbinc/db_int.in + clib_port.h:$srcdir/../dist/clib_port.h include.tcl:$srcdir/../test/include.tcl" # MinGW needs win_db.h. diff --git a/db/dist/errno.h b/db/dist/errno.h new file mode 100644 index 000000000..ae5bc88c8 --- /dev/null +++ b/db/dist/errno.h @@ -0,0 +1,186 @@ +/*- + * Copyright (c) 1982, 1986, 1989, 1993 + * The Regents of the University of California. All rights reserved. + * (c) UNIX System Laboratories, Inc. + * All or some portions of this file are derived from material licensed + * to the University of California by American Telephone and Telegraph + * Co. or Unix System Laboratories, Inc. and are reproduced herein with + * the permission of UNIX System Laboratories, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)errno.h 8.5 (Berkeley) 1/21/94 + * FreeBSD: /repoman/r/ncvs/src/sys/sys/errno.h,v 1.28 2005/04/02 12:33:28 das Exp $ + * + * $Id: errno.h,v 1.2 2006/06/11 16:13:13 bostic Exp $ + */ + +#ifndef _SYS_ERRNO_H_ +#define _SYS_ERRNO_H_ + +#undef errno +#define errno __db_errno +extern int __db_errno; + +#define EPERM 1 /* Operation not permitted */ +#define ENOENT 2 /* No such file or directory */ +#define ESRCH 3 /* No such process */ +#define EINTR 4 /* Interrupted system call */ +#define EIO 5 /* Input/output error */ +#define ENXIO 6 /* Device not configured */ +#define E2BIG 7 /* Argument list too long */ +#define ENOEXEC 8 /* Exec format error */ +#define EBADF 9 /* Bad file descriptor */ +#define ECHILD 10 /* No child processes */ +#define EDEADLK 11 /* Resource deadlock avoided */ + /* 11 was EAGAIN */ +#define ENOMEM 12 /* Cannot allocate memory */ +#define EACCES 13 /* Permission denied */ +#define EFAULT 14 /* Bad address */ +#ifndef _POSIX_SOURCE +#define ENOTBLK 15 /* Block device required */ +#endif +#define EBUSY 16 /* Device busy */ +#define EEXIST 17 /* File exists */ +#define EXDEV 18 /* Cross-device link */ +#define ENODEV 19 /* Operation not supported by device */ +#define ENOTDIR 20 /* Not a directory */ +#define EISDIR 21 /* Is a directory */ +#define EINVAL 22 /* Invalid argument */ +#define ENFILE 23 /* Too many open files in system */ +#define EMFILE 24 /* Too many open files */ +#define ENOTTY 25 /* Inappropriate ioctl for device */ +#ifndef _POSIX_SOURCE +#define ETXTBSY 26 /* Text file busy */ +#endif +#define EFBIG 27 /* File too large */ +#define ENOSPC 28 /* No space left on device */ +#define ESPIPE 29 /* Illegal seek */ +#define EROFS 30 /* Read-only filesystem */ +#define EMLINK 31 /* Too many links */ +#define EPIPE 32 /* Broken pipe */ + +/* math software */ +#define EDOM 33 /* Numerical argument out of domain */ +#define ERANGE 34 /* Result too large */ + +/* non-blocking and interrupt i/o */ +#define EAGAIN 35 /* Resource temporarily unavailable */ +#ifndef _POSIX_SOURCE +#define EWOULDBLOCK EAGAIN /* Operation would block */ +#define EINPROGRESS 36 /* Operation now in progress */ +#define EALREADY 37 /* Operation already in progress */ + +/* ipc/network software -- argument errors */ +#define ENOTSOCK 38 /* Socket operation on non-socket */ +#define EDESTADDRREQ 39 /* Destination address required */ +#define EMSGSIZE 40 /* Message too long */ +#define EPROTOTYPE 41 /* Protocol wrong type for socket */ +#define ENOPROTOOPT 42 /* Protocol not available */ +#define EPROTONOSUPPORT 43 /* Protocol not supported */ +#define ESOCKTNOSUPPORT 44 /* Socket type not supported */ +#define EOPNOTSUPP 45 /* Operation not supported */ +#define ENOTSUP EOPNOTSUPP /* Operation not supported */ +#define EPFNOSUPPORT 46 /* Protocol family not supported */ +#define EAFNOSUPPORT 47 /* Address family not supported by protocol family */ +#define EADDRINUSE 48 /* Address already in use */ +#define EADDRNOTAVAIL 49 /* Can't assign requested address */ + +/* ipc/network software -- operational errors */ +#define ENETDOWN 50 /* Network is down */ +#define ENETUNREACH 51 /* Network is unreachable */ +#define ENETRESET 52 /* Network dropped connection on reset */ +#define ECONNABORTED 53 /* Software caused connection abort */ +#define ECONNRESET 54 /* Connection reset by peer */ +#define ENOBUFS 55 /* No buffer space available */ +#define EISCONN 56 /* Socket is already connected */ +#define ENOTCONN 57 /* Socket is not connected */ +#define ESHUTDOWN 58 /* Can't send after socket shutdown */ +#define ETOOMANYREFS 59 /* Too many references: can't splice */ +#define ETIMEDOUT 60 /* Operation timed out */ +#define ECONNREFUSED 61 /* Connection refused */ + +#define ELOOP 62 /* Too many levels of symbolic links */ +#endif /* _POSIX_SOURCE */ +#define ENAMETOOLONG 63 /* File name too long */ + +/* should be rearranged */ +#ifndef _POSIX_SOURCE +#define EHOSTDOWN 64 /* Host is down */ +#define EHOSTUNREACH 65 /* No route to host */ +#endif /* _POSIX_SOURCE */ +#define ENOTEMPTY 66 /* Directory not empty */ + +/* quotas & mush */ +#ifndef _POSIX_SOURCE +#define EPROCLIM 67 /* Too many processes */ +#define EUSERS 68 /* Too many users */ +#define EDQUOT 69 /* Disc quota exceeded */ + +/* Network File System */ +#define ESTALE 70 /* Stale NFS file handle */ +#define EREMOTE 71 /* Too many levels of remote in path */ +#define EBADRPC 72 /* RPC struct is bad */ +#define ERPCMISMATCH 73 /* RPC version wrong */ +#define EPROGUNAVAIL 74 /* RPC prog. not avail */ +#define EPROGMISMATCH 75 /* Program version wrong */ +#define EPROCUNAVAIL 76 /* Bad procedure for program */ +#endif /* _POSIX_SOURCE */ + +#define ENOLCK 77 /* No locks available */ +#define ENOSYS 78 /* Function not implemented */ + +#ifndef _POSIX_SOURCE +#define EFTYPE 79 /* Inappropriate file type or format */ +#define EAUTH 80 /* Authentication error */ +#define ENEEDAUTH 81 /* Need authenticator */ +#define EIDRM 82 /* Identifier removed */ +#define ENOMSG 83 /* No message of desired type */ +#define EOVERFLOW 84 /* Value too large to be stored in data type */ +#define ECANCELED 85 /* Operation canceled */ +#define EILSEQ 86 /* Illegal byte sequence */ +#define ENOATTR 87 /* Attribute not found */ + +#define EDOOFUS 88 /* Programming error */ +#endif /* _POSIX_SOURCE */ + +#define EBADMSG 89 /* Bad message */ +#define EMULTIHOP 90 /* Multihop attempted */ +#define ENOLINK 91 /* Link has been severed */ +#define EPROTO 92 /* Protocol error */ + +#ifndef _POSIX_SOURCE +#define ELAST 92 /* Must be equal largest errno */ +#endif /* _POSIX_SOURCE */ + +#ifdef _KERNEL +/* pseudo-errors returned inside kernel to modify return to process */ +#define ERESTART (-1) /* restart syscall */ +#define EJUSTRETURN (-2) /* don't modify regs, just return */ +#define ENOIOCTL (-3) /* ioctl not handled by this layer */ +#define EDIRIOCTL (-4) /* do direct ioctl in GEOM */ +#endif + +#endif diff --git a/db/dist/gen_inc.awk b/db/dist/gen_inc.awk index d48d02bb1..3d631d17c 100644 --- a/db/dist/gen_inc.awk +++ b/db/dist/gen_inc.awk @@ -5,7 +5,7 @@ # PUBLIC lines are put into two versions of per-directory include files: # one file that contains the prototypes, and one file that contains a # #define for the name to be processed during configuration when creating -# unique names for every global symbol in the DB library. +# unique names for every global C-language symbol in the DB library. # # The EXTERN lines are put into two files: one of which contains prototypes # which are always appended to the db.h file, and one of which contains a @@ -37,20 +37,6 @@ } } -# When we switched to methods in 4.0, we guessed txn_{abort,begin,commit} -# were the interfaces applications would likely use and not be willing to -# change, due to the sheer volume of the calls. Provide wrappers -- we -# could do txn_abort and txn_commit using macros, but not txn_begin, as -# the name of the field is txn_begin, we didn't want to modify it. -# -# The issue with txn_begin hits us in another way. If configured with the -# --with-uniquename option, we use #defines to re-define DB's interfaces -# to unique names. We can't do that for these functions because txn_begin -# is also a field name in the DB_ENV structure, and the #defines we use go -# at the end of the db.h file -- we get control too late to #define a field -# name. So, modify the script that generates the unique names #defines to -# not generate them for these three functions, and don't include the three -# functions in libraries built with that configuration option. /EXTERN:/ { sub("^.*EXTERN:[ ][ ]*", "") if ($0 ~ "^#if|^#ifdef|^#ifndef|^#else|^#endif") { @@ -62,7 +48,7 @@ if (eline ~ "\\)\\);") { sub("^[ ]*", "", eline) print eline >> e_pfile - if (eline !~ db_version_unique_name && eline !~ "^int txn_") { + if (eline !~ db_version_unique_name) { gsub("[ ][ ]*__P.*", "", eline) sub("^.*[ ][*]*", "", eline) printf("#define %s %s@DB_VERSION_UNIQUE_NAME@\n", diff --git a/db/dist/gen_rec.awk b/db/dist/gen_rec.awk index 001ec65f0..a8f1f01f3 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-2004 -# Sleepycat Software. All rights reserved. +# Copyright (c) 1996-2006 +# Oracle Corporation. All rights reserved. # -# $Id: gen_rec.awk,v 11.110 2004/10/20 20:40:58 bostic Exp $ +# $Id: gen_rec.awk,v 12.22 2006/09/14 15:00:47 bostic Exp $ # # This awk script generates all the log, print, and read routines for the DB @@ -89,10 +89,6 @@ BEGIN { # Write recovery template file headers # This assumes we're doing DB recovery. printf("#include \"db_config.h\"\n\n") > TFILE - printf("#ifndef NO_SYSTEM_INCLUDES\n") >> TFILE - printf("#include <sys/types.h>\n\n") >> TFILE - printf("#include <string.h>\n") >> TFILE - printf("#endif\n\n") >> TFILE printf("#include \"db_int.h\"\n") >> TFILE printf("#include \"dbinc/db_page.h\"\n") >> TFILE printf("#include \"dbinc/%s.h\"\n", prefix) >> TFILE @@ -106,7 +102,7 @@ BEGIN { printf("%s ", $i) >> PFILE printf("%s\n", $i) >> PFILE } -/^[ ]*(BEGIN|IGNORED|BEGIN_BUF)/ { +/^[ ]*(BEGIN|BEGIN_COMPAT|BEGIN_BUF)/ { if (in_begin) { print "Invalid format: missing END statement" exit @@ -115,19 +111,31 @@ BEGIN { is_dbt = 0; has_dbp = 0; is_uint = 0; + # + # BEGIN_COMPAT does not need logging function or rec table entry. + # need_log_function = ($1 == "BEGIN") || ($1 == "BEGIN_BUF"); - not_buf = ($1 == "BEGIN") || ($1 == "IGNORED"); + is_compat = ($1 == "BEGIN_COMPAT"); + not_buf = ($1 == "BEGIN") || ($1 == "BEGIN_COMPAT"); if (not_buf) buf_only = 0; nvars = 0; thisfunc = $2; - funcname = sprintf("%s_%s", prefix, $2); + version = $3; if (not_buf) - rectype = $3; + rectype = $4; + logfunc = sprintf("%s_%s", prefix, $2); + logname[num_funcs] = logfunc; + if (is_compat) { + funcname = sprintf("%s_%s_%s", prefix, $2, version); + } else { + funcname = logfunc; + } funcs[num_funcs] = funcname; + functable[num_funcs] = is_compat; ++num_funcs; } /^[ ]*(DB|ARG|DBT|LOCKS|PGDBT|POINTER|TIME)/ { @@ -172,7 +180,7 @@ BEGIN { # Here are the required fields for every structure if (not_buf) { - printf("\tu_int32_t type;\n\tDB_TXN *txnid;\n") >> HFILE + printf("\tu_int32_t type;\n\tDB_TXN *txnp;\n") >> HFILE printf("\tDB_LSN prev_lsn;\n") >>HFILE } @@ -181,7 +189,7 @@ BEGIN { t = types[i]; if (modes[i] == "POINTER") { ndx = index(t, "*"); - t = substr(types[i], 0, ndx - 2); + t = substr(types[i], 1, ndx - 2); } printf("\t%s\t%s;\n", t, vars[i]) >> HFILE } @@ -243,6 +251,8 @@ END { printf("\tint ret;\n\n") >> PFILE; for (i = 0; i < num_funcs; i++) { + if (functable[i] == 1) + continue; printf("\tif ((ret = __db_add_recovery(dbenv, ") >> PFILE; printf("dtabp, dtabsizep,\n") >> PFILE; printf("\t %s_print, DB_%s)) != 0)\n", \ @@ -278,6 +288,8 @@ END { printf(" db_recops, void *));\n") >> CFILE; printf("\tsize_t *dtabsizep;\n{\n\tint ret;\n\n") >> CFILE; for (i = 0; i < num_funcs; i++) { + if (functable[i] == 1) + continue; printf("\tif ((ret = __db_add_recovery(dbenv, ") >> CFILE; printf("dtabp, dtabsizep,\n") >> CFILE; printf("\t %s_recover, DB_%s)) != 0)\n", \ @@ -292,7 +304,7 @@ function log_function() # Write the log function; function prototype pi = 1; if (not_buf) { - p[pi++] = sprintf("int %s_log", funcname); + p[pi++] = sprintf("int %s_log", logfunc); p[pi++] = " "; if (has_dbp == 1) { p[pi++] = "__P((DB *"; @@ -301,7 +313,7 @@ function log_function() } p[pi++] = ", DB_TXN *, DB_LSN *, u_int32_t"; } else { - p[pi++] = sprintf("int %s_buf", funcname); + p[pi++] = sprintf("int %s_buf", logfunc); p[pi++] = " "; p[pi++] = "__P((u_int8_t *, size_t, size_t *"; } @@ -322,13 +334,13 @@ function log_function() # Function declaration if (not_buf && has_dbp == 1) { - printf("int\n%s_log(dbp, txnid, ret_lsnp, flags", \ - funcname) >> CFILE; + printf("int\n%s_log(dbp, txnp, ret_lsnp, flags", \ + logfunc) >> CFILE; } else if (not_buf) { - printf("int\n%s_log(dbenv, txnid, ret_lsnp, flags", \ - funcname) >> CFILE; + printf("int\n%s_log(dbenv, txnp, ret_lsnp, flags", \ + logfunc) >> CFILE; } else { - printf("int\n%s_buf(buf, max, lenp", funcname) >> CFILE; + printf("int\n%s_buf(buf, max, lenp", logfunc) >> CFILE; } for (i = 0; i < nvars; i++) { if (modes[i] == "DB") { @@ -352,7 +364,7 @@ function log_function() } else { printf("\tDB_ENV *dbenv;\n") >> CFILE; } - printf("\tDB_TXN *txnid;\n\tDB_LSN *ret_lsnp;\n") >> CFILE; + printf("\tDB_TXN *txnp;\n\tDB_LSN *ret_lsnp;\n") >> CFILE; printf("\tu_int32_t flags;\n") >> CFILE; } else { printf("\tu_int8_t *buf;\n") >> CFILE; @@ -403,7 +415,7 @@ function log_function() printf("\tdbenv = dbp->dbenv;\n") >> CFILE; if (dbprivate) printf("\tCOMPQUIET(lr, NULL);\n\n") >> CFILE; - printf("\trectype = DB_%s;\n", funcname) >> CFILE; + printf("\trectype = DB_%s;\n", logfunc) >> CFILE; printf("\tnpad = 0;\n") >> CFILE; printf("\trlsnp = ret_lsnp;\n\n") >> CFILE; } @@ -419,23 +431,25 @@ function log_function() >> CFILE; } else { printf(") {\n") >> CFILE; - printf("\t\tif (txnid == NULL)\n") >> CFILE; + printf("\t\tif (txnp == NULL)\n") >> CFILE; printf("\t\t\treturn (0);\n") >> CFILE; } + printf("\t\tif (txnp == 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("\tif (txnp == 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") { + if (dbprivate && logfunc != "__db_debug") { printf(\ - "\t\tif (TAILQ_FIRST(&txnid->kids) != NULL &&\n") >> CFILE; + "\t\tif (TAILQ_FIRST(&txnp->kids) != NULL &&\n") >> CFILE; printf("\t\t (ret = __txn_activekids(") >> CFILE; - printf("dbenv, rectype, txnid)) != 0)\n") >> CFILE; + printf("dbenv, rectype, txnp)) != 0)\n") >> CFILE; printf("\t\t\treturn (ret);\n") >> CFILE; } printf("\t\t/*\n\t\t * We need to assign begin_lsn while ") \ @@ -445,11 +459,10 @@ function log_function() 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") \ + 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\tDB_SET_TXN_LSNP(txnp, &rlsnp, &lsnp);\n") >> CFILE; + printf("\t\ttxn_num = txnp->txnid;\n") >> CFILE; printf("\t}\n\n") >> CFILE; # If we're logging a DB handle, make sure we have a log @@ -471,7 +484,7 @@ function log_function() printf("->adj_size(logrec.size);\n") >> CFILE; printf("\t\tlogrec.size += npad;\n\t}\n\n") >> CFILE - printf("\tif (is_durable || txnid == NULL) {\n") \ + printf("\tif (is_durable || txnp == NULL) {\n") \ >> CFILE; printf("\t\tif ((ret =\n\t\t __os_malloc(dbenv, ") \ >> CFILE; @@ -576,10 +589,27 @@ function log_function() 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], \ + printf("\tif (%s != NULL)", vars[i]) >> CFILE; + if (not_buf && has_dbp && types[i] == "DB_LSN *") { + printf(" {\n\t\tif (txnp != NULL) {\n") \ + >> CFILE; + printf( \ + "\t\t\tLOG *lp = dbenv->lg_handle->reginfo.primary;\n") >> CFILE; + printf( \ + "\t\t\tif (LOG_COMPARE(%s, &lp->lsn) >= 0 && (ret =\n", vars[i]) \ + >> CFILE; + printf( \ + "\t\t\t __log_check_page_lsn(dbenv, dbp, %s) != 0))\n", vars[i]) \ + >> CFILE; + printf("\t\t\t\treturn (ret);\n") >> CFILE; + printf("\t\t}") >> CFILE; + } + printf("\n\t\tmemcpy(bp, %s, %s);\n", vars[i], \ sizes[i]) >> CFILE; - printf("\telse\n") >> CFILE; + if (not_buf && has_dbp && types[i] == "DB_LSN *") + printf("\t} else\n") >> CFILE; + else + printf("\telse\n") >> CFILE; printf("\t\tmemset(bp, 0, %s);\n", sizes[i]) >> CFILE; printf("\tbp += %s;\n\n", sizes[i]) >> CFILE; } @@ -590,9 +620,9 @@ function log_function() # rather than requiring assert.h. if (not_buf) { if (dbprivate) { - printf("\tDB_ASSERT((u_int32_t)") >> CFILE; - printf("(bp - (u_int8_t *)logrec.data) ") >> CFILE; - printf("<= logrec.size);\n\n") >> CFILE; + printf("\tDB_ASSERT(dbenv,\n") >> CFILE; + printf("\t (u_int32_t)(bp - (u_int8_t *)") >> CFILE; + printf("logrec.data) <= 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 @@ -600,15 +630,15 @@ function log_function() # 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") \ + printf("\tif (is_durable || txnp == 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(" && txnp != NULL) {\n") >> CFILE; + printf("\t\t\t*lsnp = *rlsnp;\n") >> CFILE; printf("\t\t\tif (rlsnp != ret_lsnp)\n") >> CFILE; printf("\t\t\t\t *ret_lsnp = *rlsnp;\n") >> CFILE; @@ -637,8 +667,10 @@ function log_function() 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("\t\tSTAILQ_INSERT_HEAD(&txnp") >> CFILE; printf("->logs, lr, links);\n") >> CFILE; + printf("\t\tF_SET((TXN_DETAIL *)") >> CFILE; + printf("txnp->td, TXN_DTL_INMEMORY);\n") >> CFILE; # Update the return LSN. printf("\t\tLSN_NOT_LOGGED(*ret_lsnp);\n") >> CFILE; printf("\t}\n\n") >> CFILE; @@ -646,10 +678,10 @@ function log_function() 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; + printf(" && txnp != NULL) {\n") >> CFILE; # Update the transactions last_lsn. - printf("\t\ttxnid->last_lsn = *rlsnp;\n") >> CFILE; + printf("\t\t*lsnp = *rlsnp;\n") >> CFILE; printf("\t\tif (rlsnp != ret_lsnp)\n") >> CFILE; printf("\t\t\t *ret_lsnp = *rlsnp;\n") >> CFILE; printf("\t}\n") >> CFILE; @@ -660,15 +692,14 @@ function log_function() 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 + printf("\t\t (DBT *)&logrec, ret_lsnp, ") >> CFILE + printf("DB_TXN_PRINT, NULL);\n#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; + printf("\tif (is_durable || txnp == NULL)\n") >> CFILE; write_free("\t\t", "logrec.data", CFILE) printf("#endif\n") >> CFILE } else { @@ -691,7 +722,7 @@ function db_handle_id_function(modes, n) # that ID we're able to acquire an open handle # at recovery time. printf(\ - "\tDB_ASSERT(dbp->log_filename != NULL);\n") \ + "\tDB_ASSERT(dbenv, dbp->log_filename != NULL);\n") \ >> CFILE; printf("\tif (dbp->log_filename->id == ") \ >> CFILE; @@ -727,6 +758,7 @@ function print_function() if (modes[i] == "TIME") { printf("\tstruct tm *lt;\n") >> PFILE printf("\ttime_t timeval;\n") >> PFILE + printf("\tchar time_buf[CTIME_BUFLEN];\n") >> PFILE break; } for (i = 0; i < nvars; i ++) @@ -738,7 +770,7 @@ function print_function() printf("\tint ret;\n\n") >> PFILE; # Get rid of complaints about unused parameters. - printf("\tnotused2 = DB_TXN_ABORT;\n\tnotused3 = NULL;\n\n") >> PFILE; + printf("\tnotused2 = DB_TXN_PRINT;\n\tnotused3 = NULL;\n\n") >> PFILE; # Call read routine to initialize structure printf("\tif ((ret = %s_read(dbenv, dbtp->data, &argp)) != 0)\n", \ @@ -746,18 +778,15 @@ function print_function() printf("\t\treturn (ret);\n") >> PFILE; # Print values in every record - printf("\t(void)printf(\n\t \"[%%lu][%%lu]%s%%s: ",\ - 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(void)printf(\n \"[%%lu][%%lu]%s%%s: ", funcname) >> PFILE; + printf("rec: %%lu txnp %%lx prevlsn [%%lu][%%lu]\\n\",\n") >> PFILE; + printf("\t (u_long)lsnp->file, (u_long)lsnp->offset,\n") >> PFILE; printf("\t (argp->type & DB_debug_FLAG) ? \"_debug\" : \"\",\n") \ >> 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; + printf("\t (u_long)argp->txnp->txnid,\n") >> PFILE; + printf("\t (u_long)argp->prev_lsn.file, ") >> PFILE; + printf("(u_long)argp->prev_lsn.offset);\n") >> PFILE; # Now print fields of argp for (i = 0; i < nvars; i ++) { @@ -794,7 +823,8 @@ function print_function() "%%%s (%%.24s, 20%%02lu%%02lu%%02lu%%02lu%%02lu.%%02lu)\\n\",\n", \ formats[i]) >> PFILE; printf("\t (long)argp->%s, ", vars[i]) >> PFILE; - printf("ctime(&timeval),", vars[i]) >> PFILE; + printf("__db_ctime(&timeval, time_buf),", \ + 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; @@ -874,20 +904,21 @@ function read_function() } write_malloc("\t", "argp", malloc_size, CFILE) - # Set up the pointers to the txnid. + # Set up the pointers to the DB_TXN *. printf("\tbp = recbuf;\n") >> CFILE; if (not_buf) { - printf("\targp->txnid = (DB_TXN *)&argp[1];\n\n") >> CFILE; - - # First get the record type, prev_lsn, and txnid fields. + printf("\targp->txnp = (DB_TXN *)&argp[1];\n") >> CFILE; + printf("\tmemset(argp->txnp, 0, sizeof(DB_TXN));\n\n") \ + >> CFILE; + # First get the record type, prev_lsn, and txnp 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->txnp->txnid, bp, ") >> CFILE; + printf("sizeof(argp->txnp->txnid));\n") >> CFILE; + printf("\tbp += sizeof(argp->txnp->txnid);\n\n") >> CFILE; printf("\tmemcpy(&argp->prev_lsn, bp, sizeof(DB_LSN));\n") \ >> CFILE; printf("\tbp += sizeof(DB_LSN);\n\n") >> CFILE; diff --git a/db/dist/gen_rpc.awk b/db/dist/gen_rpc.awk index 7eee77b3d..e4bf85e76 100644 --- a/db/dist/gen_rpc.awk +++ b/db/dist/gen_rpc.awk @@ -1,5 +1,5 @@ # -# $Id: gen_rpc.awk,v 11.58 2004/08/19 20:28:37 mjc Exp $ +# $Id: gen_rpc.awk,v 12.7 2006/05/05 15:29:43 bostic Exp $ # Awk script for generating client/server RPC code. # # This awk script generates most of the RPC routines for DB client/server @@ -54,6 +54,12 @@ BEGIN { printf("/* Do not edit: automatically built by gen_rpc.awk. */\n") \ > XFILE nendlist = 1; + + # Output headers + general_headers() + + # Put out the actual illegal and no-server functions. + illegal_functions(CFILE) } END { if (error == 0) { @@ -65,29 +71,60 @@ END { printf("\t} = %d%03d;\n", major, minor) >> XFILE printf("} = 351457;\n") >> XFILE + + obj_init("DB", "dbp", obj_db, CFILE) + obj_init("DBC", "dbc", obj_dbc, CFILE) + obj_init("DB_ENV", "dbenv", obj_dbenv, CFILE) + obj_init("DB_TXN", "txn", obj_txn, CFILE) } } +/^[ ]*LOCAL/ { + # LOCAL methods are ones where we don't override the handle + # method for RPC, nor is it illegal -- it's just satisfied + # locally. + next; +} +/^[ ]*NOFUNC/ { + ++obj_indx; + + # NOFUNC methods are illegal on the RPC client. + if ($2 ~ "^db_") + obj_illegal(obj_db, "dbp", $2, $3) + else if ($2 ~ "^dbc_") + obj_illegal(obj_dbc, "dbc", $2, $3) + else if ($2 ~ "^env_") + obj_illegal(obj_dbenv, "dbenv", $2, $3) + else if ($2 ~ "^txn_") + obj_illegal(obj_txn, "txn", $2, $3) + else { + print "unexpected handle prefix: " $2 + error = 1; exit + } + next; +} /^[ ]*BEGIN/ { + ++obj_indx; + name = $2; - nofunc_code = 0; - funcvars = 0; - ret_code = 0; - if ($3 == "NOFUNC") - nofunc_code = 1; - if ($3 == "RETCODE") - ret_code = 1; + link_only = ret_code = 0 + if ($3 == "LINKONLY") + link_only = 1 + else if ($3 == "RETCODE") + ret_code = 1 + funcvars = 0; + newvars = 0; nvars = 0; rvars = 0; - newvars = 0; + xdr_free = 0; + db_handle = 0; - env_handle = 0; dbc_handle = 0; - txn_handle = 0; - mp_handle = 0; dbt_handle = 0; - xdr_free = 0; + env_handle = 0; + mp_handle = 0; + txn_handle = 0; } /^[ ]*ARG/ { rpc_type[nvars] = $2; @@ -102,36 +139,36 @@ END { if (c_type[nvars] == "DBT *") dbt_handle = 1; - - if (c_type[nvars] == "DB_ENV *") { + else if (c_type[nvars] == "DB_ENV *") { ctp_type[nvars] = "CT_ENV"; env_handle = 1; env_idx = nvars; - } - if (c_type[nvars] == "DB *") { + if (nvars == 0) + obj_func("dbenv", obj_dbenv); + } else if (c_type[nvars] == "DB *") { ctp_type[nvars] = "CT_DB"; if (db_handle != 1) { db_handle = 1; db_idx = nvars; } - } - if (c_type[nvars] == "DBC *") { + if (nvars == 0) + obj_func("dbp", obj_db); + } else if (c_type[nvars] == "DBC *") { ctp_type[nvars] = "CT_CURSOR"; dbc_handle = 1; dbc_idx = nvars; - } - if (c_type[nvars] == "DB_TXN *") { + if (nvars == 0) + obj_func("dbc", obj_dbc); + } else if (c_type[nvars] == "DB_TXN *") { ctp_type[nvars] = "CT_TXN"; txn_handle = 1; txn_idx = nvars; - } - if (c_type[nvars] == "DB_MPOOLFILE *") { - mp_handle = 1; - mp_idx = nvars; + if (nvars == 0) + obj_func("txn", obj_txn); } ++nvars; @@ -189,198 +226,10 @@ END { /^[ ]*END/ { # # ===================================================== - # File headers, if necessary. + # LINKONLY -- just reference the function, that's all. # - if (first == 0) { - printf("#include \"db_config.h\"\n") >> CFILE - printf("\n") >> CFILE - printf("#ifndef NO_SYSTEM_INCLUDES\n") >> CFILE - printf("#include <sys/types.h>\n") >> CFILE - printf("\n") >> CFILE - printf("#include <rpc/rpc.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("#include \"dbinc_auto/rpc_client_ext.h\"\n") >> CFILE - printf("\n") >> CFILE - - printf("#include \"db_config.h\"\n") >> TFILE - printf("\n") >> TFILE - printf("#ifndef NO_SYSTEM_INCLUDES\n") >> TFILE - printf("#include <sys/types.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/txn.h\"\n") >> TFILE - printf("\n") >> TFILE - - printf("#include \"db_config.h\"\n") >> SFILE - printf("\n") >> SFILE - printf("#ifndef NO_SYSTEM_INCLUDES\n") >> SFILE - printf("#include <sys/types.h>\n") >> SFILE - printf("\n") >> SFILE - printf("#include <rpc/rpc.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/db_server_int.h\"\n") >> SFILE - printf("#include \"dbinc_auto/rpc_server_ext.h\"\n") >> SFILE - printf("\n") >> SFILE - - printf("#include \"db_config.h\"\n") >> PFILE - printf("\n") >> PFILE - printf("#ifndef NO_SYSTEM_INCLUDES\n") >> PFILE - printf("#include <sys/types.h>\n") >> PFILE - printf("\n") >> PFILE - printf("#include <rpc/rpc.h>\n") >> PFILE - printf("\n") >> PFILE - 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/db_server_int.h\"\n") >> PFILE - printf("\n") >> PFILE - - first = 1; - } - # - # ===================================================== - # Generate Client Nofunc code first if necessary - # NOTE: This code must be first, because we don't want any - # other code other than this function, so before we write - # out to the XDR and server files, we just generate this - # and move on if this is all we are doing. - # - if (nofunc_code == 1) { - # - # First time through, put out the general no server and - # illegal functions. - # - if (first_nofunc == 0) { - printf("static int __dbcl_noserver ") >> CFILE - printf("__P((DB_ENV *));\n\n") >> CFILE - printf("static int\n") >> CFILE - printf("__dbcl_noserver(dbenv)\n") >> CFILE - printf("\tDB_ENV *dbenv;\n") >> CFILE - printf("{\n\t__db_err(dbenv,") >> CFILE - printf(" \"No server environment\");\n") >> CFILE - printf("\treturn (DB_NOSERVER);\n") >> CFILE - printf("}\n\n") >> CFILE - - printf("static int __dbcl_rpc_illegal ") >> CFILE - printf("__P((DB_ENV *, char *));\n\n") >> CFILE - printf("static int\n") >> CFILE - printf("__dbcl_rpc_illegal(dbenv, name)\n") >> CFILE - printf("\tDB_ENV *dbenv;\n\tchar *name;\n") >> CFILE - printf("{\n\t__db_err(dbenv,") >> CFILE - printf(" \"%%s method unsupported in RPC") >> CFILE - printf(" environments\", name);\n") >> CFILE - printf("\treturn (DB_OPNOTSUP);\n") >> CFILE - printf("}\n\n") >> CFILE - - first_nofunc = 1 - } - # - # Spit out PUBLIC prototypes. - # - delete p; - pi = 1; - p[pi++] = sprintf("int __dbcl_%s __P((", name); - p[pi++] = ""; - for (i = 0; i < nvars; ++i) { - p[pi++] = pr_type[i]; - p[pi++] = ", "; - } - p[pi - 1] = ""; - p[pi] = "));"; - proto_format(p, CFILE); - - # - # Spit out function name/args. - # - printf("int\n") >> CFILE - printf("__dbcl_%s(", name) >> CFILE - sep = ""; - for (i = 0; i < nvars; ++i) { - printf("%s%s", sep, args[i]) >> CFILE - sep = ", "; - } - printf(")\n") >> CFILE - - for (i = 0; i < nvars; ++i) - if (func_arg[i] == 0) - printf("\t%s %s;\n", c_type[i], args[i]) \ - >> CFILE - else - printf("\t%s;\n", c_type[i]) >> CFILE - - # - # Call error function and return EINVAL - # - printf("{\n") >> CFILE - - # - # If we don't have a local env, set one. - # - if (env_handle == 0) { - printf("\tDB_ENV *dbenv;\n\n") >> CFILE - if (db_handle) - printf("\tdbenv = %s->dbenv;\n", \ - args[db_idx]) >> CFILE - else if (dbc_handle) - printf("\tdbenv = %s->dbp->dbenv;\n", \ - args[dbc_idx]) >> CFILE - else if (txn_handle) - printf("\tdbenv = %s->mgrp->dbenv;\n", \ - args[txn_idx]) >> CFILE - else if (mp_handle) - printf("\tdbenv = %s->dbenv;\n", \ - args[mp_idx]) >> CFILE - else - printf("\tdbenv = NULL;\n") >> CFILE - } - # - # Quiet the compiler for all variables. - # - # NOTE: Index 'i' starts at 1, not 0. Our first arg is - # the handle we need to get to the env, and we do not want - # to COMPQUIET that one. - for (i = 1; i < nvars; ++i) { - if (rpc_type[i] == "CONST" || rpc_type[i] == "DBT" || - rpc_type[i] == "LIST" || rpc_type[i] == "STRING" || - rpc_type[i] == "GID") { - printf("\tCOMPQUIET(%s, NULL);\n", args[i]) \ - >> CFILE - } - if (rpc_type[i] == "INT" || rpc_type[i] == "IGNORE" || - rpc_type[i] == "ID") { - printf("\tCOMPQUIET(%s, 0);\n", args[i]) \ - >> CFILE - } - } - - if (!env_handle) { - printf("\treturn (__dbcl_rpc_illegal(dbenv, ") >> CFILE - printf("\"%s\"));\n", name) >> CFILE - } else - printf("\treturn (__dbcl_rpc_illegal(%s, \"%s\"));\n", \ - args[env_idx], name) >> CFILE - printf("}\n\n") >> CFILE - + if (link_only) next; - } # # ===================================================== @@ -716,7 +565,7 @@ END { # for (i = 0; i < nvars; ++i) { if (rpc_type[i] == "ID") { - printf("\tlong %scl_id;\n", args[i]) >> PFILE + printf("\tunsigned int %scl_id;\n", args[i]) >> PFILE } if (rpc_type[i] == "STRING") { printf("\tchar *%s;\n", args[i]) >> PFILE @@ -851,8 +700,7 @@ END { args[txn_idx]) >> CFILE else printf("\tdbenv = NULL;\n") >> CFILE - printf("\tif (dbenv == NULL || !RPC_ON(dbenv))\n") \ - >> CFILE + printf("\tif (dbenv == NULL || !RPC_ON(dbenv))\n") >> CFILE printf("\t\treturn (__dbcl_noserver(NULL));\n") >> CFILE } else { printf("\tif (%s == NULL || !RPC_ON(%s))\n", \ @@ -862,13 +710,8 @@ END { } printf("\n") >> CFILE - if (!env_handle) - printf("\tcl = (CLIENT *)dbenv->cl_handle;\n") >> CFILE - else - printf("\tcl = (CLIENT *)%s->cl_handle;\n", \ - args[env_idx]) >> CFILE - - printf("\n") >> CFILE + printf("\tcl = (CLIENT *)%s->cl_handle;\n\n", \ + env_handle ? args[env_idx] : "dbenv") >> CFILE # # If there is a function arg, check that it is NULL @@ -878,9 +721,9 @@ END { continue; printf("\tif (%s != NULL) {\n", args[i]) >> CFILE if (!env_handle) { - printf("\t\t__db_err(dbenv, ") >> CFILE + printf("\t\t__db_errx(dbenv, ") >> CFILE } else { - printf("\t\t__db_err(%s, ", args[env_idx]) >> CFILE + printf("\t\t__db_errx(%s, ", args[env_idx]) >> CFILE } printf("\"User functions not supported in RPC\");\n") >> CFILE printf("\t\treturn (EINVAL);\n\t}\n") >> CFILE @@ -891,15 +734,22 @@ END { # for (i = 0; i < nvars; ++i) { if (rpc_type[i] == "ID") { - printf("\tif (%s == NULL)\n", args[i]) >> CFILE - printf("\t\tmsg.%scl_id = 0;\n\telse\n", \ - args[i]) >> CFILE + # We don't need to check for a NULL DB_ENV *, because + # we already checked for it. I frankly couldn't care + # less, but lint gets all upset at the wasted cycles. + if (c_type[i] != "DB_ENV *") { + printf("\tif (%s == NULL)\n", args[i]) >> CFILE + printf("\t\tmsg.%scl_id = 0;\n\telse\n", \ + args[i]) >> CFILE + indent = "\t\t"; + } else + indent = "\t"; if (c_type[i] == "DB_TXN *") { - printf("\t\tmsg.%scl_id = %s->txnid;\n", \ - args[i], args[i]) >> CFILE + printf("%smsg.%scl_id = %s->txnid;\n", \ + indent, args[i], args[i]) >> CFILE } else { - printf("\t\tmsg.%scl_id = %s->cl_id;\n", \ - args[i], args[i]) >> CFILE + printf("%smsg.%scl_id = %s->cl_id;\n", \ + indent, args[i], args[i]) >> CFILE } } if (rpc_type[i] == "GID") { @@ -990,10 +840,10 @@ END { } printf("\tif (replyp == NULL) {\n") >> CFILE if (!env_handle) { - printf("\t\t__db_err(dbenv, ") >> CFILE + printf("\t\t__db_errx(dbenv, ") >> CFILE printf("clnt_sperror(cl, \"Berkeley DB\"));\n") >> CFILE } else { - printf("\t\t__db_err(%s, ", args[env_idx]) >> CFILE + printf("\t\t__db_errx(%s, ", args[env_idx]) >> CFILE printf("clnt_sperror(cl, \"Berkeley DB\"));\n") >> CFILE } printf("\t\tret = DB_NOSERVER;\n") >> CFILE @@ -1129,6 +979,154 @@ END { } } +function general_headers() +{ + printf("#include \"db_config.h\"\n") >> CFILE + printf("\n") >> CFILE + printf("#include \"db_int.h\"\n") >> CFILE + printf("#ifndef NO_SYSTEM_INCLUDES\n") >> CFILE + printf("#include <rpc/rpc.h>\n") >> CFILE + printf("#endif\n") >> CFILE + printf("#include \"db_server.h\"\n") >> CFILE + printf("#include \"dbinc/txn.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("#include \"db_int.h\"\n") >> TFILE + printf("#include \"dbinc/txn.h\"\n") >> TFILE + printf("\n") >> TFILE + + printf("#include \"db_config.h\"\n") >> SFILE + printf("\n") >> SFILE + printf("#include \"db_int.h\"\n") >> SFILE + printf("#ifndef NO_SYSTEM_INCLUDES\n") >> SFILE + printf("#include <rpc/rpc.h>\n") >> SFILE + printf("#endif\n") >> SFILE + printf("#include \"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 + + printf("#include \"db_config.h\"\n") >> PFILE + printf("\n") >> PFILE + printf("#include \"db_int.h\"\n") >> PFILE + printf("#ifndef NO_SYSTEM_INCLUDES\n") >> PFILE + printf("#include <rpc/rpc.h>\n") >> PFILE + printf("#endif\n") >> PFILE + printf("#include \"db_server.h\"\n") >> PFILE + printf("#include \"dbinc/db_server_int.h\"\n") >> PFILE + printf("\n") >> PFILE +} + +# +# illegal_functions -- +# Output general illegal-call functions +function illegal_functions(OUTPUT) +{ + printf("static int __dbcl_dbp_illegal __P((DB *));\n") >> OUTPUT + printf("static int __dbcl_noserver __P((DB_ENV *));\n") >> OUTPUT + printf("static int __dbcl_txn_illegal __P((DB_TXN *));\n") >> OUTPUT + printf("\n") >> OUTPUT + + printf("static int\n") >> OUTPUT + printf("__dbcl_noserver(dbenv)\n") >> OUTPUT + printf("\tDB_ENV *dbenv;\n") >> OUTPUT + printf("{\n\t__db_errx(dbenv,") >> OUTPUT + printf(" \"No Berkeley DB RPC server environment\");\n") >> OUTPUT + printf("\treturn (DB_NOSERVER);\n") >> OUTPUT + printf("}\n\n") >> OUTPUT + + printf("/*\n") >> OUTPUT + printf(" * __dbcl_dbenv_illegal --\n") >> OUTPUT + printf(" * DB_ENV method not supported under RPC.\n") >> OUTPUT + printf(" *\n") >> OUTPUT + printf(" * PUBLIC: int __dbcl_dbenv_illegal __P((DB_ENV *));\n")\ + >> OUTPUT + printf(" */\n") >> OUTPUT + printf("int\n") >> OUTPUT + printf("__dbcl_dbenv_illegal(dbenv)\n") >> OUTPUT + printf("\tDB_ENV *dbenv;\n") >> OUTPUT + printf("{\n\t__db_errx(dbenv,") >> OUTPUT + printf("\n\t \"Interface not supported by ") >> OUTPUT + printf("Berkeley DB RPC client environments\");\n") >> OUTPUT + printf("\treturn (DB_OPNOTSUP);\n") >> OUTPUT + printf("}\n\n") >> OUTPUT + printf("/*\n") >> OUTPUT + printf(" * __dbcl_dbp_illegal --\n") >> OUTPUT + printf(" * DB method not supported under RPC.\n") >> OUTPUT + printf(" */\n") >> OUTPUT + printf("static int\n") >> OUTPUT + printf("__dbcl_dbp_illegal(dbp)\n") >> OUTPUT + printf("\tDB *dbp;\n") >> OUTPUT + printf("{\n\treturn (__dbcl_dbenv_illegal(dbp->dbenv));\n") >> OUTPUT + printf("}\n\n") >> OUTPUT + printf("/*\n") >> OUTPUT + printf(" * __dbcl_txn_illegal --\n") >> OUTPUT + printf(" * DB_TXN method not supported under RPC.\n") >> OUTPUT + printf(" */\n") >> OUTPUT + printf("static int\n__dbcl_txn_illegal(txn)\n") >> OUTPUT + printf("\tDB_TXN *txn;\n") >> OUTPUT + printf("{\n\treturn (__dbcl_dbenv_illegal(txn->mgrp->dbenv));\n")\ + >> OUTPUT + printf("}\n\n") >> OUTPUT +} + +function obj_func(v, l) +{ + # Ignore db_create -- there's got to be something cleaner, but I + # don't want to rewrite rpc.src right now. + if (name == "db_create") + return; + if (name == "env_create") + return; + + # Strip off the leading prefix for the method name -- there's got to + # be something cleaner, but I don't want to rewrite rpc.src right now. + len = length(name); + i = index(name, "_"); + l[obj_indx] = sprintf("\t%s->%s = __dbcl_%s;", + v, substr(name, i + 1, len - i), name); +} + +function obj_illegal(l, handle, method, proto) +{ + # All of the functions return an int, with one exception. Hack + # to make that work. + type = method == "db_get_mpf" ? "DB_MPOOLFILE *" : "int" + + # Strip off the leading prefix for the method name -- there's got to + # be something cleaner, but I don't want to rewrite rpc.src right now. + len = length(method); + i = index(method, "_"); + + l[obj_indx] =\ + sprintf("\t%s->%s =\n\t (%s (*)(",\ + handle, substr(method, i + 1, len - i), type)\ + proto\ + sprintf("))\n\t __dbcl_%s_illegal;", handle); +} + +function obj_init(obj, v, list, OUTPUT) { + printf("/*\n") >> OUTPUT + printf(" * __dbcl_%s_init --\n", v) >> OUTPUT + printf(" *\tInitialize %s handle methods.\n", obj) >> OUTPUT + printf(" *\n") >> OUTPUT + printf(\ + " * PUBLIC: void __dbcl_%s_init __P((%s *));\n", v, obj) >> OUTPUT + printf(" */\n") >> OUTPUT + printf("void\n") >> OUTPUT + printf("__dbcl_%s_init(%s)\n", v, v) >> OUTPUT + printf("\t%s *%s;\n", obj, v) >> OUTPUT + printf("{\n") >> OUTPUT + for (i = 1; i < obj_indx; ++i) { + if (i in list) + print list[i] >> OUTPUT + } + printf("\treturn;\n}\n\n") >> OUTPUT +} + # # split_lines -- # Add line separators to pretty-print the output. diff --git a/db/dist/ltmain.sh b/db/dist/ltmain.sh index c96a96ddd..06823e057 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, 2004 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -43,8 +43,8 @@ EXIT_FAILURE=1 PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.8 -TIMESTAMP=" (1.1220.2.117 2004/08/04 14:12:05)" +VERSION=1.5.22 +TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" # See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes. @@ -88,14 +88,15 @@ rm="rm -f" Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' # test EBCDIC or ASCII -case `echo A|tr A '\301'` in - A) # EBCDIC based system - SP2NL="tr '\100' '\n'" - NL2SP="tr '\r\n' '\100\100'" +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + SP2NL='tr \040 \012' + NL2SP='tr \015\012 \040\040' ;; - *) # Assume ASCII based system - SP2NL="tr '\040' '\012'" - NL2SP="tr '\015\012' '\040\040'" + *) # EBCDIC based system + SP2NL='tr \100 \n' + NL2SP='tr \r\n \100\100' ;; esac @@ -112,8 +113,9 @@ if test "${LANG+set}" = set; then fi # Make sure IFS has a sensible default -: ${IFS=" -"} +lt_nl=' +' +IFS=" $lt_nl" if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then $echo "$modename: not configured to build any kind of library" 1>&2 @@ -130,6 +132,8 @@ run= show="$echo" show_help= execute_dlfiles= +duplicate_deps=no +preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" @@ -137,13 +141,51 @@ o2lo="s/\\.${objext}\$/.lo/" # Shell function definitions: # This seems to be the best place for them +# func_mktempdir [string] +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, STRING is the basename for that directory. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $mkdir "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || { + $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 + exit $EXIT_FAILURE + } + fi + + $echo "X$my_tmpdir" | $Xsed +} + + # func_win32_libid arg # return the library type of file 'arg' # # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. -func_win32_libid () { +func_win32_libid () +{ win32_libid_type="unknown" win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in @@ -154,12 +196,11 @@ func_win32_libid () { if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` - if test "X$win32_nmres" = "Ximport" ; then - win32_libid_type="x86 archive import" - else - win32_libid_type="x86 archive static" - fi + $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac fi ;; *DLL*) @@ -183,7 +224,8 @@ func_win32_libid () { # Only attempt this if the compiler in the base compile # command doesn't match the default compiler. # arg is usually of the form 'gcc ...' -func_infer_tag () { +func_infer_tag () +{ if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -242,8 +284,25 @@ func_infer_tag () { } +# func_extract_an_archive dir oldlib +func_extract_an_archive () +{ + f_ex_an_ar_dir="$1"; shift + f_ex_an_ar_oldlib="$1" + + $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" + $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? + if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 + exit $EXIT_FAILURE + fi +} + # func_extract_archives gentop oldlib ... -func_extract_archives () { +func_extract_archives () +{ my_gentop="$1"; shift my_oldlibs=${1+"$@"} my_oldobjs="" @@ -274,9 +333,9 @@ func_extract_archives () { $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 + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then + exit $exit_status fi case $host in *-darwin*) @@ -287,7 +346,7 @@ func_extract_archives () { cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename $darwin_archive` + darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` if test -n "$darwin_arches"; then darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` @@ -296,64 +355,33 @@ func_extract_archives () { 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}" + func_extract_an_archive "`pwd`" "${darwin_base_archive}" cd "$darwin_curdir" + $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" done # $darwin_arches ## Okay now we have a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f | xargs basename | sort -u | $NL2SP` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` lipo -create -output "$darwin_file" $darwin_files done # $darwin_filelist - rm -rf unfat-$$ + ${rm}r unfat-$$ cd "$darwin_orig_dir" else - cd $darwin_orig_dir - (cd $my_xdir && $AR x $my_xabs) || exit $? + cd "$darwin_orig_dir" + func_extract_an_archive "$my_xdir" "$my_xabs" 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 ;; + *) + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; esac my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` done - func_extract_archives_result="$my_oldobjs" } # End of Shell function definitions @@ -362,6 +390,8 @@ func_extract_archives () { # Darwin sucks eval std_shrext=\"$shrext_cmds\" +disable_libs=no + # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -426,10 +456,10 @@ do --version) $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" $echo - $echo "Copyright (C) 2003 Free Software Foundation, Inc." + $echo "Copyright (C) 2005 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 $EXIT_SUCCESS + exit $? ;; --config) @@ -438,7 +468,7 @@ do for tagname in $taglist; do ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" done - exit $EXIT_SUCCESS + exit $? ;; --debug) @@ -463,7 +493,7 @@ do else $echo "disable static libraries" fi - exit $EXIT_SUCCESS + exit $? ;; --finish) mode="finish" ;; @@ -478,7 +508,11 @@ do preserve_args="$preserve_args $arg" ;; - --tag) prevopt="--tag" prev=tag ;; + --tag) + prevopt="--tag" + prev=tag + preserve_args="$preserve_args --tag" + ;; --tag=*) set tag "$optarg" ${1+"$@"} shift @@ -510,6 +544,18 @@ if test -n "$prevopt"; then exit $EXIT_FAILURE fi +case $disable_libs in +no) + ;; +shared) + build_libtool_libs=no + build_old_libs=yes + ;; +static) + build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` + ;; +esac + # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. @@ -520,7 +566,7 @@ if test -z "$show_help"; then # Infer the operation mode. if test -z "$mode"; then $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 + $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 case $nonopt in *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) mode=link @@ -586,7 +632,7 @@ if test -z "$show_help"; then for arg do - case "$arg_mode" in + case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile lastarg="$arg" @@ -668,7 +714,10 @@ if test -z "$show_help"; then case $lastarg in # Double-quote args containing other shell metacharacters. # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. + # in scan sets, and some SunOS ksh mistreat backslash-escaping + # in scan sets (worked around with variable expansion), + # and furthermore cannot handle '|' '&' '(' ')' in scan sets + # at all, so we specify them separately. *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") lastarg="\"$lastarg\"" ;; @@ -742,6 +791,14 @@ if test -z "$show_help"; then esac done + qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` + case $qlibobj in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + qlibobj="\"$qlibobj\"" ;; + esac + test "X$libobj" != "X$qlibobj" \ + && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ + && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` if test "X$xdir" = "X$obj"; then @@ -814,12 +871,17 @@ compiler." $run $rm $removelist exit $EXIT_FAILURE fi - $echo $srcfile > "$lockfile" + $echo "$srcfile" > "$lockfile" fi if test -n "$fix_srcfile_path"; then eval srcfile=\"$fix_srcfile_path\" fi + qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` + case $qsrcfile in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + qsrcfile="\"$qsrcfile\"" ;; + esac $run $rm "$libobj" "${libobj}T" @@ -841,18 +903,18 @@ EOF fbsd_hideous_sh_bug=$base_compile if test "$pic_mode" != no; then - command="$base_compile $srcfile $pic_flag" + command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code - command="$base_compile $srcfile" + command="$base_compile $qsrcfile" fi if test ! -d "${xdir}$objdir"; then $show "$mkdir ${xdir}$objdir" $run $mkdir ${xdir}$objdir - status=$? - if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then + exit $exit_status fi fi @@ -924,9 +986,9 @@ EOF if test "$build_old_libs" = yes; then if test "$pic_mode" != yes; then # Don't build PIC code - command="$base_compile $srcfile" + command="$base_compile $qsrcfile" else - command="$base_compile $srcfile $pic_flag" + command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then command="$command -o $obj" @@ -1055,6 +1117,7 @@ EOF no_install=no objs= non_pic_objects= + notinst_path= # paths that contain not-installed libtool libraries precious_files_regex= prefer_static_libs=no preload=no @@ -1083,14 +1146,15 @@ EOF if test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=yes else if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=built fi build_libtool_libs=no build_old_libs=yes - prefer_static_libs=yes break ;; esac @@ -1265,6 +1329,11 @@ EOF if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1348,6 +1417,13 @@ EOF prev= continue ;; + darwin_framework|darwin_framework_skip) + test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + prev= + continue + ;; *) eval "$prev=\"\$arg\"" prev= @@ -1406,6 +1482,18 @@ EOF continue ;; + -framework|-arch|-isysroot) + case " $CC " in + *" ${arg} ${1} "* | *" ${arg} ${1} "*) + prev=darwin_framework_skip ;; + *) compiler_flags="$compiler_flags $arg" + prev=darwin_framework ;; + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + continue + ;; + -inst-prefix-dir) prev=inst_prefix continue @@ -1432,7 +1520,8 @@ EOF absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit $EXIT_FAILURE + absdir="$dir" + notinst_path="$notinst_path $dir" fi dir="$absdir" ;; @@ -1446,10 +1535,15 @@ EOF esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; *) dllsearchpath="$dllsearchpath:$dir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac continue @@ -1458,15 +1552,15 @@ EOF -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-pw32* | *-*-beos*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) # These systems don't actually have a C or math library (as such) continue ;; - *-*-mingw* | *-*-os2*) + *-*-os2*) # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; @@ -1474,10 +1568,19 @@ EOF # Rhapsody C and math libraries are in the System framework deplibs="$deplibs -framework System" continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test "X$arg" = "X-lc" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; esac elif test "X$arg" = "X-lc_r"; then case $host in - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -1487,8 +1590,20 @@ EOF continue ;; + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + -model) + compile_command="$compile_command $arg" + compiler_flags="$compiler_flags $arg" + finalize_command="$finalize_command $arg" + prev=xcompiler + continue + ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) - deplibs="$deplibs $arg" + compiler_flags="$compiler_flags $arg" + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" continue ;; @@ -1497,13 +1612,19 @@ EOF continue ;; - # gcc -m* arguments should be passed to the linker via $compiler_flags - # in order to pass architecture information to the linker - # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo - # but this is not reliable with gcc because gcc may use -mfoo to - # select a different linker, different libraries, etc, while - # -Wl,-mfoo simply passes -mfoo to the linker. - -m*) + # -64, -mips[0-9] enable 64-bit mode on the SGI compiler + # -r[0-9][0-9]* specifies the processor on the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler + # +DA*, +DD* enable 64-bit mode on the HP compiler + # -q* pass through compiler args for the IBM compiler + # -m* pass through architecture-specific compiler args for GCC + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ + -t[45]*|-txscale*|@*) + # 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"` @@ -1514,34 +1635,10 @@ EOF esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" - fi + compiler_flags="$compiler_flags $arg" 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 @@ -1776,6 +1873,11 @@ EOF if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1881,9 +1983,9 @@ EOF if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir - status=$? - if test "$status" -ne 0 && test ! -d "$output_objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then + exit $exit_status fi fi @@ -1946,7 +2048,6 @@ EOF newlib_search_path= need_relink=no # whether we're linking any uninstalled libtool libraries notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries case $linkmode in lib) passes="conv link" @@ -1998,7 +2099,7 @@ EOF compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - deplibs="$deplib $deplibs" + compiler_flags="$compiler_flags $deplib" fi continue ;; @@ -2007,10 +2108,6 @@ EOF $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 continue fi - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do for search_ext in .la $std_shrext .so .a; do @@ -2186,7 +2283,7 @@ EOF esac # case $deplib if test "$found" = yes || test -f "$lib"; then : else - $echo "$modename: cannot find the library \`$lib'" 1>&2 + $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 exit $EXIT_FAILURE fi @@ -2210,6 +2307,8 @@ EOF # it will not redefine variables installed, or shouldnotlink installed=yes shouldnotlink=no + avoidtemprpath= + # Read the .la file case $lib in @@ -2308,6 +2407,7 @@ EOF dir="$libdir" absdir="$libdir" fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then dir="$ladir" @@ -2392,12 +2492,12 @@ EOF if test -n "$library_names" && { test "$prefer_static_libs" = no || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var"; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then # Make sure the rpath contains only unique directories. case "$temp_rpath " in *" $dir "*) ;; *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $dir" ;; + *) temp_rpath="$temp_rpath $absdir" ;; esac fi @@ -2434,8 +2534,12 @@ EOF fi link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes ; then + use_static_libs=no + fi if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { test "$use_static_libs" = no || test -z "$old_library"; }; then if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" need_relink=yes @@ -2548,11 +2652,15 @@ EOF if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5* ) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; *-*-darwin* ) # if the lib is a module then we can not link against # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then + 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 @@ -2583,7 +2691,7 @@ EOF add_dir="-L$dir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then - case "$libdir" in + case $libdir in [\\/]*) add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; @@ -2656,7 +2764,7 @@ EOF add_dir="-L$libdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then - case "$libdir" in + case $libdir in [\\/]*) add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; @@ -2717,8 +2825,6 @@ EOF fi fi else - convenience="$convenience $dir/$old_library" - old_convenience="$old_convenience $dir/$old_library" deplibs="$dir/$old_library $deplibs" link_static=yes fi @@ -2836,12 +2942,12 @@ EOF *) continue ;; esac case " $deplibs " in - *" $depdepl "*) ;; - *) deplibs="$depdepl $deplibs" ;; + *" $path "*) ;; + *) deplibs="$path $deplibs" ;; esac case " $deplibs " in - *" $path "*) ;; - *) deplibs="$deplibs $path" ;; + *" $depdepl "*) ;; + *) deplibs="$depdepl $deplibs" ;; esac done fi # link_all_deplibs != no @@ -3106,27 +3212,27 @@ EOF # Check that each of the things are valid numbers. case $current in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 + $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; esac case $revision in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 + $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; esac case $age in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 + $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; @@ -3305,9 +3411,9 @@ EOF # Eliminate all temporary directories. for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` - deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` + lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` done if test -n "$xrpath"; then @@ -3358,9 +3464,14 @@ EOF *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work ;; *) # Add libc to deplibs on all other systems if necessary. @@ -3404,11 +3515,11 @@ EOF int main() { return 0; } EOF $rm conftest - $LTCC -o conftest conftest.c $deplibs + $LTCC $LTCFLAGS -o conftest conftest.c $deplibs if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do - name="`expr $i : '-l\(.*\)'`" + name=`expr $i : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" -ne "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -3445,11 +3556,11 @@ EOF # Error occurred in the first compile. Let's try to salvage # the situation: Compile a separate program for each library. for i in $deplibs; do - name="`expr $i : '-l\(.*\)'`" + name=`expr $i : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC -o conftest conftest.c $i + $LTCC $LTCFLAGS -o conftest conftest.c $i # Did it work? if test "$?" -eq 0 ; then ldd_output=`ldd conftest` @@ -3497,7 +3608,7 @@ EOF set dummy $deplibs_check_method file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` for a_deplib in $deplibs; do - name="`expr $a_deplib : '-l\(.*\)'`" + name=`expr $a_deplib : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -3566,7 +3677,7 @@ EOF set dummy $deplibs_check_method match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` for a_deplib in $deplibs; do - name="`expr $a_deplib : '-l\(.*\)'`" + name=`expr $a_deplib : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test -n "$name" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -3696,6 +3807,35 @@ EOF deplibs=$newdeplibs fi + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + deplibs="$new_libs" + + # All the library-specific variables (install_libdir is set above). library_names= old_library= @@ -3779,6 +3919,7 @@ EOF fi lib="$output_objdir/$realname" + linknames= for link do linknames="$linknames $link" @@ -3807,6 +3948,9 @@ EOF # The command line is too long to execute in one step. $show "using reloadable object file for export list..." skipped_export=: + # Break out early, otherwise skipped_export may be + # set to false by a later but shorter cmd. + break fi done IFS="$save_ifs" @@ -3876,7 +4020,8 @@ EOF fi fi - if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && + if test "X$skipped_export" != "X:" && + len=`expr "X$test_cmds" : ".*" 2>/dev/null` && test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then : else @@ -3895,6 +4040,7 @@ EOF save_libobjs=$libobjs fi save_output=$output + output_la=`$echo "X$output" | $Xsed -e "$basename"` # Clear the reloadable object creation command queue and # initialize k to one. @@ -3904,13 +4050,13 @@ EOF delfiles= last_robj= k=1 - output=$output_objdir/$save_output-${k}.$objext + output=$output_objdir/$output_la-${k}.$objext # Loop over the list of objects to be linked. for obj in $save_libobjs do eval test_cmds=\"$reload_cmds $objlist $last_robj\" if test "X$objlist" = X || - { len=`expr "X$test_cmds" : ".*"` && + { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && test "$len" -le "$max_cmd_len"; }; then objlist="$objlist $obj" else @@ -3924,9 +4070,9 @@ EOF # the last one created. eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" fi - last_robj=$output_objdir/$save_output-${k}.$objext + last_robj=$output_objdir/$output_la-${k}.$objext k=`expr $k + 1` - output=$output_objdir/$save_output-${k}.$objext + output=$output_objdir/$output_la-${k}.$objext objlist=$obj len=1 fi @@ -3946,13 +4092,13 @@ EOF eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" fi - # Set up a command to remove the reloadale object files + # Set up a command to remove the reloadable object files # after they are used. i=0 while test "$i" -lt "$k" do i=`expr $i + 1` - delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" + delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" done $echo "creating a temporary reloadable object file: $output" @@ -4000,13 +4146,30 @@ EOF IFS="$save_ifs" eval cmd=\"$cmd\" $show "$cmd" - $run eval "$cmd" || exit $? + $run eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test "$mode" = relink; then + $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' + fi + + exit $lt_exit + } done IFS="$save_ifs" # 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 $? + + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + fi + fi + exit $EXIT_SUCCESS fi @@ -4188,6 +4351,35 @@ EOF ;; esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" @@ -4232,10 +4424,15 @@ EOF fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; *) dllsearchpath="$dllsearchpath:$libdir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac done @@ -4349,13 +4546,25 @@ extern \"C\" { # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$output.exp" + export_symbols="$output_objdir/$outputname.exp" $run $rm $export_symbols - $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac else - $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' - $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' + $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac fi fi @@ -4406,7 +4615,26 @@ extern \"C\" { #endif /* The mapping between symbol names and symbols. */ +" + + case $host in + *cygwin* | *mingw* ) + $echo >> "$output_objdir/$dlsyms" "\ +/* DATA imports from DLLs on WIN32 can't be const, because + runtime relocations are performed -- see ld's documentation + on pseudo-relocs */ +struct { +" + ;; + * ) + $echo >> "$output_objdir/$dlsyms" "\ const struct { +" + ;; + esac + + + $echo >> "$output_objdir/$dlsyms" "\ const char *name; lt_ptr address; } @@ -4453,16 +4681,29 @@ static const void *lt_preloaded_setup() { esac # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" # Transform the symbol file into the correct name. - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + case $host in + *cygwin* | *mingw* ) + if test -f "$output_objdir/${outputname}.def" ; then + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + else + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + fi + ;; + * ) + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + ;; + esac ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 @@ -4487,7 +4728,7 @@ static const void *lt_preloaded_setup() { # We have no uninstalled library dependencies, so finalize right now. $show "$link_command" $run eval "$link_command" - status=$? + exit_status=$? # Delete the generated files. if test -n "$dlsyms"; then @@ -4495,7 +4736,7 @@ static const void *lt_preloaded_setup() { $run $rm "$output_objdir/${outputname}S.${objext}" fi - exit $status + exit $exit_status fi if test -n "$shlibpath_var"; then @@ -4635,10 +4876,12 @@ static const void *lt_preloaded_setup() { esac case $host in *cygwin* | *mingw* ) - cwrappersource=`$echo ${objdir}/lt-${output}.c` - cwrapper=`$echo ${output}.exe` - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + output_name=`basename $output` + output_path=`dirname $output` + cwrappersource="$output_path/$objdir/lt-$output_name.c" + cwrapper="$output_path/$output_name.exe" + $rm $cwrappersource $cwrapper + trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 cat > $cwrappersource <<EOF @@ -4663,6 +4906,9 @@ EOF #include <malloc.h> #include <stdarg.h> #include <assert.h> +#include <string.h> +#include <ctype.h> +#include <sys/stat.h> #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -4673,15 +4919,19 @@ EOF #endif #ifndef DIR_SEPARATOR -#define DIR_SEPARATOR '/' +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' #endif #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ defined (__OS2__) -#define HAVE_DOS_BASED_FILE_SYSTEM -#ifndef DIR_SEPARATOR_2 -#define DIR_SEPARATOR_2 '\\' -#endif +# define HAVE_DOS_BASED_FILE_SYSTEM +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif #endif #ifndef DIR_SEPARATOR_2 @@ -4691,17 +4941,32 @@ EOF (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) #endif /* DIR_SEPARATOR_2 */ +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ + #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) +/* -DDEBUG is fairly common in CFLAGS. */ +#undef DEBUG +#if defined DEBUGWRAPPER +# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) +#else +# define DEBUG(format, ...) +#endif + const char *program_name = NULL; void * xmalloc (size_t num); char * xstrdup (const char *string); -char * basename (const char *name); -char * fnqualify(const char *path); +const char * base_name (const char *name); +char * find_executable(const char *wrapper); +int check_executable(const char *path); char * strendzap(char *str, const char *pat); void lt_fatal (const char *message, ...); @@ -4711,29 +4976,51 @@ main (int argc, char *argv[]) char **newargz; int i; - program_name = (char *) xstrdup ((char *) basename (argv[0])); + program_name = (char *) xstrdup (base_name (argv[0])); + DEBUG("(main) argv[0] : %s\n",argv[0]); + DEBUG("(main) program_name : %s\n",program_name); newargz = XMALLOC(char *, argc+2); EOF - cat >> $cwrappersource <<EOF - newargz[0] = "$SHELL"; + cat >> $cwrappersource <<EOF + newargz[0] = (char *) xstrdup("$SHELL"); EOF - cat >> $cwrappersource <<"EOF" - newargz[1] = fnqualify(argv[0]); + cat >> $cwrappersource <<"EOF" + newargz[1] = find_executable(argv[0]); + if (newargz[1] == NULL) + lt_fatal("Couldn't find %s", argv[0]); + DEBUG("(main) found exe at : %s\n",newargz[1]); /* we know the script has the same name, without the .exe */ /* so make sure newargz[1] doesn't end in .exe */ strendzap(newargz[1],".exe"); for (i = 1; i < argc; i++) newargz[i+1] = xstrdup(argv[i]); newargz[argc+1] = NULL; + + for (i=0; i<argc+1; i++) + { + DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]); + ; + } + EOF - cat >> $cwrappersource <<EOF + case $host_os in + mingw*) + cat >> $cwrappersource <<EOF + execv("$SHELL",(char const **)newargz); +EOF + ;; + *) + cat >> $cwrappersource <<EOF execv("$SHELL",newargz); EOF + ;; + esac - cat >> $cwrappersource <<"EOF" + cat >> $cwrappersource <<"EOF" + return 127; } void * @@ -4753,48 +5040,148 @@ xstrdup (const char *string) ; } -char * -basename (const char *name) +const char * +base_name (const char *name) { const char *base; #if defined (HAVE_DOS_BASED_FILE_SYSTEM) /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha (name[0]) && name[1] == ':') + if (isalpha ((unsigned char)name[0]) && name[1] == ':') name += 2; #endif for (base = name; *name; name++) if (IS_DIR_SEPARATOR (*name)) base = name + 1; - return (char *) base; + return base; +} + +int +check_executable(const char * path) +{ + struct stat st; + + DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); + if ((!path) || (!*path)) + return 0; + + if ((stat (path, &st) >= 0) && + ( + /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ +#if defined (S_IXOTH) + ((st.st_mode & S_IXOTH) == S_IXOTH) || +#endif +#if defined (S_IXGRP) + ((st.st_mode & S_IXGRP) == S_IXGRP) || +#endif + ((st.st_mode & S_IXUSR) == S_IXUSR)) + ) + return 1; + else + return 0; } +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise */ char * -fnqualify(const char *path) +find_executable (const char* wrapper) { - size_t size; - char *p; + int has_slash = 0; + const char* p; + const char* p_next; + /* static buffer for getcwd */ char tmp[LT_PATHMAX + 1]; + int tmp_len; + char* concat_name; + + DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); - assert(path != NULL); + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; - /* Is it qualified already? */ + /* Absolute path? */ #if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha (path[0]) && path[1] == ':') - return xstrdup (path); + if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + } #endif - if (IS_DIR_SEPARATOR (path[0])) - return xstrdup (path); - /* prepend the current directory */ - /* doesn't handle '~' */ + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char* path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char* q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR(*q)) + break; + p_len = q - p; + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + tmp_len = strlen(tmp); + concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) lt_fatal ("getcwd failed"); - size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ - p = XMALLOC(char, size); - sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); - return p; + tmp_len = strlen(tmp); + concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + return NULL; } char * @@ -4838,16 +5225,16 @@ lt_fatal (const char *message, ...) va_end (ap); } EOF - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $run $LTCC -s -o $cwrapper $cwrappersource - ;; - esac - $rm $output - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 + # we should really use a build-platform specific compiler + # here, but OTOH, the wrappers (shell script and this C one) + # are only useful if you want to execute the "real" binary. + # Since the "real" binary is built for $host, then this + # wrapper might as well be built for $host, too. + $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource + ;; + esac + $rm $output + trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 $echo > $output "\ #! $SHELL @@ -4997,13 +5384,13 @@ else # Backslashes separate directories on plain windows *-*-mingw | *-*-os2*) $echo >> $output "\ - exec \$progdir\\\\\$program \${1+\"\$@\"} + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} " ;; *) $echo >> $output "\ - exec \$progdir/\$program \${1+\"\$@\"} + exec \"\$progdir/\$program\" \${1+\"\$@\"} " ;; esac @@ -5013,7 +5400,7 @@ else fi else # The program doesn't exist. - \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 + \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 \$echo \"This script is just a wrapper for \$program.\" 1>&2 $echo \"See the $PACKAGE documentation for more information.\" 1>&2 exit $EXIT_FAILURE @@ -5055,6 +5442,63 @@ fi\ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then cmds=$old_archive_from_new_cmds else + # POSIX demands no paths to be encoded in archives. We have + # to avoid creating archives with duplicate basenames if we + # might have to extract them afterwards, e.g., when creating a + # static archive out of a convenience library, or when linking + # the entirety of a libtool archive into another (currently + # not supported by libtool). + if (for obj in $oldobjs + do + $echo "X$obj" | $Xsed -e 's%^.*/%%' + done | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "copying selected object files to avoid basename conflicts..." + + if test -z "$gentop"; then + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" + + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$gentop"; then + exit $exit_status + fi + fi + + save_oldobjs=$oldobjs + oldobjs= + counter=1 + for obj in $save_oldobjs + do + objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` + case " $oldobjs " in + " ") oldobjs=$obj ;; + *[\ /]"$objbase "*) + while :; do + # Make sure we don't pick an alternate name that also + # overlaps. + newobj=lt$counter-$objbase + counter=`expr $counter + 1` + case " $oldobjs " in + *[\ /]"$newobj "*) ;; + *) if test ! -f "$gentop/$newobj"; then break; fi ;; + esac + done + $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" + $run ln "$obj" "$gentop/$newobj" || + $run cp "$obj" "$gentop/$newobj" + oldobjs="$oldobjs $gentop/$newobj" + ;; + *) oldobjs="$oldobjs $obj" ;; + esac + done + fi + eval cmds=\"$old_archive_cmds\" if len=`expr "X$cmds" : ".*"` && @@ -5068,20 +5512,7 @@ fi\ objlist= concat_cmds= save_oldobjs=$oldobjs - # GNU ar 2.10+ was changed to match POSIX; thus no paths are - # encoded into archives. This makes 'ar r' malfunction in - # this piecewise linking case whenever conflicting object - # names appear in distinct ar calls; check, warn and compensate. - if (for obj in $save_oldobjs - do - $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2 - $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2 - AR_FLAGS=cq - fi + # Is there a better way of finding the last object in the list? for obj in $save_oldobjs do @@ -5092,7 +5523,7 @@ fi\ oldobjs="$objlist $obj" objlist="$objlist $obj" eval test_cmds=\"$old_archive_cmds\" - if len=`expr "X$test_cmds" : ".*"` && + if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && test "$len" -le "$max_cmd_len"; then : else @@ -5289,11 +5720,11 @@ relink_command=\"$relink_command\"" # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then + $echo "X$nonopt" | grep shtool > /dev/null; then # Aesthetically quote it. arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; esac @@ -5302,14 +5733,14 @@ relink_command=\"$relink_command\"" shift else install_prog= - arg="$nonopt" + arg=$nonopt fi # The real first argument should be the name of the installation program. # Aesthetically quote it. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; esac @@ -5327,28 +5758,31 @@ relink_command=\"$relink_command\"" do if test -n "$dest"; then files="$files $dest" - dest="$arg" + dest=$arg continue fi case $arg in -d) isdir=yes ;; - -f) prev="-f" ;; - -g) prev="-g" ;; - -m) prev="-m" ;; - -o) prev="-o" ;; + -f) + case " $install_prog " in + *[\\\ /]cp\ *) ;; + *) prev=$arg ;; + esac + ;; + -g | -m | -o) prev=$arg ;; -s) stripme=" -s" continue ;; - -*) ;; - + -*) + ;; *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then prev= else - dest="$arg" + dest=$arg continue fi ;; @@ -5357,7 +5791,7 @@ relink_command=\"$relink_command\"" # Aesthetically quote the argument. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; esac @@ -5526,11 +5960,14 @@ relink_command=\"$relink_command\"" if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. + # Try `ln -sf' first, because the `ln' binary might depend on + # the symlink we replace! Solaris /bin/ln does not understand -f, + # so we also need to try rm && ln -s. for linkname do if test "$linkname" != "$realname"; then - $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" - $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" + $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" + $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" fi done fi @@ -5543,7 +5980,16 @@ relink_command=\"$relink_command\"" IFS="$save_ifs" eval cmd=\"$cmd\" $show "$cmd" - $run eval "$cmd" || exit $? + $run eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test "$mode" = relink; then + $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' + fi + + exit $lt_exit + } done IFS="$save_ifs" fi @@ -5637,17 +6083,15 @@ relink_command=\"$relink_command\"" notinst_deplibs= relink_command= - # To insure that "foo" is sourced, and not "foo.exe", - # finese the cygwin/MSYS system by explicitly sourcing "foo." - # which disallows the automatic-append-.exe behavior. - case $build in - *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; - *) wrapperdot=${wrapper} ;; - esac + # Note that it is not necessary on cygwin/mingw to append a dot to + # foo even if both foo and FILE.exe exist: automatic-append-.exe + # behavior happens only for exec(3), not for open(2)! Also, sourcing + # `FILE.' does not work on cygwin managed mounts. + # # If there is no directory component, then add one. - case $file in - */* | *\\*) . ${wrapperdot} ;; - *) . ./${wrapperdot} ;; + case $wrapper in + */* | *\\*) . ${wrapper} ;; + *) . ./${wrapper} ;; esac # Check the variables that should have been set. @@ -5675,34 +6119,21 @@ relink_command=\"$relink_command\"" done relink_command= - # To insure that "foo" is sourced, and not "foo.exe", - # finese the cygwin/MSYS system by explicitly sourcing "foo." - # which disallows the automatic-append-.exe behavior. - case $build in - *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; - *) wrapperdot=${wrapper} ;; - esac + # Note that it is not necessary on cygwin/mingw to append a dot to + # foo even if both foo and FILE.exe exist: automatic-append-.exe + # behavior happens only for exec(3), not for open(2)! Also, sourcing + # `FILE.' does not work on cygwin managed mounts. + # # If there is no directory component, then add one. - case $file in - */* | *\\*) . ${wrapperdot} ;; - *) . ./${wrapperdot} ;; + case $wrapper in + */* | *\\*) . ${wrapper} ;; + *) . ./${wrapper} ;; esac outputname= if test "$fast_install" = no && test -n "$relink_command"; then if test "$finalize" = yes && test -z "$run"; then - tmpdir="/tmp" - test -n "$TMPDIR" && tmpdir="$TMPDIR" - tmpdir="$tmpdir/libtool-$$" - 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 + tmpdir=`func_mktempdir` file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. @@ -5726,7 +6157,7 @@ relink_command=\"$relink_command\"" fi # remove .exe since cygwin /usr/bin/install will append another - # one anyways + # one anyway case $install_prog,$host in */usr/bin/install*,*cygwin*) case $file:$destfile in @@ -5826,7 +6257,7 @@ relink_command=\"$relink_command\"" # Exit here if they wanted silent mode. test "$show" = : && exit $EXIT_SUCCESS - $echo "----------------------------------------------------------------------" + $echo "X----------------------------------------------------------------------" | $Xsed $echo "Libraries have been installed in:" for libdir in $libdirs; do $echo " $libdir" @@ -5859,7 +6290,7 @@ relink_command=\"$relink_command\"" $echo $echo "See any operating system documentation about shared libraries for" $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "----------------------------------------------------------------------" + $echo "X----------------------------------------------------------------------" | $Xsed exit $EXIT_SUCCESS ;; @@ -6076,9 +6507,17 @@ relink_command=\"$relink_command\"" rmfiles="$rmfiles $objdir/$n" done test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - if test "$mode" = uninstall; then + case "$mode" in + clean) + case " $library_names " in + # " " in the beginning catches empty $dlname + *" $dlname "*) ;; + *) rmfiles="$rmfiles $objdir/$dlname" ;; + esac + test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + ;; + uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. cmds=$postuninstall_cmds @@ -6111,7 +6550,8 @@ relink_command=\"$relink_command\"" IFS="$save_ifs" fi # FIXME: should reinstall the best remaining shared library. - fi + ;; + esac fi ;; @@ -6396,7 +6836,7 @@ esac $echo $echo "Try \`$modename --help' for more information about other modes." -exit $EXIT_SUCCESS +exit $? # The TAGs below are defined such that we never get into a situation # in which we disable both kinds of libraries. Given conflicting @@ -6410,12 +6850,11 @@ exit $EXIT_SUCCESS # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared -build_libtool_libs=no -build_old_libs=yes +disable_libs=shared # ### END LIBTOOL TAG CONFIG: disable-shared # ### BEGIN LIBTOOL TAG CONFIG: disable-static -build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` +disable_libs=static # ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: diff --git a/db/dist/pubdef.in b/db/dist/pubdef.in index 7f6ad2ebd..67b222499 100644 --- a/db/dist/pubdef.in +++ b/db/dist/pubdef.in @@ -1,386 +1,437 @@ +# $Id: pubdef.in,v 12.35 2006/09/13 14:53:38 mjc Exp $ +# # Name # D == documentation # I == include file # J == Java constant # N == wrapped by the Java native layer -DB_AFTER D I J -DB_AGGRESSIVE D I J -DB_ALREADY_ABORTED * I * -DB_AM_CHKSUM * I * -DB_AM_CL_WRITER * I * -DB_AM_COMPENSATE * I * -DB_AM_CREATED * I * -DB_AM_CREATED_MSTR * I * -DB_AM_DBM_ERROR * I * -DB_AM_DELIMITER * I * -DB_AM_DIRTY * I * -DB_AM_DISCARD * I * -DB_AM_DUP * I * -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 * -DB_AM_PAD * I * -DB_AM_PGDEF * I * -DB_AM_RDONLY * I * -DB_AM_RECNUM * I * -DB_AM_RECOVER * I * -DB_AM_RENUMBER * I * -DB_AM_REPLICATION * I * -DB_AM_REVSPLITOFF * I * -DB_AM_SECONDARY * I * -DB_AM_SNAPSHOT * I * -DB_AM_SUBDB * I * -DB_AM_SWAP * I * -DB_AM_TXN * I * -DB_AM_VERIFYING * I * -DB_APPEND D I J -DB_ARCH_ABS D I J -DB_ARCH_DATA D I J -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 J -DB_BTREEMAGIC * I * -DB_BTREEOLDVER * I * -DB_BTREEVERSION * I * -DB_BUFFER_SMALL D I N -DB_CACHED_COUNTS * I * -DB_CDB_ALLDB D I J -DB_CHKSUM D I J -DB_CONFIG D * * -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 * -DB_DBM_HSEARCH * 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 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 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 -DB_ENCRYPT_AES D I J -DB_ENV_AUTO_COMMIT * I * -DB_ENV_CDB * I * -DB_ENV_CDB_ALLDB * I * -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 * -DB_ENV_OPEN_CALLED * I * -DB_ENV_OVERWRITE * I * -DB_ENV_PRIVATE * I * -DB_ENV_REGION_INIT * I * -DB_ENV_RPCCLIENT * I * -DB_ENV_RPCCLIENT_GIVEN * I * -DB_ENV_SYSTEM_MEM * I * -DB_ENV_THREAD * I * -DB_ENV_TIME_NOTGRANTED * I * -DB_ENV_TXN_NOSYNC * 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_FILE_ID_LEN * I * -DB_FIRST D I J -DB_FLUSH D I J -DB_FORCE D I J -DB_GET_BOTH D I J -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 J -DB_HASHMAGIC * I * -DB_HASHOLDVER * I * -DB_HASHVERSION * I * -DB_HOME D * * -DB_INIT_CDB D I J -DB_INIT_LOCK D I J -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 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_ABORT * I * -DB_LOCK_DEADLOCK D I J -DB_LOCK_DEFAULT D I J -DB_LOCK_DIRTY * I * -DB_LOCK_DUMP * I * -DB_LOCK_EXPIRE D I J -DB_LOCK_GET D I J -DB_LOCK_GET_TIMEOUT D I J -DB_LOCK_INHERIT * I * -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 J -DB_LOCK_NOWAIT D I J -DB_LOCK_OLDEST D I J -DB_LOCK_PUT D I J -DB_LOCK_PUT_ALL D I J -DB_LOCK_PUT_OBJ D I J -DB_LOCK_PUT_READ * I * -DB_LOCK_RANDOM D I J -DB_LOCK_READ D I J -DB_LOCK_RECORD * I * -DB_LOCK_REMOVE * I * -DB_LOCK_SET_TIMEOUT * I * -DB_LOCK_SWITCH * I * -DB_LOCK_TIMEOUT D I J -DB_LOCK_TRADE * I * -DB_LOCK_UPGRADE * I * -DB_LOCK_UPGRADE_WRITE * I * -DB_LOCK_WAIT * I * -DB_LOCK_WRITE D I J -DB_LOCK_WWRITE * I * -DB_LOCK_YOUNGEST D I J -DB_LOGC_BUF_SIZE * I * -DB_LOGFILEID_INVALID * I * -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_EXPIRED * I * -DB_LSTAT_FREE * I * -DB_LSTAT_HELD * I * -DB_LSTAT_NOTEXIST * I * -DB_LSTAT_PENDING * I * -DB_LSTAT_WAITING * I * -DB_MAX_PAGES * I * -DB_MAX_RECORDS * I * -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 D I J -DB_MULTIPLE D I J -DB_MULTIPLE_INIT D I * -DB_MULTIPLE_KEY D I J -DB_MULTIPLE_KEY_NEXT D I * -DB_MULTIPLE_NEXT D I * -DB_MULTIPLE_RECNO_NEXT D I * -DB_NEEDSPLIT * I * -DB_NEXT D I J -DB_NEXT_DUP D I J -DB_NEXT_NODUP D I J -DB_NODUPDATA D I J -DB_NOLOCKING D I J -DB_NOMMAP D I J -DB_NOORDERCHK D I J -DB_NOOVERWRITE D I J -DB_NOPANIC D I J -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 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 * -DB_OPFLAGS_MASK * I * -DB_ORDERCHKONLY D I J -DB_OVERWRITE D I J -DB_PAGE_LOCK * I * -DB_PAGE_NOTFOUND D I * -DB_PANIC_ENVIRONMENT D I J -DB_POSITION D I J -DB_PREV D I J -DB_PREV_NODUP D I J -DB_PRINTABLE D I J -DB_PRIORITY_DEFAULT D I J -DB_PRIORITY_HIGH D I J -DB_PRIORITY_LOW D I J -DB_PRIORITY_VERY_HIGH D I J -DB_PRIORITY_VERY_LOW D I J -DB_PRIVATE D I J -DB_PR_PAGE * I * -DB_PR_RECOVERYTEST * I * -DB_QAMMAGIC * I * -DB_QAMOLDVER * I * -DB_QAMVERSION * I * -DB_QUEUE D I J -DB_RDONLY D I J -DB_RDWRMASTER * I * -DB_RECNO D I J -DB_RECNUM D I J -DB_RECORDCOUNT * I * -DB_RECORD_LOCK * I * -DB_RECOVER D I J -DB_RECOVER_FATAL D I J -DB_REDO * I * -DB_REGION_INIT D I J -DB_REGION_MAGIC * I * -DB_RENAMEMAGIC * I * -DB_RENUMBER D I J -DB_REP_CLIENT D I J -DB_REP_CREATE * I * -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_LOGREADY * I * -DB_REP_MASTER D I J -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_PAGEDONE * I * -DB_REP_PERMANENT 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 N -DB_SALVAGE D I J -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 * -DB_TEST_POSTOPEN * I * -DB_TEST_POSTSYNC * I * -DB_TEST_PREDESTROY * I * -DB_TEST_PREOPEN * I * -DB_TEST_SUBDB_LOCKS * I * -DB_THREAD D I J -DB_TIMEOUT * I * -DB_TIME_NOTGRANTED D I J -DB_TRUNCATE D I J -DB_TXNVERSION * I * -DB_TXN_ABORT D I J -DB_TXN_APPLY D I J -DB_TXN_BACKWARD_ALLOC * I * -DB_TXN_BACKWARD_ROLL D I J -DB_TXN_CKP * 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 J -DB_TXN_SYNC D I J -DB_TXN_WRITE_NOSYNC D I J -DB_UNDO * I * -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_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 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 N -DB_WRITECURSOR D I J -DB_WRITELOCK * I * -DB_WRITEOPEN * I * -DB_XA_CREATE D I J -DB_XIDDATASIZE D I J -DB_YIELDCPU D I J +DB_AFTER D I J +DB_AGGRESSIVE D I J +DB_ALREADY_ABORTED * I * +DB_AM_CHKSUM * I * +DB_AM_CL_WRITER * I * +DB_AM_COMPENSATE * I * +DB_AM_CREATED * I * +DB_AM_CREATED_MSTR * I * +DB_AM_DBM_ERROR * I * +DB_AM_DELIMITER * I * +DB_AM_DISCARD * I * +DB_AM_DUP * I * +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 * +DB_AM_PAD * I * +DB_AM_PGDEF * I * +DB_AM_RDONLY * I * +DB_AM_READ_UNCOMMITTED * I * +DB_AM_RECNUM * I * +DB_AM_RECOVER * I * +DB_AM_RENUMBER * I * +DB_AM_REVSPLITOFF * I * +DB_AM_SECONDARY * I * +DB_AM_SNAPSHOT * I * +DB_AM_SUBDB * I * +DB_AM_SWAP * I * +DB_AM_TXN * I * +DB_AM_VERIFYING * I * +DB_APPEND D I J +DB_ARCH_ABS D I J +DB_ARCH_DATA D I J +DB_ARCH_LOG D I J +DB_ARCH_REMOVE D I J +DB_ASSOC_IMMUTABLE_KEY * I * +DB_AUTO_COMMIT D I J +DB_BEFORE D I J +DB_BTREE D I J +DB_BTREEMAGIC * I * +DB_BTREEOLDVER * I * +DB_BTREEVERSION * I * +DB_BUFFER_SMALL D I N +DB_CDB_ALLDB D I J +DB_CHKSUM D I J +DB_COMPACT_FLAGS * I * +DB_CONFIG D * * +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 * +DB_DBM_HSEARCH * 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 N +DB_DBT_USERCOPY * I N +DB_DBT_USERMEM D I J +DB_DEGREE_2 * I * +DB_DELETED * I * +DB_DIRECT D I * +DB_DIRECT_DB D I J +DB_DIRECT_LOG D I J +DB_DIRTY_READ * I * +DB_DONOTINDEX D I J +DB_DSYNC_DB 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 +DB_ENCRYPT_AES D I J +DB_ENV_AUTO_COMMIT * I * +DB_ENV_CDB * I * +DB_ENV_CDB_ALLDB * I * +DB_ENV_CREATE * I * +DB_ENV_DBLOCAL * I * +DB_ENV_DIRECT_DB * I * +DB_ENV_DIRECT_LOG * I * +DB_ENV_DSYNC_DB * 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_MULTIVERSION * I * +DB_ENV_NOLOCKING * I * +DB_ENV_NOMMAP * I * +DB_ENV_NOPANIC * I * +DB_ENV_OPEN_CALLED * I * +DB_ENV_OVERWRITE * I * +DB_ENV_PRIVATE * I * +DB_ENV_REGION_INIT * I * +DB_ENV_RPCCLIENT * I * +DB_ENV_RPCCLIENT_GIVEN * I * +DB_ENV_SYSTEM_MEM * I * +DB_ENV_THREAD * I * +DB_ENV_TIME_NOTGRANTED * I * +DB_ENV_TXN_NOSYNC * I * +DB_ENV_TXN_SNAPSHOT * I * +DB_ENV_TXN_WRITE_NOSYNC * I * +DB_ENV_YIELDCPU * I * +DB_EVENT_NO_SUCH_EVENT * I * +DB_EVENT_PANIC D I J +DB_EVENT_REP_CLIENT D I J +DB_EVENT_REP_MASTER D I J +DB_EVENT_REP_NEWMASTER D I J +DB_EVENT_REP_STARTUPDONE D I J +DB_EVENT_WRITE_FAILED D I J +DB_EXCL D I J +DB_EXTENT * I * +DB_FAST_STAT D I J +DB_FCNTL_LOCKING * I * +DB_FILE_ID_LEN * I * +DB_FIRST D I J +DB_FLUSH D I J +DB_FORCE D I J +DB_FREELIST_ONLY D I J +DB_FREE_SPACE D I J +DB_GET_BOTH D I J +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 J +DB_HASHMAGIC * I * +DB_HASHOLDVER * I * +DB_HASHVERSION * I * +DB_HOME D * * +DB_IMMUTABLE_KEY D I J +DB_INIT_CDB D I J +DB_INIT_LOCK D I J +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 * I J +DB_JOIN_ITEM D I J +DB_JOIN_NOSORT D I J +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_ABORT * I * +DB_LOCK_DEADLOCK D I J +DB_LOCK_DEFAULT D I J +DB_LOCK_DUMP * I * +DB_LOCK_EXPIRE D I J +DB_LOCK_GET D I J +DB_LOCK_GET_TIMEOUT D I J +DB_LOCK_INHERIT * I * +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_NOTGRANTED D I J +DB_LOCK_NOWAIT D I J +DB_LOCK_OLDEST D I J +DB_LOCK_PUT D I J +DB_LOCK_PUT_ALL D I J +DB_LOCK_PUT_OBJ D I J +DB_LOCK_PUT_READ * I * +DB_LOCK_RANDOM D I J +DB_LOCK_READ D I J +DB_LOCK_READ_UNCOMMITTED * I * +DB_LOCK_RECORD * I * +DB_LOCK_SET_TIMEOUT * I * +DB_LOCK_SWITCH * I * +DB_LOCK_TIMEOUT D I J +DB_LOCK_TRADE * I * +DB_LOCK_UPGRADE * I * +DB_LOCK_UPGRADE_WRITE * I * +DB_LOCK_WAIT * I * +DB_LOCK_WRITE D I J +DB_LOCK_WWRITE * I * +DB_LOCK_YOUNGEST D I J +DB_LOGFILEID_INVALID * I * +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_SILENT_ERR * I * +DB_LOG_WRNOSYNC * I * +DB_LSTAT_ABORTED * I * +DB_LSTAT_EXPIRED * I * +DB_LSTAT_FREE * I * +DB_LSTAT_HELD * I * +DB_LSTAT_PENDING * I * +DB_LSTAT_WAITING * I * +DB_MAX_PAGES * I * +DB_MAX_RECORDS * I * +DB_MPOOL_CREATE D I * +DB_MPOOL_DIRTY D I * +DB_MPOOL_DISCARD D I * +DB_MPOOL_EDIT 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 D I J +DB_MULTIPLE D I J +DB_MULTIPLE_INIT D I * +DB_MULTIPLE_KEY D I J +DB_MULTIPLE_KEY_NEXT D I * +DB_MULTIPLE_NEXT D I * +DB_MULTIPLE_RECNO_NEXT D I * +DB_MULTIVERSION D I J +DB_MUTEX_ALLOCATED * I * +DB_MUTEX_LOCKED * I * +DB_MUTEX_LOGICAL_LOCK * I * +DB_MUTEX_PROCESS_ONLY D I * +DB_MUTEX_SELF_BLOCK D I * +DB_NEEDSPLIT * I * +DB_NEXT D I J +DB_NEXT_DUP D I J +DB_NEXT_NODUP D I J +DB_NODUPDATA D I J +DB_NOLOCKING D I J +DB_NOMMAP D I J +DB_NOORDERCHK D I J +DB_NOOVERWRITE D I J +DB_NOPANIC D I J +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 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 * +DB_OPFLAGS_MASK * I * +DB_ORDERCHKONLY D I J +DB_OVERWRITE D I J +DB_PAGE_LOCK * I * +DB_PAGE_NOTFOUND D I * +DB_PANIC_ENVIRONMENT D I J +DB_POSITION D I J +DB_PREV D I J +DB_PREV_NODUP D I J +DB_PRINTABLE D I J +DB_PRIORITY_DEFAULT D I J +DB_PRIORITY_HIGH D I J +DB_PRIORITY_LOW D I J +DB_PRIORITY_VERY_HIGH D I J +DB_PRIORITY_VERY_LOW D I J +DB_PRIVATE D I J +DB_PR_PAGE * I * +DB_PR_RECOVERYTEST * I * +DB_QAMMAGIC * I * +DB_QAMOLDVER * I * +DB_QAMVERSION * I * +DB_QUEUE D I J +DB_RDONLY D I J +DB_RDWRMASTER * I * +DB_READ_COMMITTED D I J +DB_READ_UNCOMMITTED D I J +DB_RECNO D I J +DB_RECNUM D I J +DB_RECORD_LOCK * I * +DB_RECOVER D I J +DB_RECOVER_FATAL D I J +DB_REDO * I * +DB_REGION_INIT D I J +DB_REGION_MAGIC * I * +DB_REGISTER D I J +DB_RENAMEMAGIC * I * +DB_RENUMBER D I J +DB_REPMGR_ACKS_ALL D I J +DB_REPMGR_ACKS_ALL_PEERS D I J +DB_REPMGR_ACKS_NONE D I J +DB_REPMGR_ACKS_ONE D I J +DB_REPMGR_ACKS_ONE_PEER D I J +DB_REPMGR_ACKS_QUORUM D I J +DB_REPMGR_CONNECTED D I J +DB_REPMGR_DISCONNECTED D I * +DB_REPMGR_PEER D I J +DB_REP_ACK_TIMEOUT D I J +DB_REP_ANYWHERE D I J +DB_REP_BULKOVF * I * +DB_REP_CLIENT D I J +DB_REP_CONF_BULK D I J +DB_REP_CONF_DELAYCLIENT D I J +DB_REP_CONF_NOAUTOINIT D I J +DB_REP_CONF_NOWAIT D I J +DB_REP_CONNECTION_RETRY D I J +DB_REP_DUPMASTER D I N +DB_REP_EGENCHG * I * +DB_REP_ELECTION D I J +DB_REP_ELECTION_RETRY D I J +DB_REP_ELECTION_TIMEOUT D I J +DB_REP_FULL_ELECTION D I J +DB_REP_HANDLE_DEAD D I N +DB_REP_HOLDELECTION D I N +DB_REP_IGNORE D I J +DB_REP_ISPERM D I J +DB_REP_JOIN_FAILURE D I N +DB_REP_LOCKOUT D I N +DB_REP_LOGREADY * I * +DB_REP_MASTER D I J +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_PAGEDONE * I * +DB_REP_PERMANENT D I J +DB_REP_REREQUEST D I J +DB_REP_UNAVAIL D I N +DB_REVSPLITOFF D I J +DB_RMW D I J +DB_RPCCLIENT D I J +DB_RUNRECOVERY D I N +DB_SALVAGE D I J +DB_SECONDARY_BAD D I * +DB_SEQUENCE_OLDVER * 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_SEQ_WRAPPED * I * +DB_SET D I J +DB_SET_LOCK_TIMEOUT D I J +DB_SET_RANGE D I J +DB_SET_RECNO D I J +DB_SET_TXN_LSNP * I * +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_NOERROR * 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 * +DB_TEST_POSTOPEN * I * +DB_TEST_POSTSYNC * I * +DB_TEST_PREDESTROY * I * +DB_TEST_PREOPEN * I * +DB_TEST_RECYCLE * I * +DB_TEST_SUBDB_LOCKS * I * +DB_THREAD D I J +DB_THREADID_STRLEN D I * +DB_TIMEOUT * I * +DB_TIME_NOTGRANTED D I J +DB_TRUNCATE D I J +DB_TXNVERSION * I * +DB_TXN_ABORT D I J +DB_TXN_APPLY D I J +DB_TXN_BACKWARD_ALLOC * I * +DB_TXN_BACKWARD_ROLL D I J +DB_TXN_CKP * 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 J +DB_TXN_SNAPSHOT D I J +DB_TXN_SYNC D I J +DB_TXN_WRITE_NOSYNC D I J +DB_UNDO * I * +DB_UNKNOWN D I J +DB_UNREF * I * +DB_UPDATE_SECONDARY * I * +DB_UPGRADE D I J +DB_USERCOPY_GETDATA * I N +DB_USERCOPY_SETDATA * I N +DB_USE_ENVIRON D I J +DB_USE_ENVIRON_ROOT D I J +DB_VERB_DEADLOCK D I J +DB_VERB_RECOVERY D I J +DB_VERB_REGISTER 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 N +DB_VERIFY_FATAL * I * +DB_VERSION_MAJOR * I J +DB_VERSION_MINOR * I J +DB_VERSION_MISMATCH D I N +DB_VERSION_PATCH * I J +DB_VERSION_STRING * I N +DB_WRITECURSOR D I J +DB_WRITELOCK * I * +DB_WRITEOPEN * I * +DB_XA_CREATE D I J +DB_XIDDATASIZE D I J +DB_YIELDCPU D I J diff --git a/db/dist/s_all b/db/dist/s_all index 02686b742..0891a713b 100644..100755 --- a/db/dist/s_all +++ b/db/dist/s_all @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_all,v 1.11 2002/10/30 15:26:36 bostic Exp $ +# $Id: s_all,v 12.2 2005/12/01 03:24:24 bostic Exp $ sh s_perm # permissions. sh s_symlink # symbolic links. @@ -13,8 +13,8 @@ sh s_recover # logging/recovery files. sh s_rpc # RPC files. sh s_include # standard include files. -sh s_win32 # Win32 include files. -sh s_win32_dsp # Win32 build environment. +sh s_windows # Windows include files. +sh s_windows_dsp # Windows build environment. sh s_vxworks # VxWorks include files. sh s_java # Java support. sh s_test # Test suite support. diff --git a/db/dist/s_config b/db/dist/s_config index 604a1d089..194df83a5 100755 --- a/db/dist/s_config +++ b/db/dist/s_config @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_config,v 1.13 2003/07/02 15:27:44 bostic Exp $ +# $Id: s_config,v 12.1 2005/08/16 05:19:18 mjc Exp $ # # Build the autoconfiguration files. @@ -20,14 +20,13 @@ rm -f configure autoconf # Edit version information we couldn't pre-compute. -(echo "1,\$s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" && - echo "1,\$s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" && - echo "1,\$s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" && - echo "1,\$s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" && - echo "1,\$s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" && - echo "1,\$s/__EDIT_DB_VERSION__/$DB_VERSION/g" && - echo "w" && - echo "q") | ed configure +sed -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ + -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ + -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ + -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ + -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ + -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure > configure.version +mv configure.version configure rm -rf autom4te.cache chmod 555 configure diff --git a/db/dist/s_crypto b/db/dist/s_crypto index 05a93043a..8dc736207 100644..100755 --- a/db/dist/s_crypto +++ b/db/dist/s_crypto @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_crypto,v 11.8 2003/11/24 22:41:26 bostic Exp $ +# $Id: s_crypto,v 12.1 2005/12/01 03:24:24 bostic Exp $ # Remove crypto from the DB source tree. @@ -43,8 +43,8 @@ chmod 664 $f echo 'w' && echo 'q') | ed $f - sh ./s_win32 - sh ./s_win32_dsp + sh ./s_windows + sh ./s_windows_dsp # VxWorks f=vx_config.in diff --git a/db/dist/s_include b/db/dist/s_include index ab058d86d..57a048ed8 100755 --- a/db/dist/s_include +++ b/db/dist/s_include @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_include,v 1.22 2004/04/19 18:27:17 mjc Exp $ +# $Id: s_include,v 12.3 2006/04/27 13:40:36 mjc Exp $ # # Build the automatically generated function prototype files. @@ -72,11 +72,12 @@ 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 sequence tcl txn xa; do + lock log mp mutex os qam rep repmgr rpc_client rpc_server \ + sequence tcl txn xa; do head "_${i}_ext_h_" > $i_pfile if [ $i = os ] ; then - f=`ls ../$i/*.c ../os_win32/*.c` + f=`ls ../$i/*.c ../os_windows/*.c` elif [ $i = rpc_server ] ; then f=`ls ../$i/c/*.c` elif [ $i = crypto ] ; then @@ -112,9 +113,9 @@ done # 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@"; - echo "#define __db_jump __db_jump@DB_VERSION_UNIQUE_NAME@") >> $i_dfile -(echo "#define db_xa_switch db_xa_switch@DB_VERSION_UNIQUE_NAME@") >> $e_dfile +(echo "#define __db_global_values __db_global_values@DB_VERSION_UNIQUE_NAME@"; + echo "#define __db_jump __db_jump@DB_VERSION_UNIQUE_NAME@") >> $i_dfile +(echo "#define db_xa_switch db_xa_switch@DB_VERSION_UNIQUE_NAME@") >> $e_dfile # Wrap up the external #defines/prototypes, and internal #defines. tail defonly _DB_EXT_DEF_IN_ >> $e_dfile diff --git a/db/dist/s_java b/db/dist/s_java index ae715ccd6..57b88e8e5 100755 --- a/db/dist/s_java +++ b/db/dist/s_java @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_java,v 11.8 2004/04/06 20:43:35 mjc Exp $ +# $Id: s_java,v 12.0 2004/11/17 03:43:35 bostic Exp $ # # Build the Java files. diff --git a/db/dist/s_java_const b/db/dist/s_java_const index 644b32324..8374b1f61 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.27 2004/07/30 14:51:37 mjc Exp $ +# $Id: s_java_const,v 12.0 2004/11/17 03:43:35 bostic Exp $ # # Build the Java files. diff --git a/db/dist/s_java_stat b/db/dist/s_java_stat index 4eb2ab147..67fa917f8 100755 --- a/db/dist/s_java_stat +++ b/db/dist/s_java_stat @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_java_stat,v 1.33 2004/09/28 19:30:36 mjc Exp $ +# $Id: s_java_stat,v 12.14 2006/08/24 14:45:35 bostic Exp $ # # Build the Java files. @@ -8,11 +8,10 @@ msgjava="/*- * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002-2004 - * Sleepycat Software. All rights reserved. + * Copyright (c) 2002-2006 + * Oracle Corporation. All rights reserved. */" - s=/tmp/__java.sed t=/tmp/__java c=/tmp/__javajnic @@ -28,8 +27,9 @@ jclass() /__db_$1/d /;/!d /^}/d - /char[ ]*\*/{ - s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/\\ + /db_threadid_t/d + /char[ ]*/{ + s/^[ ]*char[* ]*[ ]*\([^[;]*\).*/\\ $2 private String \1;\\ $2 public String get_\1() {\\ $2 return \1;\\ @@ -84,12 +84,15 @@ $2 }/p } EOF sed -n -f $s < ../dbinc/db.in | - perl -w -p -e 's/get_(st|bt|hash|qs)_/get_/;' \ + perl -w -p -e 's/get_(st|bt|hash|qs|compact)_/get_/;' \ -e 'if (m/get.*\(/) {' \ - -e 's/_n([b-df-hj-np-tv-z])/_num_$1/;' \ + -e 's/_n([b-df-hj-np-tv-z]|upgrade)/_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/_mvcc/_multiversion/;' \ + -e 's/_cnt/_count_/;' \ + -e 's/_pg/_pages_/;' \ + -e 's/(count|flag|free|page|percent|size|timeout)/_$1/g;' \ + -e 's/([^p])(id\()/$1_$2/g;' \ -e 's/__*/_/g;' \ -e 's/_(.)/\U$1/g' \ -e '};' \ @@ -109,8 +112,9 @@ jclass_jni() /__db_$1/d /;/!d /^}/d - /char[ ]*\*/{ - s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/ JAVADB_STAT_STRING(jnienv, jobj, $1_\1_fid, statp, \1);/p + /db_threadid_t/d + /char[ ]*/{ + s/^[ ]*char[* ]*[ ]*\([^[;]*\).*/ JAVADB_STAT_STRING(jnienv, jobj, $1_\1_fid, statp, \1);/p d } /time_t/{ @@ -136,7 +140,7 @@ jclass_jni() s/^[ ]*[^ ]*[ ]*\([^;]*\).*/ JAVADB_STAT_INT(jnienv, jobj, $1_\1_fid, statp, \1);/p } EOF - echo "static int $fill(JNIEnv *jnienv, " >> $c + 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 @@ -150,8 +154,9 @@ jni_fieldid_decls() /__db_$1/d /;/!d /^}/d - /char[ ]*\*/{ - s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/static jfieldID $1_\1_fid;/p + /db_threadid_t/d + /char[ ]*/{ + s/^[ ]*char[* ]*[ ]*\([^[;]*\).*/static jfieldID $1_\1_fid;/p d } /time_t/{ @@ -187,8 +192,9 @@ jni_fieldids() /__db_$1/d /;/!d /^}/d - /char[ ]*\*/{ - s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/ { \&$1_\1_fid, \&$1_class, \"\1\", \"Ljava\/lang\/String;\" },/p + /db_threadid_t/d + /char[ ]*/{ + s/^[ ]*char[* ]*[ ]*\([^[;]*\).*/ { \&$1_\1_fid, \&$1_class, \"\1\", \"Ljava\/lang\/String;\" },/p d } /time_t/{ @@ -225,8 +231,9 @@ jclass_toString() /__db_$1/d /;/!d /^}/d - /char[ ]*\*/{ - s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/$3 + "\\\\n$3 \1=" + \1/p + /db_threadid_t/d + /char[ ]*/{ + s/^[ ]*char[* ]*[ ]*\([^[;]*\).*/$3 + "\\\\n$3 \1=" + \1/p d } /DB_TXN_ACTIVE[ ]*\*/{ @@ -260,7 +267,7 @@ stat_class() echo echo "public class $j_class$extends {" echo " // no public constructor" - echo " protected $j_class() {}" + echo " /* package */ $j_class() {}" jclass $1 jclass_toString $1 $2 echo '}') > $t @@ -275,11 +282,42 @@ echo "$msgjava" > $c > $u2 stat_class bt_stat BtreeStats " extends DatabaseStats" + +# Build CompactStats.java - not purely a statistics class, but close enough to +# share this code. +(echo "$msgjava" + echo + echo 'package com.sleepycat.db;' + echo + echo 'import com.sleepycat.db.internal.DbUtil;' + echo + echo "public class CompactStats" + echo '{' + echo " // no public constructor" + echo " /* package */ CompactStats() {}" + echo + echo " /* package */" + echo " CompactStats(int fillpercent, int timeout, int pages) {" + echo " this.compact_fillpercent = fillpercent;" + echo " this.compact_timeout = timeout;" + echo " this.compact_pages = pages;" + echo " }" + jclass compact + jclass_toString compact CompactStats + echo '}' + echo '// end of TransactionStats.java') | + psed 's,public int get\(FillPercent\|Pages(\|Timeout\|Truncate\),/* package */ int get\1,g'> $t +jclass_jni compact __dbj_fill_compact +f=../java/src/com/sleepycat/db/CompactStats.java +cmp $t $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) + 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 mutex_stat MutexStats stat_class qam_stat QueueStats " extends DatabaseStats" stat_class rep_stat ReplicationStats stat_class seq_stat SequenceStats @@ -294,11 +332,11 @@ stat_class seq_stat SequenceStats echo "public class TransactionStats" echo '{' echo " // no public constructor" - echo " protected TransactionStats() {}" + echo " /* package */ TransactionStats() {}" echo echo -n " public static class Active {" echo " // no public constructor" - echo " protected Active() {}" + echo " /* package */ Active() {}" jclass txn_active " " jclass_toString txn_active Active " " echo ' };' diff --git a/db/dist/s_java_swig b/db/dist/s_java_swig index c1e67e316..6a12b67d0 100755 --- a/db/dist/s_java_swig +++ b/db/dist/s_java_swig @@ -1,8 +1,12 @@ #!/bin/sh - -# $Id: s_java_swig,v 11.11 2004/09/23 17:31:53 mjc Exp $ +# $Id: s_java_swig,v 12.6 2006/09/08 20:28:44 bostic Exp $ # # Run SWIG to generate the Java APIs +t=/tmp/__db_a +trap 'rm -f $t ; exit 0' 0 +trap 'rm -f $t ; exit 1' 1 2 3 13 15 + SWIG=swig SWIG_DIR=../libdb_java SWIG_FILE=$SWIG_DIR/db.i @@ -21,7 +25,7 @@ for api in java ; do swig_args="" case $api in java) - swig_args="-nodefault -package $PACKAGE $args" + swig_args="-nodefaultctor -nodefaultdtor -package $PACKAGE $args" ;; esac @@ -53,3 +57,17 @@ for f in *.java ; do perl -p $SWIG_DIR/java-post.pl < $f > $JAVA_SRCDIR/$f || exit $? rm -f $f done + +# db_config.h must be the first #include, move it to the top of the file. +( + echo '#include "db_config.h"' + sed '/#include "db_config.h"/d' < db_java_wrap.c +) > $t && cp $t db_java_wrap.c + +# The following might become redundant with newer swig versions. +# builds usually already define _CRT_SECURE_NO_DEPRECATE +( + sed -e '/# define _CRT_SECURE_NO_DEPRECATE/i\ +# undef _CRT_SECURE_NO_DEPRECATE' < db_java_wrap.c +) > $t && cp $t db_java_wrap.c + diff --git a/db/dist/s_je2db b/db/dist/s_je2db index aaaa42cf1..a5c64197e 100644 --- a/db/dist/s_je2db +++ b/db/dist/s_je2db @@ -52,7 +52,7 @@ 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\)\)" +EXCLUDETESTS="\(\(ForeignKeyTest\)\|\(TupleSerialFactoryTest\)\\|\(XACollectionTest\)\)" cd "$JESRC" for f in `find . -name '*.java' | grep $DIRMATCH` ; do diff --git a/db/dist/s_perm b/db/dist/s_perm index 8c3a0f746..834645b98 100755 --- a/db/dist/s_perm +++ b/db/dist/s_perm @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_perm,v 1.31 2004/10/05 18:56:58 bostic Exp $ +# $Id: s_perm,v 12.2 2005/12/01 03:24:24 bostic Exp $ d=.. echo 'Updating Berkeley DB source tree permissions...' @@ -15,7 +15,7 @@ run() fi } -run build_win32/include.tcl 664 +run build_windows/include.tcl 664 run dist/config.guess 555 run dist/config.sub 555 run dist/configure 555 @@ -36,8 +36,8 @@ run dist/s_symlink 555 run dist/s_tags 555 run dist/s_test 555 run dist/s_vxworks 555 -run dist/s_win32 555 -run dist/s_win32_dsp 555 +run dist/s_windows 555 +run dist/s_windows_dsp 555 run dist/vx_buildcd 555 run mod_db4/configure 555 diff --git a/db/dist/s_readme b/db/dist/s_readme index f2ed07044..afa8c5b60 100755 --- a/db/dist/s_readme +++ b/db/dist/s_readme @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_readme,v 1.7 2003/07/02 15:27:44 bostic Exp $ +# $Id: s_readme,v 12.1 2006/08/24 14:45:35 bostic Exp $ # # Build the README. @@ -15,7 +15,7 @@ trap 'rm -f $t; exit 0' 0 1 2 3 13 15 cat << END_OF_README>$t $DB_VERSION_STRING -This is version $DB_VERSION_MAJOR.$DB_VERSION_MINOR.$DB_VERSION_PATCH of Berkeley DB from Sleepycat Software. To view +This is version $DB_VERSION_MAJOR.$DB_VERSION_MINOR.$DB_VERSION_PATCH of Berkeley DB from Oracle Corporation. To view the release and installation documentation, load the distribution file docs/index.html into your web browser. END_OF_README diff --git a/db/dist/s_recover b/db/dist/s_recover index b30a08554..5bc67e7e8 100755 --- a/db/dist/s_recover +++ b/db/dist/s_recover @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_recover,v 1.17 2004/06/17 17:35:19 bostic Exp $ +# $Id: s_recover,v 12.1 2006/05/24 16:24:24 sue Exp $ # # Build the automatically generated logging/recovery files. @@ -23,11 +23,11 @@ for i in $DIR; do # 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}' + awk '{print $1 "\t" $2 "\t" $3 "\t" $4}' done done > $loglist grep -v '^PREFIX' $loglist | - awk '{print $2 "\t" $3}' | sort -n -k 2 | uniq -d -f 1 > $tmp + awk '{print $2 "\t" $3 "\t" $4}' | sort -n -k 3 | uniq -d -f 1 > $tmp [ -s $tmp ] && { echo "DUPLICATE LOG VALUES:" cat $tmp diff --git a/db/dist/s_rpc b/db/dist/s_rpc index 8dada0e3b..7da75819e 100644..100755 --- a/db/dist/s_rpc +++ b/db/dist/s_rpc @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_rpc,v 11.20 2004/03/11 20:11:17 bostic Exp $ +# $Id: s_rpc,v 12.0 2004/11/17 03:43:35 bostic Exp $ # # Build the automatically generated RPC files diff --git a/db/dist/s_symlink b/db/dist/s_symlink index 533eb6b44..9625e0134 100755 --- a/db/dist/s_symlink +++ b/db/dist/s_symlink @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_symlink,v 1.32 2004/04/01 15:10:53 bostic Exp $ +# $Id: s_symlink,v 12.5 2006/09/13 17:51:34 bostic Exp $ echo 'Creating Berkeley DB source tree symbolic links...' @@ -22,6 +22,7 @@ build db_checkpoint/tags ../dist/tags build db_deadlock/tags ../dist/tags build db_dump/tags ../dist/tags build db_dump185/tags ../dist/tags +build db_hotbackup/tags ../dist/tags build db_load/tags ../dist/tags build db_printlog/tags ../dist/tags build db_recover/tags ../dist/tags @@ -45,10 +46,12 @@ build log/tags ../dist/tags build mp/tags ../dist/tags build mutex/tags ../dist/tags build os/tags ../dist/tags +build os_brew/tags ../dist/tags build os_vxworks/tags ../dist/tags -build os_win32/tags ../dist/tags +build os_windows/tags ../dist/tags build qam/tags ../dist/tags build rep/tags ../dist/tags +build repmgr/tags ../dist/tags build rpc_client/tags ../dist/tags build rpc_server/tags ../dist/tags build sequence/tags ../dist/tags diff --git a/db/dist/s_tags b/db/dist/s_tags index d1c21e5b2..ff59d826e 100755 --- a/db/dist/s_tags +++ b/db/dist/s_tags @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_tags,v 1.18 2004/04/01 15:11:14 bostic Exp $ +# $Id: s_tags,v 12.2 2006/04/23 15:58:33 bostic Exp $ # # Build tags files. @@ -27,6 +27,7 @@ files=`echo ../dbinc/*.h \ ../os/*.[ch] \ ../qam/*.[ch] \ ../rep/*.[ch] \ + ../repmgr/*.[ch] \ ../rpc_client/*.[ch] \ ../rpc_server/c/*.[ch] \ ../sequence/*.[ch] \ @@ -55,7 +56,9 @@ fi ctags $flags $files 2>/dev/null chmod 444 $f -f=../test_perf/tags -echo "Building $f" -(cd ../test_perf && ctags $flags *.[ch] 2>/dev/null) -chmod 444 $f +for i in test_perf test_rep test_server; do + f=../$i/tags + echo "Building $f" + (cd ../$i && ctags $flags *.[ch] 2>/dev/null) + chmod 444 $f +done diff --git a/db/dist/s_test b/db/dist/s_test index df0648d56..543d95b9f 100755 --- a/db/dist/s_test +++ b/db/dist/s_test @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_test,v 1.29 2004/05/13 18:51:43 mjc Exp $ +# $Id: s_test,v 12.5 2006/07/07 19:05:59 bostic Exp $ # # Build the Tcl test files. @@ -30,11 +30,19 @@ trap 'rm -f $t; exit 0' 0 1 2 3 13 15 echo "global dict" && \ echo "global util_path" && \ echo "" && \ + echo "global is_freebsd_test" && \ echo "global is_hp_test" && \ + echo "global is_linux_test" && \ echo "global is_qnx_test" && \ + echo "global is_sunos_test" && \ echo "global is_windows_test" && \ + echo "global is_windows9x_test" && \ echo "" && \ - echo "set KILL \"@db_cv_path_kill@\"") > $t + echo "global valid_methods" && \ + echo "global checking_valid_methods" && \ + echo "global test_recopts" && \ + echo "" && \ + echo "set KILL \"@KILL@\"") > $t f=../test/include.tcl cmp $t $f > /dev/null 2>&1 || @@ -55,13 +63,21 @@ cmp $t $f > /dev/null 2>&1 || echo "global dict" && \ echo "global util_path" && \ echo "" && \ + echo "global is_freebsd_test" && \ echo "global is_hp_test" && \ + echo "global is_linux_test" && \ echo "global is_qnx_test" && \ + echo "global is_sunos_test" && \ echo "global is_windows_test" && \ + echo "global is_windows9x_test" && \ + echo "" && \ + echo "global valid_methods" && \ + echo "global checking_valid_methods" && \ + echo "global test_recopts" && \ echo "" && \ echo "set KILL ./dbkill.exe") > $t -f=../build_win32/include.tcl +f=../build_windows/include.tcl 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_vxworks b/db/dist/s_vxworks index fbff44ab0..ff974e676 100644..100755 --- a/db/dist/s_vxworks +++ b/db/dist/s_vxworks @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_vxworks,v 1.52 2004/10/15 18:28:21 bostic Exp $ +# $Id: s_vxworks,v 12.13 2006/09/13 16:57:49 bostic Exp $ # # Build the VxWorks files. @@ -29,15 +29,17 @@ i\\ #endif } /@inttypes_h_decl@/d -/@stdint_h_decl@/d /@stddef_h_decl@/d +/@stdint_h_decl@/d +/@unistd_h_decl@/d +/@thread_h_decl@/d s/@u_int8_decl@/typedef unsigned char u_int8_t;/ /@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@// +s/@u_int64_decl@/typedef unsigned long long u_int64_t;/ /@u_char_decl@/d /@u_short_decl@/d /@u_int_decl@/d @@ -46,6 +48,8 @@ s/@u_int64_decl@// s/@uintmax_t_decl@/typedef unsigned long uintmax_t;/ s/@uintptr_t_decl@/typedef unsigned long uintptr_t;/ s/@db_seq_decl@/typedef int db_seq_t;/ +/@pid_t_decl@/d +s/@db_threadid_t_decl@/typedef uintmax_t db_threadid_t;/ s/@DB_VERSION_MAJOR@/$DB_VERSION_MAJOR/ s/@DB_VERSION_MINOR@/$DB_VERSION_MINOR/ s/@DB_VERSION_PATCH@/$DB_VERSION_PATCH/ @@ -54,11 +58,14 @@ s/@DB_VERSION_UNIQUE_NAME@// s/@DB_CONST@// s/@DB_PROTO1@/#undef __P/ s/@DB_PROTO2@/#define __P(protos) protos/ +/@platform_header@/d +/@platform_footer@/d ENDOFSEDTEXT (echo "$msgc" && sed -f $s ../dbinc/db.in && cat ../dbinc_auto/ext_prot.in) > $t -`egrep '@.*@' $t` && { +test `egrep '@.*@' $t` && { + egrep '@.*@' $t echo 'Unexpanded autoconf variables found in VxWorks db.h.' exit 1 } @@ -67,11 +74,14 @@ cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) cat <<ENDOFSEDTEXT > $s +s/@INT64_FMT@/#define INT64_FMT "%lld"/ +s/@UINT64_FMT@/#define UINT64_FMT "%llu"/ s/@PATH_SEPARATOR@/\/\\\\\\\\/ s/@db_int_def@// ENDOFSEDTEXT (echo "$msgc" && sed -f $s ../dbinc/db_int.in) > $t -`egrep '@.*@' $t` && { +test `egrep '@.*@' $t` && { + egrep '@.*@' $t echo 'Unexpanded autoconf variables found in VxWorks db_int.h.' exit 1 } @@ -79,6 +89,21 @@ f=../build_vxworks/db_int.h cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) +# Build the VxWorks db_config.h file. +# We don't fail, but we complain if the vx_config.in file isn't up-to-date. +check_config() +{ + egrep '^#undef' config.hin | + awk '{print $2}' | sed '/^SIZEOF_/d' | sort > $s + (egrep '#undef' $1 | awk '{print $3}' + egrep '^#define' $1 | awk '{print $2}') | sort > $t + cmp $s $t || { + echo "config.hin and $1 differ" + echo "<<< config.hin >>> $1" + diff $s $t + } +} +check_config vx_config.in f=../build_vxworks/db_config.h (echo "$msgc" && sed "s/__EDIT_DB_VERSION__/$DB_VERSION/" vx_config.in) > $t cmp $t $f > /dev/null 2>&1 || @@ -97,6 +122,10 @@ f=../build_vxworks/db_config_small.h cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) +f=../build_vxworks/clib_port.h +cmp clib_port.h $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp clib_port.h $f && chmod 444 $f) + # Build a sed script that will change a "standard" DB utility into # VxWorks-compatible code. transform() @@ -163,8 +192,8 @@ ENDOFSEDTEXT echo '#include <db_int.h>' } -PROGRAM_LIST="db_archive db_checkpoint db_deadlock db_dump db_load \ - db_printlog db_recover db_stat db_upgrade db_verify ex_access" +PROGRAM_LIST="db_archive db_checkpoint db_deadlock db_dump db_hotbackup \ + db_load db_printlog db_recover db_stat db_upgrade db_verify ex_access" # Build VxWorks versions of the utilities. for i in $PROGRAM_LIST; do @@ -184,21 +213,80 @@ for i in $PROGRAM_LIST; do (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) done +# Output the build lines for a single utility. +# $1 == application name +util_one() +{ + egrep "app=$1" srcfiles.in | + awk '{print $1}' | + sed 's/ex_access/dbdemo/' > $u + + # Build a list of source files. + for i in `cat $u`; do + if test "$1" = "ex_access" -o "$1" = `basename $i .c`; then + i=`basename $i` + else + i="\$(PRJ_DIR)/../../$i" + fi + o="<BEGIN> FILE_$i" + + echo "${o}_dependDone" + echo "FALSE" + echo "<END>" + echo + echo "${o}_dependencies" + 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" + for i in `cat $u`; do + if test "$1" = "ex_access" -o "$1" = `basename $i .c`; then + i="`basename $i`" + else + i="../../$i" + fi + echo "\$(PRJ_DIR)/$i" + done | + sed -e '${' \ + -e 'p' \ + -e 'd' \ + -e '}' \ + -e 's/$/ \\/' + echo "<END>" + echo + echo "<BEGIN> userComments" + if test "$1" = "ex_access"; then + echo "dbdemo" + else + echo "$1" + fi + echo "<END>" +} + # Build VxWorks Tornado 2.0 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 - sed "s/__DB_APPLICATION_NAME__/$target/g" < vx_2.0/wpj.in > $t + (sed -e "s/__DB_APPLICATION_NAME__/$target/g" < vx_2.0/wpj.in + util_one $i) > $t f=../build_vxworks/$target/${target}20.wpj cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) - sed "s/__DB_APPLICATION_NAME__/$target/g" < vx_2.2/wpj.in > $t + + (sed -e "s/__DB_APPLICATION_NAME__/$target/g" < vx_2.2/wpj.in + util_one $i) > $t f=../build_vxworks/$target/${target}22.wpj cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) @@ -291,4 +379,3 @@ for v in 0 2 ; do cmp $u $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $u $f && chmod 444 $f) done - diff --git a/db/dist/s_windows b/db/dist/s_windows new file mode 100755 index 000000000..b5f46eabf --- /dev/null +++ b/db/dist/s_windows @@ -0,0 +1,197 @@ +#!/bin/sh - +# $Id: s_windows,v 12.20 2006/07/13 06:19:45 mjc Exp $ +# +# Build Windows include files. + +msgc="/* DO NOT EDIT: automatically built by dist/s_windows. */" +msgw="; DO NOT EDIT: automatically built by dist/s_windows." + +. RELEASE + +s=/tmp/__db_a$$ +t=/tmp/__db_b$$ +rm -f $s $t + +trap 'rm -f $s $t ; exit 1' 1 2 3 13 15 + +# Build the Win32 automatically generated files. +cat <<ENDOFSEDTEXT > $s +/@inttypes_h_decl@/d +/@stdint_h_decl@/d +s/@stddef_h_decl@/#include <stddef.h>/ +/@unistd_h_decl@/d +/@thread_h_decl@/d +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;/ +s/@pid_t_decl@/typedef int pid_t;/ +s/@db_threadid_t_decl@/typedef u_int32_t db_threadid_t;/ +/@u_char_decl@/{ + i\\ +#ifndef _WINSOCKAPI_ + s/@u_char_decl@/typedef unsigned char u_char;/ +} +s/@u_short_decl@/typedef unsigned short u_short;/ +s/@u_int_decl@/typedef unsigned int u_int;/ +/@u_long_decl@/{ + s/@u_long_decl@/typedef unsigned long u_long;/ + a\\ +#endif +} +/@ssize_t_decl@/{ + i\\ +#ifdef _WIN64\\ +typedef int64_t ssize_t;\\ +#else\\ +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 +} +/@platform_header@/{ + i\\ +/*\\ +\ * Turn off inappropriate compiler warnings\\ +\ */\\ +#ifdef _MSC_VER\\ +/*\\ +\ * This warning is explicitly disabled in Visual C++ by default.\\ +\ * It is necessary to explicitly enable the /Wall flag to generate this\\ +\ * warning.\\ +\ * Since this is a shared include file it should compile without warnings\\ +\ * at the highest warning level, so third party applications can use\\ +\ * higher warning levels cleanly.\\ +\ *\\ +\ * 4820: 'bytes' bytes padding added after member 'member'\\ +\ * The type and order of elements caused the compiler to\\ +\ * add padding to the end of a struct.\\ +\ */\\ +#pragma warning(push)\\ +#pragma warning(disable: 4820)\\ +#endif /* _MSC_VER */ + d +} +/@platform_footer@/{ + i\\ +/* Restore default compiler warnings */\\ +#ifdef _MSC_VER\\ +#pragma warning(pop)\\ +#endif + d +} +s/@DB_VERSION_MAJOR@/$DB_VERSION_MAJOR/ +s/@DB_VERSION_MINOR@/$DB_VERSION_MINOR/ +s/@DB_VERSION_PATCH@/$DB_VERSION_PATCH/ +s/@DB_VERSION_STRING@/"$DB_VERSION_STRING"/ +s/@DB_VERSION_UNIQUE_NAME@// +s/@DB_CONST@// +s/@DB_PROTO1@/#undef __P/ +s/@DB_PROTO2@/#define __P(protos) protos/ +ENDOFSEDTEXT +(echo "$msgc" && + sed -f $s ../dbinc/db.in && + cat ../dbinc_auto/ext_prot.in) > $t +test `egrep '@.*@' $t` && { + egrep '@.*@' $t + echo 'Unexpanded autoconf variables found in Windows db.h.' + exit 1 +} +f=../build_windows/db.h +cmp $t $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) + +cat <<ENDOFSEDTEXT > $s +s/@cxx_have_stdheaders@/#define HAVE_CXX_STDHEADERS 1/ +ENDOFSEDTEXT +(echo "$msgc" && sed -f $s ../dbinc/db_cxx.in) > $t +test `egrep '@.*@' $t` && { + egrep '@.*@' $t + echo 'Unexpanded autoconf variables found in Windows db_cxx.h.' + exit 1 +} +f=../build_windows/db_cxx.h +cmp $t $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) + +cat <<ENDOFSEDTEXT > $s +s/@INT64_FMT@/#define INT64_FMT "%I64d"/ +s/@UINT64_FMT@/#define UINT64_FMT "%I64u"/ +s/@PATH_SEPARATOR@/\\\\\\\\\/:/ +s/@db_int_def@// +ENDOFSEDTEXT +(echo "$msgc" && sed -f $s ../dbinc/db_int.in) > $t +test `egrep '@.*@' $t` && { + egrep '@.*@' $t + echo 'Unexpanded autoconf variables found in Windows db_int.h.' + exit 1 +} +f=../build_windows/db_int.h +cmp $t $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) + +# Build the Windows db_config.h file. +# We don't fail, but we complain if the win_config.in file isn't up-to-date. +check_config() +{ + egrep '^#undef' config.hin | + awk '{print $2}' | sed '/^SIZEOF_/d' | sort > $s + (egrep '#undef' $1 | awk '{print $3}' + egrep '^#define' $1 | awk '{print $2}') | sed '/__STDC__/d' | sort > $t + cmp $s $t || { + echo "config.hin and $1 differ" + echo "<<< config.hin >>> $1" + diff $s $t + } +} +check_config win_config.in +f=../build_windows/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_windows/libdb.rc +cat <<ENDOFSEDTEXT > $s +s/%MAJOR%/$DB_VERSION_MAJOR/ +s/%MINOR%/$DB_VERSION_MINOR/ +s/%PATCH%/$DB_VERSION_PATCH/ +ENDOFSEDTEXT +sed -f $s ../build_windows/libdbrc.src > $t +cmp $t $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) + +f=../build_windows/libdb.def +(echo $msgw && + echo && + echo EXPORTS; +a=1 +for i in `sed -e '/^$/d' -e '/^#/d' win_exports.in`; do + echo " $i @$a" + a=`expr $a + 1` +done) > $t +cmp $t $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) + +f=../build_windows/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_windows/clib_port.h +cmp clib_port.h $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp clib_port.h $f && chmod 444 $f) + +rm -f $s $t diff --git a/db/dist/s_windows_dsp b/db/dist/s_windows_dsp new file mode 100755 index 000000000..c7a94fe64 --- /dev/null +++ b/db/dist/s_windows_dsp @@ -0,0 +1,144 @@ +#!/bin/sh - +# $Id: s_windows_dsp,v 12.9 2006/07/13 06:19:45 mjc Exp $ +# +# Build Windows/32 .dsp files. + +. RELEASE + +SRCFILES=srcfiles.in + +create_dsp() +{ + projname="$1" # name of the .dsp file + match="$2" # the string used to egrep the $sources file + sources="$3" # a modified version of $SRCFILES to facilitate matches + dsptemplate="$4" # overall template file for the .dsp + extra_cppflags="$5" # extra flags to send to compiler + release_libs="$6" # libraries to link against in Release builds + debug_libs="$7" # libraries to link against in Debug builds + lib_suffix="$8" # the library name is libdb@lib_suffix@@VERSION@ + + srctemplate="$BUILDDIR/srcfile_dsp.src" # template file for the src file fragments + dspoutput=$BUILDDIR/$projname.dsp + + + postbuild=$dspoutput.postbuild + if [ ! -f $postbuild ] ; then + postbuild=/dev/null + fi + + rm -f $dspoutput.insert + for srcpath in `egrep "$match" $sources | sed -e 's/[ ].*//'` + do + # take the path name and break it up, converting / to \\. + # so many backslashes needed because of shell quoting and + # sed quoting -- we'll end up with two backslashes for every + # forward slash, but we need that when feeding that to the + # later sed command. + set - `echo $srcpath | sed -e 's;\(.*\)/;../\\1 ;' \ + -e "s;$BUILDDIR;.;" \ + -e 's;/;\\\\\\\\;g'` + srcdir="$1" + srcfile="$2" + sed -e "s/@srcdir@/$srcdir/g" \ + -e "s/@srcfile@/$srcfile/g" \ + < $srctemplate >> $dspoutput.insert + done + sed -e "/@SOURCE_FILES@/r$dspoutput.insert" \ + -e "/@SOURCE_FILES@/d" \ + -e "/@POST_BUILD@/r$postbuild" \ + -e "/@POST_BUILD@/d" \ + -e "s/@project_name@/$projname/g" \ + -e "s/@bin_rel_dest@/Release/g" \ + -e "s/@lib_rel_dest@/Release/g" \ + -e "s/@bin_debug_dest@/Debug/g" \ + -e "s/@lib_debug_dest@/Debug/g" \ + -e "s,@extra_cppflags@,$extra_cppflags,g" \ + -e "s,@release_libs@,$release_libs,g" \ + -e "s,@debug_libs@,$debug_libs,g" \ + -e "s,@lib_suffix@,$lib_suffix,g" \ + -e "s/@DB_VERSION_MAJOR@/$DB_VERSION_MAJOR/g" \ + -e "s/@DB_VERSION_MINOR@/$DB_VERSION_MINOR/g" \ + < $dsptemplate > $dspoutput.new + + # Set the file mode to 644 because the VC++ IDE needs a writeable file + # in our development environment. + cmp $dspoutput.new $dspoutput > /dev/null 2>&1 || + (echo "Building $dspoutput" && rm -f $dspoutput && + cp $dspoutput.new $dspoutput && chmod 664 $dspoutput) + rm -f $dspoutput.insert $dspoutput.new +} + +TMPA=/tmp/swindsp$$a +trap "rm -f $TMPA; exit 1" 1 2 3 15 + +# create a copy of the srcfiles with comments and empty lines removed. +# add a space at the end of each list of modules so that each module +# can be unambiguously matched e.g. ' dynamic ' +sed -e "s/#.*$//" \ + -e "/^[ ]*$/d" \ + -e "s/[ ][ ]*/ /" \ + -e "s/[ ]*$//" \ + -e "/[ ]/!d" \ + -e "s/$/ /" < $SRCFILES > $TMPA + +# get a list of all modules mentioned +# +MODULES="`sed -e 's/^[^ ]* //' < $TMPA \ + | tr ' ' '\012' | sort | uniq`" + +for BUILDDIR in ../build_windows +do + for module in $MODULES + do + case "$module" in + dynamic ) + create_dsp db_dll " $module " $TMPA $BUILDDIR/dynamic_dsp.src \ + '' 'ws2_32.lib' 'ws2_32.lib' + ;; + small ) + create_dsp db_small " $module " $TMPA $BUILDDIR/static_dsp.src \ + '/D "HAVE_SMALLBUILD"' '' '' _small + ;; + static ) + create_dsp db_static " $module " $TMPA $BUILDDIR/static_dsp.src + ;; + java ) + create_dsp db_java " $module " $TMPA $BUILDDIR/dynamic_dsp.src '' \ + 'libdb@DB_VERSION_MAJOR@@DB_VERSION_MINOR@.lib' \ + 'libdb@DB_VERSION_MAJOR@@DB_VERSION_MINOR@d.lib' _java + ;; + tcl ) + create_dsp db_tcl " $module " $TMPA $BUILDDIR/dynamic_dsp.src \ + '/D "DB_TCL_SUPPORT"' \ + 'libdb@DB_VERSION_MAJOR@@DB_VERSION_MINOR@.lib tcl84.lib' \ + 'libdb@DB_VERSION_MAJOR@@DB_VERSION_MINOR@d.lib tcl84g.lib' _tcl + ;; + testutil ) + create_dsp db_test " $module " $TMPA $BUILDDIR/app_dsp.src \ + '' '/out:"dbkill.exe"' '/out:"dbkill.exe"' + ;; + app=* ) + appname=`echo $module | sed -e 's/^app=//'` + case "$appname" in + ex_rep_base ) + libs='ws2_32.lib' + ;; + * ) + libs='' + ;; + esac + create_dsp $appname " $module " $TMPA $BUILDDIR/app_dsp.src '' \ + $libs $libs + ;; + vx|vxsmall ) + ;; + * ) + echo \ + "s_windows_dsp: module name $module in $SRCFILES is unknown type" + ;; + esac + done +done + +rm -f $TMPA diff --git a/db/dist/s_winmsi b/db/dist/s_winmsi new file mode 100644 index 000000000..77acd0e4b --- /dev/null +++ b/db/dist/s_winmsi @@ -0,0 +1,134 @@ +#!/bin/bash -
+# $Id: s_winmsi,v 1.8 2005/12/01 03:04:20 bostic Exp $
+#
+# Note: The s_winmsi script in Berkeley DB core closely parallels the
+# s_winmsi script in Berkeley DB/XML. If you change one,
+# consider whether your changes apply to the other.
+# As of this writing, the two s_winmsi scripts 'diff' very closely, and
+# identical portions have been factored into functions in s_winmsi.fcn.
+#
+# Usage: s_winmsi [ options ]
+#
+# See the Usage() function in s_winmsi.fcn for a full list of options.
+# By default, this script expects a db-X.Y.Z.NC.zip file
+# to be in this directory, and uses it to build all binaries
+# needed for an Windows install, and finally builds the an
+# output db-X.Y.Z.NC.msi file that can be installed on
+# Windows XP and 2000.
+#
+# The major other inputs to this script are these files:
+#
+# features.in list of choosable features (like Java,PHP,...)
+# files.in what files are in each feature and where they belong
+# links.in a list of URLs that end up as part of the Start Menu
+# environment.in a list of environment vars that must be set
+#
+# This script does a number of operations, using the directory
+# './winmsi/stage' as a staging area:
+#
+# extracts the contents of the input ZIP file and uses those
+# files (minus docs/...) to build a Sources directory for
+# the Sources features.
+#
+# builds Berkeley DB using Visual Studio tools using a .BAT
+# script derived from winbuild.in .
+#
+# builds Perl and other APIs .
+#
+# uses {features,files,links,environment}.in to build some include
+# files in WiX XML format. These files are named
+# *.wixinc (e.g. directory.wixinc)
+#
+# run m4 on dbcorewix.in to create dbcore.wxs . dbcorewix.in
+# uses m4 macros to allow reasonable refactoring of repeated
+# UI code. Also, m4 is used to include the files created in
+# the previous step.
+#
+# Use the WiX compiler/linker on the .wxs files to create the .msi file.
+#
+################################################################
+
+# Define all needed shell functions
+. ./winmsi/s_winmsi.fcn
+
+ERRORLOG="$0".log
+SetupErrorLog
+
+# Do this before parsing options, we need the version number
+. ./RELEASE
+dbver=db-$DB_VERSION.NC
+
+# Set variables used by functions to customize this installer
+PRODUCT_NAME="Berkeley DB"
+PRODUCT_VERSION="$DB_VERSION"
+PRODUCT_STAGE=`pwd`/winmsi/stage
+PRODUCT_LICENSEDIR="${PRODUCT_STAGE}/$dbver"
+PRODUCT_SUB_BLDDIR="${PRODUCT_STAGE}/$dbver"
+PRODUCT_BLDDIR="${PRODUCT_STAGE}/$dbver"
+PRODUCT_SRCDIR="${PRODUCT_STAGE}/$dbver"
+PRODUCT_DBBUILDDIR="${PRODUCT_STAGE}/$dbver/build_unix"
+PRODUCT_SHARED_WINMSIDIR=`pwd`/winmsi
+PRODUCT_IMAGEDIR=$PRODUCT_SHARED_WINMSIDIR/images
+PRODUCT_ZIP_FILEFMT="db-X.Y.Z.NC.zip"
+PRODUCT_MSI_FILEFMT="db-X.Y.Z.NC.msi"
+
+PRODUCT_MAJOR=`echo "$PRODUCT_VERSION" | \
+ sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+PRODUCT_MINOR=`echo "$PRODUCT_VERSION" | \
+ sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+PRODUCT_PATCH=`echo "$PRODUCT_VERSION" | \
+ sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
+PRODUCT_MAJMIN="${PRODUCT_MAJOR}${PRODUCT_MINOR}"
+
+# Gather command line options, and use reasonable defaults
+SetupOptions \
+ -input "$dbver.zip" \
+ -output "$dbver.msi" \
+ "$@"
+
+if [ "$OPT_USEBUILD" != '' ]; then
+ PRODUCT_BLDDIR="${OPT_USEBUILD}"
+ PRODUCT_SUB_BLDDIR="${OPT_USEBUILD}"
+fi
+
+Progress "s_winmsi starting, errors to $ERRORLOG"
+
+# Fail fast for certain missing files
+
+RequireCygwin
+RequireJava
+RequireTcl
+RequireWix
+RequirePerl
+
+CreateStage
+cd ${PRODUCT_STAGE}
+
+
+CreateSources ${PRODUCT_STAGE}/Sources
+
+# The docs are put into a separate feature set
+mv ${PRODUCT_STAGE}/Sources/docs ${PRODUCT_STAGE}/
+
+# Build everything unless we were told to use a preexisting build
+if [ "$OPT_USEBUILD" = '' ]; then
+ CreateWindowsBuild
+ CreateWindowsSystem
+ CreateInclude \
+ ${PRODUCT_SUB_BLDDIR}/installed_include \
+ ${PRODUCT_SUB_BLDDIR}/dbinc/* \
+ ${PRODUCT_SUB_BLDDIR}/dbinc_auto/* \
+ ${PRODUCT_SUB_BLDDIR}/build_windows/*.h
+ CreateDbPerl
+fi
+
+if ! "$OPT_SKIPGEN" ; then
+ CreateLicenseRtf ../../../LICENSE license.rtf
+ CreateWixIncludeFiles
+fi
+
+CreateMsi ../dbcorewix.in dbcore.wxs "$OPT_OUTFILE"
+
+Progress "s_winmsi finished, $OPT_OUTFILE created."
+exit 0
+
diff --git a/db/dist/srcfiles.in b/db/dist/srcfiles.in index b00be5a10..870ab3be4 100644 --- a/db/dist/srcfiles.in +++ b/db/dist/srcfiles.in @@ -1,8 +1,8 @@ -# $Id: srcfiles.in,v 1.87 2004/10/30 21:07:01 bostic Exp $ +# $Id: srcfiles.in,v 12.53 2006/09/09 14:08:39 bostic Exp $ # -# This is an input file for the s_win32_dsp and s_vxworks scripts. It lists +# This is an input file for the s_windows_dsp and s_vxworks scripts. It lists # the source files in the Berkeley DB tree and notes which are used to build -# the Win/32 and VxWorks libraries. +# the Windows and VxWorks libraries. # # Please keep this list sorted alphabetically! # @@ -21,6 +21,7 @@ # vx File is in the VxWorks library. # vxsmall File is in the small VxWorks library. +btree/bt_compact.c dynamic small static vx vxsmall 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 @@ -44,6 +45,7 @@ build_vxworks/db_archive/db_archive.c build_vxworks/db_checkpoint/db_checkpoint.c build_vxworks/db_deadlock/db_deadlock.c build_vxworks/db_dump/db_dump.c +build_vxworks/db_hotbackup/db_hotbackup.c build_vxworks/db_load/db_load.c build_vxworks/db_printlog/db_printlog.c build_vxworks/db_recover/db_recover.c @@ -51,27 +53,46 @@ build_vxworks/db_stat/db_stat.c build_vxworks/db_upgrade/db_upgrade.c build_vxworks/db_verify/db_verify.c build_vxworks/dbdemo/dbdemo.c -build_win32/dbkill.cpp testutil -build_win32/libdb.def dynamic -build_win32/libdb.rc dynamic -build_win32/libdb_tcl.def tcl +build_windows/dbkill.cpp testutil +build_windows/libdb.def dynamic +build_windows/libdb.rc dynamic +build_windows/libdb_tcl.def tcl +clib/abort.c +clib/atoi.c +clib/atol.c +clib/ctime.c dynamic small static vx vxsmall +clib/getaddrinfo.c dynamic static clib/getcwd.c clib/getopt.c vx vxsmall +clib/isalpha.c +clib/isdigit.c +clib/isprint.c +clib/isspace.c clib/memcmp.c clib/memmove.c +clib/printf.c clib/raise.c +clib/rand.c clib/snprintf.c vx vxsmall clib/strcasecmp.c dynamic small static vx vxsmall +clib/strcat.c +clib/strchr.c clib/strdup.c vx vxsmall clib/strerror.c +clib/strncat.c +clib/strncmp.c +clib/strrchr.c +clib/strsep.c dynamic small static vx vxsmall clib/strtol.c clib/strtoul.c common/crypto_stub.c small vxsmall common/db_byteorder.c dynamic small static vx vxsmall +common/db_clock.c dynamic static vx 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/mkpath.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 @@ -100,6 +121,7 @@ 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_cds.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 @@ -131,6 +153,7 @@ db_checkpoint/db_checkpoint.c app=db_checkpoint db_deadlock/db_deadlock.c app=db_deadlock db_dump/db_dump.c app=db_dump db_dump185/db_dump185.c +db_hotbackup/db_hotbackup.c app=db_hotbackup db_load/db_load.c app=db_load db_printlog/db_printlog.c app=db_printlog db_recover/db_recover.c app=db_recover @@ -149,13 +172,25 @@ 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_config.c dynamic small static vx vxsmall +env/env_failchk.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_register.c dynamic small static vx vxsmall env/env_stat.c dynamic small static vx vxsmall examples_c/bench_001.c +examples_c/csv/DbRecord.c app=ex_csvload app=ex_csvquery +examples_c/csv/code.c app=ex_csvcode +examples_c/csv/csv_local.c app=ex_csvload app=ex_csvquery +examples_c/csv/db.c app=ex_csvload app=ex_csvquery +examples_c/csv/load.c app=ex_csvload +examples_c/csv/load_main.c app=ex_csvload +examples_c/csv/query.c app=ex_csvquery +examples_c/csv/query_main.c app=ex_csvquery +examples_c/csv/util.c app=ex_csvload app=ex_csvquery examples_c/ex_access.c app=ex_access examples_c/ex_apprec/ex_apprec.c examples_c/ex_apprec/ex_apprec_auto.c @@ -166,27 +201,33 @@ examples_c/ex_dbclient.c examples_c/ex_env.c app=ex_env examples_c/ex_lock.c app=ex_lock examples_c/ex_mpool.c app=ex_mpool -examples_c/ex_repquote/ex_rq_client.c app=ex_repquote -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_rep/base/rep_base.c app=ex_rep_base +examples_c/ex_rep/base/rep_msg.c app=ex_rep_base +examples_c/ex_rep/base/rep_net.c app=ex_rep_base +examples_c/ex_rep/common/rep_common.c app=ex_rep_base app=ex_rep_mgr +examples_c/ex_rep/mgr/rep_mgr.c app=ex_rep_mgr +examples_c/ex_sequence.c app=ex_sequence 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_c/getting_started/example_database_load.c app=example_database_load +examples_c/getting_started/example_database_read.c app=example_database_read +examples_c/getting_started/gettingstarted_common.c app=example_database_load app=example_database_read +examples_c/txn_guide/txn_guide.c app=ex_txnguide +examples_c/txn_guide/txn_guide_inmemory.c app=ex_txnguide_inmem 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/SequenceExample.cpp app=excxx_sequence examples_cxx/TpcbExample.cpp app=excxx_tpcb -examples_cxx/getting_started/MyDb.cpp -examples_cxx/getting_started/excxx_example_database_load.cpp -examples_cxx/getting_started/excxx_example_database_read.cpp +examples_cxx/excxx_repquote/RepConfigInfo.cpp app=excxx_repquote +examples_cxx/excxx_repquote/RepQuoteExample.cpp app=excxx_repquote +examples_cxx/getting_started/MyDb.cpp app=excxx_example_database_load app=excxx_example_database_read +examples_cxx/getting_started/excxx_example_database_load.cpp app=excxx_example_database_load +examples_cxx/getting_started/excxx_example_database_read.cpp app=excxx_example_database_read +examples_cxx/txn_guide/TxnGuide.cpp app=excxx_txnguide +examples_cxx/txn_guide/TxnGuideInMemory.cpp app=excxx_txnguide_inmem 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 @@ -215,6 +256,7 @@ hsearch/hsearch.c dynamic static vx libdb_java/db_java_wrap.c java lock/lock.c dynamic small static vx vxsmall lock/lock_deadlock.c dynamic small static vx vxsmall +lock/lock_failchk.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 @@ -225,6 +267,7 @@ 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_debug.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 @@ -237,17 +280,22 @@ 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_mvcc.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_alloc.c dynamic small static vx vxsmall +mutex/mut_failchk.c dynamic small static vx vxsmall mutex/mut_fcntl.c +mutex/mut_method.c dynamic small static vx vxsmall mutex/mut_pthread.c +mutex/mut_region.c dynamic small static vx vxsmall +mutex/mut_stat.c dynamic small static vx vxsmall mutex/mut_tas.c vx vxsmall mutex/mut_win32.c dynamic small static -mutex/mutex.c dynamic small static vx vxsmall -mutex/tm.c +mutex/tm.c app=tm os/os_abs.c os/os_alloc.c dynamic small static vx vxsmall os/os_clock.c vx vxsmall @@ -255,17 +303,21 @@ os/os_config.c os/os_dir.c vx vxsmall os/os_errno.c vx vxsmall os/os_fid.c vx vxsmall +os/os_flock.c vx vxsmall os/os_fsync.c vx vxsmall +os/os_fzero.c dynamic small static vx vxsmall +os/os_getenv.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 vxsmall +os/os_method.c vx vxsmall +os/os_mkdir.c dynamic small static vx vxsmall os/os_oflags.c dynamic small static vx vxsmall os/os_open.c vx vxsmall +os/os_pid.c dynamic small static 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_rpath.c dynamic small static os/os_rw.c vx vxsmall os/os_seek.c vx vxsmall os/os_sleep.c vx vxsmall @@ -273,28 +325,60 @@ 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_uid.c dynamic small static vx vxsmall os/os_unlink.c vx vxsmall +os/os_yield.c vx vxsmall +os_brew/abort.c +os_brew/ctime.c +os_brew/fclose.c +os_brew/fgetc.c +os_brew/fgets.c +os_brew/fopen.c +os_brew/fwrite.c +os_brew/getcwd.c +os_brew/localtime.c +os_brew/os_abs.c +os_brew/os_config.c +os_brew/os_dir.c +os_brew/os_errno.c +os_brew/os_handle.c +os_brew/os_mkdir.c +os_brew/os_oflags.c +os_brew/os_open.c +os_brew/os_pid.c +os_brew/os_rename.c +os_brew/os_rw.c +os_brew/os_seek.c +os_brew/os_sleep.c +os_brew/os_stat.c +os_brew/os_truncate.c +os_brew/os_unlink.c +os_brew/time.c 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 -os_win32/os_dir.c dynamic small static -os_win32/os_errno.c dynamic small static -os_win32/os_fid.c dynamic small static -os_win32/os_fsync.c dynamic small static -os_win32/os_handle.c dynamic small static -os_win32/os_map.c dynamic small static -os_win32/os_open.c dynamic small static -os_win32/os_rename.c dynamic small static -os_win32/os_rw.c dynamic small static -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 +os_vxworks/os_vx_rpath.c vx vxsmall +os_windows/os_abs.c dynamic small static +os_windows/os_clock.c dynamic small static +os_windows/os_config.c dynamic small static +os_windows/os_dir.c dynamic small static +os_windows/os_errno.c dynamic small static +os_windows/os_fid.c dynamic small static +os_windows/os_flock.c dynamic small static +os_windows/os_fsync.c dynamic small static +os_windows/os_getenv.c dynamic small static +os_windows/os_handle.c dynamic small static +os_windows/os_map.c dynamic small static +os_windows/os_open.c dynamic small static +os_windows/os_rename.c dynamic small static +os_windows/os_rw.c dynamic small static +os_windows/os_seek.c dynamic small static +os_windows/os_sleep.c dynamic small static +os_windows/os_spin.c dynamic small static +os_windows/os_stat.c dynamic small static +os_windows/os_truncate.c dynamic small static +os_windows/os_unlink.c dynamic small static +os_windows/os_yield.c dynamic small static qam/qam.c dynamic static vx qam/qam_auto.c dynamic static vx qam/qam_autop.c app=db_printlog @@ -310,12 +394,25 @@ 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_elect.c dynamic static vx +rep/rep_log.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_stat.c dynamic static vx rep/rep_stub.c small vxsmall rep/rep_util.c dynamic static vx +rep/rep_verify.c dynamic static vx +repmgr/repmgr_elect.c dynamic static +repmgr/repmgr_method.c dynamic static +repmgr/repmgr_msg.c dynamic static +repmgr/repmgr_net.c dynamic static +repmgr/repmgr_posix.c +repmgr/repmgr_queue.c dynamic static +repmgr/repmgr_sel.c dynamic static +repmgr/repmgr_stat.c dynamic static +repmgr/repmgr_util.c dynamic static +repmgr/repmgr_windows.c dynamic static rpc_client/client.c rpc_client/gen_client.c rpc_client/gen_client_ret.c @@ -350,7 +447,7 @@ test_perf/perf_log.c app=db_perf test_perf/perf_misc.c app=db_perf test_perf/perf_op.c app=db_perf test_perf/perf_parse.c app=db_perf -test_perf/perf_rand.c app=db_perf +test_perf/perf_rand.c app=db_perf app=db_reptest test_perf/perf_spawn.c app=db_perf test_perf/perf_stat.c app=db_perf test_perf/perf_sync.c app=db_perf @@ -359,9 +456,34 @@ 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 +test_rep/db_reptest.c app=db_reptest +test_rep/reptest_accept.c app=db_reptest +test_rep/reptest_client.c app=db_reptest +test_rep/reptest_config.c app=db_reptest +test_rep/reptest_dbs.c app=db_reptest +test_rep/reptest_debug.c app=db_reptest +test_rep/reptest_elect.c app=db_reptest +test_rep/reptest_env.c app=db_reptest +test_rep/reptest_exec.c app=db_reptest +test_rep/reptest_file.c app=db_reptest +test_rep/reptest_key.c app=db_reptest +test_rep/reptest_master.c app=db_reptest +test_rep/reptest_misc.c app=db_reptest +test_rep/reptest_msg_thread.c app=db_reptest +test_rep/reptest_op.c app=db_reptest +test_rep/reptest_parse.c app=db_reptest +test_rep/reptest_send.c app=db_reptest +test_rep/reptest_site.c app=db_reptest +test_rep/reptest_socket.c app=db_reptest +test_rep/reptest_spawn.c app=db_reptest +test_rep/reptest_thread.c app=db_reptest +test_rep/reptest_txn.c app=db_reptest +test_rep/reptest_util.c app=db_reptest 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_chkpt.c dynamic small static vx vxsmall +txn/txn_failchk.c dynamic small static vx vxsmall 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 diff --git a/db/dist/tags b/db/dist/tags index 479f7d5f9..46ff0c65d 100644 --- a/db/dist/tags +++ b/db/dist/tags @@ -1,559 +1,698 @@ +ACK_WAITER ../repmgr/repmgr_windows.c /^} ACK_WAITER;$/ +ACK_WAITERS_TABLE ../dbinc/repmgr.h /^struct __ack_waiters_table;$/ 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) do { \\$/ -ACQUIRE_CUR_COUPLE ../btree/bt_cursor.c /^#define ACQUIRE_CUR_COUPLE(dbc, mode, p, ret) do {/ +ACQUIRE_CUR ../btree/bt_cursor.c /^#define ACQUIRE_CUR(dbc, mode, p, flags, 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) { \\$/ +ACTION ../dbinc/db.in /^} ACTION;$/ +ACTIVATE_CTP ../dbinc/db_server_int.h /^#define ACTIVATE_CTP(ctp, id, type) { \\$/ +ADDRINFO ../dbinc/repmgr.h /^typedef struct addrinfo ADDRINFO;$/ +ADDR_LIST_CURRENT ../dbinc/repmgr.h /^#define ADDR_LIST_CURRENT(na) ((na)->current)$/ +ADDR_LIST_FIRST ../dbinc/repmgr.h /^#define ADDR_LIST_FIRST(na) ((na)->current = (na)-/ +ADDR_LIST_NEXT ../dbinc/repmgr.h /^#define ADDR_LIST_NEXT(na) ((na)->current = (na)->/ +ADD_CONFIG_NAME ../tcl/tcl_db_pkg.c /^#define ADD_CONFIG_NAME(name) \\$/ +AES_CIPHER ../dbinc/crypto.h /^} AES_CIPHER;$/ +AI_CANONNAME ../dbinc/repmgr.h /^#define AI_CANONNAME 0x02$/ +AI_NUMERICHOST ../dbinc/repmgr.h /^#define AI_NUMERICHOST 0x04$/ +AI_PASSIVE ../dbinc/repmgr.h /^#define AI_PASSIVE 0x01$/ ALIGNP_DEC ../dbinc/db_int.in /^#define ALIGNP_DEC(p, bound) \\$/ ALIGNP_INC ../dbinc/db_int.in /^#define ALIGNP_INC(p, bound) \\$/ +ALIVE_ON ../dbinc/db_int.in /^#define ALIVE_ON(dbenv) ((dbenv)->is_alive != NUL/ +ALREADY_FLUSHED ../log/log_put.c /^#define ALREADY_FLUSHED(lp, lsnp) \\$/ ANYSITE ../rep/rep_record.c /^#define ANYSITE(rep)$/ -APPNAME ../dbinc/db_int.in 292 -BACKUP_PREFIX ../db/db.c 1007 -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 -BAD_CIPHER_STATE ../crypto/rijndael/rijndael-api-fst.h 63 -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 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 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 +APPNAME ../dbinc/db_int.in /^} APPNAME;$/ +BACKUP_PREFIX ../db/db.c /^#define BACKUP_PREFIX "__db"$/ +BADARG ../clib/getopt.c /^#define BADARG (int)':'$/ +BADCH ../clib/getopt.c /^#define BADCH (int)'?'$/ +BAD_BLOCK_LENGTH ../crypto/rijndael/rijndael-api-fst.h /^#define BAD_BLOCK_LENGTH -6$/ +BAD_CIPHER_INSTANCE ../crypto/rijndael/rijndael-api-fst.h /^#define BAD_CIPHER_INSTANCE -7$/ +BAD_CIPHER_MODE ../crypto/rijndael/rijndael-api-fst.h /^#define BAD_CIPHER_MODE -4 \/* Params st/ +BAD_CIPHER_STATE ../crypto/rijndael/rijndael-api-fst.h /^#define BAD_CIPHER_STATE -5 \/* Cipher in/ +BAD_DATA ../crypto/rijndael/rijndael-api-fst.h /^#define BAD_DATA -8 \/* Data cont/ +BAD_KEY_DIR ../crypto/rijndael/rijndael-api-fst.h /^#define BAD_KEY_DIR -1 \/* Key direc/ +BAD_KEY_INSTANCE ../crypto/rijndael/rijndael-api-fst.h /^#define BAD_KEY_INSTANCE -3 \/* Key passe/ +BAD_KEY_MAT ../crypto/rijndael/rijndael-api-fst.h /^#define BAD_KEY_MAT -2 \/* Key mater/ +BAD_KILLID ../lock/lock_deadlock.c /^#define BAD_KILLID 0xffffffff$/ +BAD_OTHER ../crypto/rijndael/rijndael-api-fst.h /^#define BAD_OTHER -9 \/* Unknown e/ +BFMSG ../db185/db185.c /^#define BFMSG \\$/ +BH ../dbinc/mp.h /^struct __bh; typedef struct __bh BH;$/ +BH_CALLPGIN ../dbinc/mp.h /^#define BH_CALLPGIN 0x001 \/* Convert the page be/ +BH_DIRTY ../dbinc/mp.h /^#define BH_DIRTY 0x002 \/* Page is modified. *\/$/ +BH_DIRTY_CREATE ../dbinc/mp.h /^#define BH_DIRTY_CREATE 0x004 \/* Page is modifie/ +BH_DISCARD ../dbinc/mp.h /^#define BH_DISCARD 0x008 \/* Page is useless. *\// +BH_FREED ../dbinc/mp.h /^#define BH_FREED 0x010 \/* Page was freed. *\/$/ +BH_FREE_FREEMEM ../dbinc/mp.h /^#define BH_FREE_FREEMEM 0x01$/ +BH_FREE_REUSE ../dbinc/mp.h /^#define BH_FREE_REUSE 0x02$/ +BH_FREE_UNLOCKED ../dbinc/mp.h /^#define BH_FREE_UNLOCKED 0x04$/ +BH_FROZEN ../dbinc/mp.h /^#define BH_FROZEN 0x020 \/* Frozen buffer: alloca/ +BH_FROZEN_ALLOC ../dbinc/mp.h /^struct __bh_frozen_a; typedef struct __bh_frozen_a/ +BH_FROZEN_PAGE ../dbinc/mp.h /^struct __bh_frozen; typedef struct __bh_frozen_p B/ +BH_LOCKED ../dbinc/mp.h /^#define BH_LOCKED 0x040 \/* Page is locked (I\/O / +BH_OBSOLETE ../dbinc/mp.h /^#define BH_OBSOLETE(bhp, old_lsn) ((SH_CHAIN_HASNE/ +BH_OWNED_BY ../dbinc/mp.h /^#define BH_OWNED_BY(dbenv, bhp, txn) ((txn) != NUL/ +BH_OWNER ../dbinc/mp.h /^#define BH_OWNER(dbenv, bhp) \\$/ +BH_PRIORITY ../dbinc/mp.h /^#define BH_PRIORITY(bhp) \\$/ +BH_TRACK ../mp/mp_sync.c /^} BH_TRACK;$/ +BH_TRASH ../dbinc/mp.h /^#define BH_TRASH 0x080 \/* Page is garbage. *\/$/ +BINTERNAL ../dbinc/db_page.h /^} BINTERNAL;$/ 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 -BI_DELETED ../dbinc/btree.h 72 +BITEM_PSIZE ../dbinc/db_page.h /^#define BITEM_PSIZE(bk) \\$/ +BITEM_SIZE ../dbinc/db_page.h /^#define BITEM_SIZE(bk) \\$/ +BITSPERBLOCK ../crypto/rijndael/rijndael-api-fst.h /^#define BITSPERBLOCK 128 \/* Default nu/ +BI_DELETED ../dbinc/btree.h /^#define BI_DELETED 0x01 \/* Key\/data pair only p/ +BKEYDATA ../dbinc/db_page.h /^} BKEYDATA;$/ BKEYDATA_PSIZE ../dbinc/db_page.h /^#define BKEYDATA_PSIZE(len) \\$/ BKEYDATA_SIZE ../dbinc/db_page.h /^#define BKEYDATA_SIZE(len) \\$/ -BOVERFLOW_PSIZE ../dbinc/db_page.h 588 -BOVERFLOW_SIZE ../dbinc/db_page.h 586 +BOVERFLOW ../dbinc/db_page.h /^} BOVERFLOW;$/ +BOVERFLOW_PSIZE ../dbinc/db_page.h /^#define BOVERFLOW_PSIZE \\$/ +BOVERFLOW_SIZE ../dbinc/db_page.h /^#define BOVERFLOW_SIZE \\$/ +BPI_NORECNUM ../dbinc/btree.h /^#define BPI_NORECNUM 0x02 \/* Not update the recn/ +BPI_SPACEONLY ../dbinc/btree.h /^#define BPI_SPACEONLY 0x01 \/* Only check for spa/ BS_TO_PAGE ../dbinc/hash.h /^#define BS_TO_PAGE(bucket, spares) \\$/ -BTM_DUP ../dbinc/db_page.h 93 -BTM_DUPSORT ../dbinc/db_page.h 99 -BTM_FIXEDLEN ../dbinc/db_page.h 96 -BTM_MASK ../dbinc/db_page.h 100 -BTM_RECNO ../dbinc/db_page.h 94 -BTM_RECNUM ../dbinc/db_page.h 95 -BTM_RENUMBER ../dbinc/db_page.h 97 -BTM_SUBDB ../dbinc/db_page.h 98 -BTREE ../dbinc/btree.h 48 -BTREEMAGIC ../dbinc/db_185.in 120 -BTREEVERSION ../dbinc/db_185.in 121 -BTREE_CURSOR ../dbinc/btree.h 49 +BTMETA ../dbinc/db_page.h /^} BTMETA33, BTMETA;$/ +BTMETA2X ../dbinc/db_upgrade.h /^} BTMETA2X;$/ +BTMETA30 ../dbinc/db_upgrade.h /^} BTMETA30;$/ +BTMETA31 ../dbinc/db_upgrade.h /^} BTMETA31;$/ +BTM_DUP ../dbinc/db_page.h /^#define BTM_DUP 0x001 \/* Duplicates. *\/$/ +BTM_DUPSORT ../dbinc/db_page.h /^#define BTM_DUPSORT 0x040 \/* Duplicates are sor/ +BTM_FIXEDLEN ../dbinc/db_page.h /^#define BTM_FIXEDLEN 0x008 \/* Recno: fixed leng/ +BTM_MASK ../dbinc/db_page.h /^#define BTM_MASK 0x07f$/ +BTM_RECNO ../dbinc/db_page.h /^#define BTM_RECNO 0x002 \/* Recno tree. *\/$/ +BTM_RECNUM ../dbinc/db_page.h /^#define BTM_RECNUM 0x004 \/* Btree: maintain rec/ +BTM_RENUMBER ../dbinc/db_page.h /^#define BTM_RENUMBER 0x010 \/* Recno: renumber o/ +BTM_SUBDB ../dbinc/db_page.h /^#define BTM_SUBDB 0x020 \/* Subdatabases. *\/$/ +BTREE ../dbinc/btree.h /^struct __btree; typedef struct __btree BTREE;$/ +BTREEINFO ../dbinc/db_185.in /^} BTREEINFO;$/ +BTREEMAGIC ../dbinc/db_185.in /^#define BTREEMAGIC 0x053162$/ +BTREEVERSION ../dbinc/db_185.in /^#define BTREEVERSION 3$/ +BTREE_CURSOR ../dbinc/btree.h /^struct __cursor; typedef struct __cursor BTREE_CUR/ BT_STK_CLR ../dbinc/btree.h /^#define BT_STK_CLR(c) do { \\$/ BT_STK_ENTER ../dbinc/btree.h /^#define BT_STK_ENTER(dbenv, c, pagep, page_indx, l/ BT_STK_NUM ../dbinc/btree.h /^#define BT_STK_NUM(dbenv, c, pagep, page_indx, ret/ BT_STK_NUMPUSH ../dbinc/btree.h /^#define BT_STK_NUMPUSH(dbenv, c, pagep, page_indx,/ BT_STK_POP ../dbinc/btree.h /^#define BT_STK_POP(c) \\$/ BT_STK_PUSH ../dbinc/btree.h /^#define BT_STK_PUSH(dbenv, c, pagep, page_indx, lo/ -BUCKET_INVALID ../dbinc/hash.h 111 +BUCKET_INVALID ../dbinc/hash.h /^#define BUCKET_INVALID 0xFFFFFFFF$/ BUCKET_TO_PAGE ../dbinc/hash.h /^#define BUCKET_TO_PAGE(I, B) (BS_TO_PAGE((B), (I)-/ +BULK_FORCE ../dbinc/rep.h /^#define BULK_FORCE 0x001 \/* Force buffer after t/ +BULK_XMIT ../dbinc/rep.h /^#define BULK_XMIT 0x002 \/* Buffer in transit. */ B_DCLR ../dbinc/db_page.h /^#define B_DCLR(t) (t) &= ~B_DELETE$/ -B_DELETE ../dbinc/db_page.h 529 +B_DELETE ../dbinc/db_page.h /^#define B_DELETE (0x80)$/ B_DISSET ../dbinc/db_page.h /^#define B_DISSET(t) ((t) & B_DELETE)$/ B_DSET ../dbinc/db_page.h /^#define B_DSET(t) (t) |= B_DELETE$/ -B_DUPLICATE ../dbinc/db_page.h 520 -B_KEYDATA ../dbinc/db_page.h 519 +B_DUPLICATE ../dbinc/db_page.h /^#define B_DUPLICATE 2 \/* Duplicate key\/data item/ +B_KEYDATA ../dbinc/db_page.h /^#define B_KEYDATA 1 \/* Key\/data item. *\/$/ B_MAX ../dbinc/btree.h /^#define B_MAX(a,b) (((a) > (b)) ? (a) : (b))$/ B_MAXSIZEONPAGE ../dbinc/btree.h /^#define B_MAXSIZEONPAGE(ovflsize) \\$/ B_MINKEY_TO_OVFLSIZE ../dbinc/btree.h /^#define B_MINKEY_TO_OVFLSIZE(dbp, minkey, pgsize) / -B_OVERFLOW ../dbinc/db_page.h 521 -B_TSET ../dbinc/db_page.h /^#define B_TSET(t, type, deleted) { \\$/ -B_TYPE ../dbinc/db_page.h /^#define B_TYPE(t) ((t) & ~B_DELETE)$/ -CAD_UPDATEROOT ../dbinc/btree.h 66 +B_OVERFLOW ../dbinc/db_page.h /^#define B_OVERFLOW 3 \/* Overflow key\/data item. / +B_TSET ../dbinc/db_page.h /^#define B_TSET(t, type) ((t) = B_TYPE(type))$/ +B_TSET_DELETED ../dbinc/db_page.h /^#define B_TSET_DELETED(t, type) ((t) = (type) | B_/ +B_TYPE ../dbinc/db_page.h /^#define B_TYPE(t) ((t) & ~B_DELETE)$/ +CAD_UPDATEROOT ../dbinc/btree.h /^#define CAD_UPDATEROOT 0x01 \/* Root page count w/ CALC_QAM_RECNO_PER_PAGE ../dbinc/qam.h /^#define CALC_QAM_RECNO_PER_PAGE(dbp) \\$/ CDB_LOCKING ../dbinc/db_int.in /^#define CDB_LOCKING(dbenv) F_ISSET(dbenv, DB_ENV_C/ -CDB_LOCKING_DONE ../db/db_cam.c /^#define CDB_LOCKING_DONE(dbp, dbc) \\$/ -CDB_LOCKING_INIT ../db/db_cam.c /^#define CDB_LOCKING_INIT(dbp, dbc) \\$/ +CDB_LOCKING_DONE ../db/db_cam.c /^#define CDB_LOCKING_DONE(dbenv, dbc) \\$/ +CDB_LOCKING_INIT ../db/db_cam.c /^#define CDB_LOCKING_INIT(dbenv, dbc) \\$/ CD_CLR ../btree/bt_recno.c /^#define CD_CLR(cp) { \\$/ CD_ISSET ../btree/bt_recno.c /^#define CD_ISSET(cp) \\$/ CD_SET ../btree/bt_recno.c /^#define CD_SET(cp) { \\$/ -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 361 -CLEAR_BYTE ../dbinc/debug.h 28 +CHAR64LONG16 ../hmac/sha1.c /^} CHAR64LONG16;$/ +CHARKEY ../dbinc/hash.h /^#define CHARKEY "%$sniglet^&"$/ +CHECK_LSN ../dbinc/log.h /^#define CHECK_LSN(e, redo, cmp, lsn, prev) \\$/ +CHECK_MTX_THREAD ../dbinc/db_int.in /^#define CHECK_MTX_THREAD(dbenv, mtx) do { \\$/ +CHECK_THREAD ../dbinc/db_int.in /^#define CHECK_THREAD(dbenv) do { \\$/ +CIPHER ../dbinc/crypto.h /^} CIPHER;$/ +CIPHER_AES ../dbinc/crypto.h /^#define CIPHER_AES 1 \/* AES algorithm *\/$/ +CIPHER_ANY ../dbinc/crypto.h /^#define CIPHER_ANY 0x00000001 \/* Only for DB_CIPH/ +CKPLSN_CMP ../dbinc/log.h /^#define CKPLSN_CMP 0$/ +CLEAR_BYTE ../dbinc/debug.h /^#define CLEAR_BYTE 0xdb$/ CLEAR_MAP ../lock/lock_deadlock.c /^#define CLEAR_MAP(M, N) { \\$/ CLIENT_ONLY ../rep/rep_record.c /^#define CLIENT_ONLY(rep, rp) do { \\$/ +CLIENT_REREQ ../rep/rep_record.c /^#define CLIENT_REREQ do { \\$/ 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) \\$/ +CLR_MAP ../lock/lock_deadlock.c /^#define CLR_MAP(M, B) ((M)[(B) \/ 32] &= ~((u_int)/ +COMPQUIET ../dbinc/debug.h /^#define COMPQUIET(n, v) do { \\$/ +CONFIG_GET_INT ../env/env_config.c /^#define CONFIG_GET_INT(s, vp) do { \\$/ +CONFIG_GET_LONG ../env/env_config.c /^#define CONFIG_GET_LONG(s, vp) do { \\$/ +CONFIG_GET_UINT32 ../env/env_config.c /^#define CONFIG_GET_UINT32(s, vp) do { \\$/ +CONFIG_INT ../env/env_config.c /^#define CONFIG_INT(s, f) do { \\$/ +CONFIG_SLOTS ../env/env_config.c /^#define CONFIG_SLOTS 10$/ +CONFIG_UINT32 ../env/env_config.c /^#define CONFIG_UINT32(s, f) do { \\$/ CONFLICTS ../dbinc/lock.h /^#define CONFLICTS(T, R, HELD, WANTED) \\$/ +CONNECTION_LIST ../dbinc/repmgr.h /^typedef TAILQ_HEAD(__repmgr_conn_list, __repmgr_co/ +CONN_CONNECTING ../dbinc/repmgr.h /^#define CONN_CONNECTING 0x01 \/* nonblocking conne/ +CONN_DEFUNCT ../dbinc/repmgr.h /^#define CONN_DEFUNCT 0x02 \/* socket close pending/ 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 -CT_DB ../dbinc/db_server_int.h 33 -CT_ENV ../dbinc/db_server_int.h 34 -CT_JOIN ../dbinc/db_server_int.h 37 -CT_JOINCUR ../dbinc/db_server_int.h 38 -CT_TXN ../dbinc/db_server_int.h 35 +CRYPTO_ONLY ../libdb_java/db_java_wrap.c /^#define CRYPTO_ONLY(x) (x);$/ +CS_DEL ../btree/bt_compact.c /^#define CS_DEL 4 \/* Get a stack to delete a page/ +CS_GETRECNO ../btree/bt_compact.c /^#define CS_GETRECNO 0x80 \/* Extract record nu/ +CS_NEXT ../btree/bt_compact.c /^#define CS_NEXT 2 \/* Get the next page. *\/$/ +CS_NEXT_WRITE ../btree/bt_compact.c /^#define CS_NEXT_WRITE 3 \/* Get the next page and / +CS_PARENT ../btree/bt_compact.c /^#define CS_PARENT 1 \/* We want the parent too, wr/ +CS_READ ../btree/bt_compact.c /^#define CS_READ 0 \/* We are just reading. *\/$/ +CS_START ../btree/bt_compact.c /^#define CS_START 5 \/* Starting level for stack, w/ +CTIME_BUFLEN ../dbinc/os.h /^#define CTIME_BUFLEN 26$/ +CTRACE ../btree/bt_compact.c /^#define CTRACE(dbc, location, t, start, f) do { / +CT_CURSOR ../dbinc/db_server_int.h /^#define CT_CURSOR 0x001 \/* Cursor *\/$/ +CT_DB ../dbinc/db_server_int.h /^#define CT_DB 0x002 \/* Database *\/$/ +CT_ENV ../dbinc/db_server_int.h /^#define CT_ENV 0x004 \/* Env *\/$/ +CT_JOIN ../dbinc/db_server_int.h /^#define CT_JOIN 0x10000000 \/* Join cursor compon/ +CT_JOINCUR ../dbinc/db_server_int.h /^#define CT_JOINCUR 0x20000000 \/* Join cursor *\/$/ +CT_TXN ../dbinc/db_server_int.h /^#define CT_TXN 0x008 \/* Txn *\/$/ CURADJ_LOG ../btree/bt_recno.c /^#define CURADJ_LOG(dbc) \\$/ -C_DELETED ../dbinc/btree.h 215 +C_DELETED ../dbinc/btree.h /^#define C_DELETED 0x0001 \/* Record was deleted. / 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 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 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 +C_RECNUM ../dbinc/btree.h /^#define C_RECNUM 0x0002 \/* Tree requires record / +C_RENUMBER ../dbinc/btree.h /^#define C_RENUMBER 0x0004 \/* Tree records are mu/ +DATA_INIT_CNT ../env/env_method.c /^#define DATA_INIT_CNT 20 \/* Start with 20 data / +DB ../dbinc/db.in /^struct __db; typedef struct __db DB;$/ +DB2JDBENV ../libdb_java/db_java_wrap.c /^#define DB2JDBENV ((jobject)DB_ENV_INTERNAL(arg1->/ +DBC ../dbinc/db.in /^struct __dbc; typedef struct __dbc DBC;$/ +DBC2JDBENV ../libdb_java/db_java_wrap.c /^#define DBC2JDBENV ((jobject)DB_ENV_INTERNAL(arg1-/ +DBC_ACTIVE ../dbinc/db.in /^#define DBC_ACTIVE 0x0001 \/* Cursor in use. *\/$/ +DBC_DONTLOCK ../dbinc/db.in /^#define DBC_DONTLOCK 0x0002 \/* Don't lock on thi/ +DBC_INTERNAL ../dbinc/db.in /^struct __dbc_internal; typedef struct __dbc_intern/ +DBC_LOGGING ../dbinc/db_int.in /^#define DBC_LOGGING(dbc) __dbc_logging(dbc)$/ +DBC_METHOD ../cxx/cxx_dbc.cpp /^\/\/ Helper macro for simple methods that pass thr/ +DBC_MULTIPLE ../dbinc/db.in /^#define DBC_MULTIPLE 0x0004 \/* Return Multiple d/ +DBC_MULTIPLE_KEY ../dbinc/db.in /^#define DBC_MULTIPLE_KEY 0x0008 \/* Return Multipl/ +DBC_OPD ../dbinc/db.in /^#define DBC_OPD 0x0010 \/* Cursor references off/ +DBC_OWN_LID ../dbinc/db.in /^#define DBC_OWN_LID 0x0020 \/* Free lock id on de/ +DBC_READ_COMMITTED ../dbinc/db.in /^#define DBC_READ_COMMITTED 0x0040 \/* Cursor has d/ +DBC_READ_UNCOMMITTED ../dbinc/db.in /^#define DBC_READ_UNCOMMITTED 0x0080 \/* Cursor has/ +DBC_RECOVER ../dbinc/db.in /^#define DBC_RECOVER 0x0100 \/* Recovery cursor; d/ +DBC_RMW ../dbinc/db.in /^#define DBC_RMW 0x0200 \/* Acquire write flag in/ +DBC_TRANSIENT ../dbinc/db.in /^#define DBC_TRANSIENT 0x0400 \/* Cursor is transi/ +DBC_WRITECURSOR ../dbinc/db.in /^#define DBC_WRITECURSOR 0x0800 \/* Cursor may be / +DBC_WRITER ../dbinc/db.in /^#define DBC_WRITER 0x1000 \/* Cursor immediately / 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_ERR ../cxx/cxx_env.cpp /^\/\/ Helper macros for simple methods that pass th/ 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 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 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 -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 1101 +DBLOG_FORCE_OPEN ../dbinc/log.h /^#define DBLOG_FORCE_OPEN 0x02 \/* Force the DB ope/ +DBLOG_RECOVER ../dbinc/log.h /^#define DBLOG_RECOVER 0x01 \/* We are in recovery/ +DBM ../dbinc/db.in /^typedef struct __db DBM;$/ +DBMETA ../dbinc/db_page.h /^} DBMETA33, DBMETA;$/ +DBMETA30 ../dbinc/db_upgrade.h /^} DBMETA30;$/ +DBMETA31 ../dbinc/db_upgrade.h /^} DBMETA31;$/ +DBMETASIZE ../dbinc/db_page.h /^#define DBMETASIZE 512$/ +DBMETA_CHKSUM ../dbinc/db_page.h /^#define DBMETA_CHKSUM 0x01$/ +DBM_INSERT ../dbinc/db.in /^#define DBM_INSERT 0 \/* Flags to dbm_store(). */ +DBM_REPLACE ../dbinc/db.in /^#define DBM_REPLACE 1$/ +DBM_SUFFIX ../dbinc/db.in /^#define DBM_SUFFIX ".db"$/ +DBREG_CHKPNT ../dbinc/log.h /^#define DBREG_CHKPNT 1 \/* Checkpoint: file name/ +DBREG_CLOSE ../dbinc/log.h /^#define DBREG_CLOSE 2 \/* File close. *\/$/ +DBREG_OPEN ../dbinc/log.h /^#define DBREG_OPEN 3 \/* File open. *\/$/ +DBREG_PREOPEN ../dbinc/log.h /^#define DBREG_PREOPEN 4 \/* Open in mpool only. */ +DBREG_RCLOSE ../dbinc/log.h /^#define DBREG_RCLOSE 5 \/* File close after recov/ +DBREG_REOPEN ../dbinc/log.h /^#define DBREG_REOPEN 6 \/* Open for in-memory dat/ +DBREP_OPENFILES ../dbinc/rep.h /^#define DBREP_OPENFILES 0x0001 \/* This handle ha/ +DBSEQ_METHOD ../cxx/cxx_seq.cpp /^\/\/ Helper macro for simple methods that pass thr/ +DBT ../dbinc/db.in /^struct __db_dbt; typedef struct __db_dbt DBT;$/ +DBTBUFLEN ../db/db_pr.c /^#define DBTBUFLEN 100$/ +DBTCL_DBM ../dbinc/tcl_db.h /^#define DBTCL_DBM 1$/ +DBTCL_GLOBAL ../dbinc/tcl_db.h /^} DBTCL_GLOBAL;$/ +DBTCL_INFO ../dbinc/tcl_db.h /^} DBTCL_INFO;$/ +DBTCL_NDBM ../dbinc/tcl_db.h /^#define DBTCL_NDBM 2$/ +DBTCL_PREP ../dbinc/tcl_db.h /^#define DBTCL_PREP 64 \/* Size of txn_recover prep/ +DBTXN_METHOD ../cxx/cxx_txn.cpp /^\/\/ Helper macro for simple methods that pass thr/ +DBTYPE ../dbinc/db.in /^} DBTYPE;$/ +DBT_LOCKED ../libdb_java/db_java_wrap.c /^} DBT_LOCKED;$/ 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_AES_CHUNK ../dbinc/crypto.h 68 -DB_AES_KEYLEN ../dbinc/crypto.h 67 -DB_AFTER ../dbinc/db.in 1123 -DB_AGGRESSIVE ../dbinc/db.in 344 +DB_ADD_BIG ../dbinc/db_am.h /^#define DB_ADD_BIG 3$/ +DB_ADD_DUP ../dbinc/db_am.h /^#define DB_ADD_DUP 1$/ +DB_ADD_PAGE_COMPAT ../dbinc/db_am.h /^#define DB_ADD_PAGE_COMPAT 5 \/* Compatibility for/ +DB_AES_CHUNK ../dbinc/crypto.h /^#define DB_AES_CHUNK 16 \/* AES byte unit size *\// +DB_AES_KEYLEN ../dbinc/crypto.h /^#define DB_AES_KEYLEN 128 \/* AES key length *\/$/ +DB_AFTER ../dbinc/db.in /^#define DB_AFTER 1 \/* c_put() *\/$/ +DB_AGGRESSIVE ../dbinc/db.in /^#define DB_AGGRESSIVE 0x0000001 \/* Salvage / 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 225 -DB_BEFORE ../dbinc/db.in 1125 -DB_BEGIN_SINGLE_THREAD ../dbinc/mutex.h 17 -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 651 -DB_CALLBACK_C_INTERCEPT ../cxx/cxx_db.cpp /^#define DB_CALLBACK_C_INTERCEPT(_name, _rettype, _/ -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 100 -DB_DEGREE_2 ../dbinc/db.in 226 -DB_DELETED ../dbinc/db.in 1216 +DB_ALREADY_ABORTED ../dbinc/db.in /^#define DB_ALREADY_ABORTED (-30899)$/ +DB_AM_CHKSUM ../dbinc/db.in /^#define DB_AM_CHKSUM 0x00000001 \/* Checksumming / +DB_AM_CL_WRITER ../dbinc/db.in /^#define DB_AM_CL_WRITER 0x00000002 \/* Allow writ/ +DB_AM_COMPENSATE ../dbinc/db.in /^#define DB_AM_COMPENSATE 0x00000004 \/* Created by/ +DB_AM_CREATED ../dbinc/db.in /^#define DB_AM_CREATED 0x00000008 \/* Database was/ +DB_AM_CREATED_MSTR ../dbinc/db.in /^#define DB_AM_CREATED_MSTR 0x00000010 \/* Encompas/ +DB_AM_DBM_ERROR ../dbinc/db.in /^#define DB_AM_DBM_ERROR 0x00000020 \/* Error in D/ +DB_AM_DELIMITER ../dbinc/db.in /^#define DB_AM_DELIMITER 0x00000040 \/* Variable l/ +DB_AM_DISCARD ../dbinc/db.in /^#define DB_AM_DISCARD 0x00000080 \/* Discard any / +DB_AM_DUP ../dbinc/db.in /^#define DB_AM_DUP 0x00000100 \/* DB_DUP *\/$/ +DB_AM_DUPSORT ../dbinc/db.in /^#define DB_AM_DUPSORT 0x00000200 \/* DB_DUPSORT */ +DB_AM_ENCRYPT ../dbinc/db.in /^#define DB_AM_ENCRYPT 0x00000400 \/* Encryption */ +DB_AM_FIXEDLEN ../dbinc/db.in /^#define DB_AM_FIXEDLEN 0x00000800 \/* Fixed-lengt/ +DB_AM_INMEM ../dbinc/db.in /^#define DB_AM_INMEM 0x00001000 \/* In-memory; no / +DB_AM_INORDER ../dbinc/db.in /^#define DB_AM_INORDER 0x00002000 \/* DB_INORDER */ +DB_AM_IN_RENAME ../dbinc/db.in /^#define DB_AM_IN_RENAME 0x00004000 \/* File is be/ +DB_AM_NOT_DURABLE ../dbinc/db.in /^#define DB_AM_NOT_DURABLE 0x00008000 \/* Do not lo/ +DB_AM_OPEN_CALLED ../dbinc/db.in /^#define DB_AM_OPEN_CALLED 0x00010000 \/* DB->open / +DB_AM_PAD ../dbinc/db.in /^#define DB_AM_PAD 0x00020000 \/* Fixed-length rec/ +DB_AM_PGDEF ../dbinc/db.in /^#define DB_AM_PGDEF 0x00040000 \/* Page size was / +DB_AM_RDONLY ../dbinc/db.in /^#define DB_AM_RDONLY 0x00080000 \/* Database is r/ +DB_AM_READ_UNCOMMITTED ../dbinc/db.in /^#define DB_AM_READ_UNCOMMITTED 0x00100000 \/* Supp/ +DB_AM_RECNUM ../dbinc/db.in /^#define DB_AM_RECNUM 0x00200000 \/* DB_RECNUM *\// +DB_AM_RECOVER ../dbinc/db.in /^#define DB_AM_RECOVER 0x00400000 \/* DB opened by/ +DB_AM_RENUMBER ../dbinc/db.in /^#define DB_AM_RENUMBER 0x00800000 \/* DB_RENUMBER/ +DB_AM_REVSPLITOFF ../dbinc/db.in /^#define DB_AM_REVSPLITOFF 0x01000000 \/* DB_REVSPL/ +DB_AM_SECONDARY ../dbinc/db.in /^#define DB_AM_SECONDARY 0x02000000 \/* Database i/ +DB_AM_SNAPSHOT ../dbinc/db.in /^#define DB_AM_SNAPSHOT 0x04000000 \/* DB_SNAPSHOT/ +DB_AM_SUBDB ../dbinc/db.in /^#define DB_AM_SUBDB 0x08000000 \/* Subdatabases s/ +DB_AM_SWAP ../dbinc/db.in /^#define DB_AM_SWAP 0x10000000 \/* Pages need to b/ +DB_AM_TXN ../dbinc/db.in /^#define DB_AM_TXN 0x20000000 \/* Opened in a tran/ +DB_AM_VERIFYING ../dbinc/db.in /^#define DB_AM_VERIFYING 0x40000000 \/* DB handle / +DB_APPEND ../dbinc/db.in /^#define DB_APPEND 2 \/* put() *\/$/ +DB_ARCH_ABS ../dbinc/db.in /^#define DB_ARCH_ABS 0x001 \/* Absolute pathnames./ +DB_ARCH_DATA ../dbinc/db.in /^#define DB_ARCH_DATA 0x002 \/* Data files. *\/$/ +DB_ARCH_LOG ../dbinc/db.in /^#define DB_ARCH_LOG 0x004 \/* Log files. *\/$/ +DB_ARCH_REMOVE ../dbinc/db.in /^#define DB_ARCH_REMOVE 0x008 \/* Remove log files./ +DB_ASSERT ../dbinc/debug.h /^#define DB_ASSERT(env, e) \\$/ +DB_ASSOC_IMMUTABLE_KEY ../dbinc/db.in /^#define DB_ASSOC_IMMUTABLE_KEY 0x00000001 \/* S/ +DB_AUTO_COMMIT ../dbinc/db.in /^#define DB_AUTO_COMMIT 0x02000000\/* Implied/ +DB_BEFORE ../dbinc/db.in /^#define DB_BEFORE 3 \/* c_put() *\/$/ +DB_BEGIN_SINGLE_THREAD ../dbinc/mutex.h /^#define DB_BEGIN_SINGLE_THREAD do { \\$/ +DB_BTREEMAGIC ../dbinc/db.in /^#define DB_BTREEMAGIC 0x053162$/ +DB_BTREEOLDVER ../dbinc/db.in /^#define DB_BTREEOLDVER 8 \/* Oldest btree version/ +DB_BTREEVERSION ../dbinc/db.in /^#define DB_BTREEVERSION 9 \/* Current btree versi/ +DB_BTREE_STAT ../dbinc/db.in /^struct __db_bt_stat; typedef struct __db_bt_stat D/ +DB_BUFFER_SMALL ../dbinc/db.in /^#define DB_BUFFER_SMALL (-30999)\/* User memory t/ +DB_CACHESIZE_MIN ../dbinc/mp.h /^#define DB_CACHESIZE_MIN (20 * 1024)$/ +DB_CACHE_PRIORITY ../dbinc/db.in /^} DB_CACHE_PRIORITY;$/ +DB_CDB_ALLDB ../dbinc/db.in /^#define DB_CDB_ALLDB 0x00004000\/* Set CDB l/ +DB_CHKSUM ../dbinc/db.in /^#define DB_CHKSUM 0x00004000 \/* Do checksum/ +DB_CIPHER ../dbinc/db.in /^struct __db_cipher; typedef struct __db_cipher DB_/ +DB_CLEARLEN_NOTSET ../dbinc/db_int.in /^#define DB_CLEARLEN_NOTSET UINT32_MAX \/* Not yet / +DB_COMMIT_FLUSH ../dbinc/log.h /^#define DB_COMMIT_FLUSH 0x0001 \/* Flush the log / +DB_COMPACT ../dbinc/db.in /^struct __db_compact; typedef struct __db_compact D/ +DB_COMPACT_FLAGS ../dbinc/db.in /^#define DB_COMPACT_FLAGS \\$/ +DB_CONSUME ../dbinc/db.in /^#define DB_CONSUME 4 \/* get() *\/$/ +DB_CONSUME_WAIT ../dbinc/db.in /^#define DB_CONSUME_WAIT 5 \/* get() *\/$/ +DB_CREATE ../dbinc/db.in /^#define DB_CREATE 0x0000001 \/* Create file / +DB_CURRENT ../dbinc/db.in /^#define DB_CURRENT 6 \/* c_get(), c_put(), DB_LO/ +DB_CXX_NO_EXCEPTIONS ../dbinc/db.in /^#define DB_CXX_NO_EXCEPTIONS 0x0000001 \/* C++: r/ +DB_DBM_HSEARCH ../dbinc/db.in /^#define DB_DBM_HSEARCH 0 \/* No historic interfac/ +DB_DBT_APPMALLOC ../dbinc/db.in /^#define DB_DBT_APPMALLOC 0x001 \/* Callback alloca/ +DB_DBT_DUPOK ../dbinc/db.in /^#define DB_DBT_DUPOK 0x080 \/* Insert if duplicat/ +DB_DBT_ISSET ../dbinc/db.in /^#define DB_DBT_ISSET 0x002 \/* Lower level calls / +DB_DBT_MALLOC ../dbinc/db.in /^#define DB_DBT_MALLOC 0x004 \/* Return in malloc'/ +DB_DBT_PARTIAL ../dbinc/db.in /^#define DB_DBT_PARTIAL 0x008 \/* Partial put\/get/ +DB_DBT_REALLOC ../dbinc/db.in /^#define DB_DBT_REALLOC 0x010 \/* Return in reallo/ +DB_DBT_USERCOPY ../dbinc/db.in /^#define DB_DBT_USERCOPY 0x020 \/* Use the user-su/ +DB_DBT_USERMEM ../dbinc/db.in /^#define DB_DBT_USERMEM 0x040 \/* Return in user's/ +DB_DEF_IOSIZE ../dbinc/db_int.in /^#define DB_DEF_IOSIZE (8 * 1024)$/ +DB_DEGREE_2 ../dbinc/db.in /^#define DB_DEGREE_2 0x04000000\/* Historic n/ +DB_DELETED ../dbinc/db.in /^#define DB_DELETED (-30898)\/* Recovery file mark/ 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 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_DIRECT ../dbinc/db.in /^#define DB_DIRECT 0x0004000 \/* Don't buffer/ +DB_DIRECT_DB ../dbinc/db.in /^#define DB_DIRECT_DB 0x00008000\/* Don't buf/ +DB_DIRECT_LOG ../dbinc/db.in /^#define DB_DIRECT_LOG 0x00010000\/* Don't bu/ +DB_DIRTY_READ ../dbinc/db.in /^#define DB_DIRTY_READ 0x08000000\/* Historic/ +DB_DONOTINDEX ../dbinc/db.in /^#define DB_DONOTINDEX (-30998)\/* "Null" return f/ +DB_DSYNC_DB ../dbinc/db.in /^#define DB_DSYNC_DB 0x00020000\/* Set O_DSYN/ +DB_DSYNC_LOG ../dbinc/db.in /^#define DB_DSYNC_LOG 0x00040000\/* Set O_DSY/ +DB_DUP ../dbinc/db.in /^#define DB_DUP 0x00008000 \/* Btree, Hash: / +DB_DUPSORT ../dbinc/db.in /^#define DB_DUPSORT 0x00010000 \/* Btree, Has/ +DB_DURABLE_UNKNOWN ../dbinc/db.in /^#define DB_DURABLE_UNKNOWN 0x0000002 \/* Durabi/ +DB_EID_BROADCAST ../dbinc/db.in /^#define DB_EID_BROADCAST -1$/ +DB_EID_INVALID ../dbinc/db.in /^#define DB_EID_INVALID -2$/ +DB_ENCRYPT ../dbinc/db.in /^#define DB_ENCRYPT 0x00020000 \/* Btree, Has/ +DB_ENCRYPT_AES ../dbinc/db.in /^#define DB_ENCRYPT_AES 0x0000001 \/* AES, as/ +DB_ENC_MAGIC ../dbinc/hmac.h /^#define DB_ENC_MAGIC "encryption and decryption ke/ +DB_END_SINGLE_THREAD ../dbinc/mutex.h /^#define DB_END_SINGLE_THREAD (void)semGive(DB_GLOB/ +DB_ENTRY ../dbinc/log.h /^} DB_ENTRY;$/ +DB_ENV ../dbinc/db.in /^struct __db_env; typedef struct __db_env DB_ENV;$/ +DB_ENV_AUTO_COMMIT ../dbinc/db.in /^#define DB_ENV_AUTO_COMMIT 0x00000001 \/* DB_AUTO_/ +DB_ENV_CDB ../dbinc/db.in /^#define DB_ENV_CDB 0x00000002 \/* DB_INIT_CDB. */ +DB_ENV_CDB_ALLDB ../dbinc/db.in /^#define DB_ENV_CDB_ALLDB 0x00000004 \/* CDB enviro/ +DB_ENV_CREATE ../dbinc/db.in /^#define DB_ENV_CREATE 0x00000008 \/* DB_CREATE se/ +DB_ENV_DBLOCAL ../dbinc/db.in /^#define DB_ENV_DBLOCAL 0x00000010 \/* Environment/ +DB_ENV_DIRECT_DB ../dbinc/db.in /^#define DB_ENV_DIRECT_DB 0x00000020 \/* DB_DIRECT_/ +DB_ENV_DIRECT_LOG ../dbinc/db.in /^#define DB_ENV_DIRECT_LOG 0x00000040 \/* DB_DIRECT/ +DB_ENV_DSYNC_DB ../dbinc/db.in /^#define DB_ENV_DSYNC_DB 0x00000080 \/* DB_DSYNC_D/ +DB_ENV_DSYNC_LOG ../dbinc/db.in /^#define DB_ENV_DSYNC_LOG 0x00000100 \/* DB_DSYNC_L/ +DB_ENV_FATAL ../dbinc/db.in /^#define DB_ENV_FATAL 0x00000200 \/* Doing fatal r/ DB_ENV_INTERNAL ../libdb_java/db_java_wrap.c /^#define DB_ENV_INTERNAL(dbenv) ((dbenv)->api2_inte/ -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_LOCKDOWN ../dbinc/db.in /^#define DB_ENV_LOCKDOWN 0x00000400 \/* DB_LOCKDOW/ +DB_ENV_LOG_AUTOREMOVE ../dbinc/db.in /^#define DB_ENV_LOG_AUTOREMOVE 0x00000800 \/* DB_/ +DB_ENV_LOG_INMEMORY ../dbinc/db.in /^#define DB_ENV_LOG_INMEMORY 0x00001000 \/* DB_/ +DB_ENV_MULTIVERSION ../dbinc/db.in /^#define DB_ENV_MULTIVERSION 0x00002000 \/* DB_MULT/ +DB_ENV_NOLOCKING ../dbinc/db.in /^#define DB_ENV_NOLOCKING 0x00004000 \/* DB_NOLOCKI/ +DB_ENV_NOMMAP ../dbinc/db.in /^#define DB_ENV_NOMMAP 0x00008000 \/* DB_NOMMAP se/ +DB_ENV_NOPANIC ../dbinc/db.in /^#define DB_ENV_NOPANIC 0x00010000 \/* Okay if pan/ +DB_ENV_OPEN_CALLED ../dbinc/db.in /^#define DB_ENV_OPEN_CALLED 0x00020000 \/* DB_ENV->/ +DB_ENV_OVERWRITE ../dbinc/db.in /^#define DB_ENV_OVERWRITE 0x00040000 \/* DB_OVERWRI/ +DB_ENV_PRIVATE ../dbinc/db.in /^#define DB_ENV_PRIVATE 0x00080000 \/* DB_PRIVATE / +DB_ENV_REGION_INIT ../dbinc/db.in /^#define DB_ENV_REGION_INIT 0x00100000 \/* DB_REGIO/ +DB_ENV_RPCCLIENT ../dbinc/db.in /^#define DB_ENV_RPCCLIENT 0x00200000 \/* DB_RPCCLIE/ +DB_ENV_RPCCLIENT_GIVEN ../dbinc/db.in /^#define DB_ENV_RPCCLIENT_GIVEN 0x00400000 \/* User/ +DB_ENV_SYSTEM_MEM ../dbinc/db.in /^#define DB_ENV_SYSTEM_MEM 0x00800000 \/* DB_SYSTEM/ 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 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 441 -DB_FTYPE_SET ../dbinc/db_int.in 440 -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_ENV_TEST_RECYCLE ../dbinc/debug.h /^#define DB_ENV_TEST_RECYCLE(env, ret) do { \\$/ +DB_ENV_THREAD ../dbinc/db.in /^#define DB_ENV_THREAD 0x01000000 \/* DB_THREAD se/ +DB_ENV_TIME_NOTGRANTED ../dbinc/db.in /^#define DB_ENV_TIME_NOTGRANTED 0x02000000 \/* DB_T/ +DB_ENV_TXN_NOSYNC ../dbinc/db.in /^#define DB_ENV_TXN_NOSYNC 0x04000000 \/* DB_TXN_NO/ +DB_ENV_TXN_SNAPSHOT ../dbinc/db.in /^#define DB_ENV_TXN_SNAPSHOT 0x08000000 \/* DB_TXN_/ +DB_ENV_TXN_WRITE_NOSYNC ../dbinc/db.in /^#define DB_ENV_TXN_WRITE_NOSYNC 0x10000000 \/* DB_/ +DB_ENV_YIELDCPU ../dbinc/db.in /^#define DB_ENV_YIELDCPU 0x20000000 \/* DB_YIELDCP/ +DB_EVENT ../dbinc/db_int.in /^#define DB_EVENT(dbenv, e, einfo) do { \\$/ +DB_EVENT_NO_SUCH_EVENT ../dbinc/db.in /^#define DB_EVENT_NO_SUCH_EVENT 0 \/* out-of-band / +DB_EVENT_PANIC ../dbinc/db.in /^#define DB_EVENT_PANIC 1$/ +DB_EVENT_REP_CLIENT ../dbinc/db.in /^#define DB_EVENT_REP_CLIENT 2$/ +DB_EVENT_REP_MASTER ../dbinc/db.in /^#define DB_EVENT_REP_MASTER 3$/ +DB_EVENT_REP_NEWMASTER ../dbinc/db.in /^#define DB_EVENT_REP_NEWMASTER 4$/ +DB_EVENT_REP_STARTUPDONE ../dbinc/db.in /^#define DB_EVENT_REP_STARTUPDONE 5$/ +DB_EVENT_WRITE_FAILED ../dbinc/db.in /^#define DB_EVENT_WRITE_FAILED 6$/ +DB_EXCL ../dbinc/db.in /^#define DB_EXCL 0x0004000 \/* Exclusive ope/ +DB_EXTENT ../dbinc/db.in /^#define DB_EXTENT 0x0008000 \/* internal: de/ +DB_FAST_STAT ../dbinc/db.in /^#define DB_FAST_STAT 0x0000001 \/* Don't tra/ +DB_FCNTL_LOCKING ../dbinc/db.in /^#define DB_FCNTL_LOCKING 0x0008000 \/* UNDOC:/ +DB_FH ../dbinc/db.in /^struct __fh_t; typedef struct __fh_t DB_FH;$/ +DB_FH_NOSYNC ../dbinc/os.h /^#define DB_FH_NOSYNC 0x01 \/* Handle doesn't need/ +DB_FH_OPENED ../dbinc/os.h /^#define DB_FH_OPENED 0x02 \/* Handle is valid. */ +DB_FH_UNLINK ../dbinc/os.h /^#define DB_FH_UNLINK 0x04 \/* Unlink on close *\// +DB_FILE_ID_LEN ../dbinc/db.in /^#define DB_FILE_ID_LEN 20 \/* Unique file ID leng/ +DB_FIRST ../dbinc/db.in /^#define DB_FIRST 7 \/* c_get(), DB_LOGC->get() */ +DB_FLUSH ../dbinc/db.in /^#define DB_FLUSH 0x001 \/* Flush data to disk (pu/ +DB_FNAME_DURABLE ../dbinc/log.h /^#define DB_FNAME_DURABLE 0x02 \/* File is durable./ +DB_FNAME_NOTLOGGED ../dbinc/log.h /^#define DB_FNAME_NOTLOGGED 0x01 \/* Log of close f/ +DB_FORCE ../dbinc/db.in /^#define DB_FORCE 0x0000004 \/* Force (anythi/ +DB_FREELIST_ONLY ../dbinc/db.in /^#define DB_FREELIST_ONLY 0x00004000 \/* Just / +DB_FREEZER_MAGIC ../mp/mp_mvcc.c /^#define DB_FREEZER_MAGIC 0x06102002$/ +DB_FREE_SPACE ../dbinc/db.in /^#define DB_FREE_SPACE 0x00008000 \/* Free / +DB_FTYPE_NOTSET ../dbinc/db_int.in /^#define DB_FTYPE_NOTSET 0 \/* Don't call... *\// +DB_FTYPE_SET ../dbinc/db_int.in /^#define DB_FTYPE_SET -1 \/* Call pgin\/pgout fun/ +DB_GET_BOTH ../dbinc/db.in /^#define DB_GET_BOTH 8 \/* get(), c_get() *\/$/ +DB_GET_BOTHC ../dbinc/db.in /^#define DB_GET_BOTHC 9 \/* c_get() (internal) */ +DB_GET_BOTH_RANGE ../dbinc/db.in /^#define DB_GET_BOTH_RANGE 10 \/* get(), c_get() */ +DB_GET_RECNO ../dbinc/db.in /^#define DB_GET_RECNO 11 \/* c_get() *\/$/ DB_GLOBAL ../dbinc/globals.h /^#define DB_GLOBAL(v) __db_global_values.v$/ -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 132 -DB_HASH_SUBDB ../dbinc/db_page.h 124 +DB_GLOBALS ../dbinc/globals.h /^} DB_GLOBALS;$/ +DB_GROW_SIZE ../dbinc/log.h /^#define DB_GROW_SIZE 64$/ +DB_HANDLE_LOCK ../dbinc/db.in /^#define DB_HANDLE_LOCK 1$/ +DB_HASHMAGIC ../dbinc/db.in /^#define DB_HASHMAGIC 0x061561$/ +DB_HASHOLDVER ../dbinc/db.in /^#define DB_HASHOLDVER 7 \/* Oldest hash version s/ +DB_HASHTAB ../dbinc/db_int.in /^typedef SH_TAILQ_HEAD(__hash_head) DB_HASHTAB;$/ +DB_HASHVERSION ../dbinc/db.in /^#define DB_HASHVERSION 8 \/* Current hash version/ +DB_HASH_DUP ../dbinc/db_page.h /^#define DB_HASH_DUP 0x01 \/* Duplicates. *\/$/ +DB_HASH_DUPSORT ../dbinc/db_page.h /^#define DB_HASH_DUPSORT 0x04 \/* Duplicates are / +DB_HASH_STAT ../dbinc/db.in /^struct __db_h_stat; typedef struct __db_h_stat DB_/ +DB_HASH_SUBDB ../dbinc/db_page.h /^#define DB_HASH_SUBDB 0x02 \/* Subdatabases. *\// 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 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_IMMUTABLE_KEY ../dbinc/db.in /^#define DB_IMMUTABLE_KEY 0x0004000 \/* Second/ +DB_INITENV_CDB ../env/env_open.c /^#define DB_INITENV_CDB 0x0001 \/* DB_INIT_CDB *\// +DB_INITENV_CDB_ALLDB ../env/env_open.c /^#define DB_INITENV_CDB_ALLDB 0x0002 \/* DB_INIT_CD/ +DB_INITENV_LOCK ../env/env_open.c /^#define DB_INITENV_LOCK 0x0004 \/* DB_INIT_LOCK */ +DB_INITENV_LOG ../env/env_open.c /^#define DB_INITENV_LOG 0x0008 \/* DB_INIT_LOG *\// +DB_INITENV_MPOOL ../env/env_open.c /^#define DB_INITENV_MPOOL 0x0010 \/* DB_INIT_MPOOL / +DB_INITENV_REP ../env/env_open.c /^#define DB_INITENV_REP 0x0020 \/* DB_INIT_REP *\// +DB_INITENV_TXN ../env/env_open.c /^#define DB_INITENV_TXN 0x0040 \/* DB_INIT_TXN *\// +DB_INITIALIZE_DB_GLOBALS ../env/env_method.c /^#define DB_INITIALIZE_DB_GLOBALS 1$/ +DB_INIT_CDB ../dbinc/db.in /^#define DB_INIT_CDB 0x0004000 \/* Concurrent/ +DB_INIT_DBT ../dbinc/db_int.in /^#define DB_INIT_DBT(dbt, d, s) do { \\$/ +DB_INIT_LOCK ../dbinc/db.in /^#define DB_INIT_LOCK 0x0008000 \/* Initializ/ +DB_INIT_LOG ../dbinc/db.in /^#define DB_INIT_LOG 0x0010000 \/* Initialize/ +DB_INIT_MPOOL ../dbinc/db.in /^#define DB_INIT_MPOOL 0x0020000 \/* Initiali/ +DB_INIT_REP ../dbinc/db.in /^#define DB_INIT_REP 0x0040000 \/* Initialize/ +DB_INIT_TXN ../dbinc/db.in /^#define DB_INIT_TXN 0x0080000 \/* Initialize/ +DB_INORDER ../dbinc/db.in /^#define DB_INORDER 0x00040000 \/* Queue: str/ DB_INTERNAL ../libdb_java/db_java_wrap.c /^#define DB_INTERNAL(db) ((db)->api_internal)$/ -DB_IO_READ ../dbinc/os.h 55 -DB_IO_WRITE ../dbinc/os.h 56 +DB_IO_READ ../dbinc/os.h /^#define DB_IO_READ 1$/ +DB_IO_WRITE ../dbinc/os.h /^#define DB_IO_WRITE 2$/ +DB_IS_READONLY ../dbinc/db_am.h /^#define DB_IS_READONLY(dbp) \\$/ DB_IS_THREADED ../dbinc/db_int.in /^#define DB_IS_THREADED(dbp) \\$/ -DB_IV_BYTES ../dbinc/db_int.in 493 -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 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 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 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 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 494 -DB_MAC_MAGIC ../dbinc/hmac.h 28 -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 89 -DB_MAX_RECORDS ../dbinc/db.in 110 -DB_METHOD ../cxx/cxx_db.cpp /^#define DB_METHOD(_name, _argspec, _arglist, _reto/ +DB_IV_BYTES ../dbinc/db_int.in /^#define DB_IV_BYTES 16 \/* Bytes per IV *\/$/ +DB_JOINENV ../dbinc/db.in /^#define DB_JOINENV 0x0 \/* Compatibility. */ +DB_JOIN_ITEM ../dbinc/db.in /^#define DB_JOIN_ITEM 12 \/* c_get(); do not do pr/ +DB_JOIN_NOSORT ../dbinc/db.in /^#define DB_JOIN_NOSORT 0x0000001 \/* Don't t/ +DB_KEYEMPTY ../dbinc/db.in /^#define DB_KEYEMPTY (-30997)\/* Key\/data deleted/ +DB_KEYEXIST ../dbinc/db.in /^#define DB_KEYEXIST (-30996)\/* The key\/data pai/ +DB_KEYFIRST ../dbinc/db.in /^#define DB_KEYFIRST 13 \/* c_put() *\/$/ +DB_KEYLAST ../dbinc/db.in /^#define DB_KEYLAST 14 \/* c_put() *\/$/ +DB_KEY_RANGE ../dbinc/db.in /^struct __key_range; typedef struct __key_range DB_/ +DB_LAST ../dbinc/db.in /^#define DB_LAST 15 \/* c_get(), DB_LOGC->get() */ +DB_LOCK ../dbinc/db.in /^struct __db_lock_u; typedef struct __db_lock_u DB_/ +DB_LOCKDOWN ../dbinc/db.in /^#define DB_LOCKDOWN 0x0100000 \/* Lock memor/ +DB_LOCKER ../dbinc/lock.h /^} DB_LOCKER;$/ +DB_LOCKER_DELETED ../dbinc/lock.h /^#define DB_LOCKER_DELETED 0x0001$/ +DB_LOCKER_DIRTY ../dbinc/lock.h /^#define DB_LOCKER_DIRTY 0x0002$/ +DB_LOCKER_INABORT ../dbinc/lock.h /^#define DB_LOCKER_INABORT 0x0004$/ +DB_LOCKER_TIMEOUT ../dbinc/lock.h /^#define DB_LOCKER_TIMEOUT 0x0008$/ +DB_LOCKOBJ ../dbinc/lock.h /^} DB_LOCKOBJ;$/ +DB_LOCKREGION ../dbinc/lock.h /^} DB_LOCKREGION;$/ +DB_LOCKREQ ../dbinc/db.in /^struct __db_lockreq; typedef struct __db_lockreq D/ +DB_LOCKTAB ../dbinc/db.in /^struct __db_locktab; typedef struct __db_locktab D/ +DB_LOCKVERSION ../dbinc/db.in /^#define DB_LOCKVERSION 1$/ +DB_LOCK_ABORT ../dbinc/db.in /^#define DB_LOCK_ABORT 0x001 \/* Internal: Lock du/ +DB_LOCK_CDB_N ../lock/lock_region.c /^#define DB_LOCK_CDB_N 5$/ +DB_LOCK_DEADLOCK ../dbinc/db.in /^#define DB_LOCK_DEADLOCK (-30995)\/* Deadlock. *\// +DB_LOCK_DEFAULT ../dbinc/db.in /^#define DB_LOCK_DEFAULT 1 \/* Default policy. *\// +DB_LOCK_DEFAULT_N ../dbinc/lock.h /^#define DB_LOCK_DEFAULT_N 1000 \/* Default # of lo/ +DB_LOCK_DOALL ../dbinc/lock.h /^#define DB_LOCK_DOALL 0x010000$/ +DB_LOCK_EXPIRE ../dbinc/db.in /^#define DB_LOCK_EXPIRE 2 \/* Only expire locks, n/ +DB_LOCK_FREE ../dbinc/lock.h /^#define DB_LOCK_FREE 0x040000$/ +DB_LOCK_ILOCK ../dbinc/db.in /^struct __db_ilock; typedef struct __db_ilock DB_LO/ +DB_LOCK_INVALIDID ../dbinc/lock.h /^#define DB_LOCK_INVALIDID 0$/ +DB_LOCK_MAXID ../dbinc/lock.h /^#define DB_LOCK_MAXID 0x7fffffff$/ +DB_LOCK_MAXLOCKS ../dbinc/db.in /^#define DB_LOCK_MAXLOCKS 3 \/* Select locker with / +DB_LOCK_MAXWRITE ../dbinc/db.in /^#define DB_LOCK_MAXWRITE 4 \/* Select locker with / +DB_LOCK_MINLOCKS ../dbinc/db.in /^#define DB_LOCK_MINLOCKS 5 \/* Select locker with / +DB_LOCK_MINWRITE ../dbinc/db.in /^#define DB_LOCK_MINWRITE 6 \/* Select locker with / +DB_LOCK_NOPROMOTE ../dbinc/lock.h /^#define DB_LOCK_NOPROMOTE 0x080000$/ +DB_LOCK_NOREGION ../dbinc/lock.h /^#define DB_LOCK_NOREGION 0x200000$/ +DB_LOCK_NORUN ../dbinc/db.in /^#define DB_LOCK_NORUN 0$/ +DB_LOCK_NOTGRANTED ../dbinc/db.in /^#define DB_LOCK_NOTGRANTED (-30994)\/* Lock unavai/ +DB_LOCK_NOWAIT ../dbinc/db.in /^#define DB_LOCK_NOWAIT 0x002 \/* Don't wait on un/ +DB_LOCK_NOWAITERS ../dbinc/lock.h /^#define DB_LOCK_NOWAITERS 0x400000$/ +DB_LOCK_OLDEST ../dbinc/db.in /^#define DB_LOCK_OLDEST 7 \/* Select oldest locker/ +DB_LOCK_RANDOM ../dbinc/db.in /^#define DB_LOCK_RANDOM 8 \/* Select random locker/ +DB_LOCK_RECORD ../dbinc/db.in /^#define DB_LOCK_RECORD 0x004 \/* Internal: record/ +DB_LOCK_RIW_N ../lock/lock_region.c /^#define DB_LOCK_RIW_N 9$/ +DB_LOCK_SET_TIMEOUT ../dbinc/db.in /^#define DB_LOCK_SET_TIMEOUT 0x008 \/* Internal: se/ +DB_LOCK_STAT ../dbinc/db.in /^struct __db_lock_stat; typedef struct __db_lock_st/ +DB_LOCK_SWITCH ../dbinc/db.in /^#define DB_LOCK_SWITCH 0x010 \/* Internal: switch/ +DB_LOCK_UNLINK ../dbinc/lock.h /^#define DB_LOCK_UNLINK 0x100000$/ +DB_LOCK_UPGRADE ../dbinc/db.in /^#define DB_LOCK_UPGRADE 0x020 \/* Internal: upgra/ +DB_LOCK_YOUNGEST ../dbinc/db.in /^#define DB_LOCK_YOUNGEST 9 \/* Select youngest loc/ +DB_LOG ../dbinc/db.in /^struct __db_log; typedef struct __db_log DB_LOG;$/ +DB_LOGC ../dbinc/db.in /^struct __db_log_cursor; typedef struct __db_log_cu/ +DB_LOGFILEID_INVALID ../dbinc/db.in /^#define DB_LOGFILEID_INVALID -1$/ +DB_LOGMAGIC ../dbinc/db.in /^#define DB_LOGMAGIC 0x040988$/ +DB_LOGOLDVER ../dbinc/db.in /^#define DB_LOGOLDVER 8 \/* Oldest log version sup/ +DB_LOGVERSION ../dbinc/db.in /^#define DB_LOGVERSION 12 \/* Current log version./ +DB_LOGVERSION_42 ../dbinc/rep.h /^#define DB_LOGVERSION_42 8$/ +DB_LOGVERSION_43 ../dbinc/rep.h /^#define DB_LOGVERSION_43 10$/ +DB_LOGVERSION_44 ../dbinc/rep.h /^#define DB_LOGVERSION_44 11$/ +DB_LOGVERSION_45 ../dbinc/rep.h /^#define DB_LOGVERSION_45 12$/ +DB_LOG_AUTOREMOVE ../dbinc/db.in /^#define DB_LOG_AUTOREMOVE 0x00080000\/* Automa/ +DB_LOG_BUFFER_FULL ../dbinc/db.in /^#define DB_LOG_BUFFER_FULL (-30993)\/* In-memory l/ +DB_LOG_CHKPNT ../dbinc/db.in /^#define DB_LOG_CHKPNT 0x002 \/* Flush supports a / +DB_LOG_COMMIT ../dbinc/db.in /^#define DB_LOG_COMMIT 0x004 \/* Flush supports a / +DB_LOG_DISK ../dbinc/db.in /^#define DB_LOG_DISK 0x01 \/* Log record came from/ +DB_LOG_INMEMORY ../dbinc/db.in /^#define DB_LOG_INMEMORY 0x00100000\/* Store / +DB_LOG_LOCKED ../dbinc/db.in /^#define DB_LOG_LOCKED 0x02 \/* Log region already/ +DB_LOG_NOCOPY ../dbinc/db.in /^#define DB_LOG_NOCOPY 0x008 \/* Don't copy data */ +DB_LOG_NOT_DURABLE ../dbinc/db.in /^#define DB_LOG_NOT_DURABLE 0x010 \/* Do not log; k/ +DB_LOG_PERM_42_44 ../dbinc/rep.h /^#define DB_LOG_PERM_42_44 0x20$/ +DB_LOG_RESEND_42_44 ../dbinc/rep.h /^#define DB_LOG_RESEND_42_44 0x40$/ +DB_LOG_SILENT_ERR ../dbinc/db.in /^#define DB_LOG_SILENT_ERR 0x04 \/* Turn-off error / +DB_LOG_STAT ../dbinc/db.in /^struct __db_log_stat; typedef struct __db_log_stat/ +DB_LOG_WRNOSYNC ../dbinc/db.in /^#define DB_LOG_WRNOSYNC 0x020 \/* Write, don't sy/ +DB_LSN ../dbinc/db.in /^struct __db_lsn; typedef struct __db_lsn DB_LSN;$/ +DB_LSN_OFF_NOTSET ../dbinc/db_int.in /^#define DB_LSN_OFF_NOTSET -1 \/* Not yet set. *\// +DB_LSN_STACK_SIZE ../dbinc/db_dispatch.h /^#define DB_LSN_STACK_SIZE 4$/ +DB_MAC_KEY ../dbinc/db_int.in /^#define DB_MAC_KEY 20 \/* Bytes per MAC checksum / +DB_MAC_MAGIC ../dbinc/hmac.h /^#define DB_MAC_MAGIC "mac derivation key magic val/ +DB_MAXMMAPSIZE ../mp/mp_fopen.c /^#define DB_MAXMMAPSIZE (10 * 1024 * 1024) \/* 10 M/ +DB_MAXPATHLEN ../dbinc/db_int.in /^#define DB_MAXPATHLEN 1024$/ +DB_MAX_PAGES ../dbinc/db.in /^#define DB_MAX_PAGES 0xffffffff \/* >= # of pages / +DB_MAX_PGSIZE ../dbinc/db_int.in /^#define DB_MAX_PGSIZE 0x010000 \/* Maximum page si/ +DB_MAX_RECORDS ../dbinc/db.in /^#define DB_MAX_RECORDS 0xffffffff \/* >= # of reco/ +DB_METHOD ../cxx/cxx_db.cpp /^\/\/ Helper macros for simple methods that pass th/ 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 94 -DB_MIN_PGSIZE ../dbinc/db_int.in 88 -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_MINPAGECACHE ../dbinc/db_int.in /^#define DB_MINPAGECACHE 16$/ +DB_MIN_PGSIZE ../dbinc/db_int.in /^#define DB_MIN_PGSIZE 0x000200 \/* Minimum page si/ +DB_MPOOL ../dbinc/db.in /^struct __db_mpool; typedef struct __db_mpool DB_MP/ +DB_MPOOLFILE ../dbinc/db.in /^struct __db_mpoolfile; typedef struct __db_mpoolfi/ +DB_MPOOLFILE_METHOD ../cxx/cxx_mpool.cpp /^\/\/ Helper macros for simple methods that pass th/ DB_MPOOLFILE_METHOD_VOID ../cxx/cxx_mpool.cpp /^#define DB_MPOOLFILE_METHOD_VOID(_name, _argspec, / -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 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_MPOOL_CREATE ../dbinc/db.in /^#define DB_MPOOL_CREATE 0x001 \/* Create a page. / +DB_MPOOL_DIRTY ../dbinc/db.in /^#define DB_MPOOL_DIRTY 0x002 \/* Get page for an / +DB_MPOOL_DISCARD ../dbinc/db.in /^#define DB_MPOOL_DISCARD 0x001 \/* Don't cache the/ +DB_MPOOL_EDIT ../dbinc/db.in /^#define DB_MPOOL_EDIT 0x004 \/* Modify without co/ +DB_MPOOL_FREE ../dbinc/db.in /^#define DB_MPOOL_FREE 0x008 \/* Free page if pres/ +DB_MPOOL_FSTAT ../dbinc/db.in /^struct __db_mpool_fstat;typedef struct __db_mpool_/ +DB_MPOOL_HASH ../dbinc/mp.h /^struct __db_mpool_hash; typedef struct __db_mpool_/ +DB_MPOOL_LAST ../dbinc/db.in /^#define DB_MPOOL_LAST 0x010 \/* Return the last p/ +DB_MPOOL_NEW ../dbinc/db.in /^#define DB_MPOOL_NEW 0x020 \/* Create a new page./ +DB_MPOOL_NOFILE ../dbinc/db.in /^#define DB_MPOOL_NOFILE 0x001 \/* Never open a ba/ +DB_MPOOL_STAT ../dbinc/db.in /^struct __db_mpool_stat; typedef struct __db_mpool_/ +DB_MPOOL_UNLINK ../dbinc/db.in /^#define DB_MPOOL_UNLINK 0x002 \/* Unlink the file/ +DB_MPREG ../dbinc/mp.h /^struct __db_mpreg; typedef struct __db_mpreg DB_MP/ +DB_MSGBUF ../dbinc/db_int.in /^} DB_MSGBUF;$/ 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 ../dbinc/db.in /^#define DB_MULTIPLE 0x10000000 \/* Return multiple/ DB_MULTIPLE_INIT ../dbinc/db.in /^#define DB_MULTIPLE_INIT(pointer, dbt) \\$/ -DB_MULTIPLE_KEY ../dbinc/db.in 1169 +DB_MULTIPLE_KEY ../dbinc/db.in /^#define DB_MULTIPLE_KEY 0x20000000 \/* Return mult/ 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 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_MULTIVERSION ../dbinc/db.in /^#define DB_MULTIVERSION 0x0000008 \/* Multiv/ +DB_MUTEX ../dbinc/db.in /^struct __db_mutex_t; typedef struct __db_mutex_t D/ +DB_MUTEXMGR ../dbinc/db.in /^struct __db_mutexmgr; typedef struct __db_mutexmgr/ +DB_MUTEXREGION ../dbinc/mutex_int.h /^} DB_MUTEXREGION;$/ +DB_MUTEX_ALLOCATED ../dbinc/db.in /^#define DB_MUTEX_ALLOCATED 0x01 \/* Mutex currentl/ +DB_MUTEX_LOCKED ../dbinc/db.in /^#define DB_MUTEX_LOCKED 0x02 \/* Mutex currently / +DB_MUTEX_LOGICAL_LOCK ../dbinc/db.in /^#define DB_MUTEX_LOGICAL_LOCK 0x04 \/* Mutex backs/ +DB_MUTEX_PROCESS_ONLY ../dbinc/db.in /^#define DB_MUTEX_PROCESS_ONLY 0x08 \/* Mutex priva/ +DB_MUTEX_SELF_BLOCK ../dbinc/db.in /^#define DB_MUTEX_SELF_BLOCK 0x10 \/* Must be able / +DB_MUTEX_STAT ../dbinc/db.in /^struct __db_mutex_stat; typedef struct __db_mutex_/ +DB_NEEDSPLIT ../dbinc/db.in /^#define DB_NEEDSPLIT (-30897)\/* Page needs to be/ +DB_NEXT ../dbinc/db.in /^#define DB_NEXT 16 \/* c_get(), DB_LOGC->get() */ +DB_NEXT_DUP ../dbinc/db.in /^#define DB_NEXT_DUP 17 \/* c_get() *\/$/ +DB_NEXT_NODUP ../dbinc/db.in /^#define DB_NEXT_NODUP 18 \/* c_get() *\/$/ +DB_NODUPDATA ../dbinc/db.in /^#define DB_NODUPDATA 19 \/* put(), c_put() *\/$/ +DB_NOLOCKING ../dbinc/db.in /^#define DB_NOLOCKING 0x00200000\/* Set locki/ +DB_NOMMAP ../dbinc/db.in /^#define DB_NOMMAP 0x0000010 \/* Don't mmap u/ DB_NONBLOCK ../dbinc/db_int.in /^#define DB_NONBLOCK(C) ((C)->txn != NULL && F_ISSE/ -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_NOORDERCHK ../dbinc/db.in /^#define DB_NOORDERCHK 0x0000002 \/* Skip sor/ +DB_NOOVERWRITE ../dbinc/db.in /^#define DB_NOOVERWRITE 20 \/* put() *\/$/ +DB_NOPANIC ../dbinc/db.in /^#define DB_NOPANIC 0x00400000\/* Set panic s/ +DB_NOSERVER ../dbinc/db.in /^#define DB_NOSERVER (-30992)\/* Server panic retu/ +DB_NOSERVER_HOME ../dbinc/db.in /^#define DB_NOSERVER_HOME (-30991)\/* Bad home sent/ +DB_NOSERVER_ID ../dbinc/db.in /^#define DB_NOSERVER_ID (-30990)\/* Bad ID sent to/ +DB_NOSYNC ../dbinc/db.in /^#define DB_NOSYNC 21 \/* close() *\/$/ +DB_NOTFOUND ../dbinc/db.in /^#define DB_NOTFOUND (-30989)\/* Key\/data pair no/ +DB_NO_AUTO_COMMIT ../dbinc/db.in /^#define DB_NO_AUTO_COMMIT 0x0010000 \/* Overri/ DB_NTOHL ../dbinc/db_swap.h /^#define DB_NTOHL(p) do { \\$/ -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 259 -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 286 -DB_PAGE_DB_LEN ../dbinc/db_page.h 58 -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 287 +DB_ODDFILESIZE ../dbinc/db.in /^#define DB_ODDFILESIZE 0x0010000 \/* Truncat/ +DB_OK_BTREE ../dbinc/db.in /^#define DB_OK_BTREE 0x01$/ +DB_OK_HASH ../dbinc/db.in /^#define DB_OK_HASH 0x02$/ +DB_OK_QUEUE ../dbinc/db.in /^#define DB_OK_QUEUE 0x04$/ +DB_OK_RECNO ../dbinc/db.in /^#define DB_OK_RECNO 0x08$/ +DB_OLD_VERSION ../dbinc/db.in /^#define DB_OLD_VERSION (-30988)\/* Out-of-date ve/ +DB_OPFLAGS_MASK ../dbinc/db.in /^#define DB_OPFLAGS_MASK 0x000000ff \/* Mask for op/ +DB_OPNOTSUP ../dbinc/db_int.in /^#define DB_OPNOTSUP EOPNOTSUPP$/ +DB_ORDERCHKONLY ../dbinc/db.in /^#define DB_ORDERCHKONLY 0x0000004 \/* Only p/ +DB_OSO_ABSMODE ../dbinc/os.h /^#define DB_OSO_ABSMODE 0x0001 \/* Absolute mode s/ +DB_OSO_CREATE ../dbinc/os.h /^#define DB_OSO_CREATE 0x0002 \/* POSIX: O_CREAT */ +DB_OSO_DIRECT ../dbinc/os.h /^#define DB_OSO_DIRECT 0x0004 \/* Don't buffer the/ +DB_OSO_DSYNC ../dbinc/os.h /^#define DB_OSO_DSYNC 0x0008 \/* POSIX: O_DSYNC. */ +DB_OSO_EXCL ../dbinc/os.h /^#define DB_OSO_EXCL 0x0010 \/* POSIX: O_EXCL *\/$/ +DB_OSO_RDONLY ../dbinc/os.h /^#define DB_OSO_RDONLY 0x0020 \/* POSIX: O_RDONLY / +DB_OSO_REGION ../dbinc/os.h /^#define DB_OSO_REGION 0x0040 \/* Opening a region/ +DB_OSO_SEQ ../dbinc/os.h /^#define DB_OSO_SEQ 0x0080 \/* Expected sequential/ +DB_OSO_TEMP ../dbinc/os.h /^#define DB_OSO_TEMP 0x0100 \/* Remove after last / +DB_OSO_TRUNC ../dbinc/os.h /^#define DB_OSO_TRUNC 0x0200 \/* POSIX: O_TRUNC */ +DB_OVERWRITE ../dbinc/db.in /^#define DB_OVERWRITE 0x00800000\/* Overwrite/ +DB_PAGE_DB_LEN ../dbinc/db_page.h /^#define DB_PAGE_DB_LEN 32$/ +DB_PAGE_LOCK ../dbinc/db.in /^#define DB_PAGE_LOCK 3$/ +DB_PAGE_NOTFOUND ../dbinc/db.in /^#define DB_PAGE_NOTFOUND (-30987)\/* Requested pag/ +DB_PAGE_QUEUE_LEN ../dbinc/db_page.h /^#define DB_PAGE_QUEUE_LEN 0$/ +DB_PANIC_ENVIRONMENT ../dbinc/db.in /^#define DB_PANIC_ENVIRONMENT 0x01000000\/* Set pa/ 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 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_PGINFO ../dbinc/db_int.in /^} DB_PGINFO;$/ +DB_PKG ../libdb_java/db_java_wrap.c /^#define DB_PKG "com\/sleepycat\/db\/"$/ +DB_POSITION ../dbinc/db.in /^#define DB_POSITION 22 \/* c_dup() *\/$/ +DB_PREPLIST ../dbinc/db.in /^struct __db_preplist; typedef struct __db_preplist/ +DB_PREV ../dbinc/db.in /^#define DB_PREV 23 \/* c_get(), DB_LOGC->get() */ +DB_PREV_NODUP ../dbinc/db.in /^#define DB_PREV_NODUP 24 \/* c_get(), DB_LOGC->ge/ +DB_PRINTABLE ../dbinc/db.in /^#define DB_PRINTABLE 0x0000020 \/* Use print/ +DB_PRIVATE ../dbinc/db.in /^#define DB_PRIVATE 0x0200000 \/* DB_ENV is p/ +DB_PR_PAGE ../dbinc/db.in /^#define DB_PR_PAGE 0x0000008 \/* Show page c/ +DB_PR_RECOVERYTEST ../dbinc/db.in /^#define DB_PR_RECOVERYTEST 0x0000010 \/* Recove/ +DB_QAMMAGIC ../dbinc/db.in /^#define DB_QAMMAGIC 0x042253$/ +DB_QAMOLDVER ../dbinc/db.in /^#define DB_QAMOLDVER 3 \/* Oldest queue version s/ +DB_QAMVERSION ../dbinc/db.in /^#define DB_QAMVERSION 4 \/* Current queue version/ +DB_QUEUE_STAT ../dbinc/db.in /^struct __db_qam_stat; typedef struct __db_qam_stat/ +DB_RDONLY ../dbinc/db.in /^#define DB_RDONLY 0x0000020 \/* Read-only (O/ +DB_RDWRMASTER ../dbinc/db.in /^#define DB_RDWRMASTER 0x0020000 \/* UNDOC: a/ +DB_READ_COMMITTED ../dbinc/db.in /^#define DB_READ_COMMITTED 0x04000000\/* Degree/ +DB_READ_UNCOMMITTED ../dbinc/db.in /^#define DB_READ_UNCOMMITTED 0x08000000\/* Degree/ 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_RECNUM ../dbinc/db.in /^#define DB_RECNUM 0x00080000 \/* Btree: reco/ +DB_RECORD_LOCK ../dbinc/db.in /^#define DB_RECORD_LOCK 2$/ +DB_RECOVER ../dbinc/db.in /^#define DB_RECOVER 0x0000040 \/* Run normal / +DB_RECOVER_FATAL ../dbinc/db.in /^#define DB_RECOVER_FATAL 0x0400000 \/* Run ca/ 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 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_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_REGENV_REPLOCKED ../dbinc/region.h /^#define DB_REGENV_REPLOCKED 0x0001 \/* Env locked / +DB_REGENV_TIMEOUT ../dbinc/region.h /^#define DB_REGENV_TIMEOUT 30 \/* Backup timeout. */ +DB_REGION_ENV ../dbinc/region.h /^#define DB_REGION_ENV "__db.001" \/* Primary envi/ +DB_REGION_FMT ../dbinc/region.h /^#define DB_REGION_FMT "__db.%03d" \/* Region file/ +DB_REGION_INIT ../dbinc/db.in /^#define DB_REGION_INIT 0x20000000\/* Page-fa/ +DB_REGION_MAGIC ../dbinc/db.in /^#define DB_REGION_MAGIC 0x120897 \/* Environment m/ +DB_REGION_NAME_LENGTH ../dbinc/region.h /^#define DB_REGION_NAME_LENGTH 8 \/* Length of fil/ +DB_REGION_PREFIX ../dbinc/region.h /^#define DB_REGION_PREFIX "__db" \/* DB file name / +DB_REGISTER ../dbinc/db.in /^#define DB_REGISTER 0x0800000 \/* Multi-proc/ +DB_REM_BIG ../dbinc/db_am.h /^#define DB_REM_BIG 4$/ +DB_REM_DUP ../dbinc/db_am.h /^#define DB_REM_DUP 2$/ +DB_REM_PAGE_COMPAT ../dbinc/db_am.h /^#define DB_REM_PAGE_COMPAT 6 \/* Compatibility for/ +DB_RENAMEMAGIC ../dbinc/db.in /^#define DB_RENAMEMAGIC 0x030800 \/* File has been / +DB_RENUMBER ../dbinc/db.in /^#define DB_RENUMBER 0x00100000 \/* Recno: re/ +DB_REP ../dbinc/db.in /^struct __db_rep; typedef struct __db_rep DB_REP;$/ +DB_REPMGR_ACK ../dbinc/repmgr.h /^} DB_REPMGR_ACK;$/ +DB_REPMGR_ACKS_ALL ../dbinc/db.in /^#define DB_REPMGR_ACKS_ALL 1$/ +DB_REPMGR_ACKS_ALL_PEERS ../dbinc/db.in /^#define DB_REPMGR_ACKS_ALL_PEERS 2$/ +DB_REPMGR_ACKS_NONE ../dbinc/db.in /^#define DB_REPMGR_ACKS_NONE 3$/ +DB_REPMGR_ACKS_ONE ../dbinc/db.in /^#define DB_REPMGR_ACKS_ONE 4$/ +DB_REPMGR_ACKS_ONE_PEER ../dbinc/db.in /^#define DB_REPMGR_ACKS_ONE_PEER 5$/ +DB_REPMGR_ACKS_QUORUM ../dbinc/db.in /^#define DB_REPMGR_ACKS_QUORUM 6$/ +DB_REPMGR_CONNECTED ../dbinc/db.in /^#define DB_REPMGR_CONNECTED 0x01$/ +DB_REPMGR_DISCONNECTED ../dbinc/db.in /^#define DB_REPMGR_DISCONNECTED 0x02$/ +DB_REPMGR_HANDSHAKE ../dbinc/repmgr.h /^} DB_REPMGR_HANDSHAKE;$/ +DB_REPMGR_PEER ../dbinc/db.in /^#define DB_REPMGR_PEER 0x01$/ +DB_REPMGR_SITE ../dbinc/db.in /^ typedef struct __db_repmgr_site DB_REPMGR_SITE;/ +DB_REPMGR_VERSION ../dbinc/repmgr.h /^#define DB_REPMGR_VERSION 1$/ +DB_REPVERSION ../dbinc/rep.h /^#define DB_REPVERSION 3$/ +DB_REPVERSION_42 ../dbinc/rep.h /^#define DB_REPVERSION_42 1$/ +DB_REPVERSION_43 ../dbinc/rep.h /^#define DB_REPVERSION_43 2$/ +DB_REPVERSION_44 ../dbinc/rep.h /^#define DB_REPVERSION_44 3$/ +DB_REPVERSION_45 ../dbinc/rep.h /^#define DB_REPVERSION_45 3$/ +DB_REPVERSION_INVALID ../dbinc/rep.h /^#define DB_REPVERSION_INVALID 0$/ +DB_REP_ACK_TIMEOUT ../dbinc/db.in /^#define DB_REP_ACK_TIMEOUT 1$/ +DB_REP_ANYWHERE ../dbinc/db.in /^#define DB_REP_ANYWHERE 0x0000001 \/* Messag/ +DB_REP_BULKOVF ../dbinc/db.in /^#define DB_REP_BULKOVF (-30896)\/* Rep bulk buffe/ +DB_REP_CLIENT ../dbinc/db.in /^#define DB_REP_CLIENT 1$/ +DB_REP_CONF_BULK ../dbinc/db.in /^#define DB_REP_CONF_BULK 0x0001 \/* Bulk transfer./ +DB_REP_CONF_DELAYCLIENT ../dbinc/db.in /^#define DB_REP_CONF_DELAYCLIENT 0x0002 \/* Delay c/ +DB_REP_CONF_NOAUTOINIT ../dbinc/db.in /^#define DB_REP_CONF_NOAUTOINIT 0x0004 \/* No autom/ +DB_REP_CONF_NOWAIT ../dbinc/db.in /^#define DB_REP_CONF_NOWAIT 0x0008 \/* Don't wait, / +DB_REP_CONNECTION_RETRY ../dbinc/db.in /^#define DB_REP_CONNECTION_RETRY 4$/ +DB_REP_DUPMASTER ../dbinc/db.in /^#define DB_REP_DUPMASTER (-30986)\/* There are two/ +DB_REP_EGENCHG ../dbinc/db.in /^#define DB_REP_EGENCHG (-30895)\/* Egen changed w/ +DB_REP_ELECTION ../dbinc/db.in /^#define DB_REP_ELECTION 2$/ +DB_REP_ELECTION_RETRY ../dbinc/db.in /^#define DB_REP_ELECTION_RETRY 3$/ +DB_REP_ELECTION_TIMEOUT ../dbinc/db.in /^#define DB_REP_ELECTION_TIMEOUT 2$/ +DB_REP_FULL_ELECTION ../dbinc/db.in /^#define DB_REP_FULL_ELECTION 3$/ +DB_REP_HANDLE_DEAD ../dbinc/db.in /^#define DB_REP_HANDLE_DEAD (-30985)\/* Rolled back/ +DB_REP_HOLDELECTION ../dbinc/db.in /^#define DB_REP_HOLDELECTION (-30984)\/* Time to ho/ +DB_REP_IGNORE ../dbinc/db.in /^#define DB_REP_IGNORE (-30983)\/* This msg should/ +DB_REP_ISPERM ../dbinc/db.in /^#define DB_REP_ISPERM (-30982)\/* Cached not writ/ +DB_REP_JOIN_FAILURE ../dbinc/db.in /^#define DB_REP_JOIN_FAILURE (-30981)\/* Unable to / +DB_REP_LOCKOUT ../dbinc/db.in /^#define DB_REP_LOCKOUT (-30980)\/* API\/Replicati/ +DB_REP_LOGREADY ../dbinc/db.in /^#define DB_REP_LOGREADY (-30894)\/* Rep log ready/ +DB_REP_MASTER ../dbinc/db.in /^#define DB_REP_MASTER 4$/ +DB_REP_MAX_GAP ../dbinc/rep.h /^#define DB_REP_MAX_GAP 128$/ +DB_REP_NEWMASTER ../dbinc/db.in /^#define DB_REP_NEWMASTER (-30979)\/* We have learn/ +DB_REP_NEWSITE ../dbinc/db.in /^#define DB_REP_NEWSITE (-30978)\/* New site enter/ +DB_REP_NOBUFFER ../dbinc/db.in /^#define DB_REP_NOBUFFER 0x0000002 \/* Do not/ +DB_REP_NOTPERM ../dbinc/db.in /^#define DB_REP_NOTPERM (-30977)\/* Permanent log / +DB_REP_PAGEDONE ../dbinc/db.in /^#define DB_REP_PAGEDONE (-30893)\/* This page was/ +DB_REP_PERMANENT ../dbinc/db.in /^#define DB_REP_PERMANENT 0x0000004 \/* Import/ +DB_REP_REQUEST_GAP ../dbinc/rep.h /^#define DB_REP_REQUEST_GAP 4$/ +DB_REP_REREQUEST ../dbinc/db.in /^#define DB_REP_REREQUEST 0x0000008 \/* This m/ +DB_REP_STAT ../dbinc/db.in /^struct __db_rep_stat; typedef struct __db_rep_stat/ +DB_REP_UNAVAIL ../dbinc/db.in /^#define DB_REP_UNAVAIL (-30976)\/* Site cannot cu/ 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) / @@ -564,915 +703,759 @@ 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/os.h 18 -DB_REVSPLITOFF ../dbinc/db.in 321 -DB_RMW ../dbinc/db.in 1170 -DB_RPC2ND_CONCATDATAKEY ../dbinc/db_int.in 515 -DB_RPC2ND_CONCATKEYDATA ../dbinc/db_int.in 514 -DB_RPC2ND_CONSTANT ../dbinc/db_int.in 518 -DB_RPC2ND_GETNAME ../dbinc/db_int.in 520 -DB_RPC2ND_GETZIP ../dbinc/db_int.in 519 -DB_RPC2ND_MASK ../dbinc/db_int.in 510 -DB_RPC2ND_NOOP ../dbinc/db_int.in 513 -DB_RPC2ND_REVERSECONCAT ../dbinc/db_int.in 516 -DB_RPC2ND_REVERSEDATA ../dbinc/db_int.in 512 -DB_RPC2ND_TRUNCDATA ../dbinc/db_int.in 517 -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 -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 1150 -DB_SET_BEGIN_LSNP ../dbinc/log.h /^#define DB_SET_BEGIN_LSNP(txn, rlsnp) do { \\$/ +DB_RETRY ../dbinc/os.h /^#define DB_RETRY 100$/ +DB_REVSPLITOFF ../dbinc/db.in /^#define DB_REVSPLITOFF 0x00200000 \/* Btree:/ +DB_RMW ../dbinc/db.in /^#define DB_RMW 0x40000000 \/* Acquire write lock / +DB_RPC2ND_CONCATDATAKEY ../dbinc/db_int.in /^#define DB_RPC2ND_CONCATDATAKEY 0x00400000 \/* cal/ +DB_RPC2ND_CONCATKEYDATA ../dbinc/db_int.in /^#define DB_RPC2ND_CONCATKEYDATA 0x00300000 \/* cal/ +DB_RPC2ND_CONSTANT ../dbinc/db_int.in /^#define DB_RPC2ND_CONSTANT 0x00700000 \/* callback/ +DB_RPC2ND_GETNAME ../dbinc/db_int.in /^#define DB_RPC2ND_GETNAME 0x00900000 \/* sj_getnam/ +DB_RPC2ND_GETZIP ../dbinc/db_int.in /^#define DB_RPC2ND_GETZIP 0x00800000 \/* sj_getzip / +DB_RPC2ND_MASK ../dbinc/db_int.in /^#define DB_RPC2ND_MASK 0x00f00000 \/* Reserved bi/ +DB_RPC2ND_NOOP ../dbinc/db_int.in /^#define DB_RPC2ND_NOOP 0x00200000 \/* callback_n(/ +DB_RPC2ND_REVERSECONCAT ../dbinc/db_int.in /^#define DB_RPC2ND_REVERSECONCAT 0x00500000 \/* cal/ +DB_RPC2ND_REVERSEDATA ../dbinc/db_int.in /^#define DB_RPC2ND_REVERSEDATA 0x00100000 \/* callb/ +DB_RPC2ND_TRUNCDATA ../dbinc/db_int.in /^#define DB_RPC2ND_TRUNCDATA 0x00600000 \/* callbac/ +DB_RPCCLIENT ../dbinc/db.in /^#define DB_RPCCLIENT 0x0000002 \/* An RPC cl/ +DB_RUNRECOVERY ../dbinc/db.in /^#define DB_RUNRECOVERY (-30975)\/* Panic return. / +DB_SALVAGE ../dbinc/db.in /^#define DB_SALVAGE 0x0000040 \/* Salvage wha/ +DB_SECONDARY_BAD ../dbinc/db.in /^#define DB_SECONDARY_BAD (-30974)\/* Secondary ind/ +DB_SEQUENCE ../dbinc/db.in /^struct __db_sequence; typedef struct __db_sequence/ +DB_SEQUENCE_OLDVER ../dbinc/db.in /^#define DB_SEQUENCE_OLDVER 1 \/* Oldest sequence/ +DB_SEQUENCE_STAT ../dbinc/db.in /^struct __db_seq_stat; typedef struct __db_seq_stat/ +DB_SEQUENCE_VERSION ../dbinc/db.in /^#define DB_SEQUENCE_VERSION 2 \/* Current sequenc/ +DB_SEQ_DEC ../dbinc/db.in /^#define DB_SEQ_DEC 0x00000001 \/* Decrement seque/ +DB_SEQ_INC ../dbinc/db.in /^#define DB_SEQ_INC 0x00000002 \/* Increment seque/ +DB_SEQ_RANGE_SET ../dbinc/db.in /^#define DB_SEQ_RANGE_SET 0x00000004 \/* Range set / +DB_SEQ_RECORD ../dbinc/db.in /^struct __db_seq_record; typedef struct __db_seq_re/ +DB_SEQ_WRAP ../dbinc/db.in /^#define DB_SEQ_WRAP 0x00000008 \/* Wrap sequence / +DB_SEQ_WRAPPED ../dbinc/db.in /^#define DB_SEQ_WRAPPED 0x00000010 \/* Just wrappe/ +DB_SERVER_DBFLAGS ../dbinc/db_server_int.h /^#define DB_SERVER_DBFLAGS (DB_NOMMAP | DB_RDONLY / +DB_SERVER_DBNOSHARE ../dbinc/db_server_int.h /^#define DB_SERVER_DBNOSHARE (DB_EXCL | DB_TRUNCAT/ +DB_SERVER_ENVFLAGS ../dbinc/db_server_int.h /^#define DB_SERVER_ENVFLAGS ( \\$/ +DB_SERVER_FLAGMASK ../dbinc/db_server_int.h /^#define DB_SERVER_FLAGMASK ( \\$/ +DB_SERVER_IDLETIMEOUT ../dbinc/db_server_int.h /^#define DB_SERVER_IDLETIMEOUT 86400 \/* 1 day *\/$/ +DB_SERVER_MAXTIMEOUT ../dbinc/db_server_int.h /^#define DB_SERVER_MAXTIMEOUT 1200 \/* 20 minutes */ +DB_SERVER_TIMEOUT ../dbinc/db_server_int.h /^#define DB_SERVER_TIMEOUT 300 \/* 5 minutes *\/$/ +DB_SET ../dbinc/db.in /^#define DB_SET 25 \/* c_get(), DB_LOGC->get() */ DB_SET_CALLBACK ../cxx/cxx_db.cpp /^#define DB_SET_CALLBACK(_cxxname, _name, _cxxargsp/ -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 288 -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_SET_DBT ../dbinc/db_int.in /^#define DB_SET_DBT(dbt, d, s) do { \\$/ +DB_SET_LOCK_TIMEOUT ../dbinc/db.in /^#define DB_SET_LOCK_TIMEOUT 26 \/* set_timout() */ +DB_SET_RANGE ../dbinc/db.in /^#define DB_SET_RANGE 27 \/* c_get() *\/$/ +DB_SET_RECNO ../dbinc/db.in /^#define DB_SET_RECNO 28 \/* get(), c_get() *\/$/ +DB_SET_TXN_LSNP ../dbinc/log.h /^#define DB_SET_TXN_LSNP(txn, blsnp, llsnp) do { / +DB_SET_TXN_NOW ../dbinc/db.in /^#define DB_SET_TXN_NOW 29 \/* set_timout() (inter/ +DB_SET_TXN_TIMEOUT ../dbinc/db.in /^#define DB_SET_TXN_TIMEOUT 30 \/* set_timout() *\// +DB_SNAPSHOT ../dbinc/db.in /^#define DB_SNAPSHOT 0x00400000 \/* Recno: sn/ +DB_STAT_ALL ../dbinc/db.in /^#define DB_STAT_ALL 0x0000002 \/* Print: Eve/ +DB_STAT_CLEAR ../dbinc/db.in /^#define DB_STAT_CLEAR 0x0000004 \/* Clear st/ +DB_STAT_LOCK_CONF ../dbinc/db.in /^#define DB_STAT_LOCK_CONF 0x0000008 \/* Print:/ +DB_STAT_LOCK_FLAGS ../lock/lock_stat.c /^#define DB_STAT_LOCK_FLAGS \\$/ +DB_STAT_LOCK_LOCKERS ../dbinc/db.in /^#define DB_STAT_LOCK_LOCKERS 0x0000010 \/* Print:/ +DB_STAT_LOCK_OBJECTS ../dbinc/db.in /^#define DB_STAT_LOCK_OBJECTS 0x0000020 \/* Print:/ +DB_STAT_LOCK_PARAMS ../dbinc/db.in /^#define DB_STAT_LOCK_PARAMS 0x0000040 \/* Print:/ +DB_STAT_MEMP_FLAGS ../mp/mp_stat.c /^#define DB_STAT_MEMP_FLAGS \\$/ +DB_STAT_MEMP_HASH ../dbinc/db.in /^#define DB_STAT_MEMP_HASH 0x0000080 \/* Print:/ +DB_STAT_NOERROR ../dbinc/db.in /^#define DB_STAT_NOERROR 0x0000100 \/* Intern/ +DB_STAT_SUBSYSTEM ../dbinc/db.in /^#define DB_STAT_SUBSYSTEM 0x0000200 \/* Print:/ +DB_SURPRISE_KID ../dbinc/db.in /^#define DB_SURPRISE_KID (-30892)\/* Child commit / +DB_SWAPBYTES ../dbinc/db.in /^#define DB_SWAPBYTES (-30891)\/* Database needs b/ +DB_SYSTEM_MEM ../dbinc/db.in /^#define DB_SYSTEM_MEM 0x1000000 \/* Use syst/ +DB_TEST_ELECTINIT ../dbinc/db.in /^#define DB_TEST_ELECTINIT 1 \/* after __rep_elect/ +DB_TEST_ELECTVOTE1 ../dbinc/db.in /^#define DB_TEST_ELECTVOTE1 2 \/* after sending VO/ +DB_TEST_POSTDESTROY ../dbinc/db.in /^#define DB_TEST_POSTDESTROY 3 \/* after destroy o/ +DB_TEST_POSTLOG ../dbinc/db.in /^#define DB_TEST_POSTLOG 4 \/* after logging all / +DB_TEST_POSTLOGMETA ../dbinc/db.in /^#define DB_TEST_POSTLOGMETA 5 \/* after logging m/ +DB_TEST_POSTOPEN ../dbinc/db.in /^#define DB_TEST_POSTOPEN 6 \/* after __os_open */ +DB_TEST_POSTSYNC ../dbinc/db.in /^#define DB_TEST_POSTSYNC 7 \/* after syncing the / +DB_TEST_PREDESTROY ../dbinc/db.in /^#define DB_TEST_PREDESTROY 8 \/* before destroy o/ +DB_TEST_PREOPEN ../dbinc/db.in /^#define DB_TEST_PREOPEN 9 \/* before __os_open */ 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_RECOVERY_LABEL ../dbinc/debug.h /^#define DB_TEST_RECOVERY_LABEL db_tr_err:$/ +DB_TEST_RECYCLE ../dbinc/db.in /^#define DB_TEST_RECYCLE 10 \/* test rep and txn_/ +DB_TEST_SUBDB_LOCKS ../dbinc/db.in /^#define DB_TEST_SUBDB_LOCKS 11 \/* subdb locking / 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 920 -DB_TRUNCATE ../dbinc/db.in 197 -DB_TXN ../dbinc/db.in 151 -DB_TXNHEAD ../dbinc/db_int.in 527 -DB_TXNLIST ../dbinc/db_int.in 528 +DB_TEST_WAIT ../dbinc/debug.h /^#define DB_TEST_WAIT(env, val) \\$/ +DB_THREAD ../dbinc/db.in /^#define DB_THREAD 0x0000080 \/* Applications/ +DB_THREADID_STRLEN ../dbinc/db.in /^#define DB_THREADID_STRLEN 128$/ +DB_THREAD_INFO ../dbinc/db_int.in /^} DB_THREAD_INFO;$/ +DB_THREAD_STATE ../dbinc/db_int.in /^} DB_THREAD_STATE;$/ +DB_TIMEOUT ../dbinc/db.in /^#define DB_TIMEOUT (-30890)\/* Timed out waiting / +DB_TIME_NOTGRANTED ../dbinc/db.in /^#define DB_TIME_NOTGRANTED 0x40000000\/* Return/ +DB_TRAIL ../env/env_open.c /^#define DB_TRAIL "BDBXXXXX"$/ +DB_TRUNCATE ../dbinc/db.in /^#define DB_TRUNCATE 0x0000100 \/* Discard ex/ +DB_TXN ../dbinc/db.in /^struct __db_txn; typedef struct __db_txn DB_TXN;$/ +DB_TXNHEAD ../dbinc/db_int.in /^struct __db_txnhead; typedef struct __db_txnhead D/ +DB_TXNLIST ../dbinc/db_int.in /^struct __db_txnlist; typedef struct __db_txnlist D/ DB_TXNLIST_MASK ../dbinc/db_dispatch.h /^#define DB_TXNLIST_MASK(hp, n) (n % hp->nslots)$/ -DB_TXNLIST_MAX_PGNO ../db/db_dispatch.c 1469 -DB_TXNLOGREC ../dbinc/txn.h 24 -DB_TXNMGR ../dbinc/db.in 154 -DB_TXNREGION ../dbinc/txn.h 23 -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_TXNLIST_MAX_PGNO ../db/db_dispatch.c /^#define DB_TXNLIST_MAX_PGNO 8 \/* A nice even num/ +DB_TXNLOGREC ../dbinc/txn.h /^struct __txn_logrec; typedef struct __txn_logrec D/ +DB_TXNMGR ../dbinc/db.in /^struct __db_txnmgr; typedef struct __db_txnmgr DB_/ +DB_TXNREGION ../dbinc/txn.h /^struct __db_txnregion; typedef struct __db_txnregi/ +DB_TXNVERSION ../dbinc/db.in /^#define DB_TXNVERSION 1$/ +DB_TXN_ACTIVE ../dbinc/db.in /^struct __db_txn_active; typedef struct __db_txn_ac/ +DB_TXN_CKP ../dbinc/db.in /^#define DB_TXN_CKP (-30889)\/* Encountered ckp re/ +DB_TXN_NOSYNC ../dbinc/db.in /^#define DB_TXN_NOSYNC 0x0000200 \/* Do not s/ +DB_TXN_NOT_DURABLE ../dbinc/db.in /^#define DB_TXN_NOT_DURABLE 0x0000400 \/* Do not/ +DB_TXN_NOWAIT ../dbinc/db.in /^#define DB_TXN_NOWAIT 0x0004000 \/* Do not w/ +DB_TXN_SNAPSHOT ../dbinc/db.in /^#define DB_TXN_SNAPSHOT 0x10000000\/* Snapsh/ +DB_TXN_STAT ../dbinc/db.in /^struct __db_txn_stat; typedef struct __db_txn_stat/ +DB_TXN_SYNC ../dbinc/db.in /^#define DB_TXN_SYNC 0x0008000 \/* Always syn/ +DB_TXN_WRITE_NOSYNC ../dbinc/db.in /^#define DB_TXN_WRITE_NOSYNC 0x0000800 \/* Write / DB_UNDO ../dbinc/db.in /^#define DB_UNDO(op) ((op) == DB_TXN_ABORT || \\$/ -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 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 +DB_UNREF ../dbinc/db.in /^#define DB_UNREF 0x0000080 \/* Report unrefe/ +DB_UPDATE_SECONDARY ../dbinc/db.in /^#define DB_UPDATE_SECONDARY 31 \/* c_get(), c_del(/ +DB_UPGRADE ../dbinc/db.in /^#define DB_UPGRADE 0x0000001 \/* Upgrading. / +DB_USERCOPY_GETDATA ../dbinc/db.in /^#define DB_USERCOPY_GETDATA 0x0001$/ +DB_USERCOPY_SETDATA ../dbinc/db.in /^#define DB_USERCOPY_SETDATA 0x0002$/ +DB_USE_ENVIRON ../dbinc/db.in /^#define DB_USE_ENVIRON 0x0001000 \/* Use the/ +DB_USE_ENVIRON_ROOT ../dbinc/db.in /^#define DB_USE_ENVIRON_ROOT 0x0002000 \/* Use th/ +DB_VERB_DEADLOCK ../dbinc/db.in /^#define DB_VERB_DEADLOCK 0x0001 \/* Deadlock detec/ +DB_VERB_RECOVERY ../dbinc/db.in /^#define DB_VERB_RECOVERY 0x0002 \/* Recovery infor/ +DB_VERB_REGISTER ../dbinc/db.in /^#define DB_VERB_REGISTER 0x0004 \/* Dump waits-for/ +DB_VERB_REPLICATION ../dbinc/db.in /^#define DB_VERB_REPLICATION 0x0008 \/* Replication/ +DB_VERB_WAITSFOR ../dbinc/db.in /^#define DB_VERB_WAITSFOR 0x0010 \/* Dump waits-for/ +DB_VERIFY ../dbinc/db.in /^#define DB_VERIFY 0x0000002 \/* Verifying. */ +DB_VERIFY_BAD ../dbinc/db.in /^#define DB_VERIFY_BAD (-30973)\/* Verify failed; / +DB_VERIFY_FATAL ../dbinc/db.in /^#define DB_VERIFY_FATAL (-30888)\/* DB->verify ca/ +DB_VERSION_MAJOR ../dbinc/db.in /^#define DB_VERSION_MAJOR @DB_VERSION_MAJOR@$/ +DB_VERSION_MINOR ../dbinc/db.in /^#define DB_VERSION_MINOR @DB_VERSION_MINOR@$/ +DB_VERSION_MISMATCH ../dbinc/db.in /^#define DB_VERSION_MISMATCH (-30972)\/* Environmen/ +DB_VERSION_PATCH ../dbinc/db.in /^#define DB_VERSION_PATCH @DB_VERSION_PATCH@$/ +DB_VERSION_STRING ../dbinc/db.in /^#define DB_VERSION_STRING @DB_VERSION_STRING@$/ +DB_WRITECURSOR ../dbinc/db.in /^#define DB_WRITECURSOR 32 \/* cursor() *\/$/ +DB_WRITELOCK ../dbinc/db.in /^#define DB_WRITELOCK 33 \/* cursor() (internal) */ +DB_WRITEOPEN ../dbinc/db.in /^#define DB_WRITEOPEN 0x0040000 \/* UNDOC: op/ +DB_XA_CREATE ../dbinc/db.in /^#define DB_XA_CREATE 0x0000002 \/* Open in a/ +DB_XIDDATASIZE ../dbinc/db.in /^#define DB_XIDDATASIZE 128$/ +DB_YIELDCPU ../dbinc/db.in /^#define DB_YIELDCPU 0x80000000\/* Yield the / +DB_debug_FLAG ../dbinc/db.in /^#define DB_debug_FLAG 0x80000000$/ +DB_user_BEGIN ../dbinc/db.in /^#define DB_user_BEGIN 10000$/ DCHARHASH ../hash/hash_func.c /^#define DCHARHASH(h, c) ((h) = 0x63c63cd9*(h) + 0x/ -DD_INVALID_ID ../lock/lock_deadlock.c 370 +DD_INVALID_ID ../lock/lock_deadlock.c /^#define DD_INVALID_ID ((u_int32_t) -1)$/ 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/ -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 +DEFMINKEYPAGE ../dbinc/btree.h /^#define DEFMINKEYPAGE (2)$/ +DEF_MAX_TXNS ../dbinc/txn.h /^#define DEF_MAX_TXNS 100 \/* Default max transact/ +DELOVFL ../dbinc/hash.h /^#define DELOVFL 0x50$/ +DELPAIR ../dbinc/hash.h /^#define DELPAIR 0x30$/ +DIR_DECRYPT ../crypto/rijndael/rijndael-api-fst.h /^#define DIR_DECRYPT 1 \/* Are we de/ +DIR_ENCRYPT ../crypto/rijndael/rijndael-api-fst.h /^#define DIR_ENCRYPT 0 \/* Are we en/ DISCARD_CUR ../btree/bt_cursor.c /^#define DISCARD_CUR(dbc, ret) do { \\$/ +DONT_NEED_LOCKS ../qam/qam.c /^#define DONT_NEED_LOCKS(dbc) ((dbc)->txn == NULL |/ DO_PREPLIST ../tcl/tcl_txn.c /^#define DO_PREPLIST(count) \\$/ -DO_TRADE ../txn/txn_util.c 218 +DO_TRADE ../txn/txn_util.c /^#define DO_TRADE do { \\$/ 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::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$/ -Db::get_byteswapped ../cxx/cxx_db.cpp /^int Db::get_byteswapped(int *isswapped)$/ -Db::get_env ../cxx/cxx_db.cpp /^DbEnv *Db::get_env()$/ -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_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() 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($/ -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()$/ -DbEnv::errx ../cxx/cxx_env.cpp /^void DbEnv::errx(const char *format, ...)$/ -DbEnv::get_app_private ../cxx/cxx_env.cpp /^void *DbEnv::get_app_private() const$/ -DbEnv::remove ../cxx/cxx_env.cpp /^int DbEnv::remove(const char *db_home, u_int32_t f/ -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_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 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/ -DbLockNotGrantedException::get_index ../cxx/cxx_except.cpp /^int DbLockNotGrantedException::get_index() const$/ -DbLockNotGrantedException::get_lock ../cxx/cxx_except.cpp /^DbLock* DbLockNotGrantedException::get_lock() cons/ -DbLockNotGrantedException::get_mode ../cxx/cxx_except.cpp /^db_lockmode_t DbLockNotGrantedException::get_mode(/ -DbLockNotGrantedException::get_obj ../cxx/cxx_except.cpp /^const Dbt* DbLockNotGrantedException::get_obj() co/ -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() 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() / -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 ../cxx/cxx_db.cpp /^\/\/ If the DB handle is still open, we close it. / +DbDeadlockException ../cxx/cxx_except.cpp /^DbDeadlockException::~DbDeadlockException() throw(/ +DbEnv ../cxx/cxx_env.cpp /^\/\/ If the DB_ENV handle is still open, we close / +DbEnv_cdsgroup_begin ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_TXN *DbEnv_cdsgroup_begin(struct DbE/ +DbEnv_close ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_close(struct DbEnv *self/ +DbEnv_dbremove ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_dbremove(struct DbEnv *s/ +DbEnv_dbrename ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_dbrename(struct DbEnv *s/ +DbEnv_err ../libdb_java/db_java_wrap.c /^SWIGINTERN void DbEnv_err(struct DbEnv *self,int e/ +DbEnv_errx ../libdb_java/db_java_wrap.c /^SWIGINTERN void DbEnv_errx(struct DbEnv *self,char/ +DbEnv_fileid_reset ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_fileid_reset(struct DbEn/ +DbEnv_get_cachesize ../libdb_java/db_java_wrap.c /^SWIGINTERN jlong DbEnv_get_cachesize(struct DbEnv / +DbEnv_get_cachesize_ncache ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_get_cachesize_ncache(struct D/ +DbEnv_get_data_dirs ../libdb_java/db_java_wrap.c /^SWIGINTERN char const **DbEnv_get_data_dirs(struct/ +DbEnv_get_encrypt_flags ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_get_encrypt_flags(struc/ +DbEnv_get_flags ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_get_flags(struct DbEnv / +DbEnv_get_home ../libdb_java/db_java_wrap.c /^SWIGINTERN char const *DbEnv_get_home(struct DbEnv/ +DbEnv_get_lg_bsize ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_get_lg_bsize(struct DbE/ +DbEnv_get_lg_dir ../libdb_java/db_java_wrap.c /^SWIGINTERN char const *DbEnv_get_lg_dir(struct DbE/ +DbEnv_get_lg_filemode ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_get_lg_filemode(struct DbEnv / +DbEnv_get_lg_max ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_get_lg_max(struct DbEnv/ +DbEnv_get_lg_regionmax ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_get_lg_regionmax(struct/ +DbEnv_get_lk_conflicts ../libdb_java/db_java_wrap.c /^SWIGINTERN struct __db_lk_conflicts DbEnv_get_lk_c/ +DbEnv_get_lk_detect ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_get_lk_detect(struct Db/ +DbEnv_get_lk_max_lockers ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_get_lk_max_lockers(stru/ +DbEnv_get_lk_max_locks ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_get_lk_max_locks(struct/ +DbEnv_get_lk_max_objects ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_get_lk_max_objects(stru/ +DbEnv_get_mp_max_openfd ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_get_mp_max_openfd(struct DbEn/ +DbEnv_get_mp_max_write ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_get_mp_max_write(struct DbEnv/ +DbEnv_get_mp_max_write_sleep ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_get_mp_max_write_sleep(struct/ +DbEnv_get_mp_mmapsize ../libdb_java/db_java_wrap.c /^SWIGINTERN size_t DbEnv_get_mp_mmapsize(struct DbE/ +DbEnv_get_open_flags ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_get_open_flags(struct D/ +DbEnv_get_shm_key ../libdb_java/db_java_wrap.c /^SWIGINTERN long DbEnv_get_shm_key(struct DbEnv *se/ +DbEnv_get_timeout ../libdb_java/db_java_wrap.c /^SWIGINTERN db_timeout_t DbEnv_get_timeout(struct D/ +DbEnv_get_tmp_dir ../libdb_java/db_java_wrap.c /^SWIGINTERN char const *DbEnv_get_tmp_dir(struct Db/ +DbEnv_get_tx_max ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_get_tx_max(struct DbEnv/ +DbEnv_get_tx_timestamp ../libdb_java/db_java_wrap.c /^SWIGINTERN time_t DbEnv_get_tx_timestamp(struct Db/ +DbEnv_get_verbose ../libdb_java/db_java_wrap.c /^SWIGINTERN int_bool DbEnv_get_verbose(struct DbEnv/ +DbEnv_get_version_major ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_get_version_major(){$/ +DbEnv_get_version_minor ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_get_version_minor(){$/ +DbEnv_get_version_patch ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_get_version_patch(){$/ +DbEnv_get_version_string ../libdb_java/db_java_wrap.c /^SWIGINTERN char const *DbEnv_get_version_string(){/ +DbEnv_is_bigendian ../libdb_java/db_java_wrap.c /^SWIGINTERN int_bool DbEnv_is_bigendian(struct DbEn/ +DbEnv_lock_detect ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_lock_detect(struct DbEnv *sel/ +DbEnv_lock_get ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_LOCK *DbEnv_lock_get(struct DbEnv *s/ +DbEnv_lock_id ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_lock_id(struct DbEnv *s/ +DbEnv_lock_id_free ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_lock_id_free(struct DbEn/ +DbEnv_lock_put ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_lock_put(struct DbEnv *s/ +DbEnv_lock_stat ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_LOCK_STAT *DbEnv_lock_stat(struct Db/ +DbEnv_log_archive ../libdb_java/db_java_wrap.c /^SWIGINTERN char **DbEnv_log_archive(struct DbEnv */ +DbEnv_log_compare ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_log_compare(DB_LSN const *lsn/ +DbEnv_log_cursor ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_LOGC *DbEnv_log_cursor(struct DbEnv / +DbEnv_log_file ../libdb_java/db_java_wrap.c /^SWIGINTERN char *DbEnv_log_file(struct DbEnv *self/ +DbEnv_log_flush ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_log_flush(struct DbEnv */ +DbEnv_log_print ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_log_print(struct DbEnv */ +DbEnv_log_put ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_log_put(struct DbEnv *se/ +DbEnv_log_stat ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_LOG_STAT *DbEnv_log_stat(struct DbEn/ +DbEnv_lsn_reset ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_lsn_reset(struct DbEnv */ +DbEnv_memp_fstat ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_MPOOL_FSTAT **DbEnv_memp_fstat(struc/ +DbEnv_memp_stat ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_MPOOL_STAT *DbEnv_memp_stat(struct D/ +DbEnv_memp_trickle ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_memp_trickle(struct DbEnv *se/ +DbEnv_mutex_get_align ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_mutex_get_align(struct / +DbEnv_mutex_get_increment ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_mutex_get_increment(str/ +DbEnv_mutex_get_max ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_mutex_get_max(struct Db/ +DbEnv_mutex_get_tas_spins ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_mutex_get_tas_spins(str/ +DbEnv_mutex_set_align ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_mutex_set_align(struct D/ +DbEnv_mutex_set_increment ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_mutex_set_increment(stru/ +DbEnv_mutex_set_max ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_mutex_set_max(struct DbE/ +DbEnv_mutex_set_tas_spins ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_mutex_set_tas_spins(stru/ +DbEnv_mutex_stat ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_MUTEX_STAT *DbEnv_mutex_stat(struct / +DbEnv_open ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_open(struct DbEnv *self,/ +DbEnv_remove ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_remove(struct DbEnv *sel/ +DbEnv_rep_elect ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_rep_elect(struct DbEnv *self,/ +DbEnv_rep_flush ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_rep_flush(struct DbEnv */ +DbEnv_rep_get_config ../libdb_java/db_java_wrap.c /^SWIGINTERN int_bool DbEnv_rep_get_config(struct Db/ +DbEnv_rep_get_limit ../libdb_java/db_java_wrap.c /^SWIGINTERN jlong DbEnv_rep_get_limit(struct DbEnv / +DbEnv_rep_get_nsites ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_rep_get_nsites(struct DbEnv */ +DbEnv_rep_get_priority ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_rep_get_priority(struct DbEnv/ +DbEnv_rep_get_timeout ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbEnv_rep_get_timeout(struct / +DbEnv_rep_process_message ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_rep_process_message(struct Db/ +DbEnv_rep_set_config ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_rep_set_config(struct Db/ +DbEnv_rep_set_limit ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_rep_set_limit(struct DbE/ +DbEnv_rep_set_nsites ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_rep_set_nsites(struct Db/ +DbEnv_rep_set_priority ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_rep_set_priority(struct / +DbEnv_rep_set_timeout ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_rep_set_timeout(struct D/ +DbEnv_rep_set_transport ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_rep_set_transport(struct/ +DbEnv_rep_start ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_rep_start(struct DbEnv */ +DbEnv_rep_stat ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_REP_STAT *DbEnv_rep_stat(struct DbEn/ +DbEnv_rep_sync ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_rep_sync(struct DbEnv *s/ +DbEnv_repmgr_add_remote_site ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbEnv_repmgr_add_remote_site(struct/ +DbEnv_repmgr_get_ack_policy ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_repmgr_get_ack_policy(st/ +DbEnv_repmgr_set_ack_policy ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_repmgr_set_ack_policy(st/ +DbEnv_repmgr_set_local_site ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_repmgr_set_local_site(st/ +DbEnv_repmgr_site_list ../libdb_java/db_java_wrap.c /^SWIGINTERN struct __db_repmgr_sites DbEnv_repmgr_s/ +DbEnv_repmgr_start ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_repmgr_start(struct DbEn/ +DbEnv_set_app_dispatch ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_app_dispatch(struct / +DbEnv_set_cachesize ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_cachesize(struct DbE/ +DbEnv_set_data_dir ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_data_dir(struct DbEn/ +DbEnv_set_encrypt ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_encrypt(struct DbEnv/ +DbEnv_set_errcall ../libdb_java/db_java_wrap.c /^SWIGINTERN void DbEnv_set_errcall(struct DbEnv *se/ +DbEnv_set_event_notify ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_event_notify(struct / +DbEnv_set_feedback ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_feedback(struct DbEn/ +DbEnv_set_flags ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_flags(struct DbEnv */ +DbEnv_set_intermediate_dir ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_intermediate_dir(str/ +DbEnv_set_lg_bsize ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_lg_bsize(struct DbEn/ +DbEnv_set_lg_dir ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_lg_dir(struct DbEnv / +DbEnv_set_lg_filemode ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_lg_filemode(struct D/ +DbEnv_set_lg_max ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_lg_max(struct DbEnv / +DbEnv_set_lg_regionmax ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_lg_regionmax(struct / +DbEnv_set_lk_conflicts ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_lk_conflicts(struct / +DbEnv_set_lk_detect ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_lk_detect(struct DbE/ +DbEnv_set_lk_max_lockers ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_lk_max_lockers(struc/ +DbEnv_set_lk_max_locks ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_lk_max_locks(struct / +DbEnv_set_lk_max_objects ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_lk_max_objects(struc/ +DbEnv_set_mp_max_openfd ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_mp_max_openfd(struct/ +DbEnv_set_mp_max_write ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_mp_max_write(struct / +DbEnv_set_mp_mmapsize ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_mp_mmapsize(struct D/ +DbEnv_set_msgcall ../libdb_java/db_java_wrap.c /^SWIGINTERN void DbEnv_set_msgcall(struct DbEnv *se/ +DbEnv_set_paniccall ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_paniccall(struct DbE/ +DbEnv_set_rep_request ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_rep_request(struct D/ +DbEnv_set_rpc_server ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_rpc_server(struct Db/ +DbEnv_set_shm_key ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_shm_key(struct DbEnv/ +DbEnv_set_timeout ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_timeout(struct DbEnv/ +DbEnv_set_tmp_dir ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_tmp_dir(struct DbEnv/ +DbEnv_set_tx_max ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_tx_max(struct DbEnv / +DbEnv_set_tx_timestamp ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_tx_timestamp(struct / +DbEnv_set_verbose ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_set_verbose(struct DbEnv/ +DbEnv_strerror ../libdb_java/db_java_wrap.c /^SWIGINTERN char const *DbEnv_strerror(int error){$/ +DbEnv_txn_begin ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_TXN *DbEnv_txn_begin(struct DbEnv *s/ +DbEnv_txn_checkpoint ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbEnv_txn_checkpoint(struct Db/ +DbEnv_txn_recover ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_PREPLIST *DbEnv_txn_recover(struct D/ +DbEnv_txn_stat ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_TXN_STAT *DbEnv_txn_stat(struct DbEn/ +DbException ../cxx/cxx_except.cpp /^DbException::~DbException() throw()$/ +DbLock ../cxx/cxx_lock.cpp /^DbLock::DbLock()$/ +DbLockNotGrantedException ../cxx/cxx_except.cpp /^DbLockNotGrantedException::~DbLockNotGrantedExcept/ +DbLogc ../cxx/cxx_logc.cpp /^\/\/ It's private, and should never be called,$/ +DbLogc_close ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbLogc_close(struct DbLogc *se/ +DbLogc_get ../libdb_java/db_java_wrap.c /^SWIGINTERN int DbLogc_get(struct DbLogc *self,DB_L/ +DbLsn ../libdb_java/db_java_wrap.c /^#define DbLsn __db_lsn$/ +DbMemoryException ../cxx/cxx_except.cpp /^DbMemoryException::~DbMemoryException() throw()$/ +DbMpoolFile ../cxx/cxx_mpool.cpp /^DbMpoolFile::~DbMpoolFile()$/ +DbMpoolFile_get_flags ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbMpoolFile_get_flags(struct / +DbMpoolFile_get_maxsize ../libdb_java/db_java_wrap.c /^SWIGINTERN jlong DbMpoolFile_get_maxsize(struct Db/ +DbMpoolFile_get_priority ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_CACHE_PRIORITY DbMpoolFile_get_prior/ +DbMpoolFile_set_flags ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbMpoolFile_set_flags(struct D/ +DbMpoolFile_set_maxsize ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbMpoolFile_set_maxsize(struct/ +DbMpoolFile_set_priority ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbMpoolFile_set_priority(struc/ +DbRepHandleDeadException ../cxx/cxx_except.cpp /^DbRepHandleDeadException::~DbRepHandleDeadExceptio/ +DbRunRecoveryException ../cxx/cxx_except.cpp /^DbRunRecoveryException::~DbRunRecoveryException() / +DbSequence ../cxx/cxx_seq.cpp /^DbSequence::~DbSequence()$/ +DbSequence_close ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbSequence_close(struct DbSequ/ +DbSequence_get ../libdb_java/db_java_wrap.c /^SWIGINTERN db_seq_t DbSequence_get(struct DbSequen/ +DbSequence_get_cachesize ../libdb_java/db_java_wrap.c /^SWIGINTERN int32_t DbSequence_get_cachesize(struct/ +DbSequence_get_db ../libdb_java/db_java_wrap.c /^SWIGINTERN DB *DbSequence_get_db(struct DbSequence/ +DbSequence_get_flags ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbSequence_get_flags(struct D/ +DbSequence_get_key ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbSequence_get_key(struct DbSe/ +DbSequence_get_range_max ../libdb_java/db_java_wrap.c /^SWIGINTERN db_seq_t DbSequence_get_range_max(struc/ +DbSequence_get_range_min ../libdb_java/db_java_wrap.c /^SWIGINTERN db_seq_t DbSequence_get_range_min(struc/ +DbSequence_initial_value ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbSequence_initial_value(struc/ +DbSequence_open ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbSequence_open(struct DbSeque/ +DbSequence_remove ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbSequence_remove(struct DbSeq/ +DbSequence_set_cachesize ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbSequence_set_cachesize(struc/ +DbSequence_set_flags ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbSequence_set_flags(struct Db/ +DbSequence_set_range ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbSequence_set_range(struct Db/ +DbSequence_stat ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_SEQUENCE_STAT *DbSequence_stat(struc/ +DbTxn ../cxx/cxx_txn.cpp /^DbTxn::~DbTxn()$/ +DbTxn_abort ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbTxn_abort(struct DbTxn *self/ +DbTxn_commit ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbTxn_commit(struct DbTxn *sel/ +DbTxn_discard ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbTxn_discard(struct DbTxn *se/ +DbTxn_get_name ../libdb_java/db_java_wrap.c /^SWIGINTERN char const *DbTxn_get_name(struct DbTxn/ +DbTxn_id ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t DbTxn_id(struct DbTxn *self){/ +DbTxn_prepare ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbTxn_prepare(struct DbTxn *se/ +DbTxn_set_name ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbTxn_set_name(struct DbTxn *s/ +DbTxn_set_timeout ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t DbTxn_set_timeout(struct DbTxn/ +Db_associate ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_associate(struct Db *self,D/ +Db_close ../libdb_java/db_java_wrap.c /^SWIGINTERN int Db_close(struct Db *self,u_int32_t / +Db_compact ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_compact(struct Db *self,DB_/ +Db_cursor ../libdb_java/db_java_wrap.c /^SWIGINTERN DBC *Db_cursor(struct Db *self,DB_TXN */ +Db_del ../libdb_java/db_java_wrap.c /^SWIGINTERN int Db_del(struct Db *self,DB_TXN *txni/ +Db_err ../libdb_java/db_java_wrap.c /^SWIGINTERN void Db_err(struct Db *self,int error,c/ +Db_errx ../libdb_java/db_java_wrap.c /^SWIGINTERN void Db_errx(struct Db *self,char const/ +Db_get ../libdb_java/db_java_wrap.c /^SWIGINTERN int Db_get(struct Db *self,DB_TXN *txni/ +Db_get_bt_minkey ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t Db_get_bt_minkey(struct Db *s/ +Db_get_byteswapped ../libdb_java/db_java_wrap.c /^SWIGINTERN int_bool Db_get_byteswapped(struct Db */ +Db_get_cachesize ../libdb_java/db_java_wrap.c /^SWIGINTERN jlong Db_get_cachesize(struct Db *self)/ +Db_get_cachesize_ncache ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t Db_get_cachesize_ncache(struc/ +Db_get_dbname ../libdb_java/db_java_wrap.c /^SWIGINTERN char const *Db_get_dbname(struct Db *se/ +Db_get_encrypt_flags ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t Db_get_encrypt_flags(struct D/ +Db_get_filename ../libdb_java/db_java_wrap.c /^SWIGINTERN char const *Db_get_filename(struct Db */ +Db_get_flags ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t Db_get_flags(struct Db *self)/ +Db_get_h_ffactor ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t Db_get_h_ffactor(struct Db *s/ +Db_get_h_nelem ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t Db_get_h_nelem(struct Db *sel/ +Db_get_lorder ../libdb_java/db_java_wrap.c /^SWIGINTERN int Db_get_lorder(struct Db *self){$/ +Db_get_mpf ../libdb_java/db_java_wrap.c /^SWIGINTERN DB_MPOOLFILE *Db_get_mpf(struct Db *sel/ +Db_get_open_flags ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t Db_get_open_flags(struct Db */ +Db_get_pagesize ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t Db_get_pagesize(struct Db *se/ +Db_get_q_extentsize ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t Db_get_q_extentsize(struct Db/ +Db_get_re_delim ../libdb_java/db_java_wrap.c /^SWIGINTERN int Db_get_re_delim(struct Db *self){$/ +Db_get_re_len ../libdb_java/db_java_wrap.c /^SWIGINTERN u_int32_t Db_get_re_len(struct Db *self/ +Db_get_re_pad ../libdb_java/db_java_wrap.c /^SWIGINTERN int Db_get_re_pad(struct Db *self){$/ +Db_get_re_source ../libdb_java/db_java_wrap.c /^SWIGINTERN char const *Db_get_re_source(struct Db / +Db_get_transactional ../libdb_java/db_java_wrap.c /^SWIGINTERN int_bool Db_get_transactional(struct Db/ +Db_get_type ../libdb_java/db_java_wrap.c /^SWIGINTERN DBTYPE Db_get_type(struct Db *self){$/ +Db_join ../libdb_java/db_java_wrap.c /^SWIGINTERN DBC *Db_join(struct Db *self,DBC **curs/ +Db_key_range ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_key_range(struct Db *self,D/ +Db_open ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_open(struct Db *self,DB_TXN/ +Db_pget ../libdb_java/db_java_wrap.c /^SWIGINTERN int Db_pget(struct Db *self,DB_TXN *txn/ +Db_put ../libdb_java/db_java_wrap.c /^SWIGINTERN int Db_put(struct Db *self,DB_TXN *txni/ +Db_remove ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_remove(struct Db *self,char/ +Db_rename ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_rename(struct Db *self,char/ +Db_set_append_recno ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_append_recno(struct Db / +Db_set_bt_compare ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_bt_compare(struct Db *s/ +Db_set_bt_minkey ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_bt_minkey(struct Db *se/ +Db_set_bt_prefix ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_bt_prefix(struct Db *se/ +Db_set_cachesize ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_cachesize(struct Db *se/ +Db_set_dup_compare ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_dup_compare(struct Db */ +Db_set_encrypt ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_encrypt(struct Db *self/ +Db_set_feedback ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_feedback(struct Db *sel/ +Db_set_flags ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_flags(struct Db *self,u/ +Db_set_h_ffactor ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_h_ffactor(struct Db *se/ +Db_set_h_hash ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_h_hash(struct Db *self,/ +Db_set_h_nelem ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_h_nelem(struct Db *self/ +Db_set_lorder ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_lorder(struct Db *self,/ +Db_set_pagesize ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_pagesize(struct Db *sel/ +Db_set_q_extentsize ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_q_extentsize(struct Db / +Db_set_re_delim ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_re_delim(struct Db *sel/ +Db_set_re_len ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_re_len(struct Db *self,/ +Db_set_re_pad ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_re_pad(struct Db *self,/ +Db_set_re_source ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_set_re_source(struct Db *se/ +Db_stat ../libdb_java/db_java_wrap.c /^SWIGINTERN void *Db_stat(struct Db *self,DB_TXN *t/ +Db_sync ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_sync(struct Db *self,u_int3/ 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 61 +Db_truncate ../libdb_java/db_java_wrap.c /^SWIGINTERN int Db_truncate(struct Db *self,DB_TXN / +Db_upgrade ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Db_upgrade(struct Db *self,cha/ +Db_verify ../libdb_java/db_java_wrap.c /^SWIGINTERN int_bool Db_verify(struct Db *self,char/ +Dbc ../cxx/cxx_dbc.cpp /^\/\/ It's private, and should never be called, but/ +Dbc_close ../libdb_java/db_java_wrap.c /^SWIGINTERN db_ret_t Dbc_close(struct Dbc *self){$/ +Dbc_count ../libdb_java/db_java_wrap.c /^SWIGINTERN db_recno_t Dbc_count(struct Dbc *self,u/ +Dbc_del ../libdb_java/db_java_wrap.c /^SWIGINTERN int Dbc_del(struct Dbc *self,u_int32_t / +Dbc_dup ../libdb_java/db_java_wrap.c /^SWIGINTERN DBC *Dbc_dup(struct Dbc *self,u_int32_t/ +Dbc_get ../libdb_java/db_java_wrap.c /^SWIGINTERN int Dbc_get(struct Dbc *self,DBT *key,D/ +Dbc_pget ../libdb_java/db_java_wrap.c /^SWIGINTERN int Dbc_pget(struct Dbc *self,DBT *key,/ +Dbc_put ../libdb_java/db_java_wrap.c /^SWIGINTERN int Dbc_put(struct Dbc *self,DBT *key,D/ +Dbt ../cxx/cxx_dbt.cpp /^Dbt::Dbt()$/ +EID_FROM_SITE ../dbinc/repmgr.h /^#define EID_FROM_SITE(s) ((int)((s) - (&db_rep->si/ +ELECTION_MAJORITY ../dbinc/rep.h /^#define ELECTION_MAJORITY(n) (((n) \/ 2) + 1)$/ +ELECT_ELECTION ../dbinc/rep.h /^#define ELECT_ELECTION 1 \/* Call for an election./ +ELECT_FAILURE_ELECTION ../dbinc/rep.h /^#define ELECT_FAILURE_ELECTION 3 \/* Do election, / +ELECT_REPSTART ../dbinc/rep.h /^#define ELECT_REPSTART 2 \/* Call rep_start(CLIENT/ +EMSG ../clib/getopt.c /^#define EMSG ""$/ +ENTRY ../dbinc/db.in /^} ENTRY;$/ +ENV_ENTER ../dbinc/db_int.in /^#define ENV_ENTER(dbenv, ip) do { \\$/ 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_ILLEGAL_BEFORE_OPEN ../dbinc/db_int.in /^#define ENV_ILLEGAL_BEFORE_OPEN(dbenv, name) \\/ +ENV_LEAVE ../dbinc/db_int.in /^#define ENV_LEAVE(dbenv, ip) do { \\$/ 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 +ENV_REQUIRES_CONFIG_XX ../dbinc/db_int.in /^#define ENV_REQUIRES_CONFIG_XX(dbenv, handle, i, f/ +EPG ../dbinc/btree.h /^struct __epg; typedef struct __epg EPG;$/ EPRINT ../dbinc/db_verify.h /^#define EPRINT(x) do { \\$/ -FALSE ../crypto/rijndael/rijndael-api-fst.h 55 +FALSE ../dbinc/db_int.in /^#define FALSE 0$/ FAST_HASH ../lock/lock_util.c /^#define FAST_HASH(P) { \\$/ +FHASH ../dbinc/mp.h /^#define FHASH(id, len) __ham_func5(NULL, id, (u_in/ +FILE_EXTEND_IO_SIZE ../env/env_file.c /^#define FILE_EXTEND_IO_SIZE (8 * 1024)$/ +FILE_WRITE_IO_SIZE ../env/env_file.c /^#define FILE_WRITE_IO_SIZE (64 * 1024)$/ +FIND_FIRST_DB_MATCH ../dbinc/db_am.h /^#define FIND_FIRST_DB_MATCH(dbenv, dbp, tdbp) do {/ FLAG_CHECK ../dbinc/tcl_db.h /^#define FLAG_CHECK(flag) do { \\$/ FLAG_CHECK2 ../dbinc/tcl_db.h /^#define FLAG_CHECK2(flag, val) do { \\$/ +FLAG_CHECK2_STDARG ../tcl/tcl_dbcursor.c /^#define FLAG_CHECK2_STDARG \\$/ 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 303 -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) \\$/ +FMAP_ENTRIES ../mp/mp_stat.c /^#define FMAP_ENTRIES 200 \/* Files we map. *\/$/ +FN ../dbinc/db_int.in /^} FN;$/ +FNAME ../dbinc/db.in /^struct __fname; typedef struct __fname FNAME;$/ +FNBUCKET ../dbinc/mp.h /^#define FNBUCKET(id, len) \\$/ +FREE_IF_CHANGED ../dbinc/db_server_int.h /^#define FREE_IF_CHANGED(dbenv, p, orig) do { \\/ +FREE_IF_NEEDED ../dbinc/db_int.in /^#define FREE_IF_NEEDED(dbenv, 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))$/ F_SET ../dbinc/db_int.in /^#define F_SET(p, f) (p)->flags |= (f)$/ +GCC_HASCLASSVISIBILITY ../libdb_java/db_java_wrap.c /^# define GCC_HASCLASSVISIBILITY$/ GETU32 ../crypto/rijndael/rijndael-alg-fst.c /^#define GETU32(p) SWAP(*((u32 *)(p)))$/ 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_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_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_list.c /^#define GET_SIZE(dp, size) do { \\$/ -GIGABYTE ../dbinc/db_int.in 77 +GIGABYTE ../dbinc/db_int.in /^#define GIGABYTE 1073741824$/ GLOB_CHAR ../tcl/tcl_internal.c /^#define GLOB_CHAR(c) ((c) == '*' || (c) == '?')$/ -GUARD_BYTE ../dbinc/debug.h 29 -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 -HASHREMOVE_EL ../dbinc/db_shash.h /^#define HASHREMOVE_EL(begin, ndx, type, field, obj/ -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 134 -HDR_NORMAL_SZ ../dbinc/log.h 133 +GUARD_BYTE ../dbinc/debug.h /^#define GUARD_BYTE 0xdc$/ +HASH ../dbinc/hash.h /^} HASH;$/ +HASH4 ../hash/hash_func.c /^#define HASH4 HASH4b$/ +HASH4a ../hash/hash_func.c /^#define HASH4a h = (h << 5) - h + *k++;$/ +HASH4b ../hash/hash_func.c /^#define HASH4b h = (h << 5) + h + *k++;$/ +HASHC ../hash/hash_func.c /^#define HASHC n = *k++ + 65599 * n$/ +HASHHDR ../dbinc/db_upgrade.h /^} HASHHDR;$/ +HASHINFO ../dbinc/db_185.in /^} HASHINFO;$/ +HASHMAGIC ../dbinc/db_185.in /^#define HASHMAGIC 0x061561$/ +HASHVERSION ../dbinc/db_185.in /^#define HASHVERSION 2$/ +HASH_CURSOR ../dbinc/hash.h /^} HASH_CURSOR;$/ +HASH_UNUSED1 ../dbinc/hash.h /^#define HASH_UNUSED1 0x60$/ +HASH_UNUSED2 ../dbinc/hash.h /^#define HASH_UNUSED2 0x70$/ +HDR ../dbinc/log.h /^struct __hdr; typedef struct __hdr HDR;$/ +HDR_CRYPTO_SZ ../dbinc/log.h /^#define HDR_CRYPTO_SZ 12 + DB_MAC_KEY + DB_IV_BYTE/ +HDR_NORMAL_SZ ../dbinc/log.h /^#define HDR_NORMAL_SZ 12$/ +HKEYDATA ../dbinc/db_page.h /^} HKEYDATA;$/ 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 26 -HMAC_OUTPUT_SIZE ../hmac/hmac.c 25 +HMAC_BLOCK_SIZE ../hmac/hmac.c /^#define HMAC_BLOCK_SIZE 64$/ +HMAC_OUTPUT_SIZE ../hmac/hmac.c /^#define HMAC_OUTPUT_SIZE 20$/ +HMETA ../dbinc/db_page.h /^} HMETA33, HMETA;$/ +HMETA30 ../dbinc/db_upgrade.h /^} HMETA30;$/ +HMETA31 ../dbinc/db_upgrade.h /^} HMETA31;$/ +HOFFDUP ../dbinc/db_page.h /^} HOFFDUP;$/ HOFFDUP_PGNO ../dbinc/db_page.h /^#define HOFFDUP_PGNO(p) (((u_int8_t *)p) + SSZ(HO/ -HOFFDUP_SIZE ../dbinc/db_page.h 512 +HOFFDUP_SIZE ../dbinc/db_page.h /^#define HOFFDUP_SIZE (sizeof(HOFFDUP))$/ +HOFFPAGE ../dbinc/db_page.h /^} HOFFPAGE;$/ HOFFPAGE_PGNO ../dbinc/db_page.h /^#define HOFFPAGE_PGNO(p) (((u_int8_t *)p) + SSZ(HO/ -HOFFPAGE_PSIZE ../dbinc/db_page.h 496 -HOFFPAGE_SIZE ../dbinc/db_page.h 495 +HOFFPAGE_PSIZE ../dbinc/db_page.h /^#define HOFFPAGE_PSIZE (HOFFPAGE_SIZE + sizeof(db/ +HOFFPAGE_SIZE ../dbinc/db_page.h /^#define HOFFPAGE_SIZE (sizeof(HOFFPAGE))$/ HOFFPAGE_TLEN ../dbinc/db_page.h /^#define HOFFPAGE_TLEN(p) (((u_int8_t *)p) + SSZ(HO/ 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_CONTINUE ../dbinc/hash.h /^#define H_CONTINUE 0x0001 \/* Join--search strict/ H_DATAINDEX ../dbinc/db_page.h /^#define H_DATAINDEX(indx) ((indx) + 1)$/ -H_DELETED ../dbinc/hash.h 80 -H_DIRTY ../dbinc/hash.h 81 -H_DUPLICATE ../dbinc/db_page.h 397 -H_DUPONLY ../dbinc/hash.h 82 -H_EXPAND ../dbinc/hash.h 83 -H_ISDUP ../dbinc/hash.h 84 -H_KEYDATA ../dbinc/db_page.h 396 +H_DELETED ../dbinc/hash.h /^#define H_DELETED 0x0002 \/* Cursor item is delet/ +H_DUPLICATE ../dbinc/db_page.h /^#define H_DUPLICATE 2 \/* Duplicate key\/data item/ +H_DUPONLY ../dbinc/hash.h /^#define H_DUPONLY 0x0004 \/* Dups only; do not ch/ +H_EXPAND ../dbinc/hash.h /^#define H_EXPAND 0x0008 \/* Table expanded. *\/$/ +H_ISDUP ../dbinc/hash.h /^#define H_ISDUP 0x0010 \/* Cursor is within dupl/ +H_KEYDATA ../dbinc/db_page.h /^#define H_KEYDATA 1 \/* Key\/data item. *\/$/ H_KEYINDEX ../dbinc/db_page.h /^#define H_KEYINDEX(indx) (indx)$/ -H_NEXT_NODUP ../dbinc/hash.h 85 -H_NOMORE ../dbinc/hash.h 86 +H_NEXT_NODUP ../dbinc/hash.h /^#define H_NEXT_NODUP 0x0020 \/* Get next non-dup / +H_NOMORE ../dbinc/hash.h /^#define H_NOMORE 0x0040 \/* No more entries in bu/ H_NUMPAIRS ../dbinc/db_page.h /^#define H_NUMPAIRS(pg) (NUM_ENT(pg) \/ 2)$/ -H_OFFDUP ../dbinc/db_page.h 399 -H_OFFPAGE ../dbinc/db_page.h 398 -H_OK ../dbinc/hash.h 87 +H_OFFDUP ../dbinc/db_page.h /^#define H_OFFDUP 4 \/* Overflow page of duplicates/ +H_OFFPAGE ../dbinc/db_page.h /^#define H_OFFPAGE 3 \/* Overflow key\/data item. */ +H_OK ../dbinc/hash.h /^#define H_OK 0x0080 \/* Request succeeded. *\/$/ 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 37 -INITIAL_DEAD_ALLOC ../lock/lock_deadlock.c 698 +ILLEGAL_SIZE ../env/db_salloc.c /^#define ILLEGAL_SIZE 1 \/* An illegal size. *\/$/ +INFOTYPE ../dbinc/tcl_db.h /^enum INFOTYPE {$/ +INITIAL_ALLOCATION ../repmgr/repmgr_windows.c /^#define INITIAL_ALLOCATION 5 \/* arbitrary size */ +INITIAL_DEAD_ALLOC ../lock/lock_deadlock.c /^#define INITIAL_DEAD_ALLOC 8$/ +INITIAL_SITES_ALLOCATION ../repmgr/repmgr_util.c /^#define INITIAL_SITES_ALLOCATION 10 \/* Arbitrary/ INIT_LSN ../dbinc/db_int.in /^#define INIT_LSN(LSN) do { \\$/ +INPROGRESS ../dbinc/repmgr.h /^#define INPROGRESS WSAEWOULDBLOCK$/ INP_OFFSET ../db/db_vrfy.c /^#define INP_OFFSET(dbp, h, i) \\$/ -INT64_FMT ../dbinc/db_int.in 59 -INT64_MAX ../dbinc/db_int.in 55 -INT64_MIN ../dbinc/db_int.in 56 -INVALID_LSNMSG ../tcl/tcl_internal.c 525 -INVALID_ORDER ../dbinc/btree.h 59 -INVALID_REGION_ID ../dbinc/region.h 107 -INVALID_REGION_SEGID ../dbinc/region.h 119 -INVALID_ROFF ../dbinc/region.h 129 -IN_ELECTION ../dbinc/rep.h /^#define IN_ELECTION(R) F_ISSET((R), REP_F_EPHASE1/ +INT64_MAX ../dbinc/db_int.in /^#define INT64_MAX _I64_MAX$/ +INT64_MIN ../dbinc/db_int.in /^#define INT64_MIN _I64_MIN$/ +INVALID_LSNMSG ../tcl/tcl_internal.c /^#define INVALID_LSNMSG "Invalid LSN with %d parts./ +INVALID_ORDER ../dbinc/btree.h /^#define INVALID_ORDER 0$/ +INVALID_REGION_ID ../dbinc/region.h /^#define INVALID_REGION_ID 0 \/* Out-of-band region/ +INVALID_REGION_SEGID ../dbinc/region.h /^#define INVALID_REGION_SEGID -1 \/* Segment IDs ar/ +INVALID_ROFF ../dbinc/region.h /^#define INVALID_ROFF 0$/ +INVALID_SOCKET ../dbinc/repmgr.h /^#define INVALID_SOCKET -1$/ +IN_ELECTION ../dbinc/rep.h /^#define IN_ELECTION(R) \\$/ IN_ELECTION_TALLY ../dbinc/rep.h /^#define IN_ELECTION_TALLY(R) \\$/ +IO_WAITER ../dbinc/mp.h /^#define IO_WAITER 0x001 \/* Thread is waiting on / 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/ -IS_AUTO_COMMIT ../dbinc/db_am.h /^#define IS_AUTO_COMMIT(dbenv, txn, flags) \\$/ +ISSET_MAP ../lock/lock_deadlock.c /^#define ISSET_MAP(M, N) ((M)[(N) \/ 32] & (1 << ((/ 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_DB_AUTO_COMMIT ../dbinc/db_am.h /^#define IS_DB_AUTO_COMMIT(dbp, txn) \\$/ IS_DELETED ../btree/bt_cursor.c /^#define IS_DELETED(dbp, page, indx) \\$/ +IS_DIRTY ../dbinc/mp.h /^#define IS_DIRTY(p) \\$/ IS_DUPLICATE ../btree/bt_cursor.c /^#define IS_DUPLICATE(dbc, i1, i2) \\$/ -IS_ENV_REPLICATED ../dbinc/rep.h /^#define IS_ENV_REPLICATED(E) (REP_ON(E) && \\$/ +IS_ENV_AUTO_COMMIT ../dbinc/db_am.h /^#define IS_ENV_AUTO_COMMIT(dbenv, txn, flags) / +IS_ENV_REPLICATED ../dbinc/rep.h /^#define IS_ENV_REPLICATED(dbenv) \\$/ 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)/ +IS_IN_RESTORE ../qam/qam_rec.c /^#define IS_IN_RESTORE(dbenv) \\$/ IS_MAX_LSN ../dbinc/db_int.in /^#define IS_MAX_LSN(LSN) \\$/ IS_NOT_LOGGED_LSN ../dbinc/db_int.in /^#define IS_NOT_LOGGED_LSN(LSN) \\$/ -IS_READONLY ../db/db_iface.c /^#define IS_READONLY(dbp) \\$/ +IS_PEER_POLICY ../dbinc/repmgr.h /^#define IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_A/ +IS_PHASE1_DONE ../rep/rep_elect.c /^#define IS_PHASE1_DONE(rep) \\$/ +IS_REAL_TXN ../dbinc/db_int.in /^#define IS_REAL_TXN(txn) \\$/ 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_MASTER ../dbinc/rep.h /^#define IS_REP_MASTER(dbenv) \\$/ IS_SUBTRANSACTION ../dbinc/db_int.in /^#define IS_SUBTRANSACTION(txn) \\$/ +IS_VALID_EID ../dbinc/repmgr.h /^#define IS_VALID_EID(e) ((e) >= 0)$/ 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_ZERO_LSN ../dbinc/db_int.in /^#define IS_ZERO_LSN(LSN) ((LSN).file == 0 && (LSN)/ +I_HAVE_WON ../rep/rep_elect.c /^#define I_HAVE_WON(rep, winner) \\$/ 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, 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 +JDBENV ../libdb_java/db_java_wrap.c /^#define JDBENV (arg1 ? (jobject)DB_ENV_INTERNAL(ar/ +JOIN_CURSOR ../dbinc/db_join.h /^} JOIN_CURSOR;$/ +JOIN_RETRY ../dbinc/db_join.h /^#define JOIN_RETRY 0x01 \/* Error on primary get; / 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_DbEnv_1lock_1vec ../libdb_java/db_java_wrap.c /^Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1/ 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 362 -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 +Java_com_sleepycat_db_internal_db_1javaJNI_initialize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +LASTCKP_CMP ../dbinc/log.h /^#define LASTCKP_CMP 1$/ +LCK_ALWAYS ../dbinc/db_am.h /^#define LCK_ALWAYS 1 \/* Lock even for off page d/ +LCK_COUPLE ../dbinc/db_am.h /^#define LCK_COUPLE 2 \/* Lock Couple *\/$/ +LCK_COUPLE_ALWAYS ../dbinc/db_am.h /^#define LCK_COUPLE_ALWAYS 3 \/* Lock Couple even i/ +LCK_DOWNGRADE ../dbinc/db_am.h /^#define LCK_DOWNGRADE 4 \/* Downgrade the lock. (/ +LCK_ROLLBACK ../dbinc/db_am.h /^#define LCK_ROLLBACK 5 \/* Lock even if in rollba/ +LEAFLEVEL ../dbinc/db_page.h /^#define LEAFLEVEL 1$/ 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) \\$/ LEN_HKEY ../dbinc/db_page.h /^#define LEN_HKEY(dbp, p, psize, indx) \\$/ LEN_HKEYDATA ../dbinc/db_page.h /^#define LEN_HKEYDATA(dbp, pg, psize, indx) \\$/ LEVEL ../dbinc/db_page.h /^#define LEVEL(p) (((PAGE *)p)->level)$/ -LFNAME ../dbinc/log.h 64 -LFNAME_V1 ../dbinc/log.h 65 -LFPREFIX ../dbinc/log.h 63 +LFNAME ../dbinc/log.h /^#define LFNAME "log.%010d" \/* Log file name temp/ +LFNAME_V1 ../dbinc/log.h /^#define LFNAME_V1 "log.%05d" \/* Log file name tem/ +LFPREFIX ../dbinc/log.h /^#define LFPREFIX "log." \/* Log file name prefix./ 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 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 +LG_BASE_REGION_SIZE ../dbinc/log.h /^#define LG_BASE_REGION_SIZE (65000) \/* 64KB - 53/ +LG_BSIZE_DEFAULT ../dbinc/log.h /^#define LG_BSIZE_DEFAULT (32000) \/* 32 KB - 768B/ +LG_BSIZE_INMEM ../dbinc/log.h /^#define LG_BSIZE_INMEM (1 * MEGABYTE) \/* 1 MB. */ +LG_CURSOR_BUF_SIZE ../dbinc/log.h /^#define LG_CURSOR_BUF_SIZE (32000) \/* 32KB - 768/ +LG_MAX_DEFAULT ../dbinc/log.h /^#define LG_MAX_DEFAULT (10 * MEGABYTE) \/* 10 MB./ +LG_MAX_INMEM ../dbinc/log.h /^#define LG_MAX_INMEM (256 * 1024) \/* 256 KB. *\// 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 209 +LIST_INCREMENT ../log/log_archive.c /^#define LIST_INCREMENT 64$/ 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 22 +LOAD_ACTUAL_MUTEX_CODE ../mutex/mut_tas.c /^#define LOAD_ACTUAL_MUTEX_CODE$/ 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), &((/ LOCK_INIT ../dbinc/lock.h /^#define LOCK_INIT(lock) ((lock).off = LOCK_INVALI/ -LOCK_INVALID ../dbinc/lock.h 27 +LOCK_INVALID ../dbinc/lock.h /^#define LOCK_INVALID INVALID_ROFF$/ LOCK_ISSET ../dbinc/lock.h /^#define LOCK_ISSET(lock) ((lock).off != LOCK_INVAL/ +LOCK_MUTEX ../dbinc/repmgr.h /^#define LOCK_MUTEX(m) do { \\$/ LOCK_SET_TIME_INVALID ../dbinc/lock.h /^#define LOCK_SET_TIME_INVALID(time) ((time)->tv_se/ LOCK_SET_TIME_MAX ../dbinc/lock.h /^#define LOCK_SET_TIME_MAX(time) ((time)->tv_sec =/ +LOCK_SYSTEM_LOCK ../dbinc/lock.h /^#define LOCK_SYSTEM_LOCK(dbenv) \\$/ +LOCK_SYSTEM_UNLOCK ../dbinc/lock.h /^#define LOCK_SYSTEM_UNLOCK(dbenv) \\$/ LOCK_TIME_EQUAL ../dbinc/lock.h /^#define LOCK_TIME_EQUAL(t1, t2) \\$/ LOCK_TIME_GREATER ../dbinc/lock.h /^#define LOCK_TIME_GREATER(t1, t2) \\$/ LOCK_TIME_ISMAX ../dbinc/lock.h /^#define LOCK_TIME_ISMAX(time) ((time)->tv_sec == / LOCK_TIME_ISVALID ../dbinc/lock.h /^#define LOCK_TIME_ISVALID(time) ((time)->tv_sec !/ LOFFSET ../dbinc/db_page.h /^#define LOFFSET(dbp, pg) \\$/ -LOG ../dbinc/log.h 60 +LOG ../dbinc/log.h /^struct __log; typedef struct __log LOG;$/ LOGGING_ON ../dbinc/db_int.in /^#define LOGGING_ON(dbenv) ((dbenv)->lg_handle != N/ -LOGP ../dbinc/log.h 61 +LOGP ../dbinc/log.h /^struct __log_persist; typedef struct __log_persist/ +LOG_COMPARE ../dbinc/db_int.in /^#define LOG_COMPARE(lsn0, lsn1) \\$/ +LOG_HDR_SUM ../dbinc/log.h /^#define LOG_HDR_SUM(crypto, hdr, sum) do { \\$/ LOG_OP ../dbinc/debug.h /^#define LOG_OP(C, T, O, K, A, F) { \\$/ -LOWER_MASK ../crypto/mersenne/mt19937db.c 41 +LOG_SYSTEM_LOCK ../dbinc/log.h /^#define LOG_SYSTEM_LOCK(dbenv) \\$/ +LOG_SYSTEM_UNLOCK ../dbinc/log.h /^#define LOG_SYSTEM_UNLOCK(dbenv) \\$/ +LOWER_MASK ../crypto/mersenne/mt19937db.c /^#define LOWER_MASK 0x7fffffff \/* least significan/ LSN ../dbinc/db_page.h /^#define LSN(p) (((PAGE *)p)->lsn)$/ +LSN_COLLECTION ../dbinc/rep.h /^} LSN_COLLECTION;$/ LSN_NOT_LOGGED ../dbinc/db_int.in /^#define LSN_NOT_LOGGED(LSN) do { \\$/ -M ../crypto/mersenne/mt19937db.c 38 +M ../crypto/mersenne/mt19937db.c /^#define M 397$/ +MAKE_INMEM ../dbinc/fop.h /^#define MAKE_INMEM(D) do { \\$/ 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 734 -MAP_FILE ../mutex/tm.c 737 -MASTER_CHECK ../rep/rep_record.c /^#define MASTER_CHECK(dbenv, eid, rep) do { \\$/ +MAP_FAILED ../mutex/tm.c /^#define MAP_FAILED (void *)-1$/ +MAP_FILE ../mutex/tm.c /^#define MAP_FILE 0$/ MASTER_ONLY ../rep/rep_record.c /^#define MASTER_ONLY(rep, rp) do { \\$/ 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 -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 277 -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 +MATRIX_A ../crypto/mersenne/mt19937db.c /^#define MATRIX_A 0x9908b0df \/* constant vector / +MAXARGS ../common/util_arg.c /^#define MAXARGS 25$/ +MAXBQUALSIZE ../dbinc/xa.h /^#define MAXBQUALSIZE 64 \/* maximum size in byte/ +MAXBTREELEVEL ../dbinc/db_page.h /^#define MAXBTREELEVEL 255$/ +MAXGTRIDSIZE ../dbinc/xa.h /^#define MAXGTRIDSIZE 64 \/* maximum size in byte/ +MAXHOSTNAMELEN ../dbinc/repmgr.h /^#define MAXHOSTNAMELEN 256$/ +MAXINFOSIZE ../dbinc/xa.h /^#define MAXINFOSIZE 256 \/* maximum size in bytes/ +MAXKB ../crypto/rijndael/rijndael-alg-fst.h /^#define MAXKB (256\/8)$/ +MAXKC ../crypto/rijndael/rijndael-alg-fst.h /^#define MAXKC (256\/32)$/ +MAXNR ../crypto/rijndael/rijndael-alg-fst.h /^#define MAXNR 14$/ +MAX_ID ../dbinc/tcl_db.h /^#define MAX_ID 8 \/* Maximum number of sub-id's w/ +MAX_IV_SIZE ../crypto/rijndael/rijndael-api-fst.h /^#define MAX_IV_SIZE 16 \/* # bytes ne/ +MAX_KEY_SIZE ../crypto/rijndael/rijndael-api-fst.h /^#define MAX_KEY_SIZE 64 \/* # of ASCII/ MAX_LSN ../dbinc/db_int.in /^#define MAX_LSN(LSN) do { \\$/ -MAX_LSN_TO_TEXT ../db/db.c 1010 -MAX_PAGE_NUMBER ../dbinc/db_185.in 79 -MAX_PAGE_OFFSET ../dbinc/db_185.in 81 -MAX_PGNOS ../lock/lock_list.c 54 -MAX_REC_NUMBER ../dbinc/db_185.in 83 -MEGABYTE ../dbinc/db_int.in 76 -MINFILL ../dbinc/hash.h 106 -MODE_CBC ../crypto/rijndael/rijndael-api-fst.h 50 -MODE_CFB1 ../crypto/rijndael/rijndael-api-fst.h 51 -MODE_ECB ../crypto/rijndael/rijndael-api-fst.h 49 +MAX_LSN_TO_TEXT ../db/db.c /^#define MAX_LSN_TO_TEXT 17$/ +MAX_PAGE_NUMBER ../dbinc/db_185.in /^#define MAX_PAGE_NUMBER 0xffffffff \/* >= # of pag/ +MAX_PAGE_OFFSET ../dbinc/db_185.in /^#define MAX_PAGE_OFFSET 65535 \/* >= # of bytes i/ +MAX_PGNOS ../lock/lock_list.c /^#define MAX_PGNOS 0xffff$/ +MAX_REC_NUMBER ../dbinc/db_185.in /^#define MAX_REC_NUMBER 0xffffffff \/* >= # of reco/ +MAX_SITE_LOC_STRING ../dbinc/repmgr.h /^#define MAX_SITE_LOC_STRING (MAXHOSTNAMELEN+20)$/ +MEGABYTE ../dbinc/db_int.in /^#define MEGABYTE 1048576$/ +MEM_ALIGN ../repmgr/repmgr_sel.c /^#define MEM_ALIGN sizeof(double)$/ +MINFILL ../dbinc/hash.h /^#define MINFILL 4$/ +MODE_CBC ../crypto/rijndael/rijndael-api-fst.h /^#define MODE_CBC 2 \/* Are we ci/ +MODE_CFB1 ../crypto/rijndael/rijndael-api-fst.h /^#define MODE_CFB1 3 \/* Are we ci/ +MODE_ECB ../crypto/rijndael/rijndael-api-fst.h /^#define MODE_ECB 1 \/* Are we ci/ +MPFARRAY ../dbinc/qam.h /^} MPFARRAY;$/ 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 160 -MPOOL_BASE_DECREMENT ../dbinc/mp.h 203 +MPF_ILLEGAL_BEFORE_OPEN ../dbinc/mp.h /^#define MPF_ILLEGAL_BEFORE_OPEN(dbmfp, name) \\/ +MPOOL ../dbinc/mp.h /^struct __mpool; typedef struct __mpool MPOOL;$/ +MPOOLFILE ../dbinc/db.in /^struct __mpoolfile; typedef struct __mpoolfile MPO/ +MPOOL_BASE_DECREMENT ../dbinc/mp.h /^#define MPOOL_BASE_DECREMENT (UINT32_MAX - (UINT32/ +MPOOL_FILE_BUCKETS ../dbinc/mp.h /^#define MPOOL_FILE_BUCKETS 17$/ MPOOL_ON ../dbinc/db_int.in /^#define MPOOL_ON(dbenv) ((dbenv)->mp_handle != NU/ -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 79 -MT_FILE ../mutex/tm.c 42 -MT_FILE_QUIT ../mutex/tm.c 43 -MUTEX_ALIGN ../dbinc/mutex.h 82 -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 831 -MUTEX_INIT ../dbinc/mutex.h /^#define MUTEX_INIT(x) 0$/ -MUTEX_INITED ../dbinc/mutex.h 832 -MUTEX_LOCK ../dbinc/mutex.h /^#define MUTEX_LOCK(dbenv, mp) \\$/ -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 835 -MUTEX_NO_RLOCK ../dbinc/mutex.h 836 -MUTEX_NO_SHMGET_LOCKS ../dbinc/mutex.h 127 -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_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) \\$/ -MUTEX_UNSET ../dbinc/mutex.h /^#define MUTEX_UNSET(x) _clear_lock(x, 0)$/ -MUTEX_WAKEME ../mutex/tm.c 58 +MPOOL_PRI_DEFAULT ../dbinc/mp.h /^#define MPOOL_PRI_DEFAULT 0 \/* No adjustment -- s/ +MPOOL_PRI_DIRTY ../dbinc/mp.h /^#define MPOOL_PRI_DIRTY 10 \/* Dirty gets a 10% b/ +MPOOL_PRI_HIGH ../dbinc/mp.h /^#define MPOOL_PRI_HIGH 10 \/* With the dirty buff/ +MPOOL_PRI_LOW ../dbinc/mp.h /^#define MPOOL_PRI_LOW -2 \/* Low. *\/$/ +MPOOL_PRI_VERY_HIGH ../dbinc/mp.h /^#define MPOOL_PRI_VERY_HIGH 1 \/* Add number of bu/ +MPOOL_PRI_VERY_LOW ../dbinc/mp.h /^#define MPOOL_PRI_VERY_LOW -1 \/* Dead duck. Chec/ +MPOOL_REGION_LOCK ../dbinc/mp.h /^#define MPOOL_REGION_LOCK(dbenv, infop) \\$/ +MPOOL_REGION_UNLOCK ../dbinc/mp.h /^#define MPOOL_REGION_UNLOCK(dbenv, infop) \\$/ +MPOOL_SYSTEM_LOCK ../dbinc/mp.h /^#define MPOOL_SYSTEM_LOCK(dbenv) \\$/ +MPOOL_SYSTEM_UNLOCK ../dbinc/mp.h /^#define MPOOL_SYSTEM_UNLOCK(dbenv) \\$/ +MP_CAN_MMAP ../dbinc/mp.h /^#define MP_CAN_MMAP 0x001 \/* If the file can be / +MP_DIRECT ../dbinc/mp.h /^#define MP_DIRECT 0x002 \/* No OS buffering. *\/$/ +MP_DURABLE_UNKNOWN ../dbinc/mp.h /^#define MP_DURABLE_UNKNOWN 0x004 \/* We don't care/ +MP_EXTENT ../dbinc/mp.h /^#define MP_EXTENT 0x008 \/* Extent file. *\/$/ +MP_FAKE_DEADFILE ../dbinc/mp.h /^#define MP_FAKE_DEADFILE 0x010 \/* Deadfile field:/ +MP_FAKE_FILEWRITTEN ../dbinc/mp.h /^#define MP_FAKE_FILEWRITTEN 0x020 \/* File_written/ +MP_FAKE_NB ../dbinc/mp.h /^#define MP_FAKE_NB 0x040 \/* No_backing_file fiel/ +MP_FAKE_UOC ../dbinc/mp.h /^#define MP_FAKE_UOC 0x080 \/* Unlink_on_close fie/ +MP_FILEID_SET ../dbinc/db.in /^#define MP_FILEID_SET 0x001 \/* Application suppl/ +MP_FLUSH ../dbinc/db.in /^#define MP_FLUSH 0x002 \/* Was opened to flush a / +MP_MULTIVERSION ../dbinc/db.in /^#define MP_MULTIVERSION 0x004 \/* Opened for mult/ +MP_NOT_DURABLE ../dbinc/mp.h /^#define MP_NOT_DURABLE 0x100 \/* File is not dura/ +MP_OPEN_CALLED ../dbinc/db.in /^#define MP_OPEN_CALLED 0x008 \/* File opened. *\// +MP_READONLY ../dbinc/db.in /^#define MP_READONLY 0x010 \/* File is readonly. */ +MP_TEMP ../dbinc/mp.h /^#define MP_TEMP 0x200 \/* Backing file is a temp/ +MP_TRUNC_RECOVER ../dbinc/mp.h /^#define MP_TRUNC_RECOVER 0x01$/ +MSG_SIZE ../dbinc/tcl_db.h /^#define MSG_SIZE 100 \/* Message size *\/$/ +MS_PER_SEC ../dbinc/db_int.in /^#define MS_PER_SEC 1000 \/* Milliseconds in a sec/ +MTX_APPLICATION ../dbinc/mutex.h /^#define MTX_APPLICATION 1$/ +MTX_DB_HANDLE ../dbinc/mutex.h /^#define MTX_DB_HANDLE 2$/ +MTX_ENV_DBLIST ../dbinc/mutex.h /^#define MTX_ENV_DBLIST 3$/ +MTX_ENV_REGION ../dbinc/mutex.h /^#define MTX_ENV_REGION 4$/ +MTX_LOCK_REGION ../dbinc/mutex.h /^#define MTX_LOCK_REGION 5$/ +MTX_LOGICAL_LOCK ../dbinc/mutex.h /^#define MTX_LOGICAL_LOCK 6$/ +MTX_LOG_FILENAME ../dbinc/mutex.h /^#define MTX_LOG_FILENAME 7$/ +MTX_LOG_FLUSH ../dbinc/mutex.h /^#define MTX_LOG_FLUSH 8$/ +MTX_LOG_HANDLE ../dbinc/mutex.h /^#define MTX_LOG_HANDLE 9$/ +MTX_LOG_REGION ../dbinc/mutex.h /^#define MTX_LOG_REGION 10$/ +MTX_MAX_ENTRY ../dbinc/mutex.h /^#define MTX_MAX_ENTRY 28$/ +MTX_MPOOLFILE_HANDLE ../dbinc/mutex.h /^#define MTX_MPOOLFILE_HANDLE 11$/ +MTX_MPOOL_FH ../dbinc/mutex.h /^#define MTX_MPOOL_FH 12$/ +MTX_MPOOL_FILE_BUCKET ../dbinc/mutex.h /^#define MTX_MPOOL_FILE_BUCKET 13$/ +MTX_MPOOL_HANDLE ../dbinc/mutex.h /^#define MTX_MPOOL_HANDLE 14$/ +MTX_MPOOL_HASH_BUCKET ../dbinc/mutex.h /^#define MTX_MPOOL_HASH_BUCKET 15$/ +MTX_MPOOL_IO ../dbinc/mutex.h /^#define MTX_MPOOL_IO 16$/ +MTX_MPOOL_REGION ../dbinc/mutex.h /^#define MTX_MPOOL_REGION 17$/ +MTX_MUTEX_REGION ../dbinc/mutex.h /^#define MTX_MUTEX_REGION 18$/ +MTX_MUTEX_TEST ../dbinc/mutex.h /^#define MTX_MUTEX_TEST 19$/ +MTX_REP_DATABASE ../dbinc/mutex.h /^#define MTX_REP_DATABASE 20$/ +MTX_REP_REGION ../dbinc/mutex.h /^#define MTX_REP_REGION 21$/ +MTX_SEQUENCE ../dbinc/mutex.h /^#define MTX_SEQUENCE 22$/ +MTX_TWISTER ../dbinc/mutex.h /^#define MTX_TWISTER 23$/ +MTX_TXN_ACTIVE ../dbinc/mutex.h /^#define MTX_TXN_ACTIVE 24$/ +MTX_TXN_CHKPT ../dbinc/mutex.h /^#define MTX_TXN_CHKPT 25$/ +MTX_TXN_COMMIT ../dbinc/mutex.h /^#define MTX_TXN_COMMIT 26$/ +MTX_TXN_MVCC ../dbinc/mutex.h /^#define MTX_TXN_MVCC 27$/ +MTX_TXN_REGION ../dbinc/mutex.h /^#define MTX_TXN_REGION 28$/ +MT_FILE ../mutex/tm.c /^#define MT_FILE "TESTDIR\/mutex.file"$/ +MT_FILE_QUIT ../mutex/tm.c /^#define MT_FILE_QUIT "TESTDIR\/mutex.file.quit"$/ +MULTIVERSION ../dbinc/mp.h /^#define MULTIVERSION(dbp) ((dbp)->mpf->mfp->multiv/ +MUTEXP_SET ../dbinc/mutex_int.h /^#define MUTEXP_SET(indx) \\$/ +MUTEX_ALIGN ../dbinc/mutex_int.h /^#define MUTEX_ALIGN 16$/ +MUTEX_DESTROY ../dbinc/mutex_int.h /^#define MUTEX_DESTROY(x) sema_destroy(x)$/ +MUTEX_FIELDS ../dbinc/mutex_int.h /^#define MUTEX_FIELDS \\$/ +MUTEX_INIT ../dbinc/mutex_int.h /^#define MUTEX_INIT(x) 0$/ +MUTEX_INVALID ../dbinc/mutex.h /^#define MUTEX_INVALID 0$/ +MUTEX_LOCK ../dbinc/mutex.h /^#define MUTEX_LOCK(dbenv, mutex) do { \\$/ +MUTEX_ON ../dbinc/db_int.in /^#define MUTEX_ON(dbenv) ((dbenv)->mutex_handle !=/ +MUTEX_PAUSE ../dbinc/mutex_int.h /^#define MUTEX_PAUSE {__asm{_emit 0xf3}; __asm{_em/ +MUTEX_SET ../dbinc/mutex_int.h /^#define MUTEX_SET(x) (!_check_lock(x, 0, 1))$/ +MUTEX_SYSTEM_LOCK ../dbinc/mutex_int.h /^#define MUTEX_SYSTEM_LOCK(dbenv) \\$/ +MUTEX_SYSTEM_UNLOCK ../dbinc/mutex_int.h /^#define MUTEX_SYSTEM_UNLOCK(dbenv) \\$/ +MUTEX_UNLOCK ../dbinc/mutex.h /^#define MUTEX_UNLOCK(dbenv, mutex) do { \\$/ +MUTEX_UNSET ../dbinc/mutex_int.h /^#define MUTEX_UNSET(x) _clear_lock(x, 0)$/ +MVCC_BHALIGN ../dbinc/mp.h /^#define MVCC_BHALIGN(mfp, p) do { \\$/ +MVCC_BHSIZE ../dbinc/mp.h /^#define MVCC_BHSIZE(mfp, sz) do { \\$/ +MVCC_BHUNALIGN ../dbinc/mp.h /^#define MVCC_BHUNALIGN(mfp, p) do { \\$/ +MVCC_MPROTECT ../dbinc/mp.h /^#define MVCC_MPROTECT(buf, sz, mode) do { \\$/ +MVCC_SKIP_CURADJ ../dbinc/mp.h /^#define MVCC_SKIP_CURADJ(dbc, pgno) \\$/ M_16_SWAP ../dbinc/db_swap.h /^#define M_16_SWAP(a) { \\$/ M_32_SWAP ../dbinc/db_swap.h /^#define M_32_SWAP(a) { \\$/ +M_64_SWAP ../dbinc/db_swap.h /^#define M_64_SWAP(a) { \\$/ Mtm ../mutex/tm.c /^main(argc, argv)$/ -N ../crypto/mersenne/mt19937db.c 37 +N ../crypto/mersenne/mt19937db.c /^#define N 624$/ 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/ @@ -1483,53 +1466,61 @@ NAME_TO_TXN ../dbinc/tcl_db.h /^#define NAME_TO_TXN(name) (DB_TXN *)_NameToPtr(( 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) \\$/ -NCACHED ../dbinc/db_page.h 134 -NCACHED2X ../dbinc/db_upgrade.h 231 -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]))$/ +NCACHED ../dbinc/db_page.h /^#define NCACHED 32 \/* number of spare points *\// +NCACHED2X ../dbinc/db_upgrade.h /^#define NCACHED2X 32 \/* number of spare points */ +NCACHED30 ../dbinc/db_upgrade.h /^#define NCACHED30 32 \/* number of spare points */ +NDX_INVALID ../dbinc/hash.h /^#define NDX_INVALID 0xFFFF$/ +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 ../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 +OKFLAGS ../db/db_iface.c /^#define OKFLAGS \\$/ +OKFLAGS_CDB ../env/env_open.c /^#define OKFLAGS_CDB \\$/ +OK_CRYPTO_FLAGS ../env/env_method.c /^#define OK_CRYPTO_FLAGS (DB_ENCRYPT_AES)$/ +OK_FLAGS ../env/env_method.c /^#define OK_FLAGS \\$/ 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 292 -OS_VMROUNDOFF ../dbinc/region.h /^#define OS_VMROUNDOFF(i) { \\$/ -OVERFLOW_ERROR ../clib/snprintf.c 122 +OS_BAD_PID ../mutex/tm.c /^#define OS_BAD_PID (os_pid_t)-1$/ +OS_VMPAGESIZE ../os/os_region.c /^#define OS_VMPAGESIZE (8 * 1024)$/ +OS_VMROUNDOFF ../os/os_region.c /^#define OS_VMROUNDOFF(i) { \\$/ +OUT_QUEUE_LIMIT ../repmgr/repmgr_net.c /^#define OUT_QUEUE_LIMIT 10 \/* arbitrary, for now / +OUT_Q_HEADER ../dbinc/repmgr.h /^typedef STAILQ_HEAD(__repmgr_out_q_head, __queued_/ +OVERFLOW_ERROR ../clib/snprintf.c /^#define OVERFLOW_ERROR "internal buffer overflow, / 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 53 -O_INDX ../dbinc/db_page.h 596 -PAIR_DATAMASK ../dbinc/hash.h 118 -PAIR_DUPMASK ../dbinc/hash.h 119 +OWNER_RW ../dbinc/os.h /^#define OWNER_RW "rw-------"$/ +O_ACCMODE ../os/os_oflags.c /^#define O_ACCMODE (O_RDONLY | O_RDWR | O_WRONLY)$/ +O_INDX ../dbinc/db_page.h /^#define O_INDX 1$/ +PAGE ../dbinc/db_page.h /^} PAGE;$/ +PAIR_DATAMASK ../dbinc/hash.h /^#define PAIR_DATAMASK 0x2$/ +PAIR_DUPMASK ../dbinc/hash.h /^#define PAIR_DUPMASK 0x4$/ PAIR_ISDATABIG ../dbinc/hash.h /^#define PAIR_ISDATABIG(N) (N & PAIR_DATAMASK)$/ PAIR_ISDATADUP ../dbinc/hash.h /^#define PAIR_ISDATADUP(N) (N & PAIR_DUPMASK)$/ PAIR_ISKEYBIG ../dbinc/hash.h /^#define PAIR_ISKEYBIG(N) (N & PAIR_KEYMASK)$/ -PAIR_KEYMASK ../dbinc/hash.h 117 -PAIR_MASK ../dbinc/hash.h 120 +PAIR_KEYMASK ../dbinc/hash.h /^#define PAIR_KEYMASK 0x1$/ +PAIR_MASK ../dbinc/hash.h /^#define PAIR_MASK 0xf$/ 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 279 -PATH_SEPARATOR ../dbinc/db_int.in 281 +PATH_DOT ../dbinc/db_int.in /^#define PATH_DOT "." \/* Current working directory/ +PATH_SEPARATOR ../dbinc/db_int.in /^#define PATH_SEPARATOR "@PATH_SEPARATOR@"$/ 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 +PGNO_BASE_MD ../dbinc/db_page.h /^#define PGNO_BASE_MD 0 \/* Base database: metadata/ +PGNO_INVALID ../dbinc/db_page.h /^#define PGNO_INVALID 0 \/* Invalid page number in / +PG_CHKSUM ../dbinc/db_page.h /^} PG_CHKSUM;$/ +PG_CRYPTO ../dbinc/db_page.h /^} PG_CRYPTO;$/ +PID_EMPTY ../env/env_register.c /^#define PID_EMPTY "X 0\\n" \// +PID_FMT ../env/env_register.c /^#define PID_FMT "%24lu\\n" \/* PID entry format/ +PID_ISEMPTY ../env/env_register.c /^#define PID_ISEMPTY(p) (memcmp(p, PID_EMPTY, PID_L/ +PID_LEN ../env/env_register.c /^#define PID_LEN (25) \/* PID entry length *\/$/ POWER_OF_TWO ../dbinc/db_int.in /^#define POWER_OF_TWO(x) (((x) & ((x) - 1)) == 0)$/ -PREPLISTSIZE ../rep/rep_method.c 536 +PREPLISTSIZE ../rep/rep_method.c /^#define PREPLISTSIZE 50$/ PREV_PGNO ../dbinc/db_page.h /^#define PREV_PGNO(p) (((PAGE *)p)->prev_pgno)$/ -PTHREAD_UNLOCK_ATTEMPTS ../mutex/mut_pthread.c 57 -PUTOVFL ../dbinc/hash.h 128 -PUTPAIR ../dbinc/hash.h 126 +PTHREAD_UNLOCK_ATTEMPTS ../mutex/mut_pthread.c /^#define PTHREAD_UNLOCK_ATTEMPTS 5$/ +PTRACE ../btree/bt_compact.c /^#define PTRACE(dbc, location, p, start, f) do { / +PUTOVFL ../dbinc/hash.h /^#define PUTOVFL 0x40$/ +PUTPAIR ../dbinc/hash.h /^#define PUTPAIR 0x20$/ PUTU32 ../crypto/rijndael/rijndael-alg-fst.c /^#define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st/ 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) { \\$/ @@ -1541,34 +1532,39 @@ 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) { \\$/ P_32_SWAP ../dbinc/db_swap.h /^#define P_32_SWAP(a) { \\$/ -P_BTREEMETA ../dbinc/db_page.h 46 +P_64_COPY ../dbinc/db_swap.h /^#define P_64_COPY(a, b) { \\$/ +P_64_SWAP ../dbinc/db_swap.h /^#define P_64_SWAP(a) { \\$/ +P_BTREEMETA ../dbinc/db_page.h /^#define P_BTREEMETA 9 \/* Btree metadata page. *\// P_CHKSUM ../dbinc/db_page.h /^#define P_CHKSUM(dbp, pg) \\$/ +P_DONTEXTEND ../dbinc/db_page.h /^#define P_DONTEXTEND 0x8000 \/* Don't allocate if / P_ENTRY ../dbinc/db_page.h /^#define P_ENTRY(dbp, pg, indx) ((u_int8_t *)pg + P/ P_FREESPACE ../dbinc/db_page.h /^#define P_FREESPACE(dbp, pg) (HOFFSET(pg) - LOFFSE/ -P_HASH ../dbinc/db_page.h 39 -P_HASHMETA ../dbinc/db_page.h 45 -P_IBTREE ../dbinc/db_page.h 40 -P_INDX ../dbinc/db_page.h 597 +P_HASH ../dbinc/db_page.h /^#define P_HASH 2 \/* Hash. *\/$/ +P_HASHMETA ../dbinc/db_page.h /^#define P_HASHMETA 8 \/* Hash metadata page. *\/$/ +P_IBTREE ../dbinc/db_page.h /^#define P_IBTREE 3 \/* Btree internal. *\/$/ +P_INDX ../dbinc/db_page.h /^#define P_INDX 2$/ P_INIT ../dbinc/db_page.h /^#define P_INIT(pg, pg_size, n, pg_prev, pg_next, b/ P_INP ../dbinc/db_page.h /^#define P_INP(dbp, pg) \\$/ -P_INVALID ../dbinc/db_page.h 37 -P_IRECNO ../dbinc/db_page.h 41 +P_INVALID ../dbinc/db_page.h /^#define P_INVALID 0 \/* Invalid page type. *\/$/ +P_IRECNO ../dbinc/db_page.h /^#define P_IRECNO 4 \/* Recno internal. *\/$/ P_IV ../dbinc/db_page.h /^#define P_IV(dbp, pg) \\$/ -P_LBTREE ../dbinc/db_page.h 42 -P_LDUP ../dbinc/db_page.h 49 -P_LRECNO ../dbinc/db_page.h 43 +P_LBTREE ../dbinc/db_page.h /^#define P_LBTREE 5 \/* Btree leaf. *\/$/ +P_LDUP ../dbinc/db_page.h /^#define P_LDUP 12 \/* Off-page duplicate leaf. */ +P_LRECNO ../dbinc/db_page.h /^#define P_LRECNO 6 \/* Recno leaf. *\/$/ P_MAXSPACE ../dbinc/db_page.h /^#define P_MAXSPACE(dbp, psize) ((psize) - P_OVERHE/ -P_OVERFLOW ../dbinc/db_page.h 44 +P_OVERFLOW ../dbinc/db_page.h /^#define P_OVERFLOW 7 \/* Overflow. *\/$/ P_OVERHEAD ../dbinc/db_page.h /^#define P_OVERHEAD(dbp) P_TO_UINT16(P_INP(dbp, 0))/ P_OVFLSPACE ../dbinc/db_page.h /^#define P_OVFLSPACE(dbp, psize, pg) (P_MAXSPACE(db/ -P_PAGETYPE_MAX ../dbinc/db_page.h 50 -P_QAMDATA ../dbinc/db_page.h 48 -P_QAMMETA ../dbinc/db_page.h 47 +P_PAGETYPE_MAX ../dbinc/db_page.h /^#define P_PAGETYPE_MAX 13$/ +P_QAMDATA ../dbinc/db_page.h /^#define P_QAMDATA 11 \/* Queue data page. *\/$/ +P_QAMMETA ../dbinc/db_page.h /^#define P_QAMMETA 10 \/* Queue metadata page. *\/$/ 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))$/ +QAMDATA ../dbinc/qam.h /^} QAMDATA;$/ 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_DIRTY ../qam/qam_rec.c /^#define QAM_DIRTY(dbp, pgno, pagep) \\$/ 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) \\$/ @@ -1577,148 +1573,231 @@ QAM_RECNO_EXTENT ../dbinc/qam.h /^#define QAM_RECNO_EXTENT(dbp, recno) \\$/ QAM_RECNO_INDEX ../dbinc/qam.h /^#define QAM_RECNO_INDEX(dbp, pgno, recno) \\$/ QAM_RECNO_PAGE ../dbinc/qam.h /^#define QAM_RECNO_PAGE(dbp, recno) \\$/ QAM_RECNO_PER_PAGE ../dbinc/qam.h /^#define QAM_RECNO_PER_PAGE(dbp) (((QUEUE*)(dbp)->q/ -QAM_SET ../dbinc/qam.h 19 -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 611 +QAM_SET ../dbinc/qam.h /^#define QAM_SET 0x02$/ +QAM_SETCUR ../dbinc/qam.h /^#define QAM_SETCUR 0x02$/ +QAM_SETFIRST ../dbinc/qam.h /^#define QAM_SETFIRST 0x01$/ +QAM_TRUNCATE ../dbinc/qam.h /^#define QAM_TRUNCATE 0x04$/ +QAM_VALID ../dbinc/qam.h /^#define QAM_VALID 0x01$/ +QDEBUG ../qam/qam.c /^#define QDEBUG$/ 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 -QPAGE_NORMAL ../dbinc/db_page.h 292 -QPAGE_SEC ../dbinc/db_page.h 294 +QMETA ../dbinc/db_page.h /^} QMETA33, QMETA;$/ +QMETA30 ../dbinc/db_upgrade.h /^} QMETA30;$/ +QMETA31 ../dbinc/db_upgrade.h /^} QMETA31;$/ +QMETA32 ../dbinc/db_upgrade.h /^} QMETA32;$/ +QPAGE ../dbinc/db_page.h /^} QPAGE;$/ +QPAGE_CHKSUM ../dbinc/db_page.h /^#define QPAGE_CHKSUM 48$/ +QPAGE_NORMAL ../dbinc/db_page.h /^#define QPAGE_NORMAL 28$/ +QPAGE_SEC ../dbinc/db_page.h /^#define QPAGE_SEC 64$/ QPAGE_SZ ../dbinc/db_page.h /^#define QPAGE_SZ(dbp) \\$/ -QUEUE ../dbinc/qam.h 23 -QUEUE_CURSOR ../dbinc/qam.h 24 -QUEUE_EXTENT ../dbinc/qam.h 72 -QUEUE_EXTENT_HEAD ../dbinc/qam.h 73 -QUEUE_MACRO_DEBUG ../dbinc/queue.h 183 +QUEUE ../dbinc/qam.h /^struct __queue; typedef struct __queue QUEUE;$/ +QUEUED_OUTPUT ../dbinc/repmgr.h /^struct __queued_output; typedef struct __queued_ou/ +QUEUE_CURSOR ../dbinc/qam.h /^struct __qcursor; typedef struct __qcursor QUEUE_C/ +QUEUE_EXTENT ../dbinc/qam.h /^#define QUEUE_EXTENT "%s%c__dbq.%s.%d"$/ +QUEUE_EXTENT_HEAD ../dbinc/qam.h /^#define QUEUE_EXTENT_HEAD "__dbq.%s."$/ +QUEUE_EXTENT_PREFIX ../dbinc/qam.h /^#define QUEUE_EXTENT_PREFIX "__dbq."$/ +QUEUE_FILELIST ../dbinc/qam.h /^} QUEUE_FILELIST;$/ +QUEUE_MACRO_DEBUG ../dbinc/queue.h /^#define QUEUE_MACRO_DEBUG 0$/ R0 ../hmac/sha1.c /^#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0/ 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/ -RECNO ../dbinc/btree.h 51 -RECNO_OOB ../dbinc/db_int.in 82 -REC_CLOSE ../dbinc/db_am.h 53 +RECNO ../dbinc/btree.h /^struct __recno; typedef struct __recno RECNO;$/ +RECNOINFO ../dbinc/db_185.in /^} RECNOINFO;$/ +RECNO_OOB ../dbinc/db_int.in /^#define RECNO_OOB 0 \/* Illegal record number. */ +RECOVERING_LOG_SKIP ../rep/rep_record.c /^#define RECOVERING_LOG_SKIP do { \\$/ +RECOVERING_SKIP ../rep/rep_record.c /^#define RECOVERING_SKIP do { \\$/ +REC_CLOSE ../dbinc/db_am.h /^#define REC_CLOSE { \\$/ +REC_DIRTY ../dbinc/db_am.h /^#define REC_DIRTY(mpf, pagep) \\$/ 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 71 +REC_INTRO ../dbinc/db_am.h /^#define REC_INTRO(func, inc_count, do_cursor) do {/ +REC_NOOP_CLOSE ../dbinc/db_am.h /^#define REC_NOOP_CLOSE \\$/ 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 526 -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 231 -REPDBNAME ../rep/rep_method.c 431 -REPPAGENAME ../rep/rep_method.c 432 -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 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 +REGENV ../dbinc/region.h /^} REGENV;$/ +REGENV_REF ../dbinc/region.h /^} REGENV_REF;$/ +REGINFO ../dbinc/db_int.in /^struct __db_reginfo_t; typedef struct __db_reginfo/ +REGION ../dbinc/region.h /^} REGION;$/ +REGION_CREATE ../dbinc/region.h /^#define REGION_CREATE 0x01 \/* Caller created reg/ +REGION_CREATE_OK ../dbinc/region.h /^#define REGION_CREATE_OK 0x02 \/* Caller willing t/ +REGION_ID_ENV ../dbinc/region.h /^#define REGION_ID_ENV 1 \/* Primary environment I/ +REGION_JOIN_OK ../dbinc/region.h /^#define REGION_JOIN_OK 0x04 \/* Caller is looking/ +REGISTER_FILE ../env/env_register.c /^#define REGISTER_FILE "__db.register"$/ +REGISTRY_EXCL_LOCK ../env/env_register.c /^#define REGISTRY_EXCL_LOCK(dbenv, nowait) \\$/ +REGISTRY_EXCL_UNLOCK ../env/env_register.c /^#define REGISTRY_EXCL_UNLOCK(dbenv) \\$/ +REGISTRY_LOCK ../env/env_register.c /^#define REGISTRY_LOCK(dbenv, pos, nowait) \\$/ +REGISTRY_UNLOCK ../env/env_register.c /^#define REGISTRY_UNLOCK(dbenv, pos) \\$/ +REP ../dbinc/rep.h /^} REP;$/ +REPCTL_ELECTABLE ../dbinc/rep.h /^#define REPCTL_ELECTABLE 0x01 \/* Upgraded client / +REPCTL_INIT ../dbinc/rep.h /^#define REPCTL_INIT 0x02 \/* Internal init messag/ +REPCTL_PERM ../dbinc/rep.h /^#define REPCTL_PERM DB_LOG_PERM_42_44$/ +REPCTL_RESEND ../dbinc/rep.h /^#define REPCTL_RESEND DB_LOG_RESEND_42_44$/ +REPDBNAME ../dbinc/rep.h /^#define REPDBNAME "__db.rep.db"$/ +REPLICATION_WRAP ../dbinc/rep.h /^#define REPLICATION_WRAP(dbenv, func_call, ret) do/ +REPMGR_ACK ../dbinc/repmgr.h /^#define REPMGR_ACK 1 \/* Acknowledgement. *\/$/ +REPMGR_CONNECTION ../dbinc/repmgr.h /^struct __repmgr_connection;$/ +REPMGR_FLAT ../dbinc/repmgr.h /^} REPMGR_FLAT;$/ +REPMGR_HANDSHAKE ../dbinc/repmgr.h /^#define REPMGR_HANDSHAKE 2 \/* Connection establis/ +REPMGR_IOVECS ../dbinc/repmgr.h /^} REPMGR_IOVECS;$/ +REPMGR_MESSAGE ../dbinc/repmgr.h /^} REPMGR_MESSAGE;$/ +REPMGR_QUEUE ../dbinc/repmgr.h /^struct __repmgr_queue; typedef struct __repmgr_que/ +REPMGR_REP_MESSAGE ../dbinc/repmgr.h /^#define REPMGR_REP_MESSAGE 3 \/* Normal replicatio/ +REPMGR_RETRY ../dbinc/repmgr.h /^struct __repmgr_retry; typedef struct __repmgr_ret/ +REPMGR_RUNNABLE ../dbinc/repmgr.h /^struct __repmgr_runnable; typedef struct __repmgr_/ +REPMGR_SITE ../dbinc/repmgr.h /^struct __repmgr_site; typedef struct __repmgr_site/ +REPMGR_SYNC_INITED ../dbinc/repmgr.h /^#define REPMGR_SYNC_INITED(db_rep) (db_rep->waiter/ +REPPAGENAME ../dbinc/rep.h /^#define REPPAGENAME "__db.reppg.db"$/ +REP_ALIVE ../dbinc/rep.h /^#define REP_ALIVE 1 \/* I am alive message. *\/$/ +REP_ALIVE_REQ ../dbinc/rep.h /^#define REP_ALIVE_REQ 2 \/* Request for alive mess/ +REP_ALL_REQ ../dbinc/rep.h /^#define REP_ALL_REQ 3 \/* Request all log records / +REP_BULK ../dbinc/rep.h /^} REP_BULK;$/ +REP_BULK_LOG ../dbinc/rep.h /^#define REP_BULK_LOG 4 \/* Bulk transfer of log re/ +REP_BULK_PAGE ../dbinc/rep.h /^#define REP_BULK_PAGE 5 \/* Bulk transfer of pages/ +REP_CONTROL ../dbinc/rep.h /^} REP_CONTROL;$/ +REP_C_BULK ../dbinc/rep.h /^#define REP_C_BULK 0x00001 \/* Bulk transfer. */ +REP_C_DELAYCLIENT ../dbinc/rep.h /^#define REP_C_DELAYCLIENT 0x00002 \/* Delay clien/ +REP_C_NOAUTOINIT ../dbinc/rep.h /^#define REP_C_NOAUTOINIT 0x00004 \/* No auto init/ +REP_C_NOWAIT ../dbinc/rep.h /^#define REP_C_NOWAIT 0x00008 \/* Immediate error/ +REP_DUPMASTER ../dbinc/rep.h /^#define REP_DUPMASTER 6 \/* Duplicate master detec/ +REP_EGENNAME ../dbinc/rep.h /^#define REP_EGENNAME "__db.rep.egen"$/ +REP_FILE ../dbinc/rep.h /^#define REP_FILE 7 \/* Page of a database file. NO/ +REP_FILE_FAIL ../dbinc/rep.h /^#define REP_FILE_FAIL 8 \/* File requested does no/ +REP_FILE_REQ ../dbinc/rep.h /^#define REP_FILE_REQ 9 \/* Request for a database / +REP_F_CLIENT ../dbinc/rep.h /^#define REP_F_CLIENT 0x00001 \/* Client replica./ +REP_F_DELAY ../dbinc/rep.h /^#define REP_F_DELAY 0x00002 \/* Delaying client / +REP_F_EPHASE1 ../dbinc/rep.h /^#define REP_F_EPHASE1 0x00004 \/* In phase 1 of / +REP_F_EPHASE2 ../dbinc/rep.h /^#define REP_F_EPHASE2 0x00008 \/* In phase 2 of / +REP_F_MASTER ../dbinc/rep.h /^#define REP_F_MASTER 0x00010 \/* Master replica./ +REP_F_MASTERELECT ../dbinc/rep.h /^#define REP_F_MASTERELECT 0x00020 \/* Master elec/ +REP_F_NOARCHIVE ../dbinc/rep.h /^#define REP_F_NOARCHIVE 0x00040 \/* Rep blocks l/ +REP_F_READY ../dbinc/rep.h /^#define REP_F_READY 0x00080 \/* Wait for txn_cnt/ +REP_F_RECOVER_LOG ../dbinc/rep.h /^#define REP_F_RECOVER_LOG 0x00100 \/* In recovery/ +REP_F_RECOVER_MASK ../dbinc/rep.h /^#define REP_F_RECOVER_MASK \\$/ +REP_F_RECOVER_PAGE ../dbinc/rep.h /^#define REP_F_RECOVER_PAGE 0x00200 \/* In recover/ +REP_F_RECOVER_UPDATE ../dbinc/rep.h /^#define REP_F_RECOVER_UPDATE 0x00400 \/* In recov/ +REP_F_RECOVER_VERIFY ../dbinc/rep.h /^#define REP_F_RECOVER_VERIFY 0x00800 \/* In recov/ +REP_F_TALLY ../dbinc/rep.h /^#define REP_F_TALLY 0x01000 \/* Tallied vote bef/ +REP_GAP_FORCE ../dbinc/rep.h /^#define REP_GAP_FORCE 0x001 \/* Force a request f/ +REP_GAP_REREQUEST ../dbinc/rep.h /^#define REP_GAP_REREQUEST 0x002 \/* Gap request is/ +REP_INVALID ../dbinc/rep.h /^#define REP_INVALID 0 \/* Invalid message type. */ +REP_LOG ../dbinc/rep.h /^#define REP_LOG 10 \/* Log record. *\/$/ +REP_LOG_MORE ../dbinc/rep.h /^#define REP_LOG_MORE 11 \/* There are more log rec/ +REP_LOG_REQ ../dbinc/rep.h /^#define REP_LOG_REQ 12 \/* Request for a log recor/ +REP_MASTER_REQ ../dbinc/rep.h /^#define REP_MASTER_REQ 13 \/* Who is the master */ +REP_MAX_MSG ../dbinc/rep.h /^#define REP_MAX_MSG 29$/ +REP_MSG_REQ ../dbinc/rep.h /^#define REP_MSG_REQ(rectype) \\$/ +REP_NEWCLIENT ../dbinc/rep.h /^#define REP_NEWCLIENT 14 \/* Announces the presenc/ +REP_NEWFILE ../dbinc/rep.h /^#define REP_NEWFILE 15 \/* Announce a log file cha/ +REP_NEWMASTER ../dbinc/rep.h /^#define REP_NEWMASTER 16 \/* Announces who the mas/ +REP_NEWSITE ../dbinc/rep.h /^#define REP_NEWSITE 17 \/* Announces that a site h/ +REP_OLD_VOTE_INFO ../dbinc/rep.h /^} REP_OLD_VOTE_INFO;$/ +REP_ON ../dbinc/db_int.in /^#define REP_ON(dbenv) \\$/ +REP_PAGE ../dbinc/rep.h /^#define REP_PAGE 18 \/* Database page. *\/$/ +REP_PAGE_FAIL ../dbinc/rep.h /^#define REP_PAGE_FAIL 19 \/* Requested page does n/ +REP_PAGE_MORE ../dbinc/rep.h /^#define REP_PAGE_MORE 20 \/* There are more pages / +REP_PAGE_REQ ../dbinc/rep.h /^#define REP_PAGE_REQ 21 \/* Request for a database/ +REP_PRINT_MESSAGE ../dbinc/rep.h /^#define REP_PRINT_MESSAGE(dbenv, eid, rp, str, fl)/ +REP_REREQUEST ../dbinc/rep.h /^#define REP_REREQUEST 22 \/* Force rerequest. *\/$/ +REP_SYSTEM_LOCK ../dbinc/rep.h /^#define REP_SYSTEM_LOCK(dbenv) \\$/ +REP_SYSTEM_UNLOCK ../dbinc/rep.h /^#define REP_SYSTEM_UNLOCK(dbenv) \\$/ +REP_THROTTLE ../dbinc/rep.h /^} REP_THROTTLE;$/ +REP_THROTTLE_ONLY ../dbinc/rep.h /^#define REP_THROTTLE_ONLY 0x0001 \/* Send _MORE me/ +REP_UPDATE ../dbinc/rep.h /^#define REP_UPDATE 23 \/* Environment hotcopy info/ +REP_UPDATE_REQ ../dbinc/rep.h /^#define REP_UPDATE_REQ 24 \/* Request for hotcopy / +REP_VERIFY ../dbinc/rep.h /^#define REP_VERIFY 25 \/* A log record for verific/ +REP_VERIFY_FAIL ../dbinc/rep.h /^#define REP_VERIFY_FAIL 26 \/* The client is outda/ +REP_VERIFY_REQ ../dbinc/rep.h /^#define REP_VERIFY_REQ 27 \/* Request for a log re/ +REP_VOTE1 ../dbinc/rep.h /^#define REP_VOTE1 28 \/* Send out your information/ +REP_VOTE2 ../dbinc/rep.h /^#define REP_VOTE2 29 \/* Send a "you are master" v/ +REP_VOTE_INFO ../dbinc/rep.h /^} REP_VOTE_INFO;$/ +REP_VTALLY ../dbinc/rep.h /^} REP_VTALLY;$/ +RESET_MPF ../fileops/fop_util.c /^#define RESET_MPF(D, F) do { \\$/ RESET_RET_MEM ../dbinc/db_int.in /^#define RESET_RET_MEM(dbc) \\$/ +RESTORE_START ../btree/bt_compact.c /^#define RESTORE_START \\$/ RETRY_CHK ../dbinc/os.h /^#define RETRY_CHK(op, ret) do { \\$/ -RET_ERROR ../dbinc/db_185.in 58 +RETRY_CHK_EINTR_ONLY ../dbinc/os.h /^#define RETRY_CHK_EINTR_ONLY(op, ret) do { \\$/ +RETRY_Q_HEADER ../dbinc/repmgr.h /^typedef TAILQ_HEAD(__repmgr_retry_q, __repmgr_retr/ +RET_ERROR ../dbinc/db_185.in /^#define RET_ERROR -1 \/* Return values. *\/$/ +RET_SET ../mutex/mut_pthread.c /^#define RET_SET(f, ret) do { \\$/ 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 +RET_SPECIAL ../dbinc/db_185.in /^#define RET_SPECIAL 1$/ +RET_SUCCESS ../dbinc/db_185.in /^#define RET_SUCCESS 0$/ 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 25 -RMNAMESZ ../dbinc/xa.h 44 +RINTERNAL ../dbinc/db_page.h /^} RINTERNAL;$/ +RINTERNAL_PSIZE ../dbinc/db_page.h /^#define RINTERNAL_PSIZE \\$/ +RINTERNAL_SIZE ../dbinc/db_page.h /^#define RINTERNAL_SIZE \\$/ +RLOCK ../log/log_get.c /^typedef enum { L_ALREADY, L_ACQUIRED, L_NONE } RLO/ +RMNAMESZ ../dbinc/xa.h /^#define RMNAMESZ 32 \/* length of resource manage/ RPC_ON ../dbinc/db_int.in /^#define RPC_ON(dbenv) ((dbenv)->cl_handle != NULL/ -RPRINT ../dbinc/rep.h /^#define RPRINT(e, r, x) do { \\$/ -RSMSG ../db185/db185.c 522 +RPRINT ../dbinc/rep.h /^#define RPRINT(e, x) do { \\$/ +RSMSG ../db185/db185.c /^#define RSMSG \\$/ R_ADDR ../dbinc/region.h /^#define R_ADDR(reginfop, offset) \\$/ -R_CURSOR ../dbinc/db_185.in 93 -R_DUP ../dbinc/db_185.in 125 -R_FIRST ../dbinc/db_185.in 95 -R_FIXEDLEN ../dbinc/db_185.in 154 -R_IAFTER ../dbinc/db_185.in 96 -R_IBEFORE ../dbinc/db_185.in 97 -R_LAST ../dbinc/db_185.in 98 -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_CURSOR ../dbinc/db_185.in /^#define R_CURSOR 1 \/* del, put, seq *\/$/ +R_DUP ../dbinc/db_185.in /^#define R_DUP 0x01 \/* duplicate keys *\/$/ +R_FIRST ../dbinc/db_185.in /^#define R_FIRST 3 \/* seq *\/$/ +R_FIXEDLEN ../dbinc/db_185.in /^#define R_FIXEDLEN 0x01 \/* fixed-length records */ +R_IAFTER ../dbinc/db_185.in /^#define R_IAFTER 4 \/* put (RECNO) *\/$/ +R_IBEFORE ../dbinc/db_185.in /^#define R_IBEFORE 5 \/* put (RECNO) *\/$/ +R_LAST ../dbinc/db_185.in /^#define R_LAST 6 \/* seq (BTREE, RECNO) *\/$/ +R_NEXT ../dbinc/db_185.in /^#define R_NEXT 7 \/* seq *\/$/ +R_NOKEY ../dbinc/db_185.in /^#define R_NOKEY 0x02 \/* key not required *\/$/ +R_NOOVERWRITE ../dbinc/db_185.in /^#define R_NOOVERWRITE 8 \/* put *\/$/ R_OFFSET ../dbinc/region.h /^#define R_OFFSET(reginfop, 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 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 +R_PREV ../dbinc/db_185.in /^#define R_PREV 9 \/* seq (BTREE, RECNO) *\/$/ +R_RECNOSYNC ../dbinc/db_185.in /^#define R_RECNOSYNC 11 \/* sync (RECNO) *\/$/ +R_SETCURSOR ../dbinc/db_185.in /^#define R_SETCURSOR 10 \/* put (RECNO) *\/$/ +R_SNAPSHOT ../dbinc/db_185.in /^#define R_SNAPSHOT 0x04 \/* snapshot the input *\// +SALVAGE_HASH ../dbinc/db_verify.h /^#define SALVAGE_HASH 6$/ +SALVAGE_IGNORE ../dbinc/db_verify.h /^#define SALVAGE_IGNORE 1$/ +SALVAGE_INVALID ../dbinc/db_verify.h /^#define SALVAGE_INVALID 0$/ +SALVAGE_LBTREE ../dbinc/db_verify.h /^#define SALVAGE_LBTREE 5$/ +SALVAGE_LDUP ../dbinc/db_verify.h /^#define SALVAGE_LDUP 2$/ +SALVAGE_LRECNO ../dbinc/db_verify.h /^#define SALVAGE_LRECNO 7$/ +SALVAGE_LRECNODUP ../dbinc/db_verify.h /^#define SALVAGE_LRECNODUP 3$/ +SALVAGE_OVERFLOW ../dbinc/db_verify.h /^#define SALVAGE_OVERFLOW 4$/ +SALVAGE_PRINTABLE ../dbinc/db_verify.h /^#define SALVAGE_PRINTABLE 0x01 \/* Output printabl/ +SALVAGE_PRINTFOOTER ../dbinc/db_verify.h /^#define SALVAGE_PRINTFOOTER 0x04 \/* Print the unk/ +SALVAGE_PRINTHEADER ../dbinc/db_verify.h /^#define SALVAGE_PRINTHEADER 0x02 \/* Print the unk/ +SAVE_START ../btree/bt_compact.c /^#define SAVE_START \\$/ +SA_SKIPFIRSTKEY ../dbinc/db_verify.h /^#define SA_SKIPFIRSTKEY 0x00080000$/ +SELF_EID ../dbinc/repmgr.h /^#define SELF_EID INT_MAX$/ 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 261 -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)/ +SEQ_IS_OPEN ../sequence/sequence.c /^#define SEQ_IS_OPEN(seq) ((seq)->seq_key.data != N/ +SEQ_OPEN_FLAGS ../sequence/sequence.c /^#define SEQ_OPEN_FLAGS (DB_CREATE | DB_EXCL | DB_T/ +SEQ_SET_FLAGS ../sequence/sequence.c /^#define SEQ_SET_FLAGS (DB_SEQ_WRAP | DB_SEQ_INC | / +SEQ_SWAP ../sequence/sequence.c /^#define SEQ_SWAP(rp) \\$/ +SEQ_SWAP_IN ../sequence/sequence.c /^#define SEQ_SWAP_IN(seq) \\$/ +SEQ_SWAP_OUT ../sequence/sequence.c /^#define SEQ_SWAP_OUT(seq) \\$/ +SET_LOG_FLAGS ../txn/txn.c /^#define SET_LOG_FLAGS(dbenv, txn, 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 77 -SHALLOC_FRAGMENT ../env/db_salloc.c 192 -SHM_R ../os/os_oflags.c 136 -SHM_W ../os/os_oflags.c 139 +SHA1HANDSOFF ../hmac/sha1.c /^#define SHA1HANDSOFF$/ +SHA1_CTX ../dbinc/hmac.h /^} SHA1_CTX;$/ +SHALLOC_FRAGMENT ../env/db_salloc.c /^#define SHALLOC_FRAGMENT 32$/ +SHM_R ../os/os_map.c /^#define SHM_R 0400$/ +SHM_W ../os/os_map.c /^#define SHM_W 0200$/ SHOBJECT_LOCK ../dbinc/lock.h /^#define SHOBJECT_LOCK(lt, reg, shobj, ndx) \\$/ +SH_CHAIN_ENTRY ../dbinc/shqueue.h /^#define SH_CHAIN_ENTRY \\$/ +SH_CHAIN_HASNEXT ../dbinc/shqueue.h /^#define SH_CHAIN_HASNEXT(elm, field) ((elm)->field/ +SH_CHAIN_HASPREV ../dbinc/shqueue.h /^#define SH_CHAIN_HASPREV(elm, field) ((elm)->field/ +SH_CHAIN_INIT ../dbinc/shqueue.h /^#define SH_CHAIN_INIT(elm, field) \\$/ +SH_CHAIN_INSERT_AFTER ../dbinc/shqueue.h /^#define SH_CHAIN_INSERT_AFTER(listelm, elm, field,/ +SH_CHAIN_INSERT_BEFORE ../dbinc/shqueue.h /^#define SH_CHAIN_INSERT_BEFORE(listelm, elm, field/ +SH_CHAIN_NEXT ../dbinc/shqueue.h /^#define SH_CHAIN_NEXT(elm, field, type) (SH_CHAIN_/ +SH_CHAIN_NEXTP ../dbinc/shqueue.h /^#define SH_CHAIN_NEXTP(elm, field, type) \\$/ +SH_CHAIN_PREV ../dbinc/shqueue.h /^#define SH_CHAIN_PREV(elm, field, type) (SH_CHAIN_/ +SH_CHAIN_PREVP ../dbinc/shqueue.h /^#define SH_CHAIN_PREVP(elm, field, type) \\$/ +SH_CHAIN_REMOVE ../dbinc/shqueue.h /^#define SH_CHAIN_REMOVE(elm, field, type) do { / +SH_CHAIN_SINGLETON ../dbinc/shqueue.h /^#define SH_CHAIN_SINGLETON(elm, field) \\$/ +SH_DBT ../dbinc/lock.h /^} SH_DBT;$/ 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) \\$/ -SH_LIST_ENTRY ../dbinc/shqueue.h 49 +SH_LIST_ENTRY ../dbinc/shqueue.h /^#define SH_LIST_ENTRY \\$/ SH_LIST_FIRST ../dbinc/shqueue.h /^#define SH_LIST_FIRST(head, type) \\$/ SH_LIST_FIRSTP ../dbinc/shqueue.h /^#define SH_LIST_FIRSTP(head, type) \\$/ SH_LIST_FOREACH ../dbinc/shqueue.h /^#define SH_LIST_FOREACH(var, head, field, type) / @@ -1732,16 +1811,16 @@ SH_LIST_NEXT ../dbinc/shqueue.h /^#define SH_LIST_NEXT(elm, field, type) \\$ SH_LIST_NEXTP ../dbinc/shqueue.h /^#define SH_LIST_NEXTP(elm, field, type) \\$/ SH_LIST_NEXT_TO_PREV ../dbinc/shqueue.h /^#define SH_LIST_NEXT_TO_PREV(elm, field) \\$/ SH_LIST_PREV ../dbinc/shqueue.h /^#define SH_LIST_PREV(elm, field, type) \\$/ -SH_LIST_REMOVE ../dbinc/shqueue.h /^#define SH_LIST_REMOVE(elm, field, type) do { \\/ +SH_LIST_REMOVE ../dbinc/shqueue.h /^#define SH_LIST_REMOVE(elm, field, type) do { / SH_LIST_REMOVE_HEAD ../dbinc/shqueue.h /^#define SH_LIST_REMOVE_HEAD(head, field, type) do / SH_PTR_TO_OFF ../dbinc/shqueue.h /^#define SH_PTR_TO_OFF(src, dest) \\$/ SH_TAILQ_EMPTY ../dbinc/shqueue.h /^#define SH_TAILQ_EMPTY(head) \\$/ -SH_TAILQ_ENTRY ../dbinc/shqueue.h 179 +SH_TAILQ_ENTRY ../dbinc/shqueue.h /^#define SH_TAILQ_ENTRY \\$/ SH_TAILQ_FIRST ../dbinc/shqueue.h /^#define SH_TAILQ_FIRST(head, type) \\$/ SH_TAILQ_FIRSTP ../dbinc/shqueue.h /^#define SH_TAILQ_FIRSTP(head, type) \\$/ SH_TAILQ_FOREACH ../dbinc/shqueue.h /^#define SH_TAILQ_FOREACH(var, head, field, type) / SH_TAILQ_FOREACH_REVERSE ../dbinc/shqueue.h /^#define SH_TAILQ_FOREACH_REVERSE(var, head, field,/ -SH_TAILQ_HEAD ../dbinc/db_shash.h 14 +SH_TAILQ_HEAD ../dbinc/shqueue.h /^#define SH_TAILQ_HEAD(name) \\$/ SH_TAILQ_HEAD_INITIALIZER ../dbinc/shqueue.h /^#define SH_TAILQ_HEAD_INITIALIZER(head) \\$/ SH_TAILQ_INIT ../dbinc/shqueue.h /^#define SH_TAILQ_INIT(head) { \\$/ SH_TAILQ_INSERT_AFTER ../dbinc/shqueue.h /^#define SH_TAILQ_INSERT_AFTER(head, listelm, elm, / @@ -1749,13 +1828,17 @@ SH_TAILQ_INSERT_BEFORE ../dbinc/shqueue.h /^#define SH_TAILQ_INSERT_BEFORE(head, SH_TAILQ_INSERT_HEAD ../dbinc/shqueue.h /^#define SH_TAILQ_INSERT_HEAD(head, elm, field, typ/ SH_TAILQ_INSERT_TAIL ../dbinc/shqueue.h /^#define SH_TAILQ_INSERT_TAIL(head, elm, field) do / SH_TAILQ_LAST ../dbinc/shqueue.h /^#define SH_TAILQ_LAST(head, field, type) \\$/ +SH_TAILQ_LASTP ../dbinc/shqueue.h /^#define SH_TAILQ_LASTP(head, field, type) \\$/ SH_TAILQ_NEXT ../dbinc/shqueue.h /^#define SH_TAILQ_NEXT(elm, field, type) \\$/ SH_TAILQ_NEXTP ../dbinc/shqueue.h /^#define SH_TAILQ_NEXTP(elm, field, type) \\$/ SH_TAILQ_NEXT_TO_PREV ../dbinc/shqueue.h /^#define SH_TAILQ_NEXT_TO_PREV(elm, field) \\$/ -SH_TAILQ_PREV ../dbinc/shqueue.h /^#define SH_TAILQ_PREV(head, elm, field, type) \\/ +SH_TAILQ_PREV ../dbinc/shqueue.h /^#define SH_TAILQ_PREV(head, elm, field, type) / SH_TAILQ_PREVP ../dbinc/shqueue.h /^#define SH_TAILQ_PREVP(elm, field, type) \\$/ SH_TAILQ_REMOVE ../dbinc/shqueue.h /^#define SH_TAILQ_REMOVE(head, elm, field, type) do/ -SIZEOF_PAGE ../dbinc/db_page.h 252 +SITE_CONNECTED ../dbinc/repmgr.h /^#define SITE_CONNECTED 2$/ +SITE_FROM_EID ../dbinc/repmgr.h /^#define SITE_FROM_EID(eid) (&db_rep->sites[eid])$/ +SITE_IDLE ../dbinc/repmgr.h /^#define SITE_IDLE 1 \/* Waiting til time to retry/ +SIZEOF_PAGE ../dbinc/db_page.h /^#define SIZEOF_PAGE 26$/ SLIST_EMPTY ../dbinc/queue.h /^#define SLIST_EMPTY(head) ((head)->slh_first == NU/ SLIST_ENTRY ../dbinc/queue.h /^#define SLIST_ENTRY(type) \\$/ SLIST_FIRST ../dbinc/queue.h /^#define SLIST_FIRST(head) ((head)->slh_first)$/ @@ -1769,10 +1852,34 @@ SLIST_INSERT_HEAD ../dbinc/queue.h /^#define SLIST_INSERT_HEAD(head, elm, field) SLIST_NEXT ../dbinc/queue.h /^#define SLIST_NEXT(elm, field) ((elm)->field.sle_n/ SLIST_REMOVE ../dbinc/queue.h /^#define SLIST_REMOVE(head, elm, type, field) do { / SLIST_REMOVE_HEAD ../dbinc/queue.h /^#define SLIST_REMOVE_HEAD(head, field) do { \\$/ +SOCKET_ERROR ../dbinc/repmgr.h /^#define SOCKET_ERROR -1$/ SORTED_SET ../db/db_join.c /^#define SORTED_SET(jc, n) ((jc)->j_curslist[(n)]/ -SPLITNEW ../dbinc/hash.h 133 -SPLITOLD ../dbinc/hash.h 132 -SPL_NRECS ../dbinc/btree.h 69 +SPLITNEW ../dbinc/hash.h /^#define SPLITNEW 0x90$/ +SPLITOLD ../dbinc/hash.h /^#define SPLITOLD 0x80$/ +SPL_NRECS ../dbinc/btree.h /^#define SPL_NRECS 0x01 \/* Split tree has record / +SR_APPEND ../dbinc/btree.h /^#define SR_APPEND 0x00040 \/* Append to the tree./ +SR_DEL ../dbinc/btree.h /^#define SR_DEL 0x40000 \/* Get the tree to delet/ +SR_DELETE ../dbinc/btree.h /^#define SR_DELETE \\$/ +SR_DELNO ../dbinc/btree.h /^#define SR_DELNO 0x00080 \/* Don't return deleted/ +SR_DUPFIRST ../dbinc/btree.h /^#define SR_DUPFIRST 0x00100 \/* Return first dupl/ +SR_DUPLAST ../dbinc/btree.h /^#define SR_DUPLAST 0x00200 \/* Return last duplic/ +SR_EXACT ../dbinc/btree.h /^#define SR_EXACT 0x00400 \/* Exact items only. */ +SR_FIND ../dbinc/btree.h /^#define SR_FIND (SR_READ | SR_DUPFIRST | SR_DELNO/ +SR_FIND_WR ../dbinc/btree.h /^#define SR_FIND_WR (SR_WRITE | SR_DUPFIRST | SR_DE/ +SR_INSERT ../dbinc/btree.h /^#define SR_INSERT (SR_WRITE | SR_DUPLAST | SR_PAST/ +SR_KEYFIRST ../dbinc/btree.h /^#define SR_KEYFIRST (SR_WRITE | SR_DUPFIRST | SR_P/ +SR_KEYLAST ../dbinc/btree.h /^#define SR_KEYLAST (SR_WRITE | SR_DUPLAST | SR_PAS/ +SR_MAX ../dbinc/btree.h /^#define SR_MAX 0x08000 \/* Get the right most ke/ +SR_MIN ../dbinc/btree.h /^#define SR_MIN 0x10000 \/* Get the left most key/ +SR_NEXT ../dbinc/btree.h /^#define SR_NEXT 0x20000 \/* Get the page after t/ +SR_PARENT ../dbinc/btree.h /^#define SR_PARENT 0x00800 \/* Lock page pair. *\// +SR_PAST_EOF ../dbinc/btree.h /^#define SR_PAST_EOF 0x02000 \/* If doing insert s/ +SR_READ ../dbinc/btree.h /^#define SR_READ 0x00001 \/* Read locks. *\/$/ +SR_STACK ../dbinc/btree.h /^#define SR_STACK 0x01000 \/* Need a complete stac/ +SR_START ../dbinc/btree.h /^#define SR_START 0x80000 \/* Level to start stack/ +SR_STK_ONLY ../dbinc/btree.h /^#define SR_STK_ONLY 0x04000 \/* Just return info / +SR_WRITE ../dbinc/btree.h /^#define SR_WRITE 0x00002 \/* Write locks. *\/$/ +SR_WRPAIR ../dbinc/btree.h /^#define SR_WRPAIR (SR_WRITE | SR_DUPLAST | SR_PAST/ 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, ret) { \\$/ @@ -1790,59 +1897,57 @@ STAILQ_INSERT_TAIL ../dbinc/queue.h /^#define STAILQ_INSERT_TAIL(head, elm, fiel STAILQ_LAST ../dbinc/queue.h /^#define STAILQ_LAST(head, type, field) \\$/ STAILQ_NEXT ../dbinc/queue.h /^#define STAILQ_NEXT(elm, field) ((elm)->field.stqe/ 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 ../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)/ 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_POINTER ../dbinc/db_int.in /^#define STAT_POINTER(msg, v) \\$/ 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 +STDERR_FILENO ../clib/snprintf.c /^#define STDERR_FILENO 2$/ 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 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 +STK_CLRDBC ../dbinc/btree.h /^#define STK_CLRDBC 0x01 \/* Clear dbc->page refer/ +STK_NOLOCK ../dbinc/btree.h /^#define STK_NOLOCK 0x02 \/* Don't retain locks. */ +STK_PGONLY ../dbinc/btree.h /^#define STK_PGONLY 0x04$/ +STRIP_AUTO_COMMIT ../dbinc/db_am.h /^#define STRIP_AUTO_COMMIT(f) FLD_CLR((f), DB_AUTO_/ +ST_DUPOK ../dbinc/db_verify.h /^#define ST_DUPOK 0x00010000 \/* Duplicates are acc/ +ST_DUPSET ../dbinc/db_verify.h /^#define ST_DUPSET 0x00020000 \/* Subtree is in a d/ +ST_DUPSORT ../dbinc/db_verify.h /^#define ST_DUPSORT 0x00040000 \/* Duplicates are s/ +ST_IS_RECNO ../dbinc/db_verify.h /^#define ST_IS_RECNO 0x00080000 \/* Subtree is a re/ +ST_OVFL_LEAF ../dbinc/db_verify.h /^#define ST_OVFL_LEAF 0x00100000 \/* Overflow reffe/ +ST_RECNUM ../dbinc/db_verify.h /^#define ST_RECNUM 0x00200000 \/* Subtree has recor/ +ST_RELEN ../dbinc/db_verify.h /^#define ST_RELEN 0x00400000 \/* Subtree has fixed-/ +ST_TOPLEVEL ../dbinc/db_verify.h /^#define ST_TOPLEVEL 0x00800000 \/* Subtree == enti/ 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 31 -SWIG_JavaThrowException ../libdb_java/db_java_wrap.c /^static void SWIG_JavaThrowException(JNIEnv *jenv, / -SWIG_NOINCLUDE ../libdb_java/db_java_wrap.c 75 +SWAP_IF_NEEDED ../dbinc/db_am.h /^#define SWAP_IF_NEEDED(sdbp, pkey) \\$/ +SWIGEXPORT ../libdb_java/db_java_wrap.c /^# define SWIGEXPORT$/ +SWIGINLINE ../libdb_java/db_java_wrap.c /^# define SWIGINLINE inline$/ +SWIGINTERN ../libdb_java/db_java_wrap.c /^# define SWIGINTERN static SWIGUNUSED$/ +SWIGINTERNINLINE ../libdb_java/db_java_wrap.c /^# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE$/ +SWIGSTDCALL ../libdb_java/db_java_wrap.c /^# define SWIGSTDCALL __stdcall$/ +SWIGTEMPLATEDISAMBIGUATOR ../libdb_java/db_java_wrap.c /^# define SWIGTEMPLATEDISAMBIGUATOR template$/ +SWIGUNUSED ../libdb_java/db_java_wrap.c /^# define SWIGUNUSED __attribute__ ((__unused__/ +SWIGUNUSEDPARM ../libdb_java/db_java_wrap.c /^# define SWIGUNUSEDPARM(p)$/ +SWIG_JavaExceptionCodes ../libdb_java/db_java_wrap.c /^} SWIG_JavaExceptionCodes;$/ +SWIG_JavaExceptions_t ../libdb_java/db_java_wrap.c /^} SWIG_JavaExceptions_t;$/ +SWIG_JavaThrowException ../libdb_java/db_java_wrap.c /^static void SWIGUNUSED SWIG_JavaThrowException(JNI/ +SWIG_NOINCLUDE ../libdb_java/db_java_wrap.c /^#define SWIG_NOINCLUDE 1$/ 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 -S_DUPFIRST ../dbinc/btree.h 105 -S_DUPLAST ../dbinc/btree.h 106 -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 74 -S_IROTH ../os/os_oflags.c 80 -S_IRUSR ../os/os_oflags.c 68 +S_IRGRP ../os/os_oflags.c /^#define S_IRGRP 0 \/* R for group *\/$/ +S_IROTH ../os/os_oflags.c /^#define S_IROTH 0 \/* R for other *\/$/ +S_IRUSR ../os/os_oflags.c /^#define S_IRUSR S_IREAD \/* R for owner *\/$/ S_ISDIR ../os/os_stat.c /^#define S_ISDIR(m) (_S_IFDIR & (m))$/ -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 -S_PAST_EOF ../dbinc/btree.h 110 -S_READ ../dbinc/btree.h 100 -S_STACK ../dbinc/btree.h 109 -S_STK_ONLY ../dbinc/btree.h 115 -S_WRITE ../dbinc/btree.h 101 -S_WRPAIR ../dbinc/btree.h 123 +S_IWGRP ../os/os_oflags.c /^#define S_IWGRP 0 \/* W for group *\/$/ +S_IWOTH ../os/os_oflags.c /^#define S_IWOTH 0 \/* W for other *\/$/ +S_IWUSR ../os/os_oflags.c /^#define S_IWUSR S_IWRITE \/* W for owner *\/$/ +S_IXGRP ../os/os_oflags.c /^#define S_IXGRP 0 \/* X for group *\/$/ +S_IXOTH ../os/os_oflags.c /^#define S_IXOTH 0 \/* X for other *\/$/ +S_IXUSR ../os/os_oflags.c /^#define S_IXUSR 0 \/* X for owner *\/$/ TAILQ_CONCAT ../dbinc/queue.h /^#define TAILQ_CONCAT(head1, head2, field) do { / TAILQ_EMPTY ../dbinc/queue.h /^#define TAILQ_EMPTY(head) ((head)->tqh_first == NU/ TAILQ_ENTRY ../dbinc/queue.h /^#define TAILQ_ENTRY(type) \\$/ @@ -1860,190 +1965,213 @@ 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 3467 -TEMPERING_MASK_B ../crypto/mersenne/mt19937db.c 44 -TEMPERING_MASK_C ../crypto/mersenne/mt19937db.c 45 +TCLDB_EVENTITEMS ../tcl/tcl_internal.c /^#define TCLDB_EVENTITEMS 2 \/* Event name and any / +TCLDB_MAXREPFLAGS ../tcl/tcl_db_pkg.c /^#define TCLDB_MAXREPFLAGS 32$/ +TCLDB_SENDEVENT ../tcl/tcl_internal.c /^#define TCLDB_SENDEVENT 2$/ +TCLDB_SENDITEMS ../tcl/tcl_db_pkg.c /^#define TCLDB_SENDITEMS 7$/ +TEMPERING_MASK_B ../crypto/mersenne/mt19937db.c /^#define TEMPERING_MASK_B 0x9d2c5680$/ +TEMPERING_MASK_C ../crypto/mersenne/mt19937db.c /^#define TEMPERING_MASK_C 0xefc60000$/ 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) \\$/ +TESTDIR ../mutex/tm.c /^#define TESTDIR "TESTDIR" \/* Working area *\/$/ +THREAD_INFO ../dbinc/db_int.in /^} THREAD_INFO;$/ +TIMESTAMP_CHECK ../rep/rep_util.c /^#define TIMESTAMP_CHECK(dbenv, ts, renv) do { / 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 -TMENDRSCAN ../dbinc/xa.h 104 -TMER_INVAL ../dbinc/xa.h 122 -TMER_PROTO ../dbinc/xa.h 123 -TMER_TMERR ../dbinc/xa.h 120 -TMFAIL ../dbinc/xa.h 93 -TMJOIN ../dbinc/xa.h 107 -TMMIGRATE ../dbinc/xa.h 109 -TMMULTIPLE ../dbinc/xa.h 105 -TMNOFLAGS ../dbinc/xa.h 78 -TMNOMIGRATE ../dbinc/xa.h 82 -TMNOWAIT ../dbinc/xa.h 95 -TMONEPHASE ../dbinc/xa.h 91 -TMREGISTER ../dbinc/xa.h 80 -TMRESUME ../dbinc/xa.h 97 -TMSTARTRSCAN ../dbinc/xa.h 103 -TMSUCCESS ../dbinc/xa.h 99 -TMSUSPEND ../dbinc/xa.h 101 -TMUSEASYNC ../dbinc/xa.h 84 -TM_JOIN ../dbinc/xa.h 115 -TM_OK ../dbinc/xa.h 119 -TM_RESUME ../dbinc/xa.h 117 -TRACEBUF ../dbinc/queue.h 193 +TM ../mutex/tm.c /^} TM;$/ +TMASYNC ../dbinc/xa.h /^#define TMASYNC 0x80000000L \/* perform routine a/ +TMENDRSCAN ../dbinc/xa.h /^#define TMENDRSCAN 0x00800000L \/* end a recovery / +TMER_INVAL ../dbinc/xa.h /^#define TMER_INVAL -2 \/* invalid arguments were / +TMER_PROTO ../dbinc/xa.h /^#define TMER_PROTO -3 \/* routine invoked in an i/ +TMER_TMERR ../dbinc/xa.h /^#define TMER_TMERR -1 \/* an error occurred in th/ +TMFAIL ../dbinc/xa.h /^#define TMFAIL 0x20000000L \/* dissociates caller/ +TMJOIN ../dbinc/xa.h /^#define TMJOIN 0x00200000L \/* caller is joining / +TMMIGRATE ../dbinc/xa.h /^#define TMMIGRATE 0x00100000L \/* caller intends t/ +TMMULTIPLE ../dbinc/xa.h /^#define TMMULTIPLE 0x00400000L \/* wait for any as/ +TMNOFLAGS ../dbinc/xa.h /^#define TMNOFLAGS 0x00000000L \/* no resource mana/ +TMNOMIGRATE ../dbinc/xa.h /^#define TMNOMIGRATE 0x00000002L \/* resource manag/ +TMNOWAIT ../dbinc/xa.h /^#define TMNOWAIT 0x10000000L \/* return if blockin/ +TMONEPHASE ../dbinc/xa.h /^#define TMONEPHASE 0x40000000L \/* caller is using/ +TMREGISTER ../dbinc/xa.h /^#define TMREGISTER 0x00000001L \/* resource manage/ +TMRESUME ../dbinc/xa.h /^#define TMRESUME 0x08000000L \/* caller is resumin/ +TMSTARTRSCAN ../dbinc/xa.h /^#define TMSTARTRSCAN 0x01000000L \/* start a recov/ +TMSUCCESS ../dbinc/xa.h /^#define TMSUCCESS 0x04000000L \/* dissociate calle/ +TMSUSPEND ../dbinc/xa.h /^#define TMSUSPEND 0x02000000L \/* caller is suspen/ +TMUSEASYNC ../dbinc/xa.h /^#define TMUSEASYNC 0x00000004L \/* resource manage/ +TM_JOIN ../dbinc/xa.h /^#define TM_JOIN 2 \/* caller is joining existing/ +TM_OK ../dbinc/xa.h /^#define TM_OK 0 \/* normal execution *\/$/ +TM_RESUME ../dbinc/xa.h /^#define TM_RESUME 1 \/* caller is resuming associ/ +TRACEBUF ../dbinc/queue.h /^#define TRACEBUF struct qm_trace trace;$/ 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 814 -TXNLIST_NEW ../dbinc/db_dispatch.h 101 -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 898 -TXN_COMMIT ../dbinc/txn.h 205 -TXN_COMMITTED ../dbinc/txn.h 49 -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 25 -TXN_EVENT_T ../dbinc/txn.h 21 -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 903 -TXN_MAINT_SIZE ../dbinc/txn.h 120 -TXN_MALLOC ../dbinc/db.in 904 -TXN_MAXIMUM ../dbinc/txn.h 31 -TXN_MINIMUM ../dbinc/txn.h 30 -TXN_NOSYNC ../dbinc/db.in 905 -TXN_NOWAIT ../dbinc/db.in 906 -TXN_OK ../dbinc/txn.h 204 +TRUE ../dbinc/db_int.in /^#define TRUE (!FALSE)$/ +TXN2JDBENV ../libdb_java/db_java_wrap.c /^#define TXN2JDBENV ((jobject)DB_ENV_INTERNAL(arg1-/ +TXN_ABORT ../dbinc/txn.h /^#define TXN_ABORT 3$/ +TXN_ABORTED ../dbinc/db.in /^#define TXN_ABORTED 1$/ +TXN_CDSGROUP ../dbinc/db.in /^#define TXN_CDSGROUP 0x0002 \/* CDS group handle./ +TXN_CHILDCOMMIT ../dbinc/db.in /^#define TXN_CHILDCOMMIT 0x0001 \/* Txn has commit/ +TXN_COMMIT ../dbinc/txn.h /^#define TXN_COMMIT 1$/ +TXN_COMMITTED ../dbinc/db.in /^#define TXN_COMMITTED 2$/ +TXN_COMPENSATE ../dbinc/db.in /^#define TXN_COMPENSATE 0x0004 \/* Compensating tr/ +TXN_DEADLOCK ../dbinc/db.in /^#define TXN_DEADLOCK 0x0008 \/* Txn has deadlocke/ +TXN_DETAIL ../dbinc/txn.h /^} TXN_DETAIL;$/ +TXN_DTL_COLLECTED ../dbinc/txn.h /^#define TXN_DTL_COLLECTED 0x1 \/* collected during/ +TXN_DTL_INMEMORY ../dbinc/txn.h /^#define TXN_DTL_INMEMORY 0x4 \/* uses in memory lo/ +TXN_DTL_RESTORED ../dbinc/txn.h /^#define TXN_DTL_RESTORED 0x2 \/* prepared txn rest/ +TXN_EVENT ../txn/txn_util.c /^typedef struct __txn_event TXN_EVENT;$/ +TXN_EVENT_T ../dbinc/txn.h /^} TXN_EVENT_T;$/ +TXN_EXPECTED ../dbinc/txn.h /^#define TXN_EXPECTED 5$/ +TXN_IGNORE ../dbinc/txn.h /^#define TXN_IGNORE 4$/ +TXN_INVALID ../dbinc/txn.h /^#define TXN_INVALID 0 \/* Invalid transaction ID./ +TXN_IN_RECOVERY ../dbinc/txn.h /^#define TXN_IN_RECOVERY 0x01 \/* environment is / +TXN_LOCKTIMEOUT ../dbinc/db.in /^#define TXN_LOCKTIMEOUT 0x0010 \/* Txn has a lock/ +TXN_MALLOC ../dbinc/db.in /^#define TXN_MALLOC 0x0020 \/* Structure allocated/ +TXN_MAXIMUM ../dbinc/txn.h /^#define TXN_MAXIMUM 0xffffffff \/* Maximum number / +TXN_MINIMUM ../dbinc/txn.h /^#define TXN_MINIMUM 0x80000000$/ +TXN_NOSYNC ../dbinc/db.in /^#define TXN_NOSYNC 0x0040 \/* Do not sync on prep/ +TXN_NOWAIT ../dbinc/db.in /^#define TXN_NOWAIT 0x0080 \/* Do not wait on lock/ +TXN_OK ../dbinc/txn.h /^#define TXN_OK 0$/ TXN_ON ../dbinc/db_int.in /^#define TXN_ON(dbenv) ((dbenv)->tx_handle != NULL/ -TXN_PREPARE ../dbinc/txn.h 206 -TXN_PREPARED ../dbinc/txn.h 48 -TXN_RESTORED ../dbinc/db.in 907 -TXN_RUNNING ../dbinc/txn.h 46 -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 -TXN_XA_PREPARED ../dbinc/txn.h 60 -TXN_XA_STARTED ../dbinc/txn.h 61 -TXN_XA_SUSPENDED ../dbinc/txn.h 62 +TXN_PREPARE ../dbinc/txn.h /^#define TXN_PREPARE 2$/ +TXN_PREPARED ../dbinc/db.in /^#define TXN_PREPARED 3$/ +TXN_PRIVATE ../dbinc/db.in /^#define TXN_PRIVATE 0x0100 \/* Txn owned by curso/ +TXN_READ_COMMITTED ../dbinc/db.in /^#define TXN_READ_COMMITTED 0x0200 \/* Txn has degr/ +TXN_READ_UNCOMMITTED ../dbinc/db.in /^#define TXN_READ_UNCOMMITTED 0x0400 \/* Txn has de/ +TXN_RESTORED ../dbinc/db.in /^#define TXN_RESTORED 0x0800 \/* Txn has been rest/ +TXN_RUNNING ../dbinc/db.in /^#define TXN_RUNNING 4$/ +TXN_SNAPSHOT ../dbinc/db.in /^#define TXN_SNAPSHOT 0x1000 \/* Snapshot Isolatio/ +TXN_SYNC ../dbinc/db.in /^#define TXN_SYNC 0x2000 \/* Write and sync on pre/ +TXN_SYNC_FLAGS ../dbinc/db.in /^#define TXN_SYNC_FLAGS (TXN_SYNC | TXN_NOSYNC | TX/ +TXN_SYSTEM_LOCK ../dbinc/txn.h /^#define TXN_SYSTEM_LOCK(dbenv) \\$/ +TXN_SYSTEM_UNLOCK ../dbinc/txn.h /^#define TXN_SYSTEM_UNLOCK(dbenv) \\$/ +TXN_UNEXPECTED ../dbinc/txn.h /^#define TXN_UNEXPECTED 6$/ +TXN_WRITE_NOSYNC ../dbinc/db.in /^#define TXN_WRITE_NOSYNC 0x4000 \/* Write only on / +TXN_XA_ABORTED ../dbinc/db.in /^#define TXN_XA_ABORTED 1$/ +TXN_XA_DEADLOCKED ../dbinc/db.in /^#define TXN_XA_DEADLOCKED 2$/ +TXN_XA_ENDED ../dbinc/db.in /^#define TXN_XA_ENDED 3$/ +TXN_XA_PREPARED ../dbinc/db.in /^#define TXN_XA_PREPARED 4$/ +TXN_XA_STARTED ../dbinc/db.in /^#define TXN_XA_STARTED 5$/ +TXN_XA_SUSPENDED ../dbinc/db.in /^#define TXN_XA_SUSPENDED 6$/ 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_MAX ../dbinc/db_int.in 39 +UINT16_MAX ../dbinc/db_int.in /^#define UINT16_MAX 65535 \/* Maximum 16-bit unsig/ UINT32_CMP ../lock/lock_list.c /^#define UINT32_CMP(A, B) ((A) == (B) ? 0 : ((A) > / -UINT32_MAX ../dbinc/db_int.in 43 -UINT64_FMT ../dbinc/db_int.in 60 -UINT64_MAX ../dbinc/db_int.in 57 +UINT32_MAX ../dbinc/db_int.in /^#define UINT32_MAX 4294967295U \/* Maximum 32-bit / +UINT64_MAX ../dbinc/db_int.in /^#define UINT64_MAX _UI64_MAX$/ 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 40 -UPREFIX ../clib/strerror.c 55 -USEC_PER_MS ../dbinc/db_int.in 80 -VERIFY_FLAGS ../db/db_vrfy.c 65 -VRFY_CHILDINFO ../dbinc/db_int.in 529 -VRFY_DBINFO ../dbinc/db_int.in 530 -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 531 -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 -XAER_INVAL ../dbinc/xa.h 169 -XAER_NOTA ../dbinc/xa.h 168 -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 174 -XA_H ../dbinc/xa.h 15 -XA_HEURCOM ../dbinc/xa.h 152 -XA_HEURHAZ ../dbinc/xa.h 150 -XA_HEURMIX ../dbinc/xa.h 156 -XA_HEURRB ../dbinc/xa.h 154 -XA_NOMIGRATE ../dbinc/xa.h 148 -XA_OK ../dbinc/xa.h 163 -XA_RBBASE ../dbinc/xa.h 129 -XA_RBCOMMFAIL ../dbinc/xa.h 133 -XA_RBDEADLOCK ../dbinc/xa.h 135 -XA_RBEND ../dbinc/xa.h 146 -XA_RBINTEGRITY ../dbinc/xa.h 136 -XA_RBOTHER ../dbinc/xa.h 139 -XA_RBPROTO ../dbinc/xa.h 142 -XA_RBROLLBACK ../dbinc/xa.h 131 -XA_RBTIMEOUT ../dbinc/xa.h 144 -XA_RBTRANSIENT ../dbinc/xa.h 145 -XA_RDONLY ../dbinc/xa.h 161 -XA_RETRY ../dbinc/xa.h 159 -XID ../dbinc/xa.h 30 -XIDDATASIZE ../dbinc/xa.h 20 +UNLOCK_MUTEX ../dbinc/repmgr.h /^#define UNLOCK_MUTEX(m) do { \\$/ +UPPER_MASK ../crypto/mersenne/mt19937db.c /^#define UPPER_MASK 0x80000000 \/* most significant/ +USEC_PER_MS ../dbinc/db_int.in /^#define USEC_PER_MS 1000 \/* Microseconds in a mi/ +VERIFY_FLAGS ../db/db_vrfy.c /^#define VERIFY_FLAGS \\$/ +VISIBLE_LSN ../dbinc/mp.h /^#define VISIBLE_LSN(dbenv, bhp) \\$/ +VM_PAGESIZE ../dbinc/mp.h /^#define VM_PAGESIZE 4096$/ +VRFY_CHILDINFO ../dbinc/db_int.in /^struct __vrfy_childinfo;typedef struct __vrfy_chil/ +VRFY_DBINFO ../dbinc/db_int.in /^struct __vrfy_dbinfo; typedef struct __vrfy_dbin/ +VRFY_DUPS_UNSORTED ../dbinc/db_verify.h /^#define VRFY_DUPS_UNSORTED 0x0001 \/* Have to flag/ +VRFY_HAS_CHKSUM ../dbinc/db_verify.h /^#define VRFY_HAS_CHKSUM 0x0002$/ +VRFY_HAS_DUPS ../dbinc/db_verify.h /^#define VRFY_HAS_DUPS 0x0004$/ +VRFY_HAS_DUPSORT ../dbinc/db_verify.h /^#define VRFY_HAS_DUPSORT 0x0008 \/* Has the flag s/ +VRFY_HAS_RECNUMS ../dbinc/db_verify.h /^#define VRFY_HAS_RECNUMS 0x0010$/ +VRFY_HAS_SUBDBS ../dbinc/db_verify.h /^#define VRFY_HAS_SUBDBS 0x0020$/ +VRFY_INCOMPLETE ../dbinc/db_verify.h /^#define VRFY_INCOMPLETE 0x0040 \/* Meta or item o/ +VRFY_IS_ALLZEROES ../dbinc/db_verify.h /^#define VRFY_IS_ALLZEROES 0x0080 \/* Hash page we / +VRFY_IS_FIXEDLEN ../dbinc/db_verify.h /^#define VRFY_IS_FIXEDLEN 0x0100$/ +VRFY_IS_RECNO ../dbinc/db_verify.h /^#define VRFY_IS_RECNO 0x0200$/ +VRFY_IS_RRECNO ../dbinc/db_verify.h /^#define VRFY_IS_RRECNO 0x0400$/ +VRFY_ITEM ../btree/bt_verify.c /^typedef enum { VRFY_ITEM_NOTSET=0, VRFY_ITEM_BEGIN/ +VRFY_LEAFCHAIN_BROKEN ../dbinc/db_verify.h /^#define VRFY_LEAFCHAIN_BROKEN 0x08 \/* Lost one or/ +VRFY_OVFL_LEAFSEEN ../dbinc/db_verify.h /^#define VRFY_OVFL_LEAFSEEN 0x0800$/ +VRFY_PAGEINFO ../dbinc/db_int.in /^struct __vrfy_pageinfo; typedef struct __vrfy_page/ +VRFY_QMETA_SET ../dbinc/db_verify.h /^#define VRFY_QMETA_SET 0x10 \/* We've seen a Q/ +V_DUPLICATE ../dbinc/db_verify.h /^#define V_DUPLICATE 1 \/* off-page dup metadata */ +V_OVERFLOW ../dbinc/db_verify.h /^#define V_OVERFLOW 2 \/* overflow page *\/$/ +V_RECNO ../dbinc/db_verify.h /^#define V_RECNO 3 \/* btree internal or leaf pag/ +WAITER_SLOT_IN_USE ../repmgr/repmgr_windows.c /^#define WAITER_SLOT_IN_USE(w) ((w)->lsnp != NULL)$/ +WOULDBLOCK ../dbinc/repmgr.h /^#define WOULDBLOCK WSAEWOULDBLOCK$/ +WRAPPED_CLASS ../dbinc/cxx_int.h /^\/\/$/ +XAER_ASYNC ../dbinc/xa.h /^#define XAER_ASYNC -2 \/* asynchronous operation / +XAER_DUPID ../dbinc/xa.h /^#define XAER_DUPID -8 \/* the XID already exists / +XAER_INVAL ../dbinc/xa.h /^#define XAER_INVAL -5 \/* invalid arguments were / +XAER_NOTA ../dbinc/xa.h /^#define XAER_NOTA -4 \/* the XID is not valid *\// +XAER_OUTSIDE ../dbinc/xa.h /^#define XAER_OUTSIDE -9 \/* resource manager doin/ +XAER_PROTO ../dbinc/xa.h /^#define XAER_PROTO -6 \/* routine invoked in an i/ +XAER_RMERR ../dbinc/xa.h /^#define XAER_RMERR -3 \/* a resource manager erro/ +XAER_RMFAIL ../dbinc/xa.h /^#define XAER_RMFAIL -7 \/* resource manager unava/ +XA_FLAGS ../xa/xa.c /^#define XA_FLAGS \\$/ +XA_HEURCOM ../dbinc/xa.h /^#define XA_HEURCOM 7 \/* the transaction branch h/ +XA_HEURHAZ ../dbinc/xa.h /^#define XA_HEURHAZ 8 \/* the transaction branch m/ +XA_HEURMIX ../dbinc/xa.h /^#define XA_HEURMIX 5 \/* the transaction branch h/ +XA_HEURRB ../dbinc/xa.h /^#define XA_HEURRB 6 \/* the transaction branch ha/ +XA_METHODS ../xa/xa_db.c /^} XA_METHODS;$/ +XA_NOMIGRATE ../dbinc/xa.h /^#define XA_NOMIGRATE 9 \/* resumption must occur / +XA_OK ../dbinc/xa.h /^#define XA_OK 0 \/* normal execution *\/$/ +XA_RBBASE ../dbinc/xa.h /^#define XA_RBBASE 100 \/* The inclusive lower bou/ +XA_RBCOMMFAIL ../dbinc/xa.h /^#define XA_RBCOMMFAIL XA_RBBASE+1 \/* The rollback/ +XA_RBDEADLOCK ../dbinc/xa.h /^#define XA_RBDEADLOCK XA_RBBASE+2 \/* A deadlock w/ +XA_RBEND ../dbinc/xa.h /^#define XA_RBEND XA_RBTRANSIENT \/* The inclusive / +XA_RBINTEGRITY ../dbinc/xa.h /^#define XA_RBINTEGRITY XA_RBBASE+3 \/* A condition/ +XA_RBOTHER ../dbinc/xa.h /^#define XA_RBOTHER XA_RBBASE+4 \/* The resource ma/ +XA_RBPROTO ../dbinc/xa.h /^#define XA_RBPROTO XA_RBBASE+5 \/* A protocol erro/ +XA_RBROLLBACK ../dbinc/xa.h /^#define XA_RBROLLBACK XA_RBBASE \/* The rollback w/ +XA_RBTIMEOUT ../dbinc/xa.h /^#define XA_RBTIMEOUT XA_RBBASE+6 \/* A transaction/ +XA_RBTRANSIENT ../dbinc/xa.h /^#define XA_RBTRANSIENT XA_RBBASE+7 \/* May retry t/ +XA_RDONLY ../dbinc/xa.h /^#define XA_RDONLY 3 \/* the transaction branch wa/ +XA_RETRY ../dbinc/xa.h /^#define XA_RETRY 4 \/* routine returned with no e/ +XID ../dbinc/xa.h /^typedef struct xid_t XID;$/ +XIDDATASIZE ../dbinc/xa.h /^#define XIDDATASIZE 128 \/* size in bytes *\/$/ +XID_FIELD_IS_SET ../txn/txn_stat.c /^#define XID_FIELD_IS_SET(p) \\$/ 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 273 -_CXX_INT_H_ ../dbinc/cxx_int.h 11 +ZF_LARGE_WRITE ../os/os_fzero.c /^#define ZF_LARGE_WRITE (64 * 1024)$/ +_CRT_SECURE_NO_DEPRECATE ../libdb_java/db_java_wrap.c /^# define _CRT_SECURE_NO_DEPRECATE$/ _CopyObjBytes ../tcl/tcl_internal.c /^_CopyObjBytes(interp, obj, newp, sizep, freep)$/ -_DB_185_H_ ../dbinc/db_185.in 39 -_DB_AM_H_ ../dbinc/db_am.h 10 -_DB_BTREE_H_ ../dbinc/btree.h 45 -_DB_CRYPTO_H_ ../dbinc/crypto.h 11 -_DB_CXX_H_ ../dbinc/db_cxx.in 11 -_DB_DEBUG_H_ ../dbinc/debug.h 11 -_DB_DISPATCH_H_ ../dbinc/db_dispatch.h 39 -_DB_HASH_H_ ../dbinc/hash.h 46 -_DB_HMAC_H_ ../dbinc/hmac.h 11 -_DB_H_ ../dbinc/db.in 22 -_DB_INTERNAL_H_ ../dbinc/db_int.in 11 -_DB_JOIN_H_ ../dbinc/db_join.h 11 -_DB_LOCK_H_ ../dbinc/lock.h 11 -_DB_MP_H_ ../dbinc/mp.h 11 -_DB_MUTEX_H_ ../dbinc/mutex.h 11 -_DB_OS_H_ ../dbinc/os.h 11 -_DB_PAGE_H_ ../dbinc/db_page.h 11 -_DB_QAM_H_ ../dbinc/qam.h 11 -_DB_QUEUE_H_ ../dbinc/queue.h 39 -_DB_REGION_H_ ../dbinc/region.h 11 -_DB_SERVER_INT_H_ ../dbinc/db_server_int.h 11 -_DB_SHASH_H_ ../dbinc/db_shash.h 11 -_DB_SWAP_H_ ../dbinc/db_swap.h 39 -_DB_TCL_DB_H_ ../dbinc/tcl_db.h 11 -_DB_UPGRADE_H_ ../dbinc/db_upgrade.h 11 -_DB_VERIFY_H_ ../dbinc/db_verify.h 11 +_DB_185_H_ ../dbinc/db_185.in /^#define _DB_185_H_$/ +_DB_AM_H_ ../dbinc/db_am.h /^#define _DB_AM_H_$/ +_DB_BTREE_H_ ../dbinc/btree.h /^#define _DB_BTREE_H_$/ +_DB_CRYPTO_H_ ../dbinc/crypto.h /^#define _DB_CRYPTO_H_$/ +_DB_CXX_H_ ../dbinc/db_cxx.in /^#define _DB_CXX_H_$/ +_DB_CXX_INT_H_ ../dbinc/cxx_int.h /^#define _DB_CXX_INT_H_$/ +_DB_DEBUG_H_ ../dbinc/debug.h /^#define _DB_DEBUG_H_$/ +_DB_DISPATCH_H_ ../dbinc/db_dispatch.h /^#define _DB_DISPATCH_H_$/ +_DB_FOP_H_ ../dbinc/fop.h /^#define _DB_FOP_H_$/ +_DB_GLOBALS_H_ ../dbinc/globals.h /^#define _DB_GLOBALS_H_$/ +_DB_HASH_H_ ../dbinc/hash.h /^#define _DB_HASH_H_$/ +_DB_HMAC_H_ ../dbinc/hmac.h /^#define _DB_HMAC_H_$/ +_DB_H_ ../dbinc/db.in /^#define _DB_H_$/ +_DB_INT_H_ ../dbinc/db_int.in /^#define _DB_INT_H_$/ +_DB_JOIN_H_ ../dbinc/db_join.h /^#define _DB_JOIN_H_$/ +_DB_LOCK_H_ ../dbinc/lock.h /^#define _DB_LOCK_H_$/ +_DB_LOG_H_ ../dbinc/log.h /^#define _DB_LOG_H_$/ +_DB_MP_H_ ../dbinc/mp.h /^#define _DB_MP_H_$/ +_DB_MUTEX_H_ ../dbinc/mutex.h /^#define _DB_MUTEX_H_$/ +_DB_MUTEX_INT_H_ ../dbinc/mutex_int.h /^#define _DB_MUTEX_INT_H_$/ +_DB_OS_H_ ../dbinc/os.h /^#define _DB_OS_H_$/ +_DB_PAGE_H_ ../dbinc/db_page.h /^#define _DB_PAGE_H_$/ +_DB_QAM_H_ ../dbinc/qam.h /^#define _DB_QAM_H_$/ +_DB_QUEUE_H_ ../dbinc/queue.h /^#define _DB_QUEUE_H_$/ +_DB_REGION_H_ ../dbinc/region.h /^#define _DB_REGION_H_$/ +_DB_REPMGR_H_ ../dbinc/repmgr.h /^#define _DB_REPMGR_H_$/ +_DB_REP_H_ ../dbinc/rep.h /^#define _DB_REP_H_$/ +_DB_SERVER_INT_H_ ../dbinc/db_server_int.h /^#define _DB_SERVER_INT_H_$/ +_DB_SHQUEUE_H_ ../dbinc/shqueue.h /^#define _DB_SHQUEUE_H_$/ +_DB_SWAP_H_ ../dbinc/db_swap.h /^#define _DB_SWAP_H_$/ +_DB_TCL_DB_H_ ../dbinc/tcl_db.h /^#define _DB_TCL_DB_H_$/ +_DB_TXN_H_ ../dbinc/txn.h /^#define _DB_TXN_H_$/ +_DB_UPGRADE_H_ ../dbinc/db_upgrade.h /^#define _DB_UPGRADE_H_$/ +_DB_VERIFY_H_ ../dbinc/db_verify.h /^#define _DB_VERIFY_H_$/ +_DB_XA_H_ ../dbinc/xa.h /^#define _DB_XA_H_$/ _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(dbenv, pfx, msg)$/ _ErrorSetup ../tcl/tcl_internal.c /^_ErrorSetup(interp, ret, errmsg)$/ -_FOP_H_ ../dbinc/fop.h 11 +_EventFunc ../tcl/tcl_internal.c /^_EventFunc(dbenv, event, info)$/ _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/ _GetUInt32 ../tcl/tcl_internal.c /^_GetUInt32(interp, obj, resp)$/ -_LOG_H_ ../dbinc/log.h 11 _LockMode ../tcl/tcl_lock.c /^_LockMode(interp, obj, mode)$/ _LockPutInfo ../tcl/tcl_lock.c /^_LockPutInfo(interp, op, lock, lockid, objp)$/ _MpInfoDelete ../tcl/tcl_mp.c /^_MpInfoDelete(interp, mpip)$/ @@ -2051,9 +2179,7 @@ _NameToInfo ../tcl/tcl_internal.c /^_NameToInfo(name)$/ _NameToPtr ../tcl/tcl_internal.c /^_NameToPtr(name)$/ _NewInfo ../tcl/tcl_internal.c /^_NewInfo(interp, anyp, name, type)$/ _PtrToInfo ../tcl/tcl_internal.c /^_PtrToInfo(ptr)$/ -_REP_H_ ../dbinc/rep.h 9 _ReturnSetup ../tcl/tcl_internal.c /^_ReturnSetup(interp, ret, ok, errmsg)$/ -_SYS_SHQUEUE_H_ ../dbinc/shqueue.h 11 _Set3DBTList ../tcl/tcl_internal.c /^_Set3DBTList(interp, list, elem1, is1recno, elem2,/ _SetInfoData ../tcl/tcl_internal.c /^_SetInfoData(p, data)$/ _SetListElem ../tcl/tcl_internal.c /^_SetListElem(interp, list, elem1, e1cnt, elem2, e2/ @@ -2061,24 +2187,25 @@ _SetListElemInt ../tcl/tcl_internal.c /^_SetListElemInt(interp, list, elem1, ele _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 376 -__DB_OVFL ../env/env_open.c /^#define __DB_OVFL(v, max) \\$/ +__BIT_TYPES_DEFINED__ ../dbinc/db.in /^#define __BIT_TYPES_DEFINED__$/ +__DBC_INTERNAL ../dbinc/db_int.in /^#define __DBC_INTERNAL \\$/ __DB_STD ../dbinc/db_cxx.in /^#define __DB_STD(x) std::x$/ -__ENV_LPUT ../dbinc/db_am.h /^#define __ENV_LPUT(dbenv, lock, flags) \\$/ +__ENV_LPUT ../dbinc/db_am.h /^#define __ENV_LPUT(dbenv, lock) \\$/ +__INCLUDE_NETWORKING ../clib/getaddrinfo.c /^#define __INCLUDE_NETWORKING 1$/ +__INCLUDE_SELECT_H ../os/os_sleep.c /^#define __INCLUDE_SELECT_H 1$/ __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 -__RIJNDAEL_ALG_FST_H ../crypto/rijndael/rijndael-alg-fst.h 30 -__RIJNDAEL_API_FST_H ../crypto/rijndael/rijndael-api-fst.h 42 -__R_UNUSED ../dbinc/db_185.in 94 +__P ../dbinc/db_185.in /^#define __P(protos) protos \/* ANSI C prototypes / +__P_DUPLICATE ../dbinc/db_page.h /^#define __P_DUPLICATE 1 \/* Duplicate. DEPRECATED / +__RIJNDAEL_ALG_FST_H ../crypto/rijndael/rijndael-alg-fst.h /^#define __RIJNDAEL_ALG_FST_H$/ +__RIJNDAEL_API_FST_H ../crypto/rijndael/rijndael-api-fst.h /^#define __RIJNDAEL_API_FST_H$/ +__R_UNUSED ../dbinc/db_185.in /^#define __R_UNUSED 2 \/* UNUSED *\/$/ __SH_LIST_PREV_OFF ../dbinc/shqueue.h /^#define __SH_LIST_PREV_OFF(elm, field) \\$/ __SH_TAILQ_LAST_OFF ../dbinc/shqueue.h /^#define __SH_TAILQ_LAST_OFF(head) \\$/ __SH_TAILQ_PREV_OFF ../dbinc/shqueue.h /^#define __SH_TAILQ_PREV_OFF(elm, field) \\$/ __TLPUT ../dbinc/db_am.h /^#define __TLPUT(dbc, lock) \\$/ __absname ../log/log_archive.c /^__absname(dbenv, pref, name, newnamep)$/ +__ack_waiters_table ../repmgr/repmgr_windows.c /^struct __ack_waiters_table {$/ __aes_adj_size ../crypto/aes_method.c /^__aes_adj_size(len)$/ __aes_close ../crypto/aes_method.c /^__aes_close(dbenv, data)$/ __aes_decrypt ../crypto/aes_method.c /^__aes_decrypt(dbenv, aes_data, iv, cipher, cipher_/ @@ -2091,7 +2218,7 @@ __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_log ../btree/btree_auto.c /^__bam_adj_log(dbp, txnid, ret_lsnp, flags, pgno, l/ +__bam_adj_log ../btree/btree_auto.c /^__bam_adj_log(dbp, txnp, ret_lsnp, flags, pgno, ls/ __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)$/ @@ -2107,11 +2234,9 @@ __bam_c_count ../btree/bt_cursor.c /^__bam_c_count(dbc, recnop)$/ __bam_c_del ../btree/bt_cursor.c /^__bam_c_del(dbc)$/ __bam_c_destroy ../btree/bt_cursor.c /^__bam_c_destroy(dbc)$/ __bam_c_dup ../btree/bt_cursor.c /^__bam_c_dup(orig_dbc, new_dbc)$/ -__bam_c_first ../btree/bt_cursor.c /^__bam_c_first(dbc)$/ __bam_c_get ../btree/bt_cursor.c /^__bam_c_get(dbc, key, data, flags, pgnop)$/ __bam_c_getstack ../btree/bt_cursor.c /^__bam_c_getstack(dbc)$/ __bam_c_init ../btree/bt_cursor.c /^__bam_c_init(dbc, dbtype)$/ -__bam_c_last ../btree/bt_cursor.c /^__bam_c_last(dbc)$/ __bam_c_next ../btree/bt_cursor.c /^__bam_c_next(dbc, initial_move, deleted_okay)$/ __bam_c_physdel ../btree/bt_cursor.c /^__bam_c_physdel(dbc)$/ __bam_c_prev ../btree/bt_cursor.c /^__bam_c_prev(dbc)$/ @@ -2120,24 +2245,28 @@ __bam_c_refresh ../btree/bt_cursor.c /^__bam_c_refresh(dbc)$/ __bam_c_rget ../btree/bt_cursor.c /^__bam_c_rget(dbc, data)$/ __bam_c_search ../btree/bt_cursor.c /^__bam_c_search(dbc, root_pgno, key, flags, exactp)/ __bam_c_writelock ../btree/bt_cursor.c /^__bam_c_writelock(dbc)$/ -__bam_ca_delete ../btree/bt_curadj.c /^__bam_ca_delete(dbp, pgno, indx, delete)$/ +__bam_ca_delete ../btree/bt_curadj.c /^__bam_ca_delete(dbp, pgno, indx, delete, countp)$/ __bam_ca_di ../btree/bt_curadj.c /^__bam_ca_di(my_dbc, pgno, indx, adjust)$/ __bam_ca_dup ../btree/bt_curadj.c /^__bam_ca_dup(my_dbc, first, fpgno, fi, tpgno, ti)$/ __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_log ../btree/btree_auto.c /^__bam_cadjust_log(dbp, txnid, ret_lsnp, flags, pgn/ +__bam_cadjust_log ../btree/btree_auto.c /^__bam_cadjust_log(dbp, txnp, ret_lsnp, flags, pgno/ __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_log ../btree/btree_auto.c /^__bam_cdel_log(dbp, txnid, ret_lsnp, flags, pgno, / +__bam_cdel_log ../btree/btree_auto.c /^__bam_cdel_log(dbp, txnp, ret_lsnp, flags, pgno, l/ __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_cmp ../btree/bt_compare.c /^__bam_cmp(dbp, txn, dbt, h, indx, func, cmpp)$/ +__bam_compact ../btree/bt_compact.c /^__bam_compact(dbp, txn, start, stop, c_data, flags/ +__bam_compact_dups ../btree/bt_compact.c /^__bam_compact_dups(dbc, ppg, factor, have_lock, c_/ +__bam_compact_int ../btree/bt_compact.c /^__bam_compact_int(dbc, start, stop, factor, spanp,/ __bam_copy ../btree/bt_split.c /^__bam_copy(dbp, pp, cp, nxt, stop)$/ -__bam_curadj_log ../btree/btree_auto.c /^__bam_curadj_log(dbp, txnid, ret_lsnp, flags, mode/ +__bam_csearch ../btree/bt_compact.c /^__bam_csearch(dbc, start, sflag, level)$/ +__bam_curadj_log ../btree/btree_auto.c /^__bam_curadj_log(dbp, txnp, ret_lsnp, flags, mode,/ __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)$/ @@ -2146,10 +2275,13 @@ __bam_db_create ../btree/bt_method.c /^__bam_db_create(dbp)$/ __bam_defcmp ../btree/bt_compare.c /^__bam_defcmp(dbp, a, b)$/ __bam_defpfx ../btree/bt_compare.c /^__bam_defpfx(dbp, a, b)$/ __bam_ditem ../btree/bt_delete.c /^__bam_ditem(dbc, h, indx)$/ -__bam_dpages ../btree/bt_delete.c /^__bam_dpages(dbc, stack_epg)$/ -__bam_dup_convert ../btree/bt_put.c /^__bam_dup_convert(dbc, h, indx)$/ +__bam_dpages ../btree/bt_delete.c /^__bam_dpages(dbc, use_top, update)$/ +__bam_dup_check ../btree/bt_put.c /^__bam_dup_check(dbc, op, h, indx, sz, cntp)$/ +__bam_dup_convert ../btree/bt_put.c /^__bam_dup_convert(dbc, h, indx, cnt)$/ +__bam_free_freelist ../btree/bt_compact.c /^__bam_free_freelist(dbp, txn)$/ __bam_get_bt_minkey ../btree/bt_method.c /^__bam_get_bt_minkey(dbp, bt_minkeyp)$/ __bam_get_prev ../btree/bt_cursor.c /^__bam_get_prev(dbc)$/ +__bam_get_root ../btree/bt_search.c /^__bam_get_root(dbc, pg, slevel, flags, stack)$/ __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)$/ @@ -2159,6 +2291,14 @@ __bam_init_recover ../btree/btree_auto.c /^__bam_init_recover(dbenv, dtabp, dtab __bam_isopd ../btree/bt_cursor.c /^__bam_isopd(dbc, pgnop)$/ __bam_key_range ../btree/bt_stat.c /^__bam_key_range(dbc, dbt, kp, flags)$/ __bam_map_flags ../btree/bt_method.c /^__bam_map_flags(dbp, inflagsp, outflagsp)$/ +__bam_merge ../btree/bt_compact.c /^__bam_merge(dbc, ndbc, factor, stop, c_data, donep/ +__bam_merge_internal ../btree/bt_compact.c /^__bam_merge_internal(dbc, ndbc, level, c_data, mer/ +__bam_merge_log ../btree/btree_auto.c /^__bam_merge_log(dbp, txnp, ret_lsnp, flags, pgno, / +__bam_merge_pages ../btree/bt_compact.c /^__bam_merge_pages(dbc, ndbc, c_data)$/ +__bam_merge_print ../btree/btree_autop.c /^__bam_merge_print(dbenv, dbtp, lsnp, notused2, not/ +__bam_merge_read ../btree/btree_auto.c /^__bam_merge_read(dbenv, recbuf, argpp)$/ +__bam_merge_records ../btree/bt_compact.c /^__bam_merge_records(dbc, ndbc, factor, c_data)$/ +__bam_merge_recover ../btree/bt_rec.c /^__bam_merge_recover(dbenv, dbtp, lsnp, op, info)$/ __bam_meta2pgset ../btree/bt_verify.c /^__bam_meta2pgset(dbp, vdp, btmeta, flags, pgset)$/ __bam_metachk ../btree/bt_open.c /^__bam_metachk(dbp, name, btm)$/ __bam_mswap ../btree/bt_conv.c /^__bam_mswap(pg)$/ @@ -2166,52 +2306,62 @@ __bam_new_file ../btree/bt_open.c /^__bam_new_file(dbp, txn, fhp, name)$/ __bam_new_subdb ../btree/bt_open.c /^__bam_new_subdb(mdbp, dbp, txn)$/ __bam_nrecs ../btree/bt_rsearch.c /^__bam_nrecs(dbc, rep)$/ __bam_opd_cursor ../btree/bt_curadj.c /^__bam_opd_cursor(dbp, dbc, first, tpgno, ti)$/ +__bam_opd_exists ../btree/bt_cursor.c /^__bam_opd_exists(dbc, pgno)$/ __bam_open ../btree/bt_open.c /^__bam_open(dbp, txn, name, base_pgno, flags)$/ __bam_ovput ../btree/bt_put.c /^__bam_ovput(dbc, type, pgno, h, indx, item)$/ __bam_page ../btree/bt_split.c /^__bam_page(dbc, pp, cp)$/ __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_pgno_log ../btree/btree_auto.c /^__bam_pgno_log(dbp, txnp, ret_lsnp, flags, pgno, l/ +__bam_pgno_print ../btree/btree_autop.c /^__bam_pgno_print(dbenv, dbtp, lsnp, notused2, notu/ +__bam_pgno_read ../btree/btree_auto.c /^__bam_pgno_read(dbenv, recbuf, argpp)$/ +__bam_pgno_recover ../btree/bt_rec.c /^__bam_pgno_recover(dbenv, dbtp, lsnp, op, info)$/ __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_pinsert ../btree/bt_split.c /^__bam_pinsert(dbc, parent, lchild, rchild, flags)$/ __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_log ../btree/btree_auto.c /^__bam_rcuradj_log(dbp, txnid, ret_lsnp, flags, mod/ +__bam_pupdate ../btree/bt_delete.c /^__bam_pupdate(dbc, lpg)$/ +__bam_rcuradj_log ../btree/btree_auto.c /^__bam_rcuradj_log(dbp, txnp, ret_lsnp, flags, mode/ __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_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 ../btree/bt_delete.c /^__bam_relink(dbc, pagep, new_pgno)$/ +__bam_relink_43_print ../btree/btree_autop.c /^__bam_relink_43_print(dbenv, dbtp, lsnp, notused2,/ +__bam_relink_43_read ../btree/btree_auto.c /^__bam_relink_43_read(dbenv, recbuf, argpp)$/ +__bam_relink_43_recover ../btree/bt_rec.c /^__bam_relink_43_recover(dbenv, dbtp, lsnp, op, inf/ +__bam_relink_log ../btree/btree_auto.c /^__bam_relink_log(dbp, txnp, 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_log ../btree/btree_auto.c /^__bam_repl_log(dbp, txnp, ret_lsnp, flags, pgno, l/ __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_log ../btree/btree_auto.c /^__bam_root_log(dbp, txnid, ret_lsnp, flags, meta_p/ +__bam_root_log ../btree/btree_auto.c /^__bam_root_log(dbp, txnp, ret_lsnp, flags, meta_pg/ __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_log ../btree/btree_auto.c /^__bam_rsplit_log(dbp, txnid, ret_lsnp, flags, pgno/ +__bam_rsplit_log ../btree/btree_auto.c /^__bam_rsplit_log(dbp, txnp, ret_lsnp, flags, pgno,/ __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/ __bam_salvage ../btree/bt_verify.c /^__bam_salvage(dbp, vdp, pgno, pgtype, h, handle, c/ __bam_salvage_walkdupint ../btree/bt_verify.c /^__bam_salvage_walkdupint(dbp, vdp, h, key, handle,/ -__bam_search ../btree/bt_search.c /^__bam_search(dbc, root_pgno, key, flags, stop, rec/ +__bam_savekey ../btree/bt_compact.c /^__bam_savekey(dbc, next, start)$/ +__bam_search ../btree/bt_search.c /^__bam_search(dbc, root_pgno, key, flags, slevel, r/ __bam_set_bt_compare ../btree/bt_method.c /^__bam_set_bt_compare(dbp, func)$/ -__bam_set_bt_maxkey ../btree/bt_method.c /^__bam_set_bt_maxkey(dbp, bt_maxkey)$/ __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_setup_freelist ../btree/bt_compact.c /^__bam_setup_freelist(dbp, list, nelems)$/ __bam_split ../btree/bt_split.c /^__bam_split(dbc, arg, root_pgnop)$/ -__bam_split_log ../btree/btree_auto.c /^__bam_split_log(dbp, txnid, ret_lsnp, flags, left,/ +__bam_split_log ../btree/btree_auto.c /^__bam_split_log(dbp, txnp, ret_lsnp, flags, left, / __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)$/ @@ -2223,19 +2373,54 @@ __bam_stkrel ../btree/bt_search.c /^__bam_stkrel(dbc, flags)$/ __bam_total ../btree/bt_rsearch.c /^__bam_total(dbp, h)$/ __bam_traverse ../btree/bt_stat.c /^__bam_traverse(dbc, mode, root_pgno, callback, coo/ __bam_truncate ../btree/bt_reclaim.c /^__bam_truncate(dbc, countp)$/ +__bam_truncate_internal ../btree/bt_compact.c /^__bam_truncate_internal(dbp, txn, c_data)$/ +__bam_truncate_internal_overflow ../btree/bt_compact.c /^__bam_truncate_internal_overflow(dbc, page, c_data/ +__bam_truncate_overflow ../btree/bt_compact.c /^__bam_truncate_overflow(dbc, pgno, pg_lock, c_data/ +__bam_truncate_page ../btree/bt_compact.c /^__bam_truncate_page(dbc, pgp, update_parent)$/ +__bam_truncate_root_page ../btree/bt_compact.c /^__bam_truncate_root_page(dbc, pg, indx, c_data)$/ __bam_vrfy ../btree/bt_verify.c /^__bam_vrfy(dbp, vdp, h, pgno, flags)$/ __bam_vrfy_inp ../btree/bt_verify.c /^__bam_vrfy_inp(dbp, vdp, h, pgno, nentriesp, flags/ __bam_vrfy_itemorder ../btree/bt_verify.c /^__bam_vrfy_itemorder(dbp, vdp, h, pgno, nentries, / __bam_vrfy_meta ../btree/bt_verify.c /^__bam_vrfy_meta(dbp, vdp, meta, pgno, flags)$/ __bam_vrfy_structure ../btree/bt_verify.c /^__bam_vrfy_structure(dbp, vdp, meta_pgno, flags)$/ __bam_vrfy_subtree ../btree/bt_verify.c /^__bam_vrfy_subtree(dbp, vdp, pgno, l, r, flags, le/ -__bam_vrfy_treeorder ../btree/bt_verify.c /^__bam_vrfy_treeorder(dbp, pgno, h, lp, rp, func, f/ +__bam_vrfy_treeorder ../btree/bt_verify.c /^__bam_vrfy_treeorder(dbp, h, lp, rp, func, flags)$/ +__bh ../dbinc/mp.h /^struct __bh {$/ +__bh_frozen_a ../dbinc/mp.h /^struct __bh_frozen_a {$/ +__bh_frozen_p ../dbinc/mp.h /^struct __bh_frozen_p {$/ __bhcmp ../mp/mp_sync.c /^__bhcmp(p1, p2)$/ +__btree ../dbinc/btree.h /^struct __btree { \/* Btree access method. *\/$/ __build_data ../log/log_archive.c /^__build_data(dbenv, pref, listp)$/ +__cdsgroup_abort ../db/db_cds.c /^static int __cdsgroup_abort(txn)$/ +__cdsgroup_begin ../db/db_cds.c /^int __cdsgroup_begin(dbenv, txnpp)$/ +__cdsgroup_commit ../db/db_cds.c /^static int __cdsgroup_commit(txn, flags)$/ +__cdsgroup_discard ../db/db_cds.c /^static int __cdsgroup_discard(txn, flags)$/ +__cdsgroup_id ../db/db_cds.c /^static u_int32_t __cdsgroup_id(txn)$/ +__cdsgroup_notsup ../db/db_cds.c /^__cdsgroup_notsup(dbenv, meth)$/ +__cdsgroup_prepare ../db/db_cds.c /^static int __cdsgroup_prepare(txn, gid)$/ +__cdsgroup_set_name ../db/db_cds.c /^static int __cdsgroup_set_name(txn, name)$/ +__cdsgroup_set_timeout ../db/db_cds.c /^static int __cdsgroup_set_timeout(txn, timeout, fl/ __cmpfunc ../log/log_archive.c /^__cmpfunc(p1, p2)$/ +__config_parse ../env/env_config.c /^__config_parse(dbenv, s, lc)$/ +__config_split ../env/env_config.c /^__config_split(input, argv)$/ +__cq_aq ../dbinc/db.in /^ struct __cq_aq {$/ +__cq_fq ../dbinc/db.in /^ struct __cq_fq {$/ +__cq_jq ../dbinc/db.in /^ struct __cq_jq {$/ __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_log ../db/crdel_auto.c /^__crdel_metasub_log(dbp, txnid, ret_lsnp, flags, p/ +__crdel_inmem_create_log ../db/crdel_auto.c /^__crdel_inmem_create_log(dbenv, txnp, ret_lsnp, fl/ +__crdel_inmem_create_print ../db/crdel_autop.c /^__crdel_inmem_create_print(dbenv, dbtp, lsnp, notu/ +__crdel_inmem_create_read ../db/crdel_auto.c /^__crdel_inmem_create_read(dbenv, recbuf, argpp)$/ +__crdel_inmem_create_recover ../db/crdel_rec.c /^__crdel_inmem_create_recover(dbenv, dbtp, lsnp, op/ +__crdel_inmem_remove_log ../db/crdel_auto.c /^__crdel_inmem_remove_log(dbenv, txnp, ret_lsnp, fl/ +__crdel_inmem_remove_print ../db/crdel_autop.c /^__crdel_inmem_remove_print(dbenv, dbtp, lsnp, notu/ +__crdel_inmem_remove_read ../db/crdel_auto.c /^__crdel_inmem_remove_read(dbenv, recbuf, argpp)$/ +__crdel_inmem_remove_recover ../db/crdel_rec.c /^__crdel_inmem_remove_recover(dbenv, dbtp, lsnp, op/ +__crdel_inmem_rename_log ../db/crdel_auto.c /^__crdel_inmem_rename_log(dbenv, txnp, ret_lsnp, fl/ +__crdel_inmem_rename_print ../db/crdel_autop.c /^__crdel_inmem_rename_print(dbenv, dbtp, lsnp, notu/ +__crdel_inmem_rename_read ../db/crdel_auto.c /^__crdel_inmem_rename_read(dbenv, recbuf, argpp)$/ +__crdel_inmem_rename_recover ../db/crdel_rec.c /^__crdel_inmem_rename_recover(dbenv, dbtp, lsnp, op/ +__crdel_metasub_log ../db/crdel_auto.c /^__crdel_metasub_log(dbp, txnp, ret_lsnp, flags, pg/ __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/ @@ -2245,6 +2430,9 @@ __crypto_decrypt_meta ../crypto/crypto.c /^__crypto_decrypt_meta(dbenv, dbp, mbu __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)$/ +__cursor ../dbinc/btree.h /^struct __cursor {$/ +__data ../env/db_salloc.c /^struct __data {$/ +__db ../dbinc/db.in /^struct __db {$/ __db185_open ../db185/db185.c /^__db185_open(file, oflags, mode, type, openinfo)$/ __db_31_offdup ../db/db_upg_opd.c /^__db_31_offdup(dbp, real_name, fhp, sorted, pgnop)/ __db_SHA1Final ../hmac/sha1.c /^__db_SHA1Final(digest, context)$/ @@ -2252,30 +2440,30 @@ __db_SHA1Init ../hmac/sha1.c /^__db_SHA1Init(context)$/ __db_SHA1Transform ../hmac/sha1.c /^__db_SHA1Transform(state, buffer)$/ __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_limbo ../db/db_dispatch.c /^__db_add_limbo(dbenv, hp, fileid, pgno, count)$/ __db_add_recovery ../db/db_dispatch.c /^__db_add_recovery(dbenv, dtab, dtabsize, func, ndx/ -__db_addrem_log ../db/db_auto.c /^__db_addrem_log(dbp, txnid, ret_lsnp, flags,$/ +__db_addrem_log ../db/db_auto.c /^__db_addrem_log(dbp, txnp, ret_lsnp, flags,$/ __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_allocinfo ../os/os_alloc.c /^union __db_allocinfo {$/ __db_append_primary ../db/db_am.c /^__db_append_primary(dbc, key, data)$/ __db_appname ../env/env_open.c /^__db_appname(dbenv, appname, file, tmp_oflags, fhp/ __db_apprec ../env/env_recover.c /^__db_apprec(dbenv, max_lsn, trunclsn, update, flag/ -__db_assert ../common/db_err.c /^__db_assert(failedexpr, file, line)$/ +__db_assert ../common/db_err.c /^__db_assert(dbenv, e, file, line)$/ __db_associate ../db/db_am.c /^__db_associate(dbp, txn, sdbp, callback, flags)$/ __db_associate_arg ../db/db_iface.c /^__db_associate_arg(dbp, sdbp, callback, flags)$/ __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_log ../db/db_auto.c /^__db_big_log(dbp, txnid, ret_lsnp, flags,$/ +__db_big_log ../db/db_auto.c /^__db_big_log(dbp, txnp, ret_lsnp, flags,$/ __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, 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_bt_stat ../dbinc/db.in /^struct __db_bt_stat {$/ __db_build_bi ../db/db_upg_opd.c /^__db_build_bi(dbp, fhp, ipage, page, indx, nomemp)/ __db_build_ri ../db/db_upg_opd.c /^__db_build_ri(dbp, fhp, ipage, page, indx, nomemp)/ __db_buildpartial ../db/db_cam.c /^__db_buildpartial(dbp, oldrec, partial, newrec)$/ @@ -2288,6 +2476,7 @@ __db_c_count ../db/db_cam.c /^__db_c_count(dbc, recnop)$/ __db_c_count_pp ../db/db_iface.c /^__db_c_count_pp(dbc, recnop, flags)$/ __db_c_del ../db/db_cam.c /^__db_c_del(dbc, flags)$/ __db_c_del_arg ../db/db_iface.c /^__db_c_del_arg(dbc, flags)$/ +__db_c_del_oldskey ../db/db_cam.c /^__db_c_del_oldskey(sdbp, dbc_arg, skey, pkey, oldd/ __db_c_del_pp ../db/db_iface.c /^__db_c_del_pp(dbc, flags)$/ __db_c_del_primary ../db/db_cam.c /^__db_c_del_primary(dbc)$/ __db_c_del_secondary ../db/db_cam.c /^__db_c_del_secondary(dbc)$/ @@ -2307,14 +2496,15 @@ __db_c_put ../db/db_cam.c /^__db_c_put(dbc_arg, key, data, flags)$/ __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_chksum ../hmac/hmac.c /^__db_check_chksum(dbenv, hdr, db_cipher, chksum, d/ __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_chksum ../hmac/hmac.c /^__db_chksum(hdr, data, data_len, mac_key, store)$/ +__db_cipher ../dbinc/crypto.h /^struct __db_cipher {$/ __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_log ../db/db_auto.c /^__db_cksum_log(dbenv, txnid, ret_lsnp, flags)$/ +__db_cksum_log ../db/db_auto.c /^__db_cksum_log(dbenv, txnp, ret_lsnp, flags)$/ __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)$/ @@ -2322,7 +2512,11 @@ __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_commit ../dbinc/log.h /^struct __db_commit {$/ +__db_compact ../dbinc/db.in /^struct __db_compact {$/ +__db_compact_pp ../db/db_iface.c /^__db_compact_pp(dbp, txn, start, stop, c_data, fla/ __db_create_proc ../rpc_server/c/db_server_proc.c /^__db_create_proc(dbenvcl_id, flags, replyp)$/ +__db_ctime ../clib/ctime.c /^__db_ctime(tod, time_buf)$/ __db_curinval ../db/db_iface.c /^__db_curinval(dbenv)$/ __db_cursor ../db/db_iface.c /^__db_cursor(dbp, txn, dbcp, flags)$/ __db_cursor_arg ../db/db_iface.c /^__db_cursor_arg(dbp, flags)$/ @@ -2330,56 +2524,55 @@ __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, 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_db_associate_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_associate_4005__SVCSUFFIX__(msg, req)$/ +__db_db_close_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_close_4005__SVCSUFFIX__(msg, req)$/ +__db_db_create_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_create_4005__SVCSUFFIX__(msg, req)$/ +__db_db_cursor_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_cursor_4005__SVCSUFFIX__(msg, req)$/ +__db_db_del_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_del_4005__SVCSUFFIX__(msg, req)$/ +__db_db_get_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_4005__SVCSUFFIX__(msg, req)$/ +__db_db_get_bt_minkey_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_bt_minkey_4005__SVCSUFFIX__(msg, req)$/ +__db_db_get_dbname_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_dbname_4005__SVCSUFFIX__(msg, req)$/ +__db_db_get_encrypt_flags_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_encrypt_flags_4005__SVCSUFFIX__(msg, r/ +__db_db_get_flags_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_flags_4005__SVCSUFFIX__(msg, req)$/ +__db_db_get_h_ffactor_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_h_ffactor_4005__SVCSUFFIX__(msg, req)$/ +__db_db_get_h_nelem_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_h_nelem_4005__SVCSUFFIX__(msg, req)$/ +__db_db_get_lorder_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_lorder_4005__SVCSUFFIX__(msg, req)$/ +__db_db_get_open_flags_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_open_flags_4005__SVCSUFFIX__(msg, req)/ +__db_db_get_pagesize_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_pagesize_4005__SVCSUFFIX__(msg, req)$/ +__db_db_get_q_extentsize_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_q_extentsize_4005__SVCSUFFIX__(msg, re/ +__db_db_get_re_delim_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_re_delim_4005__SVCSUFFIX__(msg, req)$/ +__db_db_get_re_len_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_re_len_4005__SVCSUFFIX__(msg, req)$/ +__db_db_get_re_pad_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_re_pad_4005__SVCSUFFIX__(msg, req)$/ +__db_db_join_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_join_4005__SVCSUFFIX__(msg, req)$/ +__db_db_key_range_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_key_range_4005__SVCSUFFIX__(msg, req)$/ +__db_db_open_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_open_4005__SVCSUFFIX__(msg, req)$/ +__db_db_pget_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_pget_4005__SVCSUFFIX__(msg, req)$/ +__db_db_put_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_put_4005__SVCSUFFIX__(msg, req)$/ +__db_db_remove_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_remove_4005__SVCSUFFIX__(msg, req)$/ +__db_db_rename_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_rename_4005__SVCSUFFIX__(msg, req)$/ +__db_db_set_bt_minkey_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_set_bt_minkey_4005__SVCSUFFIX__(msg, req)$/ +__db_db_set_encrypt_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_set_encrypt_4005__SVCSUFFIX__(msg, req)$/ +__db_db_set_flags_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_set_flags_4005__SVCSUFFIX__(msg, req)$/ +__db_db_set_h_ffactor_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_set_h_ffactor_4005__SVCSUFFIX__(msg, req)$/ +__db_db_set_h_nelem_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_set_h_nelem_4005__SVCSUFFIX__(msg, req)$/ +__db_db_set_lorder_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_set_lorder_4005__SVCSUFFIX__(msg, req)$/ +__db_db_set_pagesize_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_set_pagesize_4005__SVCSUFFIX__(msg, req)$/ +__db_db_set_q_extentsize_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_set_q_extentsize_4005__SVCSUFFIX__(msg, re/ +__db_db_set_re_delim_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_set_re_delim_4005__SVCSUFFIX__(msg, req)$/ +__db_db_set_re_len_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_set_re_len_4005__SVCSUFFIX__(msg, req)$/ +__db_db_set_re_pad_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_set_re_pad_4005__SVCSUFFIX__(msg, req)$/ +__db_db_stat_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_stat_4005__SVCSUFFIX__(msg, req)$/ +__db_db_sync_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_sync_4005__SVCSUFFIX__(msg, req)$/ +__db_db_truncate_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_truncate_4005__SVCSUFFIX__(msg, req)$/ +__db_dbc_c_close_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_dbc_c_close_4005__SVCSUFFIX__(msg, req)$/ +__db_dbc_c_count_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_dbc_c_count_4005__SVCSUFFIX__(msg, req)$/ +__db_dbc_c_del_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_dbc_c_del_4005__SVCSUFFIX__(msg, req)$/ +__db_dbc_c_dup_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_dbc_c_dup_4005__SVCSUFFIX__(msg, req)$/ +__db_dbc_c_get_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_dbc_c_get_4005__SVCSUFFIX__(msg, req)$/ +__db_dbc_c_pget_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_dbc_c_pget_4005__SVCSUFFIX__(msg, req)$/ +__db_dbc_c_put_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_dbc_c_put_4005__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_dbenv_setup ../db/db.c /^__db_dbenv_setup(dbp, txn, fname, dname, id, flags/ __db_dbm_close ../dbm/dbm.c /^__db_dbm_close()$/ __db_dbm_delete ../dbm/dbm.c /^__db_dbm_delete(key)$/ __db_dbm_fetch ../dbm/dbm.c /^__db_dbm_fetch(key)$/ @@ -2387,19 +2580,21 @@ __db_dbm_firstkey ../dbm/dbm.c /^__db_dbm_firstkey()$/ __db_dbm_init ../dbm/dbm.c /^__db_dbm_init(file)$/ __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_dbt ../dbinc/db.in /^struct __db_dbt {$/ +__db_dbtxn_remove ../db/db_remove.c /^__db_dbtxn_remove(dbp, txn, name, subdb)$/ __db_dbtype_to_string ../db/db_pr.c /^__db_dbtype_to_string(type)$/ -__db_debug_log ../db/db_auto.c /^__db_debug_log(dbenv, txnid, ret_lsnp, flags,$/ +__db_debug_log ../db/db_auto.c /^__db_debug_log(dbenv, txnp, ret_lsnp, flags,$/ __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_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_arg ../db/db_iface.c /^__db_del_arg(dbp, key, 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, 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_destroy ../env/env_region.c /^__db_des_destroy(dbenv, rp)$/ __db_des_get ../env/env_region.c /^__db_des_get(dbenv, env_infop, infop, rpp)$/ +__db_difftime ../common/db_clock.c /^__db_difftime(ssec, esec, susec, eusec, secp, usec/ __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)$/ @@ -2410,46 +2605,57 @@ __db_do_the_limbo ../db/db_dispatch.c /^__db_do_the_limbo(dbenv, ptxn, txn, hp, __db_doff ../db/db_overflow.c /^__db_doff(dbc, pgno)$/ __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_dumptree ../db/db_pr.c /^__db_dumptree(dbp, txn, 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_golive ../env/env_region.c /^__db_e_golive(dbenv)$/ __db_e_remfile ../env/env_region.c /^__db_e_remfile(dbenv)$/ __db_e_remove ../env/env_region.c /^__db_e_remove(dbenv, flags)$/ -__db_encrypt_proc ../rpc_server/c/db_server_proc.c /^__db_encrypt_proc(dbpcl_id, passwd, flags, replyp)/ -__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 ../dbinc/db.in /^struct __db_env {$/ +__db_env_cdsgroup_begin_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_cdsgroup_begin_4005__SVCSUFFIX__(msg, req/ +__db_env_close_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_close_4005__SVCSUFFIX__(msg, req)$/ __db_env_config ../env/env_method.c /^__db_env_config(dbenv, i, flags)$/ -__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_env_create_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_create_4005__SVCSUFFIX__(msg, req)$/ +__db_env_dbremove_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_dbremove_4005__SVCSUFFIX__(msg, req)$/ +__db_env_dbrename_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_dbrename_4005__SVCSUFFIX__(msg, req)$/ +__db_env_destroy ../env/env_method.c /^__db_env_destroy(dbenv)$/ +__db_env_get_cachesize_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_get_cachesize_4005__SVCSUFFIX__(msg, req)/ +__db_env_get_encrypt_flags_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_get_encrypt_flags_4005__SVCSUFFIX__(msg, / +__db_env_get_flags_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_get_flags_4005__SVCSUFFIX__(msg, req)$/ +__db_env_get_home_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_get_home_4005__SVCSUFFIX__(msg, req)$/ +__db_env_get_open_flags_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_get_open_flags_4005__SVCSUFFIX__(msg, req/ +__db_env_open_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_open_4005__SVCSUFFIX__(msg, req)$/ +__db_env_remove_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_remove_4005__SVCSUFFIX__(msg, req)$/ +__db_env_set_cachesize_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_set_cachesize_4005__SVCSUFFIX__(msg, req)/ +__db_env_set_encrypt_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_set_encrypt_4005__SVCSUFFIX__(msg, req)$/ +__db_env_set_flags_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_set_flags_4005__SVCSUFFIX__(msg, req)$/ +__db_env_txn_begin_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_txn_begin_4005__SVCSUFFIX__(msg, req)$/ +__db_env_txn_recover_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_txn_recover_4005__SVCSUFFIX__(msg, req)$/ +__db_err ../common/db_err.c /^__db_err(dbenv, error fmt, va_alist)$/ __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_extentsize_proc ../rpc_server/c/db_server_proc.c /^__db_extentsize_proc(dbpcl_id, extentsize, replyp)/ +__db_errx ../common/db_err.c /^__db_errx(dbenv, fmt, va_alist)$/ +__db_failed ../common/db_err.c /^__db_failed(dbenv, msg, pid, tid)$/ __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)$/ __db_fchk ../common/db_err.c /^__db_fchk(dbenv, name, flags, ok_flags)$/ -__db_fcntl_mutex_destroy ../mutex/mut_fcntl.c /^__db_fcntl_mutex_destroy(mutexp)$/ -__db_fcntl_mutex_init ../mutex/mut_fcntl.c /^__db_fcntl_mutex_init(dbenv, mutexp, offset)$/ -__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_fcntl_mutex_destroy ../mutex/mut_fcntl.c /^__db_fcntl_mutex_destroy(dbenv, mutex)$/ +__db_fcntl_mutex_init ../mutex/mut_fcntl.c /^__db_fcntl_mutex_init(dbenv, mutex, flags)$/ +__db_fcntl_mutex_lock ../mutex/mut_fcntl.c /^__db_fcntl_mutex_lock(dbenv, mutex)$/ +__db_fcntl_mutex_unlock ../mutex/mut_fcntl.c /^__db_fcntl_mutex_unlock(dbenv, mutex)$/ __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_file_extend ../env/env_file.c /^__db_file_extend(dbenv, fhp, size)$/ +__db_file_multi_write ../env/env_file.c /^__db_file_multi_write(dbenv, path)$/ +__db_file_write ../env/env_file.c /^__db_file_write(dbenv, fhp, mbytes, bytes, pattern/ +__db_filestart ../dbinc/log.h /^struct __db_filestart {$/ __db_fnl ../common/db_err.c /^__db_fnl(dbenv, name)$/ __db_free ../db/db_meta.c /^__db_free(dbc, h)$/ +__db_free_truncate ../db/db_meta.c /^__db_free_truncate(dbp, txn, flags, c_data, listp,/ +__db_freeaddrinfo ../clib/getaddrinfo.c /^__db_freeaddrinfo(dbenv, ai)$/ +__db_freelist_pos ../db/db_meta.c /^__db_freelist_pos(pgno, list, nelem, posp)$/ +__db_freelist_sort ../db/db_meta.c /^__db_freelist_sort(list, nelems)$/ __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)$/ @@ -2458,12 +2664,12 @@ __db_get_bt_minkey_proc ../rpc_server/c/db_server_proc.c /^__db_get_bt_minkey_pr __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_dbname ../db/db_method.c /^__db_get_dbname(dbp, fnamep, dnamep)$/ +__db_get_dbname_proc ../rpc_server/c/db_server_proc.c /^__db_get_dbname_proc(dbpcl_id, replyp)$/ __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)$/ __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_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)$/ @@ -2471,41 +2677,43 @@ __db_get_h_ffactor_proc ../rpc_server/c/db_server_proc.c /^__db_get_h_ffactor_pr __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 ../db/db_method.c /^__db_get_mpf(dbp)$/ __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, keydof/ +__db_get_q_extentsize_proc ../rpc_server/c/db_server_proc.c /^__db_get_q_extentsize_proc(dbpcl_id, replyp)$/ __db_get_re_delim_proc ../rpc_server/c/db_server_proc.c /^__db_get_re_delim_proc(dbpcl_id, replyp)$/ __db_get_re_len_proc ../rpc_server/c/db_server_proc.c /^__db_get_re_len_proc(dbpcl_id, replyp)$/ __db_get_re_pad_proc ../rpc_server/c/db_server_proc.c /^__db_get_re_pad_proc(dbpcl_id, replyp)$/ __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_getaddrinfo ../clib/getaddrinfo.c /^__db_getaddrinfo(dbenv, nodename, port, servname, / __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/ -__db_goff ../db/db_overflow.c /^__db_goff(dbp, dbt, tlen, pgno, bpp, bpsz)$/ +__db_goff ../db/db_overflow.c /^__db_goff(dbp, txn, dbt, tlen, pgno, bpp, bpsz)$/ __db_guesspgsize ../db/db_vrfy.c /^__db_guesspgsize(dbenv, fhp)$/ -__db_h_ffactor_proc ../rpc_server/c/db_server_proc.c /^__db_h_ffactor_proc(dbpcl_id, ffactor, replyp)$/ -__db_h_nelem_proc ../rpc_server/c/db_server_proc.c /^__db_h_nelem_proc(dbpcl_id, nelem, replyp)$/ +__db_h_stat ../dbinc/db.in /^struct __db_h_stat {$/ __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, 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_ilock ../dbinc/db.in /^struct __db_ilock {$/ +__db_infohead ../dbinc/tcl_db.h /^#define __db_infohead __dbtcl_global.g_infohead$/ +__db_init ../db/db_method.c /^__db_init(dbenv, dbp, flags)$/ __db_init_meta ../db/db_meta.c /^__db_init_meta(dbp, p, pgno, pgtype)$/ __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_inmem_remove ../db/db_remove.c /^__db_inmem_remove(dbp, txn, name)$/ __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()$/ @@ -2530,24 +2738,30 @@ __db_limbo_bucket ../db/db_dispatch.c /^__db_limbo_bucket(dbenv, txn, elp, state __db_limbo_fix ../db/db_dispatch.c /^__db_limbo_fix(dbp, ctxn, elp, lastp, meta, state)/ __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_lk_conflicts ../libdb_java/db_java_wrap.c /^struct __db_lk_conflicts {$/ __db_loadme ../db/db_pr.c /^__db_loadme()$/ +__db_lock ../dbinc/lock.h /^struct __db_lock {$/ __db_lock_move ../db/db_dispatch.c /^__db_lock_move(dbenv, fileid, pgno, mode, ptxn, tx/ +__db_lock_stat ../dbinc/db.in /^struct __db_lock_stat {$/ +__db_lock_u ../dbinc/db.in /^struct __db_lock_u {$/ __db_lockmode_to_string ../db/db_pr.c /^__db_lockmode_to_string(mode)$/ +__db_lockreq ../dbinc/db.in /^struct __db_lockreq {$/ +__db_locktab ../dbinc/lock.h /^struct __db_locktab {$/ +__db_log ../dbinc/log.h /^struct __db_log {$/ __db_log2 ../common/db_log2.c /^__db_log2(num)$/ __db_log_corrupt ../env/env_recover.c /^__db_log_corrupt(dbenv, lsnp)$/ +__db_log_cursor ../dbinc/db.in /^struct __db_log_cursor {$/ __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_log_stat ../dbinc/db.in /^struct __db_log_stat {$/ __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_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_lsn ../dbinc/db.in /^struct __db_lsn {$/ __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, dbenv)$/ -__db_map_xid ../xa/xa_map.c /^__db_map_xid(dbenv, xid, off)$/ +__db_map_xid ../xa/xa_map.c /^__db_map_xid(dbenv, xid, td)$/ __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, fn, flags)$/ @@ -2556,20 +2770,21 @@ __db_meta_setup ../db/db_open.c /^__db_meta_setup(dbenv, dbp, name, meta, oflags __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_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_mkpath ../common/mkpath.c /^__db_mkpath(dbenv, name)$/ +__db_moff ../db/db_overflow.c /^__db_moff(dbp, txn, dbt, pgno, tlen, cmpfunc, cmpp/ +__db_mpool ../dbinc/mp.h /^struct __db_mpool {$/ +__db_mpool_fstat ../dbinc/db.in /^struct __db_mpool_fstat {$/ +__db_mpool_hash ../dbinc/mp.h /^struct __db_mpool_hash {$/ +__db_mpool_stat ../dbinc/db.in /^struct __db_mpool_stat {$/ +__db_mpoolfile ../dbinc/db.in /^struct __db_mpoolfile {$/ +__db_mpreg ../dbinc/mp.h /^struct __db_mpreg {$/ +__db_msg ../common/db_err.c /^__db_msg(dbenv, fmt, va_alist)$/ +__db_msgadd ../common/db_err.c /^__db_msgadd(dbenv, mbp, fmt, va_alist)$/ __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)$/ -__db_mutex_init ../dbinc/mutex.h /^#define __db_mutex_init(a, b, c, d, e, f) \\$/ -__db_mutex_init_int ../dbinc/mutex.h /^#define __db_mutex_init_int(a, b, c, d) __db_pthre/ -__db_mutex_lock ../dbinc/mutex.h /^#define __db_mutex_lock(a, b) __db_pthread_mutex_/ -__db_mutex_maint ../mutex/mutex.c /^__db_mutex_maint(dbenv, infop)$/ -__db_mutex_setup ../mutex/mutex.c /^__db_mutex_setup(dbenv, infop, ptr, flags)$/ -__db_mutex_unlock ../dbinc/mutex.h /^#define __db_mutex_unlock(a, b) __db_pthread_mute/ +__db_mutex_stat ../dbinc/db.in /^struct __db_mutex_stat {$/ +__db_mutex_t ../dbinc/mutex_int.h /^struct __db_mutex_t { \/* Mutex. *\/$/ +__db_mutexmgr ../dbinc/mutex_int.h /^struct __db_mutexmgr {$/ __db_ndbm_clearerr ../dbm/dbm.c /^__db_ndbm_clearerr(dbm)$/ __db_ndbm_close ../dbm/dbm.c /^__db_ndbm_close(dbm)$/ __db_ndbm_delete ../dbm/dbm.c /^__db_ndbm_delete(dbm, key)$/ @@ -2585,11 +2800,11 @@ __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_log ../db/db_auto.c /^__db_noop_log(dbp, txnid, ret_lsnp, flags, pgno, p/ +__db_noop_log ../db/db_auto.c /^__db_noop_log(dbp, txnp, ret_lsnp, flags, pgno, pr/ __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)$/ +__db_norepmgr ../env/env_method.c /^__db_norepmgr(dbenv)$/ __db_not_txn_env ../common/db_err.c /^__db_not_txn_env(dbenv)$/ __db_oflags ../os/os_oflags.c /^__db_oflags(oflags)$/ __db_omode ../os/os_oflags.c /^__db_omode(perm)$/ @@ -2597,47 +2812,60 @@ __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, 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_log ../db/db_auto.c /^__db_ovref_log(dbp, txnid, ret_lsnp, flags, pgno, / +__db_out_stream ../libdb_java/db_java_wrap.c /^struct __db_out_stream {$/ +__db_ovref ../db/db_overflow.c /^__db_ovref(dbc, pgno)$/ +__db_ovref_log ../db/db_auto.c /^__db_ovref_log(dbp, txnp, ret_lsnp, flags, pgno, a/ __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/ __db_padEncrypt ../crypto/rijndael/rijndael-api-fst.c /^__db_padEncrypt(cipher, key, input, inputOctets, o/ __db_page_pass ../db/db_upg.c /^__db_page_pass(dbp, real_name, flags, fl, fhp)$/ -__db_pagesize_proc ../rpc_server/c/db_server_proc.c /^__db_pagesize_proc(dbpcl_id, pagesize, replyp)$/ __db_pagetype_to_string ../db/db_pr.c /^__db_pagetype_to_string(type)$/ __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_panic_set ../common/db_err.c /^__db_panic_set(dbenv, on)$/ __db_partsize ../db/db_cam.c /^__db_partsize(nbytes, data)$/ -__db_pg_alloc_log ../db/db_auto.c /^__db_pg_alloc_log(dbp, txnid, ret_lsnp, flags, met/ +__db_pg_alloc_42_print ../db/db_autop.c /^__db_pg_alloc_42_print(dbenv, dbtp, lsnp, notused2/ +__db_pg_alloc_42_read ../db/db_auto.c /^__db_pg_alloc_42_read(dbenv, recbuf, argpp)$/ +__db_pg_alloc_42_recover ../db/db_rec.c /^__db_pg_alloc_42_recover(dbenv, dbtp, lsnp, op, in/ +__db_pg_alloc_log ../db/db_auto.c /^__db_pg_alloc_log(dbp, txnp, ret_lsnp, flags, meta/ __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_log ../db/db_auto.c /^__db_pg_free_log(dbp, txnid, ret_lsnp, flags, pgno/ +__db_pg_free_42_print ../db/db_autop.c /^__db_pg_free_42_print(dbenv, dbtp, lsnp, notused2,/ +__db_pg_free_42_read ../db/db_auto.c /^__db_pg_free_42_read(dbenv, recbuf, argpp)$/ +__db_pg_free_42_recover ../db/db_rec.c /^__db_pg_free_42_recover(dbenv, dbtp, lsnp, op, inf/ +__db_pg_free_log ../db/db_auto.c /^__db_pg_free_log(dbp, txnp, ret_lsnp, flags, pgno,/ __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_42_int ../db/db_rec.c /^__db_pg_free_recover_42_int(dbenv, argp, file_dbp,/ __db_pg_free_recover_int ../db/db_rec.c /^__db_pg_free_recover_int(dbenv, argp, file_dbp, ls/ -__db_pg_freedata_log ../db/db_auto.c /^__db_pg_freedata_log(dbp, txnid, ret_lsnp, flags, / +__db_pg_freedata_42_print ../db/db_autop.c /^__db_pg_freedata_42_print(dbenv, dbtp, lsnp, notus/ +__db_pg_freedata_42_read ../db/db_auto.c /^__db_pg_freedata_42_read(dbenv, recbuf, argpp)$/ +__db_pg_freedata_42_recover ../db/db_rec.c /^__db_pg_freedata_42_recover(dbenv, dbtp, lsnp, op,/ +__db_pg_freedata_log ../db/db_auto.c /^__db_pg_freedata_log(dbp, txnp, ret_lsnp, flags, p/ __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_init_log ../db/db_auto.c /^__db_pg_init_log(dbp, txnid, ret_lsnp, flags, pgno/ +__db_pg_init_log ../db/db_auto.c /^__db_pg_init_log(dbp, txnp, 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_log ../db/db_auto.c /^__db_pg_new_log(dbp, txnp, ret_lsnp, flags, pgno, / __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_log ../db/db_auto.c /^__db_pg_prepare_log(dbp, txnid, ret_lsnp, flags, p/ +__db_pg_prepare_log ../db/db_auto.c /^__db_pg_prepare_log(dbp, txnp, ret_lsnp, flags, pg/ __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_pg_sort_log ../db/db_auto.c /^__db_pg_sort_log(dbp, txnp, ret_lsnp, flags, meta,/ +__db_pg_sort_print ../db/db_autop.c /^__db_pg_sort_print(dbenv, dbtp, lsnp, notused2, no/ +__db_pg_sort_read ../db/db_auto.c /^__db_pg_sort_read(dbenv, recbuf, argpp)$/ +__db_pg_sort_recover ../db/db_rec.c /^__db_pg_sort_recover(dbenv, dbtp, lsnp, op, info)$/ +__db_pg_truncate ../db/db_meta.c /^__db_pg_truncate(mpf, txn, list, c_data, nelemp, l/ __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_arg ../db/db_iface.c /^__db_pget_arg(dbp, pkey, flags)$/ @@ -2645,6 +2873,7 @@ __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, skey/ __db_pgfmt ../common/db_err.c /^__db_pgfmt(dbenv, pgno)$/ __db_pgin ../db/db_conv.c /^__db_pgin(dbenv, pg, pp, cookie)$/ +__db_pglistcmp ../db/db_meta.c /^__db_pglistcmp(a, b)$/ __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)$/ @@ -2652,42 +2881,43 @@ __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, flags)$/ __db_prdbt ../db/db_pr.c /^__db_prdbt(dbtp, checkprint, prefix, handle, callb/ +__db_preplist ../dbinc/db.in /^struct __db_preplist {$/ __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_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_fh ../env/env_stat.c /^__db_print_fh(dbenv, tag, 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_prnpage ../db/db_pr.c /^__db_prnpage(dbp, txn, 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)$/ -__db_pthread_mutex_unlock ../mutex/mut_pthread.c /^__db_pthread_mutex_unlock(dbenv, mutexp)$/ +__db_prtree ../db/db_pr.c /^__db_prtree(dbp, txn, flags)$/ +__db_pthread_mutex_destroy ../mutex/mut_pthread.c /^__db_pthread_mutex_destroy(dbenv, mutex)$/ +__db_pthread_mutex_init ../mutex/mut_pthread.c /^__db_pthread_mutex_init(dbenv, mutex, flags)$/ +__db_pthread_mutex_lock ../mutex/mut_pthread.c /^__db_pthread_mutex_lock(dbenv, mutex)$/ +__db_pthread_mutex_unlock ../mutex/mut_pthread.c /^__db_pthread_mutex_unlock(dbenv, mutex)$/ __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, keydof/ +__db_qam_stat ../dbinc/db.in /^struct __db_qam_stat {$/ __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)$/ -__db_re_delim_proc ../rpc_server/c/db_server_proc.c /^__db_re_delim_proc(dbpcl_id, delim, replyp)$/ -__db_re_len_proc ../rpc_server/c/db_server_proc.c /^__db_re_len_proc(dbpcl_id, len, replyp)$/ -__db_re_pad_proc ../rpc_server/c/db_server_proc.c /^__db_re_pad_proc(dbpcl_id, pad, replyp)$/ +__db_rdonly ../common/db_err.c /^__db_rdonly(dbenv, name)$/ __db_rec_repl ../common/db_err.c /^__db_rec_repl(dbenv, data_size, data_dlen)$/ __db_rec_toobig ../common/db_err.c /^__db_rec_toobig(dbenv, data_len, fixed_rec_len)$/ __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_refresh ../db/db.c /^__db_refresh(dbp, txn, flags, deferred_closep, reu/ +__db_reginfo_t ../dbinc/region.h /^struct __db_reginfo_t { \/* __db_r_attach IN para/ +__db_relink_42_print ../db/db_autop.c /^__db_relink_42_print(dbenv, dbtp, lsnp, notused2, / +__db_relink_42_read ../db/db_auto.c /^__db_relink_42_read(dbenv, recbuf, argpp)$/ +__db_relink_42_recover ../db/db_rec.c /^__db_relink_42_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)$/ @@ -2696,8 +2926,12 @@ __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, newname, f/ +__db_rep ../dbinc/rep.h /^struct __db_rep {$/ __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_rep_stat ../dbinc/db.in /^struct __db_rep_stat {$/ +__db_repmgr_site ../dbinc/db.in /^struct __db_repmgr_site {$/ +__db_repmgr_sites ../libdb_java/db_java_wrap.c /^struct __db_repmgr_sites {$/ +__db_ret ../db/db_ret.c /^__db_ret(dbp, txn, 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)$/ __db_rijndaelDecryptRound ../crypto/rijndael/rijndael-alg-fst.c /^__db_rijndaelDecryptRound(rk, Nr, pt, ct)$/ @@ -2707,14 +2941,15 @@ __db_rijndaelKeySetupDec ../crypto/rijndael/rijndael-alg-fst.c /^__db_rijndaelKe __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, dbenvp)$/ __db_rpath ../os/os_rpath.c /^__db_rpath(path)$/ +__db_s_count ../db/db_cam.c /^__db_s_count(pdbp)$/ __db_s_done ../db/db_cam.c /^__db_s_done(sdbp)$/ -__db_s_first ../db/db_cam.c /^__db_s_first(pdbp)$/ +__db_s_first ../db/db_cam.c /^__db_s_first(pdbp, sdbpp)$/ __db_s_next ../db/db_cam.c /^__db_s_next(sdbpp)$/ __db_safe_goff ../db/db_ovfl_vrfy.c /^__db_safe_goff(dbp, vdp, pgno, dbt, buf, flags)$/ __db_salvage ../db/db_vrfy.c /^__db_salvage(dbp, vdp, pgno, h, handle, callback, / __db_salvage_destroy ../db/db_vrfyutil.c /^__db_salvage_destroy(vdp)$/ __db_salvage_duptree ../db/db_vrfy.c /^__db_salvage_duptree(dbp, vdp, pgno, key, handle, / -__db_salvage_getnext ../db/db_vrfyutil.c /^__db_salvage_getnext(vdp, pgnop, pgtypep)$/ +__db_salvage_getnext ../db/db_vrfyutil.c /^__db_salvage_getnext(vdp, dbcp, pgnop, pgtypep, sk/ __db_salvage_init ../db/db_vrfyutil.c /^__db_salvage_init(vdp)$/ __db_salvage_isdone ../db/db_vrfyutil.c /^__db_salvage_isdone(vdp, pgno)$/ __db_salvage_markdone ../db/db_vrfyutil.c /^__db_salvage_markdone(vdp, pgno)$/ @@ -2726,35 +2961,43 @@ __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_seq_record ../dbinc/db.in /^struct __db_seq_record {$/ +__db_seq_stat ../dbinc/db.in /^struct __db_seq_stat {$/ +__db_sequence ../dbinc/db.in /^struct __db_sequence {$/ __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_minkey_proc ../rpc_server/c/db_server_proc.c /^__db_set_bt_minkey_proc(dbpcl_id, minkey, replyp)$/ __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)$/ +__db_set_encrypt_proc ../rpc_server/c/db_server_proc.c /^__db_set_encrypt_proc(dbpcl_id, passwd, flags, rep/ __db_set_errcall ../db/db_method.c /^__db_set_errcall(dbp, errcall)$/ __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_flags_proc ../rpc_server/c/db_server_proc.c /^__db_set_flags_proc(dbpcl_id, flags, replyp)$/ +__db_set_h_ffactor_proc ../rpc_server/c/db_server_proc.c /^__db_set_h_ffactor_proc(dbpcl_id, ffactor, replyp)/ +__db_set_h_nelem_proc ../rpc_server/c/db_server_proc.c /^__db_set_h_nelem_proc(dbpcl_id, nelem, replyp)$/ +__db_set_lastpgno ../db/db_upg.c /^__db_set_lastpgno(dbp, real_name, fhp)$/ __db_set_lorder ../db/db_method.c /^__db_set_lorder(dbp, db_lorder)$/ +__db_set_lorder_proc ../rpc_server/c/db_server_proc.c /^__db_set_lorder_proc(dbpcl_id, lorder, replyp)$/ __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_pagesize_proc ../rpc_server/c/db_server_proc.c /^__db_set_pagesize_proc(dbpcl_id, pagesize, replyp)/ __db_set_paniccall ../db/db_method.c /^__db_set_paniccall(dbp, paniccall)$/ +__db_set_q_extentsize_proc ../rpc_server/c/db_server_proc.c /^__db_set_q_extentsize_proc(dbpcl_id, extentsize, r/ +__db_set_re_delim_proc ../rpc_server/c/db_server_proc.c /^__db_set_re_delim_proc(dbpcl_id, delim, replyp)$/ +__db_set_re_len_proc ../rpc_server/c/db_server_proc.c /^__db_set_re_len_proc(dbpcl_id, len, replyp)$/ +__db_set_re_pad_proc ../rpc_server/c/db_server_proc.c /^__db_set_re_pad_proc(dbpcl_id, pad, replyp)$/ __db_sgenrand ../crypto/mersenne/mt19937db.c /^__db_sgenrand(seed, mt, mtip)$/ __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_space_err ../common/db_err.c /^__db_space_err(dbp)$/ __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)$/ @@ -2768,41 +3011,53 @@ __db_subdb_rename ../db/db_rename.c /^__db_subdb_rename(dbp, txn, name, subdb, n __db_sync ../db/db_am.c /^__db_sync(dbp)$/ __db_sync_pp ../db/db_iface.c /^__db_sync_pp(dbp, flags)$/ __db_sync_proc ../rpc_server/c/db_server_proc.c /^__db_sync_proc(dbpcl_id, flags, replyp)$/ +__db_syserr ../common/db_err.c /^__db_syserr(dbenv, error fmt, va_alist)$/ __db_tablesize ../env/db_shash.c /^__db_tablesize(n_buckets)$/ -__db_tas_mutex_destroy ../mutex/mut_tas.c /^__db_tas_mutex_destroy(mutexp)$/ -__db_tas_mutex_init ../mutex/mut_tas.c /^__db_tas_mutex_init(dbenv, mutexp, flags)$/ -__db_tas_mutex_lock ../mutex/mut_tas.c /^__db_tas_mutex_lock(dbenv, mutexp)$/ -__db_tas_mutex_unlock ../mutex/mut_tas.c /^__db_tas_mutex_unlock(dbenv, mutexp)$/ +__db_tas_mutex_destroy ../mutex/mut_tas.c /^__db_tas_mutex_destroy(dbenv, mutex)$/ +__db_tas_mutex_init ../mutex/mut_tas.c /^__db_tas_mutex_init(dbenv, mutex, flags)$/ +__db_tas_mutex_lock ../mutex/mut_tas.c /^__db_tas_mutex_lock(dbenv, mutex)$/ +__db_tas_mutex_unlock ../mutex/mut_tas.c /^__db_tas_mutex_unlock(dbenv, mutex)$/ __db_testcopy ../db/db.c /^__db_testcopy(dbenv, dbp, name)$/ __db_testdocopy ../db/db.c /^__db_testdocopy(dbenv, name)$/ +__db_threadid ../env/env_failchk.c /^struct __db_threadid {$/ __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_traverse_big ../db/db_reclaim.c /^__db_traverse_big(dbp, pgno, txn, callback, cookie/ __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_freelist ../db/db_meta.c /^__db_truncate_freelist(dbc, meta, h, list, start, / __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, flags, rep/ -__db_txn_abort_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_txn_abort_4003__SVCSUFFIX__(msg, req)$/ +__db_txn ../dbinc/db.in /^struct __db_txn {$/ +__db_txn_abort_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_txn_abort_4005__SVCSUFFIX__(msg, req)$/ +__db_txn_active ../dbinc/db.in /^struct __db_txn_active {$/ __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_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, statusp)$/ +__db_txn_commit_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_txn_commit_4005__SVCSUFFIX__(msg, req)$/ +__db_txn_deadlock_err ../common/db_err.c /^__db_txn_deadlock_err(dbenv)$/ +__db_txn_discard_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_txn_discard_4005__SVCSUFFIX__(msg, req)$/ +__db_txn_prepare_4005__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_txn_prepare_4005__SVCSUFFIX__(msg, req)$/ +__db_txn_stat ../dbinc/db.in /^struct __db_txn_stat {$/ +__db_txnhead ../dbinc/db_dispatch.h /^struct __db_txnhead {$/ +__db_txnlist ../dbinc/db_dispatch.h /^struct __db_txnlist {$/ +__db_txnlist_add ../db/db_dispatch.c /^__db_txnlist_add(dbenv, hp, txnid, status, lsn)$/ +__db_txnlist_ckp ../db/db_dispatch.c /^__db_txnlist_ckp(dbenv, hp, ckp_lsn)$/ +__db_txnlist_end ../db/db_dispatch.c /^__db_txnlist_end(dbenv, hp)$/ +__db_txnlist_find ../db/db_dispatch.c /^__db_txnlist_find(dbenv, hp, 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_gen ../db/db_dispatch.c /^__db_txnlist_gen(dbenv, hp, 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)$/ +__db_txnlist_lsnadd ../db/db_dispatch.c /^__db_txnlist_lsnadd(dbenv, hp, lsnp)$/ +__db_txnlist_lsnget ../db/db_dispatch.c /^__db_txnlist_lsnget(dbenv, hp, lsnp, flags)$/ __db_txnlist_lsninit ../db/db_dispatch.c /^__db_txnlist_lsninit(dbenv, hp, lsnp)$/ __db_txnlist_pgnoadd ../db/db_dispatch.c /^__db_txnlist_pgnoadd(dbenv, hp, fileid, uid, fname/ -__db_txnlist_print ../db/db_dispatch.c /^__db_txnlist_print(listp)$/ -__db_txnlist_remove ../db/db_dispatch.c /^__db_txnlist_remove(dbenv, listp, txnid)$/ -__db_txnlist_update ../db/db_dispatch.c /^__db_txnlist_update(dbenv, listp, txnid, status, l/ +__db_txnlist_print ../db/db_dispatch.c /^__db_txnlist_print(hp)$/ +__db_txnlist_remove ../db/db_dispatch.c /^__db_txnlist_remove(dbenv, hp, txnid)$/ +__db_txnlist_update ../db/db_dispatch.c /^__db_txnlist_update(dbenv, hp, txnid, status, lsn,/ +__db_txnmgr ../dbinc/txn.h /^struct __db_txnmgr {$/ +__db_txnregion ../dbinc/txn.h /^struct __db_txnregion {$/ +__db_unknown_error ../common/db_err.c /^__db_unknown_error(error)$/ __db_unknown_flag ../common/db_err.c /^__db_unknown_flag(dbenv, routine, flag)$/ +__db_unknown_path ../common/db_err.c /^__db_unknown_path(dbenv, routine)$/ __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(dbenv, xid, off)$/ @@ -2838,7 +3093,7 @@ __db_vrfy_meta ../db/db_vrfy.c /^__db_vrfy_meta(dbp, vdp, meta, pgno, flags)$/ __db_vrfy_orderchkonly ../db/db_vrfy.c /^__db_vrfy_orderchkonly(dbp, vdp, name, subdb, flag/ __db_vrfy_overflow ../db/db_ovfl_vrfy.c /^__db_vrfy_overflow(dbp, vdp, h, pgno, flags)$/ __db_vrfy_ovfl_structure ../db/db_ovfl_vrfy.c /^__db_vrfy_ovfl_structure(dbp, vdp, pgno, tlen, fla/ -__db_vrfy_pageinfo_create ../db/db_vrfyutil.c /^__db_vrfy_pageinfo_create(dbenv, pgipp)$/ +__db_vrfy_pageinfo_create ../db/db_vrfyutil.c /^__db_vrfy_pageinfo_create(dbenv, pipp)$/ __db_vrfy_pagezero ../db/db_vrfy.c /^__db_vrfy_pagezero(dbp, vdp, fhp, flags)$/ __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)$/ @@ -2850,10 +3105,10 @@ __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/ __db_vrfy_subdbs ../db/db_vrfy.c /^__db_vrfy_subdbs(dbp, vdp, dbname, flags)$/ __db_vrfy_walkpages ../db/db_vrfy.c /^__db_vrfy_walkpages(dbp, vdp, handle, callback, fl/ -__db_win32_mutex_destroy ../mutex/mut_win32.c /^__db_win32_mutex_destroy(mutexp)$/ -__db_win32_mutex_init ../mutex/mut_win32.c /^__db_win32_mutex_init(dbenv, mutexp, flags)$/ -__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_win32_mutex_destroy ../mutex/mut_win32.c /^__db_win32_mutex_destroy(dbenv, mutex)$/ +__db_win32_mutex_init ../mutex/mut_win32.c /^__db_win32_mutex_init(dbenv, mutex, flags)$/ +__db_win32_mutex_lock ../mutex/mut_win32.c /^__db_win32_mutex_lock(dbenv, mutex)$/ +__db_win32_mutex_unlock ../mutex/mut_win32.c /^__db_win32_mutex_unlock(dbenv, mutex)$/ __db_wrlock_err ../db/db_cam.c /^__db_wrlock_err(dbenv)$/ __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)$/ @@ -2867,24 +3122,21 @@ __db_xa_recover ../xa/xa.c /^__db_xa_recover(xids, count, 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 ../dbinc/db.in /^struct __dbc {$/ +__dbc_c_close_proc ../rpc_server/c/db_server_proc.c /^__dbc_c_close_proc(dbccl_id, replyp)$/ +__dbc_c_count_proc ../rpc_server/c/db_server_proc.c /^__dbc_c_count_proc(dbccl_id, flags, replyp)$/ +__dbc_c_del_proc ../rpc_server/c/db_server_proc.c /^__dbc_c_del_proc(dbccl_id, flags, replyp)$/ +__dbc_c_dup_proc ../rpc_server/c/db_server_proc.c /^__dbc_c_dup_proc(dbccl_id, flags, replyp)$/ +__dbc_c_get_proc ../rpc_server/c/db_server_proc.c /^__dbc_c_get_proc(dbccl_id, keydlen, keydoff, keyul/ +__dbc_c_pget_proc ../rpc_server/c/db_server_proc.c /^__dbc_c_pget_proc(dbccl_id, skeydlen, skeydoff, sk/ +__dbc_c_put_proc ../rpc_server/c/db_server_proc.c /^__dbc_c_put_proc(dbccl_id, keydlen, keydoff, keyul/ __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_proc ../rpc_server/c/db_server_proc.c /^__dbc_count_proc(dbccl_id, flags, replyp)$/ -__dbc_del_proc ../rpc_server/c/db_server_proc.c /^__dbc_del_proc(dbccl_id, flags, replyp)$/ -__dbc_dup_proc ../rpc_server/c/db_server_proc.c /^__dbc_dup_proc(dbccl_id, flags, replyp)$/ -__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/ +__dbc_internal ../dbinc/db_int.in /^struct __dbc_internal {$/ +__dbc_logging ../common/db_err.c /^__dbc_logging(dbc)$/ __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)$/ -__dbcl_db_alloc ../rpc_client/gen_client.c /^__dbcl_db_alloc(dbp, func0, func1, func2)$/ __dbcl_db_associate ../rpc_client/gen_client.c /^__dbcl_db_associate(dbp, txnp, sdbp, func0, flags)/ -__dbcl_db_bt_compare ../rpc_client/gen_client.c /^__dbcl_db_bt_compare(dbp, func0)$/ -__dbcl_db_bt_maxkey ../rpc_client/gen_client.c /^__dbcl_db_bt_maxkey(dbp, maxkey)$/ -__dbcl_db_bt_minkey ../rpc_client/gen_client.c /^__dbcl_db_bt_minkey(dbp, minkey)$/ -__dbcl_db_bt_prefix ../rpc_client/gen_client.c /^__dbcl_db_bt_prefix(dbp, func0)$/ -__dbcl_db_cachesize ../rpc_client/gen_client.c /^__dbcl_db_cachesize(dbp, gbytes, bytes, ncache)$/ __dbcl_db_close ../rpc_client/gen_client.c /^__dbcl_db_close(dbp, flags)$/ __dbcl_db_close_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_close_ret(dbp, flags, replyp)$/ __dbcl_db_create ../rpc_client/gen_client.c /^__dbcl_db_create(dbp, dbenv, flags)$/ @@ -2892,86 +3144,79 @@ __dbcl_db_create_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_create_ret(dbp, __dbcl_db_cursor ../rpc_client/gen_client.c /^__dbcl_db_cursor(dbp, txnp, dbcpp, flags)$/ __dbcl_db_cursor_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_cursor_ret(dbp, txnp, dbcp, flags, reply/ __dbcl_db_del ../rpc_client/gen_client.c /^__dbcl_db_del(dbp, txnp, key, flags)$/ -__dbcl_db_dup_compare ../rpc_client/gen_client.c /^__dbcl_db_dup_compare(dbp, func0)$/ -__dbcl_db_encrypt ../rpc_client/gen_client.c /^__dbcl_db_encrypt(dbp, passwd, flags)$/ -__dbcl_db_extentsize ../rpc_client/gen_client.c /^__dbcl_db_extentsize(dbp, extentsize)$/ -__dbcl_db_fd ../rpc_client/gen_client.c /^__dbcl_db_fd(dbp, fdp)$/ -__dbcl_db_feedback ../rpc_client/gen_client.c /^__dbcl_db_feedback(dbp, func0)$/ -__dbcl_db_flags ../rpc_client/gen_client.c /^__dbcl_db_flags(dbp, flags)$/ __dbcl_db_get ../rpc_client/gen_client.c /^__dbcl_db_get(dbp, txnp, key, data, flags)$/ __dbcl_db_get_bt_minkey ../rpc_client/gen_client.c /^__dbcl_db_get_bt_minkey(dbp, minkeyp)$/ -__dbcl_db_get_cachesize ../rpc_client/gen_client.c /^__dbcl_db_get_cachesize(dbp, gbytesp, bytesp, ncac/ +__dbcl_db_get_dbname ../rpc_client/gen_client.c /^__dbcl_db_get_dbname(dbp, filenamep, dbnamep)$/ __dbcl_db_get_encrypt_flags ../rpc_client/gen_client.c /^__dbcl_db_get_encrypt_flags(dbp, flagsp)$/ -__dbcl_db_get_extentsize ../rpc_client/gen_client.c /^__dbcl_db_get_extentsize(dbp, extentsizep)$/ __dbcl_db_get_flags ../rpc_client/gen_client.c /^__dbcl_db_get_flags(dbp, flagsp)$/ __dbcl_db_get_h_ffactor ../rpc_client/gen_client.c /^__dbcl_db_get_h_ffactor(dbp, ffactorp)$/ __dbcl_db_get_h_nelem ../rpc_client/gen_client.c /^__dbcl_db_get_h_nelem(dbp, nelemp)$/ __dbcl_db_get_lorder ../rpc_client/gen_client.c /^__dbcl_db_get_lorder(dbp, lorderp)$/ -__dbcl_db_get_name ../rpc_client/gen_client.c /^__dbcl_db_get_name(dbp, filenamep, dbnamep)$/ __dbcl_db_get_open_flags ../rpc_client/gen_client.c /^__dbcl_db_get_open_flags(dbp, flagsp)$/ __dbcl_db_get_pagesize ../rpc_client/gen_client.c /^__dbcl_db_get_pagesize(dbp, pagesizep)$/ +__dbcl_db_get_q_extentsize ../rpc_client/gen_client.c /^__dbcl_db_get_q_extentsize(dbp, extentsizep)$/ __dbcl_db_get_re_delim ../rpc_client/gen_client.c /^__dbcl_db_get_re_delim(dbp, delimp)$/ __dbcl_db_get_re_len ../rpc_client/gen_client.c /^__dbcl_db_get_re_len(dbp, lenp)$/ __dbcl_db_get_re_pad ../rpc_client/gen_client.c /^__dbcl_db_get_re_pad(dbp, padp)$/ -__dbcl_db_get_re_source ../rpc_client/gen_client.c /^__dbcl_db_get_re_source(dbp, re_sourcep)$/ __dbcl_db_get_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_get_ret(dbp, txnp, key, data, flags, rep/ -__dbcl_db_h_ffactor ../rpc_client/gen_client.c /^__dbcl_db_h_ffactor(dbp, ffactor)$/ -__dbcl_db_h_hash ../rpc_client/gen_client.c /^__dbcl_db_h_hash(dbp, func0)$/ -__dbcl_db_h_nelem ../rpc_client/gen_client.c /^__dbcl_db_h_nelem(dbp, nelem)$/ __dbcl_db_join ../rpc_client/gen_client.c /^__dbcl_db_join(dbp, curs, dbcp, flags)$/ __dbcl_db_join_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_join_ret(dbp, curs, dbcp, flags, replyp)/ __dbcl_db_key_range ../rpc_client/gen_client.c /^__dbcl_db_key_range(dbp, txnp, key, range, flags)$/ __dbcl_db_key_range_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_key_range_ret(dbp, txnp, key, range, fla/ -__dbcl_db_lorder ../rpc_client/gen_client.c /^__dbcl_db_lorder(dbp, lorder)$/ __dbcl_db_open ../rpc_client/gen_client.c /^__dbcl_db_open(dbp, txnp, name, subdb, type, flags/ __dbcl_db_open_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_open_ret(dbp, txn, name, subdb, type, fl/ __dbcl_db_open_wrap ../rpc_client/client.c /^__dbcl_db_open_wrap(dbp, txnp, name, subdb, type, / -__dbcl_db_pagesize ../rpc_client/gen_client.c /^__dbcl_db_pagesize(dbp, pagesize)$/ -__dbcl_db_panic ../rpc_client/gen_client.c /^__dbcl_db_panic(dbp, func0)$/ __dbcl_db_pget ../rpc_client/gen_client.c /^__dbcl_db_pget(dbp, txnp, skey, pkey, data, flags)/ __dbcl_db_pget_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_pget_ret(dbp, txnp, skey, pkey, data, fl/ __dbcl_db_put ../rpc_client/gen_client.c /^__dbcl_db_put(dbp, txnp, key, data, flags)$/ __dbcl_db_put_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_put_ret(dbp, txnp, key, data, flags, rep/ -__dbcl_db_re_delim ../rpc_client/gen_client.c /^__dbcl_db_re_delim(dbp, delim)$/ -__dbcl_db_re_len ../rpc_client/gen_client.c /^__dbcl_db_re_len(dbp, len)$/ -__dbcl_db_re_pad ../rpc_client/gen_client.c /^__dbcl_db_re_pad(dbp, pad)$/ -__dbcl_db_re_source ../rpc_client/gen_client.c /^__dbcl_db_re_source(dbp, re_source)$/ __dbcl_db_remove ../rpc_client/gen_client.c /^__dbcl_db_remove(dbp, name, subdb, flags)$/ __dbcl_db_remove_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_remove_ret(dbp, name, subdb, flags, repl/ __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_set_bt_minkey ../rpc_client/gen_client.c /^__dbcl_db_set_bt_minkey(dbp, minkey)$/ +__dbcl_db_set_encrypt ../rpc_client/gen_client.c /^__dbcl_db_set_encrypt(dbp, passwd, flags)$/ +__dbcl_db_set_flags ../rpc_client/gen_client.c /^__dbcl_db_set_flags(dbp, flags)$/ +__dbcl_db_set_h_ffactor ../rpc_client/gen_client.c /^__dbcl_db_set_h_ffactor(dbp, ffactor)$/ +__dbcl_db_set_h_nelem ../rpc_client/gen_client.c /^__dbcl_db_set_h_nelem(dbp, nelem)$/ +__dbcl_db_set_lorder ../rpc_client/gen_client.c /^__dbcl_db_set_lorder(dbp, lorder)$/ +__dbcl_db_set_pagesize ../rpc_client/gen_client.c /^__dbcl_db_set_pagesize(dbp, pagesize)$/ +__dbcl_db_set_q_extentsize ../rpc_client/gen_client.c /^__dbcl_db_set_q_extentsize(dbp, extentsize)$/ +__dbcl_db_set_re_delim ../rpc_client/gen_client.c /^__dbcl_db_set_re_delim(dbp, delim)$/ +__dbcl_db_set_re_len ../rpc_client/gen_client.c /^__dbcl_db_set_re_len(dbp, len)$/ +__dbcl_db_set_re_pad ../rpc_client/gen_client.c /^__dbcl_db_set_re_pad(dbp, pad)$/ __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/ -__dbcl_db_upgrade ../rpc_client/gen_client.c /^__dbcl_db_upgrade(dbp, fname, flags)$/ -__dbcl_db_verify ../rpc_client/gen_client.c /^__dbcl_db_verify(dbp, fname, subdb, outfile, flags/ -__dbcl_dbc_close ../rpc_client/gen_client.c /^__dbcl_dbc_close(dbc)$/ -__dbcl_dbc_close_ret ../rpc_client/gen_client_ret.c /^__dbcl_dbc_close_ret(dbc, replyp)$/ -__dbcl_dbc_count ../rpc_client/gen_client.c /^__dbcl_dbc_count(dbc, countp, flags)$/ -__dbcl_dbc_count_ret ../rpc_client/gen_client_ret.c /^__dbcl_dbc_count_ret(dbc, countp, flags, replyp)$/ -__dbcl_dbc_del ../rpc_client/gen_client.c /^__dbcl_dbc_del(dbc, flags)$/ -__dbcl_dbc_dup ../rpc_client/gen_client.c /^__dbcl_dbc_dup(dbc, dbcp, flags)$/ -__dbcl_dbc_dup_ret ../rpc_client/gen_client_ret.c /^__dbcl_dbc_dup_ret(dbc, dbcp, flags, replyp)$/ -__dbcl_dbc_get ../rpc_client/gen_client.c /^__dbcl_dbc_get(dbc, key, data, flags)$/ -__dbcl_dbc_get_ret ../rpc_client/gen_client_ret.c /^__dbcl_dbc_get_ret(dbc, key, data, flags, replyp)$/ -__dbcl_dbc_pget ../rpc_client/gen_client.c /^__dbcl_dbc_pget(dbc, skey, pkey, data, flags)$/ -__dbcl_dbc_pget_ret ../rpc_client/gen_client_ret.c /^__dbcl_dbc_pget_ret(dbc, skey, pkey, data, flags, / -__dbcl_dbc_put ../rpc_client/gen_client.c /^__dbcl_dbc_put(dbc, key, data, flags)$/ -__dbcl_dbc_put_ret ../rpc_client/gen_client_ret.c /^__dbcl_dbc_put_ret(dbc, key, data, flags, replyp)$/ +__dbcl_dbc_c_close ../rpc_client/gen_client.c /^__dbcl_dbc_c_close(dbc)$/ +__dbcl_dbc_c_close_ret ../rpc_client/gen_client_ret.c /^__dbcl_dbc_c_close_ret(dbc, replyp)$/ +__dbcl_dbc_c_count ../rpc_client/gen_client.c /^__dbcl_dbc_c_count(dbc, countp, flags)$/ +__dbcl_dbc_c_count_ret ../rpc_client/gen_client_ret.c /^__dbcl_dbc_c_count_ret(dbc, countp, flags, replyp)/ +__dbcl_dbc_c_del ../rpc_client/gen_client.c /^__dbcl_dbc_c_del(dbc, flags)$/ +__dbcl_dbc_c_dup ../rpc_client/gen_client.c /^__dbcl_dbc_c_dup(dbc, dbcp, flags)$/ +__dbcl_dbc_c_dup_ret ../rpc_client/gen_client_ret.c /^__dbcl_dbc_c_dup_ret(dbc, dbcp, flags, replyp)$/ +__dbcl_dbc_c_get ../rpc_client/gen_client.c /^__dbcl_dbc_c_get(dbc, key, data, flags)$/ +__dbcl_dbc_c_get_ret ../rpc_client/gen_client_ret.c /^__dbcl_dbc_c_get_ret(dbc, key, data, flags, replyp/ +__dbcl_dbc_c_pget ../rpc_client/gen_client.c /^__dbcl_dbc_c_pget(dbc, skey, pkey, data, flags)$/ +__dbcl_dbc_c_pget_ret ../rpc_client/gen_client_ret.c /^__dbcl_dbc_c_pget_ret(dbc, skey, pkey, data, flags/ +__dbcl_dbc_c_put ../rpc_client/gen_client.c /^__dbcl_dbc_c_put(dbc, key, data, flags)$/ +__dbcl_dbc_c_put_ret ../rpc_client/gen_client_ret.c /^__dbcl_dbc_c_put_ret(dbc, key, data, flags, replyp/ +__dbcl_dbc_init ../rpc_client/gen_client.c /^__dbcl_dbc_init(dbc)$/ __dbcl_dbclose_common ../rpc_client/client.c /^__dbcl_dbclose_common(dbp)$/ -__dbcl_env_alloc ../rpc_client/gen_client.c /^__dbcl_env_alloc(dbenv, func0, func1, func2)$/ -__dbcl_env_cachesize ../rpc_client/gen_client.c /^__dbcl_env_cachesize(dbenv, gbytes, bytes, ncache)/ +__dbcl_dbenv_illegal ../rpc_client/gen_client.c /^__dbcl_dbenv_illegal(dbenv)$/ +__dbcl_dbenv_init ../rpc_client/gen_client.c /^__dbcl_dbenv_init(dbenv)$/ +__dbcl_dbp_illegal ../rpc_client/gen_client.c /^__dbcl_dbp_illegal(dbp)$/ +__dbcl_dbp_init ../rpc_client/gen_client.c /^__dbcl_dbp_init(dbp)$/ +__dbcl_env_cdsgroup_begin ../rpc_client/gen_client.c /^__dbcl_env_cdsgroup_begin(dbenv, txnpp)$/ +__dbcl_env_cdsgroup_begin_ret ../rpc_client/gen_client_ret.c /^__dbcl_env_cdsgroup_begin_ret(envp, txnpp, replyp)/ __dbcl_env_close ../rpc_client/gen_client.c /^__dbcl_env_close(dbenv, flags)$/ __dbcl_env_close_wrap ../rpc_client/client.c /^__dbcl_env_close_wrap(dbenv, flags)$/ __dbcl_env_create ../rpc_client/gen_client.c /^__dbcl_env_create(dbenv, timeout)$/ __dbcl_env_create_ret ../rpc_client/gen_client_ret.c /^__dbcl_env_create_ret(dbenv, timeout, replyp)$/ __dbcl_env_dbremove ../rpc_client/gen_client.c /^__dbcl_env_dbremove(dbenv, txnp, name, subdb, flag/ __dbcl_env_dbrename ../rpc_client/gen_client.c /^__dbcl_env_dbrename(dbenv, txnp, name, subdb, newn/ -__dbcl_env_encrypt ../rpc_client/gen_client.c /^__dbcl_env_encrypt(dbenv, passwd, flags)$/ -__dbcl_env_flags ../rpc_client/gen_client.c /^__dbcl_env_flags(dbenv, flags, onoff)$/ __dbcl_env_get_cachesize ../rpc_client/gen_client.c /^__dbcl_env_get_cachesize(dbenv, gbytesp, bytesp, n/ __dbcl_env_get_encrypt_flags ../rpc_client/gen_client.c /^__dbcl_env_get_encrypt_flags(dbenv, flagsp)$/ __dbcl_env_get_flags ../rpc_client/gen_client.c /^__dbcl_env_get_flags(dbenv, flagsp)$/ @@ -2980,177 +3225,37 @@ __dbcl_env_get_open_flags ../rpc_client/gen_client.c /^__dbcl_env_get_open_flags __dbcl_env_open ../rpc_client/gen_client.c /^__dbcl_env_open(dbenv, home, flags, mode)$/ __dbcl_env_open_ret ../rpc_client/gen_client_ret.c /^__dbcl_env_open_ret(dbenv, home, flags, mode, repl/ __dbcl_env_open_wrap ../rpc_client/client.c /^__dbcl_env_open_wrap(dbenv, home, flags, mode)$/ -__dbcl_env_paniccall ../rpc_client/gen_client.c /^__dbcl_env_paniccall(dbenv, func0)$/ __dbcl_env_remove ../rpc_client/gen_client.c /^__dbcl_env_remove(dbenv, home, flags)$/ __dbcl_env_remove_ret ../rpc_client/gen_client_ret.c /^__dbcl_env_remove_ret(dbenv, home, flags, replyp)$/ -__dbcl_env_set_feedback ../rpc_client/gen_client.c /^__dbcl_env_set_feedback(dbenv, func0)$/ -__dbcl_envrpcserver ../rpc_client/client.c /^__dbcl_envrpcserver(dbenv, clnt, host, tsec, ssec,/ -__dbcl_get_data_dirs ../rpc_client/gen_client.c /^__dbcl_get_data_dirs(dbenv, dirpp)$/ -__dbcl_get_lg_bsize ../rpc_client/gen_client.c /^__dbcl_get_lg_bsize(dbenv, bsizep)$/ -__dbcl_get_lg_dir ../rpc_client/gen_client.c /^__dbcl_get_lg_dir(dbenv, dirp)$/ -__dbcl_get_lg_max ../rpc_client/gen_client.c /^__dbcl_get_lg_max(dbenv, maxp)$/ -__dbcl_get_lg_regionmax ../rpc_client/gen_client.c /^__dbcl_get_lg_regionmax(dbenv, maxp)$/ -__dbcl_get_lk_conflicts ../rpc_client/gen_client.c /^__dbcl_get_lk_conflicts(dbenv, conflicts, modes)$/ -__dbcl_get_lk_detect ../rpc_client/gen_client.c /^__dbcl_get_lk_detect(dbenv, detectp)$/ -__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_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)$/ -__dbcl_get_timeout ../rpc_client/gen_client.c /^__dbcl_get_timeout(dbenv, timeoutp, flags)$/ -__dbcl_get_tmp_dir ../rpc_client/gen_client.c /^__dbcl_get_tmp_dir(dbenv, dirp)$/ -__dbcl_get_tx_max ../rpc_client/gen_client.c /^__dbcl_get_tx_max(dbenv, maxp)$/ -__dbcl_get_tx_timestamp ../rpc_client/gen_client.c /^__dbcl_get_tx_timestamp(dbenv, maxp)$/ -__dbcl_get_verbose ../rpc_client/gen_client.c /^__dbcl_get_verbose(dbenv, which, onoffp)$/ -__dbcl_init ../db/db_method.c /^__dbcl_init(dbp, dbenv, flags)$/ -__dbcl_lock_detect ../rpc_client/gen_client.c /^__dbcl_lock_detect(dbenv, flags, atype, aborted)$/ -__dbcl_lock_get ../rpc_client/gen_client.c /^__dbcl_lock_get(dbenv, locker, flags, obj, mode, l/ -__dbcl_lock_id ../rpc_client/gen_client.c /^__dbcl_lock_id(dbenv, idp)$/ -__dbcl_lock_id_free ../rpc_client/gen_client.c /^__dbcl_lock_id_free(dbenv, id)$/ -__dbcl_lock_put ../rpc_client/gen_client.c /^__dbcl_lock_put(dbenv, lock)$/ -__dbcl_lock_stat ../rpc_client/gen_client.c /^__dbcl_lock_stat(dbenv, statp, flags)$/ -__dbcl_lock_vec ../rpc_client/gen_client.c /^__dbcl_lock_vec(dbenv, locker, flags, list, nlist,/ -__dbcl_log_archive ../rpc_client/gen_client.c /^__dbcl_log_archive(dbenv, listp, flags)$/ -__dbcl_log_cursor ../rpc_client/gen_client.c /^__dbcl_log_cursor(dbenv, logcp, flags)$/ -__dbcl_log_file ../rpc_client/gen_client.c /^__dbcl_log_file(dbenv, lsn, namep, len)$/ -__dbcl_log_flush ../rpc_client/gen_client.c /^__dbcl_log_flush(dbenv, lsn)$/ -__dbcl_log_put ../rpc_client/gen_client.c /^__dbcl_log_put(dbenv, lsn, data, flags)$/ -__dbcl_log_stat ../rpc_client/gen_client.c /^__dbcl_log_stat(dbenv, statp, flags)$/ -__dbcl_memp_fget ../rpc_client/gen_client.c /^__dbcl_memp_fget(dbmfp, pgnoaddr, flags, addrp)$/ -__dbcl_memp_fopen ../rpc_client/gen_client.c /^__dbcl_memp_fopen(dbmfp, path, flags, mode, pagesi/ -__dbcl_memp_fput ../rpc_client/gen_client.c /^__dbcl_memp_fput(dbmfp, pgaddr, flags)$/ -__dbcl_memp_fset ../rpc_client/gen_client.c /^__dbcl_memp_fset(dbmfp, pgaddr, flags)$/ -__dbcl_memp_fsync ../rpc_client/gen_client.c /^__dbcl_memp_fsync(dbmfp)$/ -__dbcl_memp_get_clear_len ../rpc_client/gen_client.c /^__dbcl_memp_get_clear_len(dbmfp, clear_lenp)$/ -__dbcl_memp_get_fileid ../rpc_client/gen_client.c /^__dbcl_memp_get_fileid(dbmfp, fileid)$/ -__dbcl_memp_get_flags ../rpc_client/gen_client.c /^__dbcl_memp_get_flags(dbmfp, flagsp)$/ -__dbcl_memp_get_ftype ../rpc_client/gen_client.c /^__dbcl_memp_get_ftype(dbmfp, ftype)$/ -__dbcl_memp_get_lsn_offset ../rpc_client/gen_client.c /^__dbcl_memp_get_lsn_offset(dbmfp, lsn_offsetp)$/ -__dbcl_memp_get_maxsize ../rpc_client/gen_client.c /^__dbcl_memp_get_maxsize(dbmfp, gbytesp, bytesp)$/ -__dbcl_memp_get_pgcookie ../rpc_client/gen_client.c /^__dbcl_memp_get_pgcookie(dbmfp, pgcookie)$/ -__dbcl_memp_get_priority ../rpc_client/gen_client.c /^__dbcl_memp_get_priority(dbmfp, priorityp)$/ -__dbcl_memp_register ../rpc_client/gen_client.c /^__dbcl_memp_register(dbenv, ftype, func0, func1)$/ -__dbcl_memp_set_clear_len ../rpc_client/gen_client.c /^__dbcl_memp_set_clear_len(dbmfp, clear_len)$/ -__dbcl_memp_set_fileid ../rpc_client/gen_client.c /^__dbcl_memp_set_fileid(dbmfp, fileid)$/ -__dbcl_memp_set_flags ../rpc_client/gen_client.c /^__dbcl_memp_set_flags(dbmfp, flags, onoff)$/ -__dbcl_memp_set_ftype ../rpc_client/gen_client.c /^__dbcl_memp_set_ftype(dbmfp, ftype)$/ -__dbcl_memp_set_lsn_offset ../rpc_client/gen_client.c /^__dbcl_memp_set_lsn_offset(dbmfp, lsn_offset)$/ -__dbcl_memp_set_maxsize ../rpc_client/gen_client.c /^__dbcl_memp_set_maxsize(dbmfp, gbytes, bytes)$/ -__dbcl_memp_set_pgcookie ../rpc_client/gen_client.c /^__dbcl_memp_set_pgcookie(dbmfp, pgcookie)$/ -__dbcl_memp_set_priority ../rpc_client/gen_client.c /^__dbcl_memp_set_priority(dbmfp, priority)$/ -__dbcl_memp_stat ../rpc_client/gen_client.c /^__dbcl_memp_stat(dbenv, gstatp, fstatp, flags)$/ -__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_env_set_cachesize ../rpc_client/gen_client.c /^__dbcl_env_set_cachesize(dbenv, gbytes, bytes, nca/ +__dbcl_env_set_encrypt ../rpc_client/gen_client.c /^__dbcl_env_set_encrypt(dbenv, passwd, flags)$/ +__dbcl_env_set_flags ../rpc_client/gen_client.c /^__dbcl_env_set_flags(dbenv, flags, onoff)$/ +__dbcl_env_set_rpc_server ../rpc_client/client.c /^__dbcl_env_set_rpc_server(dbenv, clnt, host, tsec,/ +__dbcl_env_txn_begin ../rpc_client/gen_client.c /^__dbcl_env_txn_begin(dbenv, parent, txnpp, flags)$/ +__dbcl_env_txn_begin_ret ../rpc_client/gen_client_ret.c /^__dbcl_env_txn_begin_ret(envp, parent, txnpp, flag/ +__dbcl_env_txn_recover ../rpc_client/gen_client.c /^__dbcl_env_txn_recover(dbenv, preplist, count, ret/ +__dbcl_env_txn_recover_ret ../rpc_client/gen_client_ret.c /^__dbcl_env_txn_recover_ret(dbenv, preplist, count,/ __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, 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/ -__dbcl_rep_set_limit ../rpc_client/gen_client.c /^__dbcl_rep_set_limit(dbenv, mbytes, bytes)$/ -__dbcl_rep_set_rep_transport ../rpc_client/gen_client.c /^__dbcl_rep_set_rep_transport(dbenv, id, func0)$/ -__dbcl_rep_set_request ../rpc_client/gen_client.c /^__dbcl_rep_set_request(dbenv, min, max)$/ -__dbcl_rep_start ../rpc_client/gen_client.c /^__dbcl_rep_start(dbenv, cdata, flags)$/ -__dbcl_rep_stat ../rpc_client/gen_client.c /^__dbcl_rep_stat(dbenv, statp, flags)$/ __dbcl_retcopy ../rpc_client/client.c /^__dbcl_retcopy(dbenv, dbt, data, len, memp, memsiz/ -__dbcl_rpc_illegal ../rpc_client/gen_client.c /^__dbcl_rpc_illegal(dbenv, name)$/ -__dbcl_set_app_dispatch ../rpc_client/gen_client.c /^__dbcl_set_app_dispatch(dbenv, func0)$/ -__dbcl_set_data_dir ../rpc_client/gen_client.c /^__dbcl_set_data_dir(dbenv, dir)$/ -__dbcl_set_lg_bsize ../rpc_client/gen_client.c /^__dbcl_set_lg_bsize(dbenv, bsize)$/ -__dbcl_set_lg_dir ../rpc_client/gen_client.c /^__dbcl_set_lg_dir(dbenv, dir)$/ -__dbcl_set_lg_max ../rpc_client/gen_client.c /^__dbcl_set_lg_max(dbenv, max)$/ -__dbcl_set_lg_regionmax ../rpc_client/gen_client.c /^__dbcl_set_lg_regionmax(dbenv, max)$/ -__dbcl_set_lk_conflict ../rpc_client/gen_client.c /^__dbcl_set_lk_conflict(dbenv, conflicts, modes)$/ -__dbcl_set_lk_detect ../rpc_client/gen_client.c /^__dbcl_set_lk_detect(dbenv, detect)$/ -__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_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)$/ -__dbcl_set_timeout ../rpc_client/gen_client.c /^__dbcl_set_timeout(dbenv, timeout, flags)$/ -__dbcl_set_tmp_dir ../rpc_client/gen_client.c /^__dbcl_set_tmp_dir(dbenv, dir)$/ -__dbcl_set_tx_max ../rpc_client/gen_client.c /^__dbcl_set_tx_max(dbenv, max)$/ -__dbcl_set_tx_timestamp ../rpc_client/gen_client.c /^__dbcl_set_tx_timestamp(dbenv, max)$/ -__dbcl_set_verbose ../rpc_client/gen_client.c /^__dbcl_set_verbose(dbenv, which, onoff)$/ __dbcl_txn_abort ../rpc_client/gen_client.c /^__dbcl_txn_abort(txnp)$/ __dbcl_txn_abort_ret ../rpc_client/gen_client_ret.c /^__dbcl_txn_abort_ret(txnp, replyp)$/ -__dbcl_txn_begin ../rpc_client/gen_client.c /^__dbcl_txn_begin(dbenv, parent, txnpp, flags)$/ -__dbcl_txn_begin_ret ../rpc_client/gen_client_ret.c /^__dbcl_txn_begin_ret(envp, parent, txnpp, flags, r/ -__dbcl_txn_checkpoint ../rpc_client/gen_client.c /^__dbcl_txn_checkpoint(dbenv, kbyte, min, flags)$/ __dbcl_txn_close ../rpc_client/client.c /^__dbcl_txn_close(dbenv)$/ __dbcl_txn_commit ../rpc_client/gen_client.c /^__dbcl_txn_commit(txnp, flags)$/ __dbcl_txn_commit_ret ../rpc_client/gen_client_ret.c /^__dbcl_txn_commit_ret(txnp, flags, replyp)$/ __dbcl_txn_discard ../rpc_client/gen_client.c /^__dbcl_txn_discard(txnp, flags)$/ __dbcl_txn_discard_ret ../rpc_client/gen_client_ret.c /^__dbcl_txn_discard_ret(txnp, flags, replyp)$/ __dbcl_txn_end ../rpc_client/client.c /^__dbcl_txn_end(txnp)$/ +__dbcl_txn_illegal ../rpc_client/gen_client.c /^__dbcl_txn_illegal(txn)$/ +__dbcl_txn_init ../rpc_client/gen_client.c /^__dbcl_txn_init(txn)$/ __dbcl_txn_prepare ../rpc_client/gen_client.c /^__dbcl_txn_prepare(txnp, gid)$/ -__dbcl_txn_recover ../rpc_client/gen_client.c /^__dbcl_txn_recover(dbenv, preplist, count, retp, f/ -__dbcl_txn_recover_ret ../rpc_client/gen_client_ret.c /^__dbcl_txn_recover_ret(dbenv, preplist, count, ret/ __dbcl_txn_setup ../rpc_client/client.c /^__dbcl_txn_setup(dbenv, txn, parent, id)$/ -__dbcl_txn_stat ../rpc_client/gen_client.c /^__dbcl_txn_stat(dbenv, statp, flags)$/ -__dbcl_txn_timeout ../rpc_client/gen_client.c /^__dbcl_txn_timeout(txnp, timeout, flags)$/ __dbclear_child ../rpc_server/c/db_server_util.c /^__dbclear_child(parent)$/ __dbclear_ctp ../rpc_server/c/db_server_util.c /^__dbclear_ctp(ctp)$/ __dbdel_ctp ../rpc_server/c/db_server_util.c /^__dbdel_ctp(parent)$/ -__dbenv_close ../env/env_open.c /^__dbenv_close(dbenv, rep_check)$/ -__dbenv_close_int ../rpc_server/c/db_server_util.c /^__dbenv_close_int(id, flags, force)$/ -__dbenv_close_pp ../env/env_open.c /^__dbenv_close_pp(dbenv, flags)$/ -__dbenv_config ../env/env_open.c /^__dbenv_config(dbenv, db_home, flags)$/ -__dbenv_dbremove_pp ../db/db_remove.c /^__dbenv_dbremove_pp(dbenv, txn, name, subdb, flags/ -__dbenv_dbrename ../db/db_rename.c /^__dbenv_dbrename(dbenv, txn, name, subdb, newname,/ -__dbenv_dbrename_pp ../db/db_rename.c /^__dbenv_dbrename_pp(dbenv, txn, name, subdb, newna/ -__dbenv_err ../env/env_method.c /^__dbenv_err(const DB_ENV *dbenv, int error, const / -__dbenv_errx ../env/env_method.c /^__dbenv_errx(const DB_ENV *dbenv, const char *fmt,/ -__dbenv_get_data_dirs ../env/env_method.c /^__dbenv_get_data_dirs(dbenv, dirpp)$/ -__dbenv_get_encrypt_flags ../env/env_method.c /^__dbenv_get_encrypt_flags(dbenv, flagsp)$/ -__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)$/ -__dbenv_get_tmp_dir ../env/env_method.c /^__dbenv_get_tmp_dir(dbenv, dirp)$/ -__dbenv_get_verbose ../env/env_method.c /^__dbenv_get_verbose(dbenv, which, onoffp)$/ -__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)$/ -__dbenv_set_alloc ../env/env_method.c /^__dbenv_set_alloc(dbenv, mal_func, real_func, free/ -__dbenv_set_app_dispatch ../env/env_method.c /^__dbenv_set_app_dispatch(dbenv, app_dispatch)$/ -__dbenv_set_data_dir ../env/env_method.c /^__dbenv_set_data_dir(dbenv, dir)$/ -__dbenv_set_encrypt ../env/env_method.c /^__dbenv_set_encrypt(dbenv, passwd, flags)$/ -__dbenv_set_errcall ../env/env_method.c /^__dbenv_set_errcall(dbenv, errcall)$/ -__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, ...)$/ +__dbh_err ../db/db_method.c /^__dbh_err(dbp, error, fmt, va_alist)$/ +__dbh_errx ../db/db_method.c /^__dbh_errx(dbp, fmt, va_alist)$/ __dbj_app_dispatch ../libdb_java/db_java_wrap.c /^static int __dbj_app_dispatch(DB_ENV *dbenv,$/ __dbj_append_recno ../libdb_java/db_java_wrap.c /^static int __dbj_append_recno(DB *db, DBT *dbt, db/ __dbj_bt_compare ../libdb_java/db_java_wrap.c /^static int __dbj_bt_compare(DB *db, const DBT *dbt/ @@ -3158,21 +3263,25 @@ __dbj_bt_prefix ../libdb_java/db_java_wrap.c /^static size_t __dbj_bt_prefix(DB __dbj_db_feedback ../libdb_java/db_java_wrap.c /^static void __dbj_db_feedback(DB *db, int opcode, / __dbj_dbt_copyin ../libdb_java/db_java_wrap.c /^static int __dbj_dbt_copyin($/ __dbj_dbt_copyout ../libdb_java/db_java_wrap.c /^static void __dbj_dbt_copyout($/ +__dbj_dbt_memcopy ../libdb_java/db_java_wrap.c /^static int __dbj_dbt_memcopy(DBT *dbt, u_int32_t o/ __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 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, $/ -__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_error ../libdb_java/db_java_wrap.c /^static void __dbj_error(const DB_ENV *dbenv,$/ +__dbj_event_notify ../libdb_java/db_java_wrap.c /^static void __dbj_event_notify(DB_ENV *dbenv, u_in/ +__dbj_fill_bt_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_bt_stat(JNIEnv *jnienv,$/ +__dbj_fill_compact ../libdb_java/java_stat_auto.c /^static int __dbj_fill_compact(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,$/ +__dbj_fill_mutex_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_mutex_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 */ @@ -3182,8 +3291,9 @@ __dbj_rep_transport ../libdb_java/db_java_wrap.c /^static int __dbj_rep_transpor __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,$/ __dbj_verify_callback ../libdb_java/db_java_wrap.c /^static int __dbj_verify_callback(void *handle, con/ +__dbj_verify_data ../libdb_java/db_java_wrap.c /^struct __dbj_verify_data {$/ __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)$/ +__dblist ../dbinc/db.in /^ struct __dblist {$/ __dbreg_add_dbentry ../dbreg/dbreg_util.c /^__dbreg_add_dbentry(dbenv, dblp, dbp, ndx)$/ __dbreg_assign_id ../dbreg/dbreg.c /^__dbreg_assign_id(dbp, id)$/ __dbreg_check_master ../dbreg/dbreg_util.c /^__dbreg_check_master(dbenv, uid, name)$/ @@ -3198,22 +3308,26 @@ __dbreg_id_to_db_int ../dbreg/dbreg_util.c /^__dbreg_id_to_db_int(dbenv, txn, db __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_invalidate_files ../dbreg/dbreg_util.c /^__dbreg_invalidate_files(dbenv)$/ __dbreg_lazy_id ../dbreg/dbreg_util.c /^__dbreg_lazy_id(dbp)$/ +__dbreg_log_close ../dbreg/dbreg.c /^__dbreg_log_close(dbenv, fnp, txn, op)$/ __dbreg_log_files ../dbreg/dbreg_util.c /^__dbreg_log_files(dbenv)$/ +__dbreg_log_id ../dbreg/dbreg.c /^__dbreg_log_id(dbp, txn, id, needlock)$/ __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_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_push_id ../dbreg/dbreg.c /^__dbreg_push_id(dbenv, dbp, id)$/ +__dbreg_register_log ../dbreg/dbreg_auto.c /^__dbreg_register_log(dbenv, txnp, ret_lsnp, flags,/ __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)$/ __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_stat_print ../dbreg/dbreg_stat.c /^__dbreg_stat_print(dbenv, flags)$/ __dbreg_teardown ../dbreg/dbreg.c /^__dbreg_teardown(dbp)$/ __dbsrv_active ../rpc_server/c/db_server_util.c /^__dbsrv_active(ctp)$/ __dbsrv_settimeout ../rpc_server/c/db_server_util.c /^__dbsrv_settimeout(ctp, to)$/ @@ -3221,60 +3335,145 @@ __dbsrv_sharedb ../rpc_server/c/db_server_util.c /^__dbsrv_sharedb(db_ctp, name, __dbsrv_shareenv ../rpc_server/c/db_server_util.c /^__dbsrv_shareenv(env_ctp, home, flags)$/ __dbsrv_timeout ../rpc_server/c/db_server_util.c /^__dbsrv_timeout(force)$/ __dbt_ferr ../db/db_iface.c /^__dbt_ferr(dbp, name, dbt, check_thread)$/ -__dd_abort ../lock/lock_deadlock.c /^__dd_abort(dbenv, info)$/ +__dbt_usercopy ../db/db_iface.c /^__dbt_usercopy(dbenv, dbt)$/ +__dbt_userfree ../db/db_iface.c /^__dbt_userfree(dbenv, key, pkey, data)$/ +__dd_abort ../lock/lock_deadlock.c /^__dd_abort(dbenv, info, statusp)$/ __dd_build ../lock/lock_deadlock.c /^__dd_build(dbenv, atype, bmp, nlockers, allocp, id/ __dd_debug ../lock/lock_deadlock.c /^__dd_debug(dbenv, idmap, bitmap, nlockers, nalloc)/ __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, nc/ +__env_cdsgroup_begin_proc ../rpc_server/c/db_server_proc.c /^__env_cdsgroup_begin_proc(dbenvcl_id, replyp)$/ +__env_close ../env/env_open.c /^__env_close(dbenv, rep_check)$/ +__env_close_int ../rpc_server/c/db_server_util.c /^__env_close_int(id, flags, force)$/ +__env_close_pp ../env/env_open.c /^__env_close_pp(dbenv, flags)$/ __env_close_proc ../rpc_server/c/db_server_proc.c /^__env_close_proc(dbenvcl_id, flags, replyp)$/ +__env_config ../env/env_open.c /^__env_config(dbenv, db_home, flags, mode)$/ __env_create_proc ../rpc_server/c/db_server_proc.c /^__env_create_proc(timeout, replyp)$/ __env_db_rep_exit ../rep/rep_util.c /^__env_db_rep_exit(dbenv)$/ +__env_dbremove_pp ../db/db_remove.c /^__env_dbremove_pp(dbenv, txn, name, subdb, flags)$/ __env_dbremove_proc ../rpc_server/c/db_server_proc.c /^__env_dbremove_proc(dbenvcl_id, txnpcl_id, name, s/ +__env_dbrename_pp ../db/db_rename.c /^__env_dbrename_pp(dbenv, txn, name, subdb, newname/ __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_err ../env/env_method.c /^__env_err(dbenv, error, fmt, va_alist)$/ +__env_errx ../env/env_method.c /^__env_errx(dbenv, fmt, va_alist)$/ +__env_failchk_pp ../env/env_failchk.c /^__env_failchk_pp(dbenv, flags)$/ +__env_fileid_reset ../db/db_setid.c /^__env_fileid_reset(dbenv, name, encrypted)$/ +__env_fileid_reset_pp ../db/db_setid.c /^__env_fileid_reset_pp(dbenv, name, flags)$/ __env_get_cachesize_proc ../rpc_server/c/db_server_proc.c /^__env_get_cachesize_proc(dbenvcl_id, replyp)$/ +__env_get_data_dirs ../env/env_method.c /^__env_get_data_dirs(dbenv, dirpp)$/ +__env_get_encrypt_flags ../env/env_method.c /^__env_get_encrypt_flags(dbenv, flagsp)$/ __env_get_encrypt_flags_proc ../rpc_server/c/db_server_proc.c /^__env_get_encrypt_flags_proc(dbenvcl_id, replyp)$/ +__env_get_errfile ../env/env_method.c /^__env_get_errfile(dbenv, errfilep)$/ +__env_get_errpfx ../env/env_method.c /^__env_get_errpfx(dbenv, errpfxp)$/ +__env_get_flags ../env/env_method.c /^__env_get_flags(dbenv, flagsp)$/ __env_get_flags_proc ../rpc_server/c/db_server_proc.c /^__env_get_flags_proc(dbenvcl_id, replyp)$/ +__env_get_home ../env/env_method.c /^__env_get_home(dbenv, homep)$/ __env_get_home_proc ../rpc_server/c/db_server_proc.c /^__env_get_home_proc(dbenvcl_id, replyp)$/ +__env_get_msgfile ../env/env_method.c /^__env_get_msgfile(dbenv, msgfilep)$/ +__env_get_open_flags ../env/env_open.c /^__env_get_open_flags(dbenv, flagsp)$/ __env_get_open_flags_proc ../rpc_server/c/db_server_proc.c /^__env_get_open_flags_proc(dbenvcl_id, replyp)$/ +__env_get_shm_key ../env/env_method.c /^__env_get_shm_key(dbenv, shm_keyp)$/ +__env_get_tmp_dir ../env/env_method.c /^__env_get_tmp_dir(dbenv, dirp)$/ +__env_get_verbose ../env/env_method.c /^__env_get_verbose(dbenv, which, onoffp)$/ +__env_in_api ../env/env_failchk.c /^__env_in_api(dbenv)$/ +__env_init ../env/env_method.c /^__env_init(dbenv)$/ +__env_init_rec ../env/env_recover.c /^__env_init_rec(dbenv, version)$/ +__env_init_rec_42 ../env/env_recover.c /^__env_init_rec_42(dbenv)$/ +__env_init_rec_43 ../env/env_recover.c /^__env_init_rec_43(dbenv)$/ +__env_init_rec_45 ../env/env_recover.c /^__env_init_rec_45(dbenv)$/ +__env_lsn_reset ../db/db_setlsn.c /^__env_lsn_reset(dbenv, name, encrypted)$/ +__env_lsn_reset_pp ../db/db_setlsn.c /^__env_lsn_reset_pp(dbenv, name, flags)$/ +__env_map_flags ../env/env_method.c /^__env_map_flags(dbenv, inflagsp, outflagsp)$/ +__env_open ../env/env_open.c /^__env_open(dbenv, db_home, flags, mode)$/ +__env_open_pp ../env/env_open.c /^__env_open_pp(dbenv, db_home, flags, mode)$/ __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_print_all ../env/env_stat.c /^__env_print_all(dbenv, flags)$/ +__env_print_stats ../env/env_stat.c /^__env_print_stats(dbenv, flags)$/ +__env_print_threads ../env/env_stat.c /^__env_print_threads(dbenv)$/ +__env_read_db_config ../env/env_config.c /^__env_read_db_config(dbenv)$/ +__env_refresh ../env/env_open.c /^__env_refresh(dbenv, orig_flags, rep_check)$/ +__env_remove ../env/env_open.c /^__env_remove(dbenv, db_home, flags)$/ __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_enter ../rep/rep_util.c /^__env_rep_enter(dbenv, checklock)$/ +__env_set_alloc ../env/env_method.c /^__env_set_alloc(dbenv, mal_func, real_func, free_f/ +__env_set_app_dispatch ../env/env_method.c /^__env_set_app_dispatch(dbenv, app_dispatch)$/ +__env_set_cachesize_proc ../rpc_server/c/db_server_proc.c /^__env_set_cachesize_proc(dbenvcl_id, gbytes, bytes/ +__env_set_data_dir ../env/env_method.c /^__env_set_data_dir(dbenv, dir)$/ +__env_set_encrypt ../env/env_method.c /^__env_set_encrypt(dbenv, passwd, flags)$/ +__env_set_encrypt_proc ../rpc_server/c/db_server_proc.c /^__env_set_encrypt_proc(dbenvcl_id, passwd, flags, / +__env_set_errcall ../env/env_method.c /^__env_set_errcall(dbenv, errcall)$/ +__env_set_errfile ../env/env_method.c /^__env_set_errfile(dbenv, errfile)$/ +__env_set_errpfx ../env/env_method.c /^__env_set_errpfx(dbenv, errpfx)$/ +__env_set_event_notify ../env/env_method.c /^__env_set_event_notify(dbenv, event_func)$/ +__env_set_feedback ../env/env_method.c /^__env_set_feedback(dbenv, feedback)$/ +__env_set_flags ../env/env_method.c /^__env_set_flags(dbenv, flags, on)$/ +__env_set_flags_proc ../rpc_server/c/db_server_proc.c /^__env_set_flags_proc(dbenvcl_id, flags, onoff, rep/ +__env_set_intermediate_dir ../env/env_method.c /^__env_set_intermediate_dir(dbenv, mode, flags)$/ +__env_set_isalive ../env/env_method.c /^__env_set_isalive(dbenv, is_alive)$/ +__env_set_msgcall ../env/env_method.c /^__env_set_msgcall(dbenv, msgcall)$/ +__env_set_msgfile ../env/env_method.c /^__env_set_msgfile(dbenv, msgfile)$/ +__env_set_paniccall ../env/env_method.c /^__env_set_paniccall(dbenv, paniccall)$/ +__env_set_rpc_server ../env/env_method.c /^__env_set_rpc_server(dbenv, cl, host, tsec, ssec, / +__env_set_shm_key ../env/env_method.c /^__env_set_shm_key(dbenv, shm_key)$/ +__env_set_state ../env/env_failchk.c /^__env_set_state(dbenv, ipp, state)$/ +__env_set_thread_count ../env/env_method.c /^__env_set_thread_count(dbenv, count)$/ +__env_set_thread_id ../env/env_method.c /^__env_set_thread_id(dbenv, id)$/ +__env_set_thread_id_string ../env/env_method.c /^__env_set_thread_id_string(dbenv, thread_id_string/ +__env_set_tmp_dir ../env/env_method.c /^__env_set_tmp_dir(dbenv, dir)$/ +__env_set_verbose ../env/env_method.c /^__env_set_verbose(dbenv, which, on)$/ +__env_stat_print ../env/env_stat.c /^__env_stat_print(dbenv, flags)$/ +__env_stat_print_pp ../env/env_stat.c /^__env_stat_print_pp(dbenv, flags)$/ +__env_thread_id_string ../env/env_failchk.c /^__env_thread_id_string(dbenv, pid, tid, buf)$/ +__env_thread_init ../env/env_failchk.c /^__env_thread_init(dbenv, created)$/ +__env_thread_state_print ../env/env_stat.c /^__env_thread_state_print(state)$/ +__env_txn_begin_proc ../rpc_server/c/db_server_proc.c /^__env_txn_begin_proc(dbenvcl_id, parentcl_id, flag/ +__env_txn_recover_proc ../rpc_server/c/db_server_proc.c /^__env_txn_recover_proc(dbenvcl_id, count, flags, r/ +__envreg_add ../env/env_register.c /^__envreg_add(dbenv, need_recoveryp)$/ +__envreg_register ../env/env_register.c /^__envreg_register(dbenv, need_recoveryp)$/ +__envreg_unregister ../env/env_register.c /^__envreg_unregister(dbenv, recovery_failed)$/ +__envreg_xunlock ../env/env_register.c /^__envreg_xunlock(dbenv)$/ +__epg ../dbinc/btree.h /^struct __epg {$/ +__fh_t ../dbinc/os.h /^struct __fh_t {$/ +__fname ../dbinc/log.h /^struct __fname {$/ __fop_create ../fileops/fop_basic.c /^__fop_create(dbenv, txn, fhpp, name, appname, mode/ -__fop_create_log ../fileops/fileops_auto.c /^__fop_create_log(dbenv, txnid, ret_lsnp, flags,$/ +__fop_create_log ../fileops/fileops_auto.c /^__fop_create_log(dbenv, txnp, ret_lsnp, flags,$/ __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_log ../fileops/fileops_auto.c /^__fop_file_remove_log(dbenv, txnid, ret_lsnp, flag/ +__fop_file_remove_log ../fileops/fileops_auto.c /^__fop_file_remove_log(dbenv, txnp, ret_lsnp, flags/ __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_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_inmem_create ../fileops/fop_util.c /^__fop_inmem_create(dbp, name, txn, flags)$/ +__fop_inmem_dummy ../fileops/fop_util.c /^__fop_inmem_dummy(dbp, txn, name, mbuf)$/ +__fop_inmem_read_meta ../fileops/fop_util.c /^__fop_inmem_read_meta(dbp, txn, name, flags)$/ +__fop_inmem_swap ../fileops/fop_util.c /^__fop_inmem_swap(olddbp, backdbp, txn, old, new, b/ __fop_lock_handle ../fileops/fop_util.c /^__fop_lock_handle(dbenv, dbp, locker, mode, elockp/ +__fop_ondisk_dummy ../fileops/fop_util.c /^__fop_ondisk_dummy(dbp, txn, name, mbuf, flags)$/ +__fop_ondisk_swap ../fileops/fop_util.c /^__fop_ondisk_swap(dbp, tmpdbp, txn, old, new, back/ __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_log ../fileops/fileops_auto.c /^__fop_remove_log(dbenv, txnid, ret_lsnp, flags,$/ +__fop_remove_log ../fileops/fileops_auto.c /^__fop_remove_log(dbenv, txnp, ret_lsnp, flags,$/ __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_log ../fileops/fileops_auto.c /^__fop_rename_log(dbenv, txnid, ret_lsnp, flags,$/ +__fop_rename_log ../fileops/fileops_auto.c /^__fop_rename_log(dbenv, txnp, ret_lsnp, flags,$/ __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_log ../fileops/fileops_auto.c /^__fop_write_log(dbenv, txnid, ret_lsnp, flags,$/ +__fop_write_log ../fileops/fileops_auto.c /^__fop_write_log(dbenv, txnp, ret_lsnp, flags,$/ __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)$/ @@ -3285,7 +3484,8 @@ __ham_31_hashmeta ../hash/hash_upgrade.c /^__ham_31_hashmeta(dbp, real_name, fla __ham_add_dup ../hash/hash_dup.c /^__ham_add_dup(dbc, nval, flags, pgnop)$/ __ham_add_el ../hash/hash_page.c /^__ham_add_el(dbc, key, val, type)$/ __ham_add_ovflpage ../hash/hash_page.c /^__ham_add_ovflpage(dbc, pagep, release, pp)$/ -__ham_alloc_pages ../hash/hash_rec.c /^__ham_alloc_pages(dbp, argp, lsnp)$/ +__ham_alloc_pages ../hash/hash_rec.c /^__ham_alloc_pages(file_dbp, argp, lsnp)$/ +__ham_alloc_pages_42 ../hash/hash_rec.c /^__ham_alloc_pages_42(dbp, argp, lsnp)$/ __ham_bulk ../hash/hash.c /^__ham_bulk(dbc, data, flags)$/ __ham_c_chgpg ../hash/hash_dup.c /^__ham_c_chgpg(dbc, old_pgno, old_index, new_pgno, / __ham_c_close ../hash/hash.c /^__ham_c_close(dbc, root_pgno, rmroot)$/ @@ -3301,16 +3501,16 @@ __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_log ../hash/hash_auto.c /^__ham_chgpg_log(dbp, txnid, ret_lsnp, flags, mode,/ +__ham_chgpg_log ../hash/hash_auto.c /^__ham_chgpg_log(dbp, txnp, ret_lsnp, flags, mode, / __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_log ../hash/hash_auto.c /^__ham_copypage_log(dbp, txnid, ret_lsnp, flags, pg/ +__ham_copypage_log ../hash/hash_auto.c /^__ham_copypage_log(dbp, txnp, ret_lsnp, flags, pgn/ __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_curadj_log ../hash/hash_auto.c /^__ham_curadj_log(dbp, txnid, ret_lsnp, flags, pgno/ +__ham_curadj_log ../hash/hash_auto.c /^__ham_curadj_log(dbp, txnp, ret_lsnp, flags, pgno,/ __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)$/ @@ -3318,7 +3518,7 @@ __ham_db_close ../hash/hash_method.c /^__ham_db_close(dbp)$/ __ham_db_create ../hash/hash_method.c /^__ham_db_create(dbp)$/ __ham_dcursor ../hash/hash_dup.c /^__ham_dcursor(dbc, pgno, indx)$/ __ham_del_pair ../hash/hash_page.c /^__ham_del_pair(dbc, reclaim_page)$/ -__ham_dirty_meta ../hash/hash_meta.c /^__ham_dirty_meta(dbc)$/ +__ham_dirty_meta ../hash/hash_meta.c /^__ham_dirty_meta(dbc, flags)$/ __ham_dpair ../hash/hash_page.c /^__ham_dpair(dbp, p, indx)$/ __ham_dsearch ../hash/hash_dup.c /^__ham_dsearch(dbc, dbt, offp, cmpp, flags)$/ __ham_dup_convert ../hash/hash_dup.c /^__ham_dup_convert(dbc)$/ @@ -3334,7 +3534,10 @@ __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_log ../hash/hash_auto.c /^__ham_groupalloc_log(dbp, txnid, ret_lsnp, flags, / +__ham_groupalloc_42_print ../hash/hash_autop.c /^__ham_groupalloc_42_print(dbenv, dbtp, lsnp, notus/ +__ham_groupalloc_42_read ../hash/hash_auto.c /^__ham_groupalloc_42_read(dbenv, recbuf, argpp)$/ +__ham_groupalloc_42_recover ../hash/hash_rec.c /^__ham_groupalloc_42_recover(dbenv, dbtp, lsnp, op,/ +__ham_groupalloc_log ../hash/hash_auto.c /^__ham_groupalloc_log(dbp, txnp, ret_lsnp, flags, m/ __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/ @@ -3342,7 +3545,7 @@ __ham_init_dbt ../hash/hash.c /^__ham_init_dbt(dbenv, dbt, size, bufp, sizep)$/ __ham_init_meta ../hash/hash_open.c /^__ham_init_meta(dbp, meta, pgno, lsnp)$/ __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_log ../hash/hash_auto.c /^__ham_insdel_log(dbp, txnid, ret_lsnp, flags,$/ +__ham_insdel_log ../hash/hash_auto.c /^__ham_insdel_log(dbp, txnp, ret_lsnp, flags,$/ __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)$/ @@ -3356,9 +3559,12 @@ __ham_item_reset ../hash/hash_page.c /^__ham_item_reset(dbc)$/ __ham_lock_bucket ../hash/hash_page.c /^__ham_lock_bucket(dbc, mode)$/ __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_meta2pgset ../hash/hash_verify.c /^__ham_meta2pgset(dbp, vdp, hmeta, flags, pgset)$/ __ham_metachk ../hash/hash_open.c /^__ham_metachk(dbp, name, hashm)$/ -__ham_metagroup_log ../hash/hash_auto.c /^__ham_metagroup_log(dbp, txnid, ret_lsnp, flags, b/ +__ham_metagroup_42_print ../hash/hash_autop.c /^__ham_metagroup_42_print(dbenv, dbtp, lsnp, notuse/ +__ham_metagroup_42_read ../hash/hash_auto.c /^__ham_metagroup_42_read(dbenv, recbuf, argpp)$/ +__ham_metagroup_42_recover ../hash/hash_rec.c /^__ham_metagroup_42_recover(dbenv, dbtp, lsnp, op, / +__ham_metagroup_log ../hash/hash_auto.c /^__ham_metagroup_log(dbp, txnp, ret_lsnp, flags, bu/ __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/ @@ -3366,11 +3572,11 @@ __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_log ../hash/hash_auto.c /^__ham_newpage_log(dbp, txnid, ret_lsnp, flags,$/ +__ham_newpage_log ../hash/hash_auto.c /^__ham_newpage_log(dbp, txnp, ret_lsnp, flags,$/ __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)$/ +__ham_next_cpage ../hash/hash_page.c /^__ham_next_cpage(dbc, pgno)$/ __ham_onpage_replace ../hash/hash_page.c /^__ham_onpage_replace(dbp, pagep, ndx, off, change,/ __ham_open ../hash/hash_open.c /^__ham_open(dbp, txn, name, base_pgno, flags)$/ __ham_overwrite ../hash/hash.c /^__ham_overwrite(dbc, nval, flags)$/ @@ -3381,7 +3587,7 @@ __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_log ../hash/hash_auto.c /^__ham_replace_log(dbp, txnid, ret_lsnp, flags, pgn/ +__ham_replace_log ../hash/hash_auto.c /^__ham_replace_log(dbp, txnp, ret_lsnp, flags, pgno/ __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)/ @@ -3392,7 +3598,7 @@ __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_log ../hash/hash_auto.c /^__ham_splitdata_log(dbp, txnid, ret_lsnp, flags, o/ +__ham_splitdata_log ../hash/hash_auto.c /^__ham_splitdata_log(dbp, txnp, ret_lsnp, flags, op/ __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/ @@ -3408,11 +3614,13 @@ __ham_vrfy_hashing ../hash/hash_verify.c /^__ham_vrfy_hashing(dbp, nentries, m, __ham_vrfy_item ../hash/hash_verify.c /^__ham_vrfy_item(dbp, vdp, pgno, h, i, flags)$/ __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 +__hdr ../dbinc/log.h /^struct __hdr {$/ +__int64 ../libdb_java/db_java_wrap.c /^ typedef long long __int64;$/ +__key_range ../dbinc/db.in /^struct __key_range {$/ +__kids ../dbinc/db.in /^ struct __kids {$/ __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)$/ +__lock_dbenv_destroy ../lock/lock_method.c /^__lock_dbenv_destroy(dbenv)$/ __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)$/ @@ -3421,6 +3629,7 @@ __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_failchk ../lock/lock_failchk.c /^__lock_failchk(dbenv)$/ __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)$/ @@ -3437,7 +3646,7 @@ __lock_get_lk_max_objects ../lock/lock_method.c /^__lock_get_lk_max_objects(dben __lock_get_pp ../lock/lock.c /^__lock_get_pp(dbenv, locker, flags, obj, lock_mode/ __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_id.c /^__lock_id(dbenv, idp)$/ +__lock_id ../lock/lock_id.c /^__lock_id(dbenv, idp, lkp)$/ __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)$/ @@ -3447,8 +3656,7 @@ __lock_inherit_timeout ../lock/lock_timer.c /^__lock_inherit_timeout(dbenv, pare __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_hash ../dbinc/lock.h /^#define __lock_locker_hash(locker) (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)$/ @@ -3457,23 +3665,22 @@ __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, flags)$/ +__lock_promote ../lock/lock.c /^__lock_promote(lt, obj, state_changedp, flags)$/ +__lock_put ../lock/lock.c /^__lock_put(dbenv, lock)$/ __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_mutex_count ../lock/lock_region.c /^__lock_region_mutex_count(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)$/ __lock_set_env_timeout ../lock/lock_method.c /^__lock_set_env_timeout(dbenv, timeout, flags)$/ __lock_set_lk_conflicts ../lock/lock_method.c /^__lock_set_lk_conflicts(dbenv, lk_conflicts, lk_mo/ __lock_set_lk_detect ../lock/lock_method.c /^__lock_set_lk_detect(dbenv, lk_detect)$/ -__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_thread_id ../lock/lock_id.c /^__lock_set_thread_id(lref, pid, tid)$/ __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)$/ @@ -3484,6 +3691,7 @@ __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 ../dbinc/log.h /^struct __log {$/ __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_archive.c /^__log_autoremove(dbenv)$/ @@ -3500,10 +3708,15 @@ __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_c_version ../log/log_get.c /^__log_c_version(logc, versionp)$/ +__log_c_version_pp ../log/log_get.c /^__log_c_version_pp(logc, versionp, flags)$/ +__log_check_page_lsn ../log/log_compare.c /^__log_check_page_lsn(dbenv, dbp, lsnp)$/ __log_check_sizes ../log/log_method.c /^__log_check_sizes(dbenv, lg_max, lg_bsize)$/ +__log_current_lsn ../log/log_put.c /^__log_current_lsn(dbenv, lsnp, mbytesp, bytesp)$/ __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)$/ +__log_dbenv_destroy ../log/log_method.c /^__log_dbenv_destroy(dbenv)$/ __log_dbenv_refresh ../log/log.c /^__log_dbenv_refresh(dbenv)$/ __log_earliest ../env/env_recover.c /^__log_earliest(dbenv, logc, lowtime, lowlsn)$/ __log_encrypt_record ../log/log_put.c /^__log_encrypt_record(dbenv, dbt, hdr, orig)$/ @@ -3519,64 +3732,87 @@ __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_filemode ../log/log_method.c /^__log_get_lg_filemode(dbenv, lg_modep)$/ __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_get_oldversion ../log/log.c /^__log_get_oldversion(dbenv, ver)$/ +__log_get_stable_lsn ../log/log_archive.c /^__log_get_stable_lsn(dbenv, stable_lsn)$/ __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_lsnoff ../log/log.c /^__log_inmem_lsnoff(dblp, lsnp, 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, create)$/ -__log_newfile ../log/log_put.c /^__log_newfile(dblp, lsnp, logfile)$/ +__log_newfile ../log/log_put.c /^__log_newfile(dblp, lsnp, logfile, version)$/ __log_open ../log/log.c /^__log_open(dbenv)$/ +__log_persist ../dbinc/log.h /^struct __log_persist {$/ __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_printf ../log/log_debug.c /^__log_printf(dbenv, txnid, fmt, va_alist)$/ +__log_printf_capi ../log/log_debug.c /^__log_printf_capi(dbenv, txnid, fmt, va_alist)$/ +__log_printf_int ../log/log_debug.c /^__log_printf_int(dbenv, txnid, fmt, ap)$/ +__log_printf_pp ../log/log_debug.c /^__log_printf_pp(dbenv, txnid, fmt, ap)$/ __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)$/ __log_putr ../log/log_put.c /^__log_putr(dblp, lsn, dbt, prev, h)$/ __log_recover ../log/log.c /^__log_recover(dblp)$/ -__log_region_destroy ../log/log.c /^__log_region_destroy(dbenv, infop)$/ +__log_region_mutex_count ../log/log.c /^__log_region_mutex_count(dbenv)$/ __log_region_size ../log/log.c /^__log_region_size(dbenv)$/ __log_rep_put ../log/log_put.c /^__log_rep_put(dbenv, lsnp, rec)$/ +__log_rep_split ../log/log_get.c /^__log_rep_split(dbenv, rp, rec, ret_lsnp, last_lsn/ __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_filemode ../log/log_method.c /^__log_set_lg_filemode(dbenv, lg_mode)$/ __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_set_version ../log/log.c /^__log_set_version(dbenv, newver)$/ __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)$/ __log_write ../log/log_put.c /^__log_write(dblp, addr, len)$/ __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, infop, mfp, len, offsetp, retp)/ -__memp_bad_buffer ../mp/mp_alloc.c /^__memp_bad_buffer(hp)$/ +__memp_alloc_freelist ../mp/mp_method.c /^__memp_alloc_freelist(dbmfp, nelems, listp)$/ +__memp_bad_buffer ../mp/mp_alloc.c /^__memp_bad_buffer(dbenv, hp)$/ +__memp_bh_freeze ../mp/mp_mvcc.c /^__memp_bh_freeze(dbmp, infop, hp, bhp, need_frozen/ +__memp_bh_priority ../mp/mp_mvcc.c /^__memp_bh_priority(bhp)$/ +__memp_bh_settxn ../mp/mp_mvcc.c /^int __memp_bh_settxn(dbmp, mfp, bhp, vtd)$/ +__memp_bh_thaw ../mp/mp_mvcc.c /^__memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_/ __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_bucket_reorder ../mp/mp_mvcc.c /^__memp_bucket_reorder(dbenv, hp, bhp)$/ +__memp_check_order ../mp/mp_alloc.c /^__memp_check_order(dbenv, hp)$/ __memp_close_flush_files ../mp/mp_sync.c /^__memp_close_flush_files(dbenv, dbmp, dosync)$/ +__memp_count_files ../mp/mp_stat.c /^__memp_count_files(dbenv, mfp, argp, countp, flags/ __memp_dbenv_create ../mp/mp_method.c /^__memp_dbenv_create(dbenv)$/ +__memp_dbenv_destroy ../mp/mp_method.c /^__memp_dbenv_destroy(dbenv)$/ __memp_dbenv_refresh ../mp/mp_region.c /^__memp_dbenv_refresh(dbenv)$/ +__memp_dirty ../mp/mp_fset.c /^__memp_dirty(dbmfp, addrp, txn, flags)$/ +__memp_extend_freelist ../mp/mp_method.c /^__memp_extend_freelist(dbmfp, count, listp)$/ __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_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_fget ../mp/mp_fget.c /^__memp_fget(dbmfp, pgnoaddr, txn, flags, addrp)$/ +__memp_fget_pp ../mp/mp_fget.c /^__memp_fget_pp(dbmfp, pgnoaddr, txnp, flags, addrp/ +__memp_file_stats ../mp/mp_stat.c /^__memp_file_stats(dbenv, mfp, argp, countp, flags)/ __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)$/ +__memp_free ../mp/mp_alloc.c /^__memp_free(infop, mfp, buf)$/ +__memp_free_freelist ../mp/mp_method.c /^__memp_free_freelist(dbmfp)$/ __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)$/ @@ -3585,7 +3821,9 @@ __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_fmethod.c /^__memp_get_clear_len(dbmfp, clear_lenp)$/ __memp_get_fileid ../mp/mp_fmethod.c /^__memp_get_fileid(dbmfp, fileid)$/ +__memp_get_files ../mp/mp_stat.c /^__memp_get_files(dbenv, mfp, argp, countp, flags)$/ __memp_get_flags ../mp/mp_fmethod.c /^__memp_get_flags(dbmfp, flagsp)$/ +__memp_get_freelist ../mp/mp_method.c /^__memp_get_freelist(dbmfp, nelemp, listp)$/ __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)$/ @@ -3594,23 +3832,25 @@ __memp_get_mp_max_write ../mp/mp_method.c /^__memp_get_mp_max_write(dbenv, maxwr __memp_get_mp_mmapsize ../mp/mp_method.c /^__memp_get_mp_mmapsize(dbenv, mp_mmapsizep)$/ __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_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_inmemlist ../mp/mp_fopen.c /^__memp_inmemlist(dbenv, namesp, cntp)$/ __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_sync.c /^__memp_mf_sync(dbmp, mfp)$/ +__memp_mf_sync ../mp/mp_sync.c /^__memp_mf_sync(dbmp, mfp, region_locked)$/ +__memp_mfp_alloc ../mp/mp_fopen.c /^__memp_mfp_alloc(dbmp, dbmfp, path, pagesize, flag/ __memp_nameop ../mp/mp_method.c /^__memp_nameop(dbenv, fileid, newname, fullold, ful/ __memp_open ../mp/mp_region.c /^__memp_open(dbenv)$/ __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_pgread ../mp/mp_bh.c /^__memp_pgread(dbmfp, hp, 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_bh ../mp/mp_stat.c /^__memp_print_bh(dbenv, dbmp, prefix, bhp, fmap)$/ +__memp_print_files ../mp/mp_stat.c /^__memp_print_files(dbenv, mfp, argp, countp, 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_region_mutex_count ../mp/mp_region.c /^__memp_region_mutex_count(dbenv)$/ +__memp_region_size ../mp/mp_region.c /^__memp_region_size(dbenv, reg_sizep, htab_bucketsp/ __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, infop)$/ @@ -3626,20 +3866,62 @@ __memp_set_mp_max_write ../mp/mp_method.c /^__memp_set_mp_max_write(dbenv, maxwr __memp_set_mp_mmapsize ../mp/mp_method.c /^__memp_set_mp_mmapsize(dbenv, mp_mmapsize)$/ __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_skip_curadj ../mp/mp_mvcc.c /^__memp_skip_curadj(dbc, pgno)$/ __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_pp ../mp/mp_stat.c /^__memp_stat_pp(dbenv, gspp, fspp, 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(reginfo, mp, mstat, 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_file ../mp/mp_sync.c /^__memp_sync_file(dbenv, mfp, argp, countp, flags)$/ __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/ __memp_sync_pp ../mp/mp_sync.c /^__memp_sync_pp(dbenv, lsnp)$/ __memp_trickle ../mp/mp_trickle.c /^__memp_trickle(dbenv, pct, nwrotep)$/ __memp_trickle_pp ../mp/mp_trickle.c /^__memp_trickle_pp(dbenv, pct, nwrotep)$/ +__memp_walk_files ../mp/mp_sync.c /^__memp_walk_files(dbenv, mp, func, arg, countp, fl/ __mp_xxx_fh ../mp/mp_sync.c /^__mp_xxx_fh(dbmfp, fhp)$/ __mpe_fsync ../os/os_fsync.c /^__mpe_fsync(fd)$/ +__mpool ../dbinc/mp.h /^struct __mpool {$/ +__mpoolfile ../dbinc/mp.h /^struct __mpoolfile {$/ +__mut_failchk ../mutex/mut_failchk.c /^__mut_failchk(dbenv)$/ +__mutex_alloc ../mutex/mut_alloc.c /^__mutex_alloc(dbenv, alloc_id, flags, indxp)$/ +__mutex_alloc_int ../mutex/mut_alloc.c /^__mutex_alloc_int(dbenv, locksys, alloc_id, flags,/ +__mutex_alloc_pp ../mutex/mut_method.c /^__mutex_alloc_pp(dbenv, flags, indxp)$/ +__mutex_clear ../mutex/mut_stat.c /^__mutex_clear(dbenv, mutex)$/ +__mutex_dbenv_refresh ../mutex/mut_region.c /^__mutex_dbenv_refresh(dbenv)$/ +__mutex_destroy ../dbinc/mutex.h /^#define __mutex_destroy(a, b) __db_pthread_mutex_/ +__mutex_free ../mutex/mut_alloc.c /^__mutex_free(dbenv, indxp)$/ +__mutex_free_int ../mutex/mut_alloc.c /^__mutex_free_int(dbenv, locksys, indxp)$/ +__mutex_free_pp ../mutex/mut_method.c /^__mutex_free_pp(dbenv, indx)$/ +__mutex_get_align ../mutex/mut_method.c /^__mutex_get_align(dbenv, alignp)$/ +__mutex_get_increment ../mutex/mut_method.c /^__mutex_get_increment(dbenv, incrementp)$/ +__mutex_get_max ../mutex/mut_method.c /^__mutex_get_max(dbenv, maxp)$/ +__mutex_get_tas_spins ../mutex/mut_method.c /^__mutex_get_tas_spins(dbenv, tas_spinsp)$/ +__mutex_init ../dbinc/mutex.h /^#define __mutex_init(a, b, c) __db_pthread_mutex_/ +__mutex_lock ../dbinc/mutex.h /^#define __mutex_lock(a, b) __db_pthread_mutex_loc/ +__mutex_lock_pp ../mutex/mut_method.c /^__mutex_lock_pp(dbenv, indx)$/ +__mutex_open ../mutex/mut_region.c /^__mutex_open(dbenv)$/ +__mutex_print_all ../mutex/mut_stat.c /^__mutex_print_all(dbenv, flags)$/ +__mutex_print_debug_single ../mutex/mut_stat.c /^__mutex_print_debug_single(dbenv, tag, mutex, flag/ +__mutex_print_debug_stats ../mutex/mut_stat.c /^__mutex_print_debug_stats(dbenv, mbp, mutex, flags/ +__mutex_print_id ../mutex/mut_stat.c /^__mutex_print_id(alloc_id)$/ +__mutex_print_stats ../mutex/mut_stat.c /^__mutex_print_stats(dbenv, flags)$/ +__mutex_print_summary ../mutex/mut_stat.c /^__mutex_print_summary(dbenv)$/ +__mutex_region_init ../mutex/mut_region.c /^__mutex_region_init(dbenv, mtxmgr)$/ +__mutex_region_size ../mutex/mut_region.c /^__mutex_region_size(dbenv)$/ +__mutex_resource_return ../mutex/mut_region.c /^__mutex_resource_return(dbenv, infop)$/ +__mutex_set_align ../mutex/mut_method.c /^__mutex_set_align(dbenv, align)$/ +__mutex_set_increment ../mutex/mut_method.c /^__mutex_set_increment(dbenv, increment)$/ +__mutex_set_max ../mutex/mut_method.c /^__mutex_set_max(dbenv, max)$/ +__mutex_set_tas_spins ../mutex/mut_method.c /^__mutex_set_tas_spins(dbenv, tas_spins)$/ +__mutex_set_wait_info ../mutex/mut_stat.c /^__mutex_set_wait_info(dbenv, mutex, waitp, nowaitp/ +__mutex_stat ../mutex/mut_stat.c /^__mutex_stat(dbenv, statp, flags)$/ +__mutex_stat_print ../mutex/mut_stat.c /^__mutex_stat_print(dbenv, flags)$/ +__mutex_unlock ../dbinc/mutex.h /^#define __mutex_unlock(a, b) __db_pthread_mutex_u/ +__mutex_unlock_pp ../mutex/mut_method.c /^__mutex_unlock_pp(dbenv, indx)$/ +__no_system_mem ../os/os_map.c /^__no_system_mem(dbenv)$/ __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)$/ @@ -3648,28 +3930,31 @@ __os_clock ../os/os_clock.c /^__os_clock(dbenv, secsp, usecsp)$/ __os_closehandle ../os/os_handle.c /^__os_closehandle(dbenv, fhp)$/ __os_dirfree ../os/os_dir.c /^__os_dirfree(dbenv, names, cnt)$/ __os_dirlist ../os/os_dir.c /^__os_dirlist(dbenv, dir, namesp, cntp)$/ -__os_exists ../os/os_stat.c /^__os_exists(path, isdirp)$/ +__os_exists ../os/os_stat.c /^__os_exists(dbenv, path, isdirp)$/ +__os_fdlock ../os/os_flock.c /^__os_fdlock(dbenv, fhp, offset, acquire, nowait)$/ __os_fileid ../os/os_fid.c /^__os_fileid(dbenv, fname, unique_okay, fidp)$/ __os_free ../os/os_alloc.c /^__os_free(dbenv, ptr)$/ __os_fs_notzero ../os/os_config.c /^__os_fs_notzero()$/ __os_fsync ../os/os_fsync.c /^__os_fsync(dbenv, fhp)$/ __os_get_errno ../os/os_errno.c /^__os_get_errno()$/ __os_get_errno_ret_zero ../os/os_errno.c /^__os_get_errno_ret_zero()$/ +__os_get_neterr ../os/os_errno.c /^__os_get_neterr()$/ +__os_get_syserr ../os/os_errno.c /^__os_get_syserr()$/ +__os_getenv ../os/os_getenv.c /^__os_getenv(dbenv, name, bpp, buflen)$/ __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_id ../os/os_pid.c /^__os_id(dbenv, pidp, tidp)$/ +__os_io ../os/os_rw.c /^__os_io(dbenv, op, fhp, pgno, pgsize, relative, io/ __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_mkdir ../os/os_mkdir.c /^__os_mkdir(dbenv, name, mode)$/ __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, 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_posix_err ../os/os_errno.c /^__os_posix_err(error)$/ __os_pstat_getdynamic ../os/os_spin.c /^__os_pstat_getdynamic()$/ __os_qnx_region_open ../os/os_open.c /^__os_qnx_region_open(dbenv, name, oflags, mode, fh/ __os_r_attach ../os/os_region.c /^__os_r_attach(dbenv, infop, rp)$/ @@ -3680,27 +3965,32 @@ __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, silent)$/ -__os_seek ../os/os_seek.c /^__os_seek(dbenv, fhp, pgsize, pageno, relative, is/ +__os_seek ../os/os_seek.c /^__os_seek(dbenv, fhp, pgno, pgsize, relative)$/ __os_set_errno ../os/os_errno.c /^__os_set_errno(evalue)$/ __os_shmname ../os/os_open.c /^__os_shmname(dbenv, name, newnamep)$/ __os_sleep ../os/os_sleep.c /^__os_sleep(dbenv, secs, usecs)$/ __os_spin ../os/os_spin.c /^__os_spin(dbenv)$/ __os_strdup ../os/os_alloc.c /^__os_strdup(dbenv, str, storep)$/ +__os_strerror ../os/os_errno.c /^__os_strerror(error, buf, len)$/ +__os_support_db_register ../os/os_config.c /^__os_support_db_register()$/ +__os_support_direct_io ../os/os_config.c /^__os_support_direct_io()$/ +__os_support_replication ../os/os_config.c /^__os_support_replication()$/ __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_unique_id ../os/os_uid.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)$/ __os_write ../os/os_rw.c /^__os_write(dbenv, fhp, addr, len, nwp)$/ -__os_yield ../os/os_spin.c /^__os_yield(dbenv, usecs)$/ -__os_zerofill ../os/os_rw.c /^__os_zerofill(dbenv, fhp)$/ +__os_yield ../os/os_yield.c /^__os_yield(dbenv)$/ +__os_zerofill ../os/os_fzero.c /^__os_zerofill(dbenv, fhp)$/ +__pgno_cmp ../mp/mp_mvcc.c /^__pgno_cmp(a, b)$/ __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_log ../qam/qam_auto.c /^__qam_add_log(dbp, txnid, ret_lsnp, flags, lsn, pg/ +__qam_add_log ../qam/qam_auto.c /^__qam_add_log(dbp, txnp, ret_lsnp, flags, lsn, pgn/ __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)$/ @@ -3716,25 +4006,27 @@ __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_log ../qam/qam_auto.c /^__qam_del_log(dbp, txnid, ret_lsnp, flags, lsn, pg/ +__qam_del_log ../qam/qam_auto.c /^__qam_del_log(dbp, txnp, ret_lsnp, flags, lsn, pgn/ __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_log ../qam/qam_auto.c /^__qam_delext_log(dbp, txnid, ret_lsnp, flags, lsn,/ +__qam_delete ../qam/qam.c /^__qam_delete(dbc, key)$/ +__qam_delext_log ../qam/qam_auto.c /^__qam_delext_log(dbp, txnp, ret_lsnp, flags, lsn, / __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_dirty ../dbinc/qam.h /^#define __qam_dirty(dbp, pgno, pagep, lsnp, flags)/ __qam_exid ../qam/qam_files.c /^__qam_exid(dbp, fidp, exnum)$/ __qam_extent_names ../qam/qam_files.c /^__qam_extent_names(dbenv, name, namelistp)$/ __qam_fclose ../qam/qam_files.c /^__qam_fclose(dbp, pgnoaddr)$/ -__qam_fget ../dbinc/qam.h /^#define __qam_fget(dbp, pgnoaddr, flags, addrp) \\$/ -__qam_fprobe ../qam/qam_files.c /^__qam_fprobe(dbp, pgno, addrp, mode, flags)$/ -__qam_fput ../dbinc/qam.h /^#define __qam_fput(dbp, pageno, addrp, flags) \\$/ +__qam_fget ../dbinc/qam.h /^#define __qam_fget(dbp, pgnoaddr, lsnp, flags, add/ +__qam_fprobe ../qam/qam_files.c /^__qam_fprobe(dbp, pgno, txn, addrp, mode, flags)$/ +__qam_fput ../dbinc/qam.h /^#define __qam_fput(dbp, pgno, addrp, flags) \\$/ __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_log ../qam/qam_auto.c /^__qam_incfirst_log(dbp, txnid, ret_lsnp, flags, re/ +__qam_incfirst_log ../qam/qam_auto.c /^__qam_incfirst_log(dbp, txnp, ret_lsnp, flags, rec/ __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/ @@ -3744,7 +4036,7 @@ __qam_init_recover ../qam/qam_auto.c /^__qam_init_recover(dbenv, dtabp, dtabsize __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_log ../qam/qam_auto.c /^__qam_mvptr_log(dbp, txnid, ret_lsnp, flags,$/ +__qam_mvptr_log ../qam/qam_auto.c /^__qam_mvptr_log(dbp, txnp, ret_lsnp, flags,$/ __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)$/ @@ -3753,7 +4045,7 @@ __qam_new_file ../qam/qam_open.c /^__qam_new_file(dbp, txn, fhp, name)$/ __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_position ../qam/qam.c /^__qam_position(dbc, recnop, lock_mode, get_mode, e/ __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)$/ @@ -3770,14 +4062,18 @@ __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/ +__qcursor ../dbinc/qam.h /^struct __qcursor {$/ +__qmpf ../dbinc/qam.h /^ struct __qmpf {$/ +__queue ../dbinc/qam.h /^struct __queue {$/ __queue_pageinfo ../qam/qam_method.c /^__queue_pageinfo(dbp, firstp, lastp, emptyp, prpag/ +__queued_output ../dbinc/repmgr.h /^struct __queued_output {$/ __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)$/ __ram_c_get ../btree/bt_recno.c /^__ram_c_get(dbc, key, data, flags, pgnop)$/ __ram_c_put ../btree/bt_recno.c /^__ram_c_put(dbc, key, data, flags, pgnop)$/ -__ram_ca ../btree/bt_recno.c /^__ram_ca(dbc_arg, op)$/ -__ram_ca_delete ../btree/bt_curadj.c /^__ram_ca_delete(dbp, root_pgno)$/ +__ram_ca ../btree/bt_recno.c /^__ram_ca(dbc_arg, op, foundp)$/ +__ram_ca_delete ../btree/bt_curadj.c /^__ram_ca_delete(dbp, root_pgno, foundp)$/ __ram_get_re_delim ../btree/bt_method.c /^__ram_get_re_delim(dbp, re_delimp)$/ __ram_get_re_len ../btree/bt_method.c /^__ram_get_re_len(dbp, re_lenp)$/ __ram_get_re_pad ../btree/bt_method.c /^__ram_get_re_pad(dbp, re_padp)$/ @@ -3799,85 +4095,209 @@ __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, is_dupp)$/ +__rep_allreq ../rep/rep_log.c /^__rep_allreq(dbenv, rp, eid)$/ +__rep_apply ../rep/rep_record.c /^__rep_apply(dbenv, rp, rec, ret_lsnp, is_dupp, las/ __rep_bt_cmp ../rep/rep_method.c /^__rep_bt_cmp(dbp, dbt1, dbt2)$/ +__rep_bulk_alloc ../rep/rep_util.c /^__rep_bulk_alloc(dbenv, bulkp, eid, offp, flagsp, / +__rep_bulk_free ../rep/rep_util.c /^__rep_bulk_free(dbenv, bulkp, flags)$/ +__rep_bulk_log ../rep/rep_log.c /^__rep_bulk_log(dbenv, rp, rec, savetime, ret_lsnp)/ +__rep_bulk_message ../rep/rep_util.c /^__rep_bulk_message(dbenv, bulk, repth, lsn, dbt, f/ +__rep_bulk_page ../rep/rep_backup.c /^__rep_bulk_page(dbenv, eid, rp, rec)$/ __rep_check_doreq ../rep/rep_record.c /^__rep_check_doreq(dbenv, rep)$/ +__rep_check_uid ../rep/rep_backup.c /^__rep_check_uid(dbenv, fp, endfp, uid)$/ +__rep_chk_newfile ../rep/rep_log.c /^__rep_chk_newfile(dbenv, logc, rep, rp, eid)$/ __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_close ../rep/rep_region.c /^__rep_close(dbenv)$/ +__rep_closefiles ../rep/rep_region.c /^__rep_closefiles(dbenv)$/ +__rep_cmp_vote ../rep/rep_elect.c /^__rep_cmp_vote(dbenv, rep, eid, lsnp, priority, ge/ __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_config_map ../rep/rep_method.c /^__rep_config_map(dbenv, inflagsp, outflagsp)$/ +__rep_conv_vers ../rep/rep_method.c /^__rep_conv_vers(dbenv, log_ver)$/ __rep_dbenv_create ../rep/rep_method.c /^__rep_dbenv_create(dbenv)$/ +__rep_dbenv_destroy ../rep/rep_method.c /^__rep_dbenv_destroy(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_dorecovery ../rep/rep_verify.c /^__rep_dorecovery(dbenv, lsnp, trunclsnp)$/ __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 ../rep/rep_elect.c /^__rep_elect(dbenv, given_nsites, nvotes, eidp, fla/ __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, nvotes, prio/ -__rep_elect_master ../rep/rep_method.c /^__rep_elect_master(dbenv, rep, eidp)$/ +__rep_elect_init ../rep/rep_elect.c /^__rep_elect_init(dbenv, lsnp, nsites, nvotes, begi/ +__rep_elect_master ../rep/rep_elect.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_find_dbs ../rep/rep_backup.c /^__rep_find_dbs(dbenv, fp, fileszp, filelenp, filec/ __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_config ../rep/rep_method.c /^__rep_get_config(dbenv, which, onp)$/ +__rep_get_fileinfo ../rep/rep_backup.c /^__rep_get_fileinfo(dbenv, file, subdb, rfp, uid, f/ __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_get_nsites ../rep/rep_method.c /^__rep_get_nsites(dbenv, n)$/ +__rep_get_priority ../rep/rep_method.c /^__rep_get_priority(dbenv, priority)$/ +__rep_get_request ../rep/rep_method.c /^__rep_get_request(dbenv, minp, maxp)$/ +__rep_get_timeout ../rep/rep_method.c /^__rep_get_timeout(dbenv, which, timeout)$/ __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, msg_th)$/ +__rep_init_cleanup ../rep/rep_backup.c /^__rep_init_cleanup(dbenv, rep, force)$/ +__rep_lockout_api ../rep/rep_util.c /^__rep_lockout_api(dbenv, rep)$/ +__rep_lockout_msg ../rep/rep_util.c /^__rep_lockout_msg(dbenv, rep, msg_th)$/ +__rep_log ../rep/rep_log.c /^__rep_log(dbenv, rp, rec, savetime, ret_lsnp)$/ +__rep_log_backup ../rep/rep_verify.c /^__rep_log_backup(dbenv, rep, logc, lsn)$/ __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_loggap_req ../rep/rep_log.c /^__rep_loggap_req(dbenv, rep, lsnp, gapflags)$/ +__rep_logready ../rep/rep_log.c /^__rep_logready(dbenv, rep, savetime, last_lsnp)$/ +__rep_logreq ../rep/rep_log.c /^__rep_logreq(dbenv, rp, rec, eid)$/ __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_mpf_open ../rep/rep_backup.c /^__rep_mpf_open(dbenv, mpfp, rfp, flags)$/ +__rep_msg_from_old ../rep/rep_util.c /^__rep_msg_from_old(version, rectype)$/ +__rep_msg_to_old ../rep/rep_util.c /^__rep_msg_to_old(version, rectype)$/ __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_newfile ../rep/rep_record.c /^__rep_newfile(dbenv, rc, rec, lsnp)$/ +__rep_newmaster_empty ../rep/rep_util.c /^__rep_newmaster_empty(dbenv, lsnp, cntrl, eid)$/ __rep_noarchive ../rep/rep_util.c /^__rep_noarchive(dbenv)$/ -__rep_open ../rep/rep_method.c /^__rep_open(dbenv)$/ +__rep_open ../rep/rep_region.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_pggap_req ../rep/rep_backup.c /^__rep_pggap_req(dbenv, rep, reqfp, gapflags)$/ +__rep_preclose ../rep/rep_region.c /^__rep_preclose(dbenv)$/ __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_message ../rep/rep_util.c /^__rep_print_message(dbenv, eid, rp, str, flags)$/ __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_remove_dbs ../rep/rep_backup.c /^__rep_remove_dbs(dbenv)$/ +__rep_remove_logs ../rep/rep_backup.c /^__rep_remove_logs(dbenv)$/ +__rep_resend_req ../rep/rep_record.c /^__rep_resend_req(dbenv, rereq)$/ __rep_restore_prepared ../rep/rep_method.c /^__rep_restore_prepared(dbenv)$/ -__rep_send_message ../rep/rep_util.c /^__rep_send_message(dbenv, eid, rtype, lsnp, dbtp, / +__rep_send_bulk ../rep/rep_util.c /^__rep_send_bulk(dbenv, bulkp, ctlflags)$/ +__rep_send_message ../rep/rep_util.c /^__rep_send_message(dbenv, eid, rtype, lsnp, dbt, c/ +__rep_send_throttle ../rep/rep_util.c /^__rep_send_throttle(dbenv, eid, repth, flags)$/ __rep_send_vote ../rep/rep_util.c /^__rep_send_vote(dbenv, lsnp, nsites, nvotes, pri, / +__rep_set_config ../rep/rep_method.c /^__rep_set_config(dbenv, which, on)$/ __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_nsites ../rep/rep_method.c /^__rep_set_nsites(dbenv, n)$/ +__rep_set_priority ../rep/rep_method.c /^__rep_set_priority(dbenv, priority)$/ __rep_set_request ../rep/rep_method.c /^__rep_set_request(dbenv, min, max)$/ +__rep_set_timeout ../rep/rep_method.c /^__rep_set_timeout(dbenv, which, timeout)$/ +__rep_set_transport ../rep/rep_method.c /^__rep_set_transport(dbenv, eid, f_send)$/ +__rep_skip_msg ../rep/rep_record.c /^__rep_skip_msg(dbenv, rep, eid, rectype)$/ __rep_start ../rep/rep_method.c /^__rep_start(dbenv, dbt, 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_sync ../rep/rep_method.c /^__rep_sync(dbenv, flags)$/ +__rep_tally ../rep/rep_elect.c /^__rep_tally(dbenv, rep, eid, countp, egen, vtoff)$/ __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_verify ../rep/rep_verify.c /^__rep_verify(dbenv, rp, rec, eid, savetime)$/ +__rep_verify_fail ../rep/rep_verify.c /^__rep_verify_fail(dbenv, rp, eid)$/ +__rep_verify_match ../rep/rep_verify.c /^__rep_verify_match(dbenv, reclsnp, savetime)$/ +__rep_verify_req ../rep/rep_verify.c /^__rep_verify_req(dbenv, rp, eid)$/ +__rep_vote1 ../rep/rep_elect.c /^__rep_vote1(dbenv, rp, rec, eidp)$/ +__rep_vote2 ../rep/rep_elect.c /^__rep_vote2(dbenv, rec, eidp)$/ +__rep_wait ../rep/rep_elect.c /^__rep_wait(dbenv, timeout, eidp, flags)$/ +__rep_walk_dir ../rep/rep_backup.c /^__rep_walk_dir(dbenv, dir, fp, origfp, fileszp, fi/ __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)$/ +__repmgr_accept ../repmgr/repmgr_sel.c /^__repmgr_accept(dbenv)$/ +__repmgr_add_buffer ../repmgr/repmgr_util.c /^__repmgr_add_buffer(v, address, length)$/ +__repmgr_add_dbt ../repmgr/repmgr_util.c /^__repmgr_add_dbt(v, dbt)$/ +__repmgr_add_remote_site ../repmgr/repmgr_method.c /^__repmgr_add_remote_site(dbenv, host, port, eidp, / +__repmgr_add_site ../repmgr/repmgr_net.c /^__repmgr_add_site(dbenv, host, port, newsitep)$/ +__repmgr_available_site ../repmgr/repmgr_net.c /^__repmgr_available_site(dbenv, eid)$/ +__repmgr_await_ack ../repmgr/repmgr_posix.c /^__repmgr_await_ack(dbenv, lsnp)$/ +__repmgr_await_threads ../repmgr/repmgr_method.c /^__repmgr_await_threads(dbenv)$/ +__repmgr_become_master ../repmgr/repmgr_elect.c /^__repmgr_become_master(dbenv)$/ +__repmgr_bust_connection ../repmgr/repmgr_net.c /^__repmgr_bust_connection(dbenv, conn, do_close)$/ +__repmgr_cleanup_connection ../repmgr/repmgr_net.c /^__repmgr_cleanup_connection(dbenv, conn)$/ +__repmgr_cleanup_netaddr ../repmgr/repmgr_util.c /^__repmgr_cleanup_netaddr(dbenv, addr)$/ +__repmgr_close ../repmgr/repmgr_method.c /^__repmgr_close(dbenv)$/ +__repmgr_close_sync ../repmgr/repmgr_posix.c /^__repmgr_close_sync(dbenv)$/ +__repmgr_compute_wait_deadline ../repmgr/repmgr_posix.c /^__repmgr_compute_wait_deadline(dbenv, result, wait/ +__repmgr_connect ../repmgr/repmgr_sel.c /^__repmgr_connect(dbenv, socket_result, site)$/ +__repmgr_connect_site ../repmgr/repmgr_sel.c /^__repmgr_connect_site(dbenv, eid)$/ +__repmgr_connection ../dbinc/repmgr.h /^struct __repmgr_connection {$/ +__repmgr_dbenv_create ../repmgr/repmgr_method.c /^__repmgr_dbenv_create(dbenv, db_rep)$/ +__repmgr_dbenv_destroy ../repmgr/repmgr_method.c /^__repmgr_dbenv_destroy(dbenv, db_rep)$/ +__repmgr_elect_main ../repmgr/repmgr_elect.c /^__repmgr_elect_main(dbenv)$/ +__repmgr_elect_thread ../repmgr/repmgr_elect.c /^__repmgr_elect_thread(args)$/ +__repmgr_find_site ../repmgr/repmgr_net.c /^__repmgr_find_site(dbenv, host, port)$/ +__repmgr_first_try_connections ../repmgr/repmgr_sel.c /^__repmgr_first_try_connections(dbenv)$/ +__repmgr_format_eid_loc ../repmgr/repmgr_util.c /^__repmgr_format_eid_loc(db_rep, eid, buffer)$/ +__repmgr_format_site_loc ../repmgr/repmgr_util.c /^__repmgr_format_site_loc(site, buffer)$/ +__repmgr_get_ack_policy ../repmgr/repmgr_method.c /^__repmgr_get_ack_policy(dbenv, policy)$/ +__repmgr_get_nsites ../repmgr/repmgr_util.c /^__repmgr_get_nsites(db_rep)$/ +__repmgr_getaddr ../repmgr/repmgr_net.c /^__repmgr_getaddr(dbenv, host, port, flags, result)/ +__repmgr_init_election ../repmgr/repmgr_elect.c /^__repmgr_init_election(dbenv, initial_operation)$/ +__repmgr_init_sync ../repmgr/repmgr_posix.c /^__repmgr_init_sync(dbenv, db_rep)$/ +__repmgr_iovec_init ../repmgr/repmgr_util.c /^__repmgr_iovec_init(v)$/ +__repmgr_is_permanent ../repmgr/repmgr_net.c /^__repmgr_is_permanent(dbenv, lsnp)$/ +__repmgr_is_ready ../repmgr/repmgr_elect.c /^__repmgr_is_ready(dbenv)$/ +__repmgr_listen ../repmgr/repmgr_net.c /^__repmgr_listen(dbenv)$/ +__repmgr_lock_mutex ../repmgr/repmgr_posix.c /^__repmgr_lock_mutex(mutex)$/ +__repmgr_msg_thread ../repmgr/repmgr_msg.c /^__repmgr_msg_thread(args)$/ +__repmgr_net_close ../repmgr/repmgr_net.c /^__repmgr_net_close(dbenv)$/ +__repmgr_net_create ../repmgr/repmgr_net.c /^__repmgr_net_create(dbenv, db_rep)$/ +__repmgr_net_destroy ../repmgr/repmgr_net.c /^__repmgr_net_destroy(dbenv, db_rep)$/ +__repmgr_net_init ../repmgr/repmgr_posix.c /^__repmgr_net_init(dbenv, db_rep)$/ +__repmgr_new_connection ../repmgr/repmgr_util.c /^__repmgr_new_connection(dbenv, connp, s, flags)$/ +__repmgr_new_site ../repmgr/repmgr_util.c /^__repmgr_new_site(dbenv, sitep, addr, state)$/ +__repmgr_pack_netaddr ../repmgr/repmgr_net.c /^__repmgr_pack_netaddr(dbenv, host, port, list, add/ +__repmgr_prepare_my_addr ../repmgr/repmgr_util.c /^__repmgr_prepare_my_addr(dbenv, dbt)$/ +__repmgr_print_stats ../repmgr/repmgr_stat.c /^__repmgr_print_stats(dbenv)$/ +__repmgr_queue_create ../repmgr/repmgr_queue.c /^__repmgr_queue_create(dbenv, db_rep)$/ +__repmgr_queue_destroy ../repmgr/repmgr_queue.c /^__repmgr_queue_destroy(dbenv)$/ +__repmgr_queue_get ../repmgr/repmgr_queue.c /^__repmgr_queue_get(dbenv, msgp)$/ +__repmgr_queue_put ../repmgr/repmgr_queue.c /^__repmgr_queue_put(dbenv, msg)$/ +__repmgr_queue_size ../repmgr/repmgr_queue.c /^__repmgr_queue_size(dbenv)$/ +__repmgr_read_from_site ../repmgr/repmgr_sel.c /^__repmgr_read_from_site(dbenv, conn)$/ +__repmgr_readv ../repmgr/repmgr_posix.c /^__repmgr_readv(fd, iovec, buf_count, byte_count_p)/ +__repmgr_reset_for_reading ../repmgr/repmgr_util.c /^__repmgr_reset_for_reading(con)$/ +__repmgr_retry ../dbinc/repmgr.h /^struct __repmgr_retry {$/ +__repmgr_retry_connections ../repmgr/repmgr_sel.c /^__repmgr_retry_connections(dbenv)$/ +__repmgr_runnable ../dbinc/repmgr.h /^struct __repmgr_runnable {$/ +__repmgr_schedule_connection_attempt ../repmgr/repmgr_util.c /^__repmgr_schedule_connection_attempt(dbenv, eid, i/ +__repmgr_select_loop ../repmgr/repmgr_posix.c /^__repmgr_select_loop(dbenv)$/ +__repmgr_select_thread ../repmgr/repmgr_sel.c /^__repmgr_select_thread(args)$/ +__repmgr_send ../repmgr/repmgr_net.c /^__repmgr_send(dbenv, control, rec, lsnp, eid, flag/ +__repmgr_send_broadcast ../repmgr/repmgr_net.c /^__repmgr_send_broadcast(dbenv, control, rec, nsite/ +__repmgr_send_handshake ../repmgr/repmgr_sel.c /^__repmgr_send_handshake(dbenv, conn)$/ +__repmgr_send_internal ../repmgr/repmgr_net.c /^__repmgr_send_internal(dbenv, conn, msg)$/ +__repmgr_send_one ../repmgr/repmgr_net.c /^__repmgr_send_one(dbenv, conn, msg_type, control, / +__repmgr_set_ack_policy ../repmgr/repmgr_method.c /^__repmgr_set_ack_policy(dbenv, policy)$/ +__repmgr_set_local_site ../repmgr/repmgr_method.c /^__repmgr_set_local_site(dbenv, host, port, flags)$/ +__repmgr_set_nonblocking ../repmgr/repmgr_posix.c /^int __repmgr_set_nonblocking(fd)$/ +__repmgr_signal ../repmgr/repmgr_posix.c /^__repmgr_signal(v)$/ +__repmgr_site ../dbinc/repmgr.h /^struct __repmgr_site {$/ +__repmgr_site_list ../repmgr/repmgr_stat.c /^__repmgr_site_list(dbenv, countp, listp)$/ +__repmgr_start ../repmgr/repmgr_method.c /^__repmgr_start(dbenv, nthreads, flags)$/ +__repmgr_stash_generation ../repmgr/repmgr_msg.c /^__repmgr_stash_generation(dbenv)$/ +__repmgr_stop_threads ../repmgr/repmgr_method.c /^__repmgr_stop_threads(dbenv)$/ +__repmgr_thread_failure ../repmgr/repmgr_util.c /^__repmgr_thread_failure(dbenv, why)$/ +__repmgr_thread_join ../repmgr/repmgr_posix.c /^__repmgr_thread_join(thread)$/ +__repmgr_thread_start ../repmgr/repmgr_posix.c /^__repmgr_thread_start(dbenv, runnable)$/ +__repmgr_timeval_cmp ../repmgr/repmgr_util.c /^__repmgr_timeval_cmp(a, b)$/ +__repmgr_timeval_diff_current ../repmgr/repmgr_posix.c /^__repmgr_timeval_diff_current(dbenv, when, result)/ +__repmgr_unlock_mutex ../repmgr/repmgr_posix.c /^__repmgr_unlock_mutex(mutex)$/ +__repmgr_update_consumed ../repmgr/repmgr_util.c /^__repmgr_update_consumed(v, byte_count)$/ +__repmgr_wake_main_thread ../repmgr/repmgr_posix.c /^__repmgr_wake_main_thread(dbenv)$/ +__repmgr_wake_waiting_senders ../repmgr/repmgr_posix.c /^__repmgr_wake_waiting_senders(dbenv)$/ +__repmgr_write_some ../repmgr/repmgr_sel.c /^__repmgr_write_some(dbenv, conn)$/ +__repmgr_writev ../repmgr/repmgr_posix.c /^__repmgr_writev(fd, iovec, buf_count, byte_count_p/ +__repmgr_wsa_init ../repmgr/repmgr_windows.c /^__repmgr_wsa_init(dbenv)$/ +__seq_chk_cachesize ../sequence/sequence.c /^__seq_chk_cachesize(dbenv, cachesize, max, min)$/ __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)$/ @@ -3886,7 +4306,7 @@ __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_open_pp ../sequence/sequence.c /^__seq_open_pp(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)$/ @@ -3896,97 +4316,115 @@ __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)$/ +__shm_mode ../os/os_map.c /^__shm_mode(dbenv)$/ +__txn_abort ../txn/txn.c /^__txn_abort(txn)$/ +__txn_abort_pp ../txn/txn.c /^__txn_abort_pp(txn)$/ __txn_abort_proc ../rpc_server/c/db_server_proc.c /^__txn_abort_proc(txnpcl_id, replyp)$/ -__txn_activekids ../txn/txn.c /^__txn_activekids(dbenv, rectype, txnp)$/ +__txn_activekids ../txn/txn.c /^__txn_activekids(dbenv, rectype, txn)$/ +__txn_add_buffer ../txn/txn_region.c /^int __txn_add_buffer(dbenv, td)$/ __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, 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_log ../txn/txn_auto.c /^__txn_child_log(dbenv, txnid, ret_lsnp, flags,$/ +__txn_checkpoint ../txn/txn_chkpt.c /^__txn_checkpoint(dbenv, kbytes, minutes, flags)$/ +__txn_checkpoint_pp ../txn/txn_chkpt.c /^__txn_checkpoint_pp(dbenv, kbytes, minutes, flags)/ +__txn_child_log ../txn/txn_auto.c /^__txn_child_log(dbenv, txnp, ret_lsnp, flags,$/ __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_log ../txn/txn_auto.c /^__txn_ckp_log(dbenv, txnid, ret_lsnp, flags,$/ +__txn_ckp_42_print ../txn/txn_autop.c /^__txn_ckp_42_print(dbenv, dbtp, lsnp, notused2, no/ +__txn_ckp_42_read ../txn/txn_auto.c /^__txn_ckp_42_read(dbenv, recbuf, argpp)$/ +__txn_ckp_42_recover ../txn/txn_rec.c /^__txn_ckp_42_recover(dbenv, dbtp, lsnp, op, info)$/ +__txn_ckp_log ../txn/txn_auto.c /^__txn_ckp_log(dbenv, txnp, ret_lsnp, flags,$/ __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 ../txn/txn.c /^__txn_commit(txn, flags)$/ +__txn_commit_pp ../txn/txn.c /^__txn_commit_pp(txn, 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_continue ../txn/txn.c /^__txn_continue(env, txn, td)$/ __txn_dbenv_create ../txn/txn_method.c /^__txn_dbenv_create(dbenv)$/ +__txn_dbenv_destroy ../txn/txn_method.c /^__txn_dbenv_destroy(dbenv)$/ __txn_dbenv_refresh ../txn/txn_region.c /^__txn_dbenv_refresh(dbenv)$/ -__txn_discard ../txn/txn.c /^__txn_discard(txnp, flags)$/ -__txn_discard_pp ../txn/txn.c /^__txn_discard_pp(txnp, flags)$/ +__txn_discard ../txn/txn.c /^__txn_discard(txn, flags)$/ +__txn_discard_int ../txn/txn.c /^__txn_discard_int(txn, flags)$/ __txn_discard_proc ../rpc_server/c/db_server_proc.c /^__txn_discard_proc(txnpcl_id, flags, replyp)$/ -__txn_dispatch_undo ../txn/txn.c /^__txn_dispatch_undo(dbenv, txnp, rdbt, key_lsn, tx/ +__txn_dispatch_undo ../txn/txn.c /^__txn_dispatch_undo(dbenv, txn, rdbt, key_lsn, txn/ __txn_doevents ../txn/txn_util.c /^__txn_doevents(dbenv, txn, opcode, preprocess)$/ -__txn_end ../txn/txn.c /^__txn_end(txnp, is_commit)$/ +__txn_end ../txn/txn.c /^__txn_end(txn, is_commit)$/ +__txn_event ../txn/txn_util.c /^struct __txn_event {$/ +__txn_failchk ../txn/txn_failchk.c /^__txn_failchk(dbenv)$/ __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_name ../txn/txn.c /^__txn_get_name(txn, namep)$/ __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_getactive ../txn/txn_chkpt.c /^__txn_getactive(dbenv, lsnp)$/ +__txn_getckp ../txn/txn_chkpt.c /^__txn_getckp(dbenv, lsnp)$/ +__txn_gid ../txn/txn_stat.c /^__txn_gid(dbenv, mbp, txn)$/ +__txn_id ../txn/txn.c /^__txn_id(txn)$/ __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 ../txn/txn_region.c /^__txn_init(dbenv, mgr)$/ __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_isvalid ../txn/txn.c /^__txn_isvalid(txn, op)$/ __txn_lockevent ../txn/txn_util.c /^__txn_lockevent(dbenv, txn, dbp, lock, locker)$/ +__txn_logrec ../dbinc/txn.h /^struct __txn_logrec {$/ __txn_map_gid ../txn/txn_recover.c /^__txn_map_gid(dbenv, gid, tdp, offp)$/ +__txn_oldest_reader ../txn/txn_region.c /^__txn_oldest_reader(dbenv, lsnp)$/ __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 ../txn/txn.c /^__txn_prepare(txn, 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, flags, reply/ -__txn_recycle_log ../txn/txn_auto.c /^__txn_recycle_log(dbenv, txnid, ret_lsnp, flags,$/ +__txn_recycle_id ../txn/txn.c /^__txn_recycle_id(dbenv)$/ +__txn_recycle_log ../txn/txn_auto.c /^__txn_recycle_log(dbenv, txnp, ret_lsnp, flags,$/ __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_log ../txn/txn_auto.c /^__txn_regop_log(dbenv, txnid, ret_lsnp, flags,$/ +__txn_regop_42_print ../txn/txn_autop.c /^__txn_regop_42_print(dbenv, dbtp, lsnp, notused2, / +__txn_regop_42_read ../txn/txn_auto.c /^__txn_regop_42_read(dbenv, recbuf, argpp)$/ +__txn_regop_42_recover ../txn/txn_rec.c /^__txn_regop_42_recover(dbenv, dbtp, lsnp, op, info/ +__txn_regop_log ../txn/txn_auto.c /^__txn_regop_log(dbenv, txnp, ret_lsnp, flags,$/ __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)$/ +__txn_remevent ../txn/txn_util.c /^__txn_remevent(dbenv, txn, name, fileid, inmem)$/ __txn_remlock ../txn/txn_util.c /^__txn_remlock(dbenv, txn, lock, locker)$/ +__txn_remove_buffer ../txn/txn_region.c /^int __txn_remove_buffer(dbenv, td, hash_mtx)$/ __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_name ../txn/txn.c /^__txn_set_name(txn, name)$/ +__txn_set_timeout ../txn/txn.c /^__txn_set_timeout(txn, 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_set_txn_lsnp ../txn/txn.c /^__txn_set_txn_lsnp(txn, blsnp, llsnp)$/ __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_status ../txn/txn_stat.c /^__txn_status(txn)$/ +__txn_undo ../txn/txn.c /^__txn_undo(txn)$/ +__txn_updateckp ../txn/txn_chkpt.c /^__txn_updateckp(dbenv, lsnp)$/ __txn_xa_begin ../txn/txn.c /^__txn_xa_begin(dbenv, txn)$/ -__txn_xa_regop_log ../txn/txn_auto.c /^__txn_xa_regop_log(dbenv, txnid, ret_lsnp, flags,$/ +__txn_xa_regop_log ../txn/txn_auto.c /^__txn_xa_regop_log(dbenv, txnp, ret_lsnp, flags,$/ __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)$/ +__vrfy_childinfo ../dbinc/db_verify.h /^struct __vrfy_childinfo {$/ +__vrfy_dbinfo ../dbinc/db_verify.h /^struct __vrfy_dbinfo {$/ +__vrfy_pageinfo ../dbinc/db_verify.h /^struct __vrfy_pageinfo {$/ __vx_fsync ../os/os_fsync.c /^__vx_fsync(fd)$/ __xa_close ../xa/xa_db.c /^__xa_close(dbp, flags)$/ __xa_cursor ../xa/xa_db.c /^__xa_cursor(dbp, txn, dbcp, flags)$/ @@ -3996,16 +4434,39 @@ __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(dbenv, txnp)$/ +__xa_set_txn ../xa/xa_db.c /^__xa_set_txn(dbp, txnpp, no_xa_txn)$/ +__xa_truncate ../xa/xa_db.c /^__xa_truncate(dbp, txn, countp, flags)$/ +__xa_txn ../dbinc/db.in /^ struct __xa_txn { \/* XA Active Transactions. *\// +_app_dispatch_intercept ../cxx/cxx_env.cpp /^int DbEnv::_app_dispatch_intercept(DB_ENV *env, DB/ _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 132 +_event_func_intercept ../cxx/cxx_env.cpp /^void DbEnv::_event_func_intercept($/ +_event_func_intercept_c ../cxx/cxx_env.cpp /^void _event_func_intercept_c(DB_ENV *env, u_int32_/ +_exported ../dbinc/db_cxx.in /^# define _exported __declspec(dllexport) / +_feedback_intercept ../cxx/cxx_env.cpp /^void DbEnv::_feedback_intercept(DB_ENV *env, int o/ _feedback_intercept_c ../cxx/cxx_env.cpp /^void _feedback_intercept_c(DB_ENV *env, int opcode/ +_isalive_intercept ../cxx/cxx_env.cpp /^int DbEnv::_isalive_intercept($/ +_isalive_intercept_c ../cxx/cxx_env.cpp /^int _isalive_intercept_c($/ +_paniccall_intercept ../cxx/cxx_env.cpp /^void DbEnv::_paniccall_intercept(DB_ENV *env, int / _paniccall_intercept_c ../cxx/cxx_env.cpp /^void _paniccall_intercept_c(DB_ENV *env, int errva/ +_rep_send_intercept ../cxx/cxx_env.cpp /^int DbEnv::_rep_send_intercept(DB_ENV *env, const / _rep_send_intercept_c ../cxx/cxx_env.cpp /^int _rep_send_intercept_c(DB_ENV *env, const DBT */ +_stream_error_function ../cxx/cxx_env.cpp /^void DbEnv::_stream_error_function($/ _stream_error_function_c ../cxx/cxx_env.cpp /^void _stream_error_function_c(const DB_ENV *env,$/ +_stream_message_function ../cxx/cxx_env.cpp /^void DbEnv::_stream_message_function(const DB_ENV / _stream_message_function_c ../cxx/cxx_env.cpp /^void _stream_message_function_c(const DB_ENV *env,/ +_thread_id_intercept ../cxx/cxx_env.cpp /^void DbEnv::_thread_id_intercept(DB_ENV *env,$/ +_thread_id_intercept_c ../cxx/cxx_env.cpp /^void _thread_id_intercept_c(DB_ENV *env, pid_t *pi/ +_thread_id_string_intercept ../cxx/cxx_env.cpp /^char *DbEnv::_thread_id_string_intercept(DB_ENV *e/ +_thread_id_string_intercept_c ../cxx/cxx_env.cpp /^char *_thread_id_string_intercept_c(DB_ENV *env, p/ +abort ../clib/abort.c /^abort()$/ +ack_message ../repmgr/repmgr_msg.c /^ack_message(dbenv, generation, lsn)$/ add_home ../rpc_server/c/db_server_util.c /^add_home(home)$/ add_passwd ../rpc_server/c/db_server_util.c /^add_passwd(passwd)$/ +allocate_wait_slot ../repmgr/repmgr_windows.c /^allocate_wait_slot(dbenv, resultp)$/ +archopts ../tcl/tcl_log.c /^ enum archopts {$/ +atoi ../clib/atoi.c /^atoi(str)$/ +atol ../clib/atol.c /^atol(str)$/ bdb_DbOpen ../tcl/tcl_db_pkg.c /^bdb_DbOpen(interp, objc, objv, ip, dbp)$/ bdb_DbRemove ../tcl/tcl_db_pkg.c /^bdb_DbRemove(interp, objc, objv)$/ bdb_DbRename ../tcl/tcl_db_pkg.c /^bdb_DbRename(interp, objc, objv)$/ @@ -4013,6 +4474,7 @@ bdb_DbUpgrade ../tcl/tcl_db_pkg.c /^bdb_DbUpgrade(interp, objc, objv)$/ bdb_DbVerify ../tcl/tcl_db_pkg.c /^bdb_DbVerify(interp, objc, objv)$/ bdb_DbmCommand ../tcl/tcl_compat.c /^bdb_DbmCommand(interp, objc, objv, flag, dbm)$/ bdb_EnvOpen ../tcl/tcl_db_pkg.c /^bdb_EnvOpen(interp, objc, objv, ip, env)$/ +bdb_GetConfig ../tcl/tcl_db_pkg.c /^bdb_GetConfig(interp, objc, objv)$/ 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)$/ @@ -4020,23 +4482,41 @@ 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)$/ +bdbenvopen ../tcl/tcl_db_pkg.c /^ enum bdbenvopen {$/ +bdbmv ../tcl/tcl_db_pkg.c /^ enum bdbmv {$/ +bdbopen ../tcl/tcl_db_pkg.c /^ enum bdbopen {$/ +bdbrem ../tcl/tcl_db_pkg.c /^ enum bdbrem {$/ +bdbupg ../tcl/tcl_db_pkg.c /^ enum bdbupg {$/ +bdbver ../tcl/tcl_db_pkg.c /^ enum bdbver {$/ +bdbvrfy ../tcl/tcl_db_pkg.c /^ enum bdbvrfy {$/ berkdb_Cmd ../tcl/tcl_db_pkg.c /^berkdb_Cmd(notused, interp, objc, objv)$/ +berkdbcmds ../tcl/tcl_db_pkg.c /^ enum berkdbcmds {$/ 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 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 -ct_dbc ../dbinc/db_server_int.h 125 -ct_dbdata ../dbinc/db_server_int.h 65 -ct_dbdp ../dbinc/db_server_int.h 129 -ct_dbp ../dbinc/db_server_int.h 124 -ct_entry ../dbinc/db_server_int.h 89 -ct_envdata ../dbinc/db_server_int.h 64 -ct_envdp ../dbinc/db_server_int.h 128 -ct_envp ../dbinc/db_server_int.h 122 -ct_txnp ../dbinc/db_server_int.h 123 +ca_recno_arg ../dbinc/btree.h /^} ca_recno_arg;$/ +cdsgroup_begin ../cxx/cxx_env.cpp /^int DbEnv::cdsgroup_begin(DbTxn **tid)$/ +cipherInstance ../crypto/rijndael/rijndael-api-fst.h /^} cipherInstance;$/ +cleanup ../cxx/cxx_db.cpp /^\/\/ private method to cleanup after destructor or/ +close ../cxx/cxx_env.cpp /^int DbEnv::close(u_int32_t flags)$/ +closesocket ../dbinc/repmgr.h /^#define closesocket(fd) close(fd)$/ +commitopt ../tcl/tcl_txn.c /^ enum commitopt {$/ +cond_var_t ../dbinc/repmgr.h /^typedef HANDLE cond_var_t;$/ +confonoff ../tcl/tcl_rep.c /^ enum confonoff {$/ +confwhich ../tcl/tcl_rep.c /^ enum confwhich {$/ +const ../dbinc/db_185.in /^#define const$/ +ct_anyp ../dbinc/db_server_int.h /^#define ct_anyp handle_u.anyp$/ +ct_dbc ../dbinc/db_server_int.h /^#define ct_dbc handle_u.dbc$/ +ct_dbdata ../dbinc/db_server_int.h /^typedef struct ct_dbdata ct_dbdata;$/ +ct_dbdp ../dbinc/db_server_int.h /^#define ct_dbdp private_u.dbdp$/ +ct_dbp ../dbinc/db_server_int.h /^#define ct_dbp handle_u.dbp$/ +ct_entry ../dbinc/db_server_int.h /^typedef struct ct_entry ct_entry;$/ +ct_envdata ../dbinc/db_server_int.h /^typedef struct ct_envdata ct_envdata;$/ +ct_envdp ../dbinc/db_server_int.h /^#define ct_envdp private_u.envdp$/ +ct_envp ../dbinc/db_server_int.h /^#define ct_envp handle_u.envp$/ +ct_txnp ../dbinc/db_server_int.h /^#define ct_txnp handle_u.txnp$/ +data ../dbinc/tcl_db.h /^ union data {$/ +data2 ../dbinc/tcl_db.h /^ union data2 {$/ +datum ../dbinc/db.in /^} datum;$/ db185_close ../db185/db185.c /^db185_close(db185p)$/ db185_compare ../db185/db185.c /^db185_compare(dbp, a, b)$/ db185_del ../db185/db185.c /^db185_del(db185p, key185, flags)$/ @@ -4048,7 +4528,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 316 +db_ca_mode ../dbinc/btree.h /^} db_ca_mode;$/ 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)$/ @@ -4073,26 +4553,41 @@ 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_free_fcn_type ../dbinc/db_cxx.in 157 -db_ham_mode ../dbinc/hash.h 142 -db_indx_t ../dbinc/db.in 106 -db_limbo_state ../dbinc/db_dispatch.h 113 -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_error_set_t ../dbinc/debug.h /^} db_error_set_t;$/ +db_ham_mode ../dbinc/hash.h /^} db_ham_mode;$/ +db_indx_t ../dbinc/db.in /^typedef u_int16_t db_indx_t; \/* Page offset type./ +db_iovec_t ../dbinc/repmgr.h /^typedef WSABUF db_iovec_t;$/ +db_limbo_state ../dbinc/db_dispatch.h /^} db_limbo_state;$/ +db_lockmode_t ../dbinc/db.in /^} db_lockmode_t;$/ +db_lockop_t ../dbinc/db.in /^} db_lockop_t;$/ +db_mutex_t ../dbinc/db.in /^typedef u_int32_t db_mutex_t;$/ +db_pgno_t ../dbinc/db.in /^typedef u_int32_t db_pgno_t; \/* Page number type./ +db_recno_t ../dbinc/db.in /^typedef u_int32_t db_recno_t; \/* Record number ty/ +db_recops ../dbinc/db.in /^} db_recops;$/ +db_ret_t ../libdb_java/db_java_wrap.c /^typedef int db_ret_t;$/ db_sequence_create ../sequence/sequence.c /^db_sequence_create(seqp, dbp, flags)$/ -db_status_t ../dbinc/db.in 446 +db_status_t ../dbinc/db.in /^}db_status_t;$/ db_strerror ../common/db_err.c /^db_strerror(error)$/ -db_sync_op ../dbinc/mp.h 37 -db_timeout_t ../dbinc/db.in 112 -db_txnlist_type ../dbinc/db_dispatch.h 51 +db_sync_op ../dbinc/mp.h /^} db_sync_op;$/ +db_timeout_t ../dbinc/db.in /^typedef u_int32_t db_timeout_t; \/* Type of a time/ +db_timeval_t ../dbinc/lock.h /^} db_timeval_t;$/ +db_trunc_param ../dbinc/db_am.h /^} db_trunc_param;$/ +db_txnlist_type ../dbinc/db_dispatch.h /^} db_txnlist_type;$/ db_version ../env/env_open.c /^db_version(majverp, minverp, patchp)$/ +dbaopts ../tcl/tcl_db.c /^ enum dbaopts {$/ dbc_Cmd ../tcl/tcl_dbcursor.c /^dbc_Cmd(clientData, interp, objc, objv)$/ +dbccmds ../tcl/tcl_dbcursor.c /^ enum dbccmds {$/ +dbcdupopts ../tcl/tcl_dbcursor.c /^ enum dbcdupopts {$/ +dbcgetopts ../tcl/tcl_dbcursor.c /^ enum dbcgetopts {$/ +dbclose ../tcl/tcl_db.c /^ enum dbclose {$/ +dbcmds ../tcl/tcl_db.c /^ enum dbcmds {$/ +dbcuropts ../tcl/tcl_db.c /^ enum dbcuropts {$/ +dbcutopts ../tcl/tcl_dbcursor.c /^ enum dbcutopts {$/ +dbdelopts ../tcl/tcl_db.c /^ enum dbdelopts {$/ +dbgetjopts ../tcl/tcl_db.c /^ enum dbgetjopts {$/ +dbgetopts ../tcl/tcl_db.c /^ enum dbgetopts {$/ +dbjopts ../tcl/tcl_db.c /^ enum dbjopts {$/ +dbkeyropts ../tcl/tcl_db.c /^ enum dbkeyropts {$/ dbm_clearerr ../dbinc/db.in /^#define dbm_clearerr(a) __db_ndbm_clearerr@DB_VER/ dbm_close ../dbinc/db.in /^#define dbm_close(a) __db_ndbm_close@DB_VERSION_U/ dbm_delete ../dbinc/db.in /^#define dbm_delete(a, b) __db_ndbm_delete@DB_VERSI/ @@ -4105,15 +4600,23 @@ 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 2135 +dbmclose ../dbinc/db.in /^#define dbmclose __db_dbm_close@DB_VERSION_UNIQUE_/ +dbmcmds ../tcl/tcl_compat.c /^ enum dbmcmds {$/ dbminit ../dbinc/db.in /^#define dbminit(a) __db_dbm_init@DB_VERSION_UNIQUE/ -dbopen ../dbinc/db_185.in 167 +dbopen ../dbinc/db_185.in /^#define dbopen __db185_open@DB_VERSION_UNIQUE_NAME/ +dbputapp ../tcl/tcl_db.c /^ enum dbputapp { DBPUT_APPEND0 };$/ +dbputopts ../tcl/tcl_db.c /^ enum dbputopts {$/ +dbstatopts ../tcl/tcl_db.c /^ enum dbstatopts {$/ +dbt_ ../cxx/cxx_except.cpp /^, dbt_(dbt)$/ delete ../dbinc/db.in /^#define delete(a) __db_dbm_delete@DB_VERSION_UNIQU/ -delete_DbLock ../libdb_java/db_java_wrap.c /^void delete_DbLock(struct DbLock *self){$/ -dirent ../clib/getcwd.c 48 +delete_DbLock ../libdb_java/db_java_wrap.c /^SWIGINTERN void delete_DbLock(struct DbLock *self)/ +describe ../cxx/cxx_except.cpp /^void DbException::describe(const char *prefix, con/ +dirent ../clib/getcwd.c /^# define dirent direct$/ 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 163 +dispatch_phase_completion ../repmgr/repmgr_sel.c /^dispatch_phase_completion(dbenv, conn)$/ +dupString ../cxx/cxx_except.cpp /^\/\/ Note: would not be needed if we can inherit f/ +enqueue_msg ../repmgr/repmgr_net.c /^enqueue_msg(dbenv, conn, msg, offset)$/ +env_ ../cxx/cxx_except.cpp /^, env_(0)$/ 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)$/ @@ -4123,126 +4626,239 @@ env_GetOpenFlag ../tcl/tcl_env.c /^env_GetOpenFlag(interp, objc, objv, dbenv)$/ env_GetTimeout ../tcl/tcl_env.c /^env_GetTimeout(interp, objc, objv, dbenv)$/ 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)$/ +envcmds ../tcl/tcl_env.c /^ enum envcmds {$/ +envdbmv ../tcl/tcl_env.c /^ enum envdbmv {$/ +envdbrem ../tcl/tcl_env.c /^ enum envdbrem {$/ +envopen ../tcl/tcl_db_pkg.c /^ enum envopen {$/ +envremopts ../tcl/tcl_env.c /^ enum envremopts {$/ +envtestat ../tcl/tcl_env.c /^ enum envtestat {$/ +envtestcmd ../tcl/tcl_env.c /^ enum envtestcmd {$/ +error_policy ../cxx/cxx_db.cpp /^\/\/ Return a tristate value corresponding to whet/ +errx ../cxx/cxx_db.cpp /^void Db::errx(const char *format, ...)$/ fetch ../dbinc/db.in /^#define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_/ -firstkey ../dbinc/db.in 2140 +finish_connecting ../repmgr/repmgr_posix.c /^finish_connecting(dbenv, conn)$/ +firstkey ../dbinc/db.in /^#define firstkey __db_dbm_firstkey@DB_VERSION_UNIQ/ +flatten ../repmgr/repmgr_net.c /^flatten(dbenv, msg)$/ +fprintf ../clib/printf.c /^fprintf(fp, fmt, va_alist)$/ +free_wait_slot ../repmgr/repmgr_windows.c /^free_wait_slot(dbenv, slot)$/ fsync ../os/os_fsync.c /^#define fsync(fd) __vx_fsync(fd)$/ +get ../cxx/cxx_dbc.cpp /^int Dbc::get(Dbt* key, Dbt *data, u_int32_t _flags/ +get_app_private ../cxx/cxx_env.cpp /^void *DbEnv::get_app_private() const$/ +get_byteswapped ../cxx/cxx_db.cpp /^int Db::get_byteswapped(int *isswapped)$/ +get_dbt ../cxx/cxx_except.cpp /^Dbt *DbMemoryException::get_dbt() const$/ +get_env ../cxx/cxx_db.cpp /^DbEnv *Db::get_env()$/ +get_errno ../cxx/cxx_except.cpp /^int DbException::get_errno() const$/ +get_error_stream ../cxx/cxx_env.cpp /^__DB_STD(ostream) *DbEnv::get_error_stream()$/ get_fullhome ../rpc_server/c/db_server_util.c /^get_fullhome(name)$/ +get_handle ../mutex/mut_win32.c /^static __inline int get_handle(dbenv, mutexp, even/ +get_index ../cxx/cxx_except.cpp /^int DbLockNotGrantedException::get_index() const$/ +get_key ../cxx/cxx_seq.cpp /^Dbt *DbSequence::get_key()$/ +get_lock ../cxx/cxx_except.cpp /^DbLock* DbLockNotGrantedException::get_lock() cons/ +get_message_stream ../cxx/cxx_env.cpp /^__DB_STD(ostream) *DbEnv::get_message_stream()$/ +get_mode ../cxx/cxx_except.cpp /^db_lockmode_t DbLockNotGrantedException::get_mode(/ +get_mpf ../cxx/cxx_db.cpp /^DbMpoolFile *Db::get_mpf()$/ +get_obj ../cxx/cxx_except.cpp /^const Dbt* DbLockNotGrantedException::get_obj() co/ +get_op ../cxx/cxx_except.cpp /^db_lockop_t DbLockNotGrantedException::get_op() co/ 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 165 +h_hash_callback_ ../cxx/cxx_db.cpp /^, h_hash_callback_(0)$/ +handle_completion ../repmgr/repmgr_windows.c /^handle_completion(dbenv, conn)$/ +handle_newsite ../repmgr/repmgr_msg.c /^handle_newsite(dbenv, rec)$/ +hcmds ../tcl/tcl_compat.c /^ enum hcmds {$/ hcreate ../dbinc/db.in /^#define hcreate(a) __db_hcreate@DB_VERSION_UNIQUE_/ -hdestroy ../dbinc/db.in 2157 -home_entry ../dbinc/db_server_int.h 40 +hdestroy ../dbinc/db.in /^#define hdestroy __db_hdestroy@DB_VERSION_UNIQUE_N/ +header ../repmgr/repmgr_queue.c /^};$/ +home_entry ../dbinc/db_server_int.h /^typedef struct home_entry home_entry;$/ hsearch ../dbinc/db.in /^#define hsearch(a, b) __db_hsearch@DB_VERSION_UNIQ/ -i_anyp ../dbinc/tcl_db.h 123 -i_data ../dbinc/tcl_db.h 134 -i_data2 ../dbinc/tcl_db.h 137 -i_dbcp ../dbinc/tcl_db.h 127 -i_dbdbcid ../dbinc/tcl_db.h 148 -i_dbp ../dbinc/tcl_db.h 126 -i_envlockid ../dbinc/tcl_db.h 142 -i_envlogcid ../dbinc/tcl_db.h 144 -i_envmpid ../dbinc/tcl_db.h 141 -i_envmutexid ../dbinc/tcl_db.h 143 -i_envp ../dbinc/tcl_db.h 125 -i_envtxnid ../dbinc/tcl_db.h 140 -i_lock ../dbinc/tcl_db.h 130 -i_locker ../dbinc/tcl_db.h 136 -i_logc ../dbinc/tcl_db.h 132 -i_mp ../dbinc/tcl_db.h 129 -i_mppgid ../dbinc/tcl_db.h 146 -i_mutex ../dbinc/tcl_db.h 131 -i_pagep ../dbinc/tcl_db.h 124 -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 1725 -item ../hsearch/hsearch.c /^ ENTRY item;$/ +i_anyp ../dbinc/tcl_db.h /^#define i_anyp un.anyp$/ +i_cdata ../dbinc/tcl_db.h /^#define i_cdata und2.c_data$/ +i_data ../dbinc/tcl_db.h /^#define i_data und.anydata$/ +i_data2 ../dbinc/tcl_db.h /^#define i_data2 und2.anydata$/ +i_dbcp ../dbinc/tcl_db.h /^#define i_dbcp un.dbcp$/ +i_dbdbcid ../dbinc/tcl_db.h /^#define i_dbdbcid i_otherid[0]$/ +i_dbp ../dbinc/tcl_db.h /^#define i_dbp un.dbp$/ +i_envlockid ../dbinc/tcl_db.h /^#define i_envlockid i_otherid[2]$/ +i_envlogcid ../dbinc/tcl_db.h /^#define i_envlogcid i_otherid[3]$/ +i_envmpid ../dbinc/tcl_db.h /^#define i_envmpid i_otherid[1]$/ +i_envp ../dbinc/tcl_db.h /^#define i_envp un.envp$/ +i_envtxnid ../dbinc/tcl_db.h /^#define i_envtxnid i_otherid[0]$/ +i_lock ../dbinc/tcl_db.h /^#define i_lock un.lock$/ +i_locker ../dbinc/tcl_db.h /^#define i_locker und.lockid$/ +i_logc ../dbinc/tcl_db.h /^#define i_logc un.logc$/ +i_mp ../dbinc/tcl_db.h /^#define i_mp un.mp$/ +i_mppgid ../dbinc/tcl_db.h /^#define i_mppgid i_otherid[0]$/ +i_pagep ../dbinc/tcl_db.h /^#define i_pagep un.anyp$/ +i_pgno ../dbinc/tcl_db.h /^#define i_pgno und.pgno$/ +i_pgsz ../dbinc/tcl_db.h /^#define i_pgsz und2.pagesz$/ +i_txnp ../dbinc/tcl_db.h /^#define i_txnp un.txnp$/ +idwhich ../tcl/tcl_env.c /^ enum idwhich {$/ +imp_ ../cxx/cxx_mpool.cpp /^: imp_(0)$/ +index_ ../cxx/cxx_except.cpp /^, index_(index)$/ +indx_t ../dbinc/db_185.in /^typedef u_int16_t indx_t;$/ +infop ../dbinc/tcl_db.h /^ union infop {$/ +initialize ../cxx/cxx_db.cpp /^\/\/ private method to initialize during construct/ +int ../db/db_upg.c /^static int (* const func_31_list[P_PAGETYPE_MAX])$/ +int_bool ../libdb_java/db_java_wrap.c /^typedef int int_bool;$/ +iov_base ../dbinc/repmgr.h /^#define iov_base buf$/ +iov_len ../dbinc/repmgr.h /^#define iov_len len$/ +isalpha ../clib/isalpha.c /^isalpha(c)$/ +isdigit ../clib/isdigit.c /^isdigit(c)$/ +isprint ../clib/isprint.c /^isprint(c)$/ +isspace ../clib/isspace.c /^isspace(c)$/ +keyInstance ../crypto/rijndael/rijndael-api-fst.h /^} keyInstance;$/ +ldopts ../tcl/tcl_lock.c /^ enum ldopts {$/ +lgopts ../tcl/tcl_lock.c /^ enum lgopts {$/ +linfo_t ../dbinc/rep.h /^} linfo_t;$/ +lkcmds ../tcl/tcl_lock.c /^ enum lkcmds {$/ +lkmode ../tcl/tcl_lock.c /^ enum lkmode {$/ +lkops ../tcl/tcl_lock.c /^ enum lkops {$/ +lock_ ../cxx/cxx_lock.cpp /^: lock_(value)$/ lock_Cmd ../tcl/tcl_lock.c /^lock_Cmd(clientData, interp, objc, objv)$/ +locker_info ../lock/lock_deadlock.c /^} locker_info;$/ +locker_start ../mutex/tm.c /^locker_start(id)$/ +locker_wait ../mutex/tm.c /^locker_wait()$/ 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 374 -m ../dbinc/tcl_db.h 42 -map_file ../mutex/tm.c /^map_file(gm_addrp, tm_addrp, lm_addrp, fdp)$/ +logccmds ../tcl/tcl_log.c /^ enum logccmds {$/ +logcgetopts ../tcl/tcl_log.c /^ enum logcgetopts {$/ +logfile_validity ../dbinc/log.h /^} logfile_validity;$/ +logputopts ../tcl/tcl_log.c /^ enum logputopts {$/ +lsnwhich ../tcl/tcl_env.c /^ enum lsnwhich {$/ +lvopts ../tcl/tcl_lock.c /^ enum lvopts {$/ +map_file ../mutex/tm.c /^map_file(gm_addrp, tm_addrp, lm_addrp, fhpp)$/ memcmp ../clib/memcmp.c /^memcmp(s1, s2, n)$/ -memcpy ../clib/memmove.c /^memcpy(dst0, src0, length)$/ +message_loop ../repmgr/repmgr_msg.c /^message_loop(dbenv)$/ +mgr_mutex_t ../dbinc/repmgr.h /^typedef HANDLE mgr_mutex_t;$/ mp_Cmd ../tcl/tcl_mp.c /^mp_Cmd(clientData, interp, objc, objv)$/ -mu_action ../dbinc/db_int.in 392 -mutex_Cmd ../tcl/tcl_util.c /^mutex_Cmd(clientData, interp, objc, objv)$/ +mpcmds ../tcl/tcl_mp.c /^ enum mpcmds {$/ +mpget ../tcl/tcl_mp.c /^ enum mpget {$/ +mpopts ../tcl/tcl_mp.c /^ enum mpopts {$/ +mu_action ../dbinc/db_int.in /^typedef enum { MU_REMOVE, MU_RENAME, MU_OPEN } mu_/ +ndbcmds ../tcl/tcl_compat.c /^ enum ndbcmds {$/ 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 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/ +ndbopen ../tcl/tcl_compat.c /^ enum ndbopen {$/ +net_errno ../dbinc/repmgr.h /^#define net_errno WSAGetLastError()$/ +new_Db ../libdb_java/db_java_wrap.c /^SWIGINTERN struct Db *new_Db(DB_ENV *dbenv,u_int32/ +new_DbEnv ../libdb_java/db_java_wrap.c /^SWIGINTERN struct DbEnv *new_DbEnv(u_int32_t flags/ +new_DbSequence ../libdb_java/db_java_wrap.c /^SWIGINTERN struct DbSequence *new_DbSequence(DB *d/ new_ct_ent ../rpc_server/c/db_server_util.c /^new_ct_ent(errp)$/ +next ../cxx/cxx_multi.cpp /^bool DbMultipleDataIterator::next(Dbt &data)$/ nextkey ../dbinc/db.in /^#define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNI/ -onint ../common/util_sig.c /^onint(signo)$/ +notify_handshake ../repmgr/repmgr_sel.c /^notify_handshake(dbenv, conn)$/ +op_is_remove ../mp/mp_method.c /^#define op_is_remove (newname == NULL)$/ +os_pid_t ../mutex/tm.c /^typedef HANDLE os_pid_t;$/ +os_spawn ../mutex/tm.c /^os_spawn(path, argv)$/ +os_thread_create ../mutex/tm.c /^#define os_thread_create(thrp, attr, func, arg) / +os_thread_join ../mutex/tm.c /^#define os_thread_join(thr, statusp) \\$/ +os_thread_self ../mutex/tm.c /^#define os_thread_self() GetCurrentThreadId()$/ +os_thread_t ../mutex/tm.c /^typedef HANDLE os_thread_t;$/ +os_wait ../mutex/tm.c /^os_wait(procs, nprocs)$/ +p_ ../cxx/cxx_multi.cpp /^ p_((u_int32_t*)(data_ + dbt.get_ulen() - sizeof/ pg_Cmd ../tcl/tcl_mp.c /^pg_Cmd(clientData, interp, objc, objv)$/ -pgin_fcn_type ../dbinc/db_cxx.in 167 -pgno_t ../dbinc/db_185.in 76 -pgout_fcn_type ../dbinc/db_cxx.in 169 +pgcmds ../tcl/tcl_mp.c /^ enum pgcmds {$/ +pgcookie ../dbinc/db_cxx.in /^ (DB_ENV *dbenv, db_pgno_t pgno, void *pgaddr, DB/ +pget ../cxx/cxx_db.cpp /^int Db::pget(DbTxn *txnid, Dbt *key, Dbt *pkey, Db/ +pglist ../dbinc/db_page.h /^struct pglist {$/ +pgno_t ../dbinc/db_185.in /^#define pgno_t db_pgno_t$/ +pgopt ../tcl/tcl_mp.c /^ enum pgopt {$/ +phase_t ../dbinc/repmgr.h /^} phase_t;$/ +printf ../clib/printf.c /^printf(fmt, va_alist)$/ +process_message ../repmgr/repmgr_msg.c /^process_message(dbenv, control, rec, eid)$/ 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_cond_signal ../mutex/mut_pthread.c /^#define pthread_cond_signal _lwp_cond_signal$/ +pthread_cond_wait ../mutex/mut_pthread.c /^#define pthread_cond_wait _lwp_cond_wait$/ pthread_mutex_destroy ../mutex/mut_pthread.c /^#define pthread_mutex_destroy(x) 0$/ -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 +pthread_mutex_lock ../mutex/mut_pthread.c /^#define pthread_mutex_lock _lwp_mutex_lock$/ +pthread_mutex_trylock ../mutex/mut_pthread.c /^#define pthread_mutex_trylock _lwp_mutex_trylock$/ +pthread_mutex_unlock ../mutex/mut_pthread.c /^#define pthread_mutex_unlock _lwp_mutex_unlock$/ +qam_name_op ../dbinc/qam.h /^} qam_name_op;$/ +qam_probe_mode ../dbinc/qam.h /^} qam_probe_mode;$/ +qm_trace ../dbinc/queue.h /^struct qm_trace {$/ raise ../clib/raise.c /^raise(s)$/ -recno_t ../dbinc/db_185.in 84 -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 121 +rand ../clib/rand.c /^int rand(void) \/* RAND_MAX assumed to be 32767 */ +rcmds ../tcl/tcl_util.c /^ enum rcmds {$/ +recno_t ../dbinc/db_185.in /^typedef u_int32_t recno_t;$/ +record_ack ../repmgr/repmgr_sel.c /^record_ack(dbenv, site, ack)$/ +reg_type_t ../dbinc/region.h /^ REGION_TYPE_TXN } reg_type_t;$/ +remove ../cxx/cxx_env.cpp /^int DbEnv::remove(const char *db_home, u_int32_t f/ +rep_send_callback_ ../cxx/cxx_env.cpp /^, rep_send_callback_(0)$/ +repdb_t ../dbinc/rep.h /^} repdb_t;$/ +repmgr_netaddr_t ../dbinc/repmgr.h /^} repmgr_netaddr_t;$/ +repmgr_timeval_t ../dbinc/repmgr.h /^} repmgr_timeval_t;$/ +rmgr ../tcl/tcl_rep.c /^ enum rmgr {$/ +roff_t ../dbinc/db.in /^typedef uintptr_t roff_t;$/ 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)$/ +runtime_error ../cxx/cxx_env.cpp /^\/\/ Report an error associated with the DbEnv.$/ +runtime_error_dbt ../cxx/cxx_env.cpp /^\/\/ Like DbEnv::runtime_error, but issue a DbMemo/ +runtime_error_lock_get ../cxx/cxx_env.cpp /^\/\/ Like DbEnv::runtime_error, but issue a DbLock/ +select_timeout_t ../dbinc/repmgr.h /^typedef DWORD select_timeout_t;$/ +sending_msg ../repmgr/repmgr_net.c /^struct sending_msg {$/ 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, .../ +seqcmds ../tcl/tcl_seq.c /^ enum seqcmds {$/ +seqgetopts ../tcl/tcl_seq.c /^ enum seqgetopts {$/ +seqopen ../tcl/tcl_db_pkg.c /^ enum seqopen {$/ +set_env ../cxx/cxx_except.cpp /^void DbException::set_env(DbEnv *env)$/ +set_error_stream ../cxx/cxx_env.cpp /^void DbEnv::set_error_stream(__DB_STD(ostream) *st/ +set_event_notify ../cxx/cxx_env.cpp /^int DbEnv::set_event_notify(void (*arg)(DbEnv *, u/ +set_feedback ../cxx/cxx_env.cpp /^int DbEnv::set_feedback(void (*arg)(DbEnv *, int, / +set_message_stream ../cxx/cxx_env.cpp /^void DbEnv::set_message_stream(__DB_STD(ostream) */ +set_paniccall ../cxx/cxx_env.cpp /^int DbEnv::set_paniccall(void (*arg)(DbEnv *, int)/ +set_signal ../common/util_sig.c /^set_signal(s, is_dflt)$/ +set_thread_id_string ../cxx/cxx_env.cpp /^int DbEnv::set_thread_id_string($/ +setup_sending_msg ../repmgr/repmgr_net.c /^setup_sending_msg(msg, type, control, rec)$/ +sfonoff ../tcl/tcl_env.c /^ enum sfonoff {$/ +sfwhich ../tcl/tcl_env.c /^ enum sfwhich {$/ +signal_handler ../common/util_sig.c /^signal_handler(signo)$/ +size_t ../dbinc/db_cxx.in /^ (size_t);$/ +snprintf ../clib/snprintf.c /^snprintf(str, n, fmt, va_alist)$/ +socket_t ../dbinc/repmgr.h /^typedef SOCKET socket_t;$/ +socklen_t ../dbinc/repmgr.h /^typedef int socklen_t;$/ +sockopt_t ../dbinc/repmgr.h /^typedef char * sockopt_t;$/ +spawn_proc ../mutex/tm.c /^spawn_proc(id, tmpath, typearg)$/ sprintf_overflow ../clib/snprintf.c /^sprintf_overflow()$/ sprintf_retcharpnt ../clib/snprintf.c /^sprintf_retcharpnt()$/ +srand ../clib/rand.c /^void srand(unsigned int seed)$/ +srchacts ../tcl/tcl_compat.c /^ enum srchacts {$/ +start_election_thread ../repmgr/repmgr_elect.c /^start_election_thread(dbenv)$/ +stflag ../tcl/tcl_compat.c /^ enum stflag {$/ store ../dbinc/db.in /^#define store(a, b) __db_dbm_store@DB_VERSION_UNIQ/ strcasecmp ../clib/strcasecmp.c /^strcasecmp(s1, s2)$/ +strcat ../clib/strcat.c /^strcat(char *s, const char *append)$/ +strchr ../clib/strchr.c /^char *strchr(const char *p, int ch)$/ strdup ../clib/strdup.c /^strdup(str)$/ strerror ../clib/strerror.c /^strerror(num)$/ strncasecmp ../clib/strcasecmp.c /^strncasecmp(s1, s2, n)$/ +strncat ../clib/strncat.c /^strncat(char *dst, const char *src, size_t n)$/ +strncmp ../clib/strncmp.c /^strncmp(s1, s2, n)$/ +strrchr ../clib/strrchr.c /^char *strrchr(const char *p, int ch)$/ +strsep ../clib/strsep.c /^strsep(stringp, delim)$/ strtol ../clib/strtol.c /^strtol(nptr, endptr, base)$/ strtoul ../clib/strtoul.c /^strtoul(nptr, endptr, base)$/ +tcl_CDSGroup ../tcl/tcl_txn.c /^tcl_CDSGroup(interp, objc, objv, envp, envip)$/ tcl_DbAssociate ../tcl/tcl_db.c /^tcl_DbAssociate(interp, objc, objv, dbp)$/ tcl_DbClose ../tcl/tcl_db.c /^tcl_DbClose(interp, objc, objv, dbp, dbip)$/ -tcl_DbCount ../tcl/tcl_db.c /^tcl_DbCount(interp, objc, objv, dbp)$/ tcl_DbCursor ../tcl/tcl_db.c /^tcl_DbCursor(interp, objc, objv, dbp, dbcp)$/ tcl_DbDelete ../tcl/tcl_db.c /^tcl_DbDelete(interp, objc, objv, dbp)$/ tcl_DbGet ../tcl/tcl_db.c /^tcl_DbGet(interp, objc, objv, dbp, ispget)$/ -tcl_DbGetFlags ../tcl/tcl_db.c /^tcl_DbGetFlags(interp, objc, objv, dbp)$/ -tcl_DbGetOpenFlags ../tcl/tcl_db.c /^tcl_DbGetOpenFlags(interp, objc, objv, dbp)$/ -tcl_DbGetjoin ../tcl/tcl_db.c /^tcl_DbGetjoin(interp, objc, objv, dbp)$/ -tcl_DbJoin ../tcl/tcl_db.c /^tcl_DbJoin(interp, objc, objv, dbp, dbcp)$/ -tcl_DbKeyRange ../tcl/tcl_db.c /^tcl_DbKeyRange(interp, objc, objv, dbp)$/ tcl_DbPut ../tcl/tcl_db.c /^tcl_DbPut(interp, objc, objv, dbp)$/ tcl_DbStat ../tcl/tcl_db.c /^tcl_DbStat(interp, objc, objv, dbp)$/ -tcl_DbTruncate ../tcl/tcl_db.c /^tcl_DbTruncate(interp, objc, objv, dbp)$/ tcl_DbcDup ../tcl/tcl_dbcursor.c /^tcl_DbcDup(interp, objc, objv, dbc)$/ tcl_DbcGet ../tcl/tcl_dbcursor.c /^tcl_DbcGet(interp, objc, objv, dbc, ispget)$/ 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_EnvIdReset ../tcl/tcl_env.c /^tcl_EnvIdReset(interp, objc, objv, dbenv)$/ +tcl_EnvLsnReset ../tcl/tcl_env.c /^tcl_EnvLsnReset(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)$/ +tcl_EventNotify ../tcl/tcl_env.c /^tcl_EventNotify(interp, dbenv, eobj, ip)$/ tcl_LockDetect ../tcl/tcl_lock.c /^tcl_LockDetect(interp, objc, objv, envp)$/ tcl_LockGet ../tcl/tcl_lock.c /^tcl_LockGet(interp, objc, objv, envp)$/ tcl_LockStat ../tcl/tcl_lock.c /^tcl_LockStat(interp, objc, objv, envp)$/ @@ -4261,17 +4877,21 @@ tcl_MpGet ../tcl/tcl_mp.c /^tcl_MpGet(interp, objc, objv, mp, mpip)$/ tcl_MpStat ../tcl/tcl_mp.c /^tcl_MpStat(interp, objc, objv, envp)$/ tcl_MpSync ../tcl/tcl_mp.c /^tcl_MpSync(interp, objc, objv, envp)$/ tcl_MpTrickle ../tcl/tcl_mp.c /^tcl_MpTrickle(interp, objc, objv, envp)$/ -tcl_Mutex ../tcl/tcl_util.c /^tcl_Mutex(interp, objc, objv, envp, envip)$/ tcl_Pg ../tcl/tcl_mp.c /^tcl_Pg(interp, objc, objv, page, mp, pgip, putop)$/ tcl_PgInit ../tcl/tcl_mp.c /^tcl_PgInit(interp, objc, objv, page, pgip)$/ tcl_PgIsset ../tcl/tcl_mp.c /^tcl_PgIsset(interp, objc, objv, page, pgip)$/ +tcl_RepConfig ../tcl/tcl_rep.c /^tcl_RepConfig(interp, dbenv, list)$/ tcl_RepElect ../tcl/tcl_rep.c /^tcl_RepElect(interp, objc, objv, dbenv)$/ tcl_RepFlush ../tcl/tcl_rep.c /^tcl_RepFlush(interp, objc, objv, dbenv)$/ +tcl_RepGetConfig ../tcl/tcl_rep.c /^tcl_RepGetConfig(interp, dbenv, which)$/ tcl_RepLimit ../tcl/tcl_rep.c /^tcl_RepLimit(interp, objc, objv, dbenv)$/ +tcl_RepMgr ../tcl/tcl_rep.c /^tcl_RepMgr(interp, objc, objv, dbenv)$/ tcl_RepProcessMessage ../tcl/tcl_rep.c /^tcl_RepProcessMessage(interp, objc, objv, dbenv)$/ 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_RepSync ../tcl/tcl_rep.c /^tcl_RepSync(interp, objc, objv, dbenv)$/ +tcl_RepTransport ../tcl/tcl_rep.c /^tcl_RepTransport(interp, objc, objv, dbenv, ip)$/ 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)$/ @@ -4291,22 +4911,41 @@ 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_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)$/ +tclrpstrt ../tcl/tcl_rep.c /^ enum tclrpstrt {$/ +thread_id_t ../dbinc/repmgr.h /^typedef HANDLE thread_id_t;$/ +threadsync_timeout_t ../dbinc/repmgr.h /^typedef DWORD threadsync_timeout_t;$/ +tm_env_close ../mutex/tm.c /^tm_env_close()$/ +tm_env_init ../mutex/tm.c /^tm_env_init()$/ 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()$/ -tsl_t ../dbinc/mutex.h 79 +tsl_t ../dbinc/mutex_int.h /^typedef int tsl_t;$/ txn_Cmd ../tcl/tcl_txn.c /^txn_Cmd(clientData, interp, objc, objv)$/ -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)$/ +txn_begin ../cxx/cxx_env.cpp /^int DbEnv::txn_begin(DbTxn *pid, DbTxn **tid, u_in/ +txnckpopts ../tcl/tcl_txn.c /^ enum txnckpopts {$/ +txncmds ../tcl/tcl_txn.c /^ enum txncmds {$/ +txnop_t ../txn/txn.c /^} txnop_t;$/ +txnopts ../tcl/tcl_txn.c /^ enum txnopts {$/ +u16 ../crypto/rijndael/rijndael-alg-fst.h /^typedef u_int16_t u16;$/ +u32 ../crypto/rijndael/rijndael-alg-fst.h /^typedef u_int32_t u32;$/ +u8 ../crypto/rijndael/rijndael-alg-fst.h /^typedef u_int8_t u8;$/ +u_int32_t ../dbinc/db_cxx.in /^ (DB *, const void *, u_int32_t);$/ +unmap_file ../mutex/tm.c /^unmap_file(addr, fhp)$/ usage ../mutex/tm.c /^usage()$/ -val ../dbinc/tcl_db.h 43 +verbonoff ../tcl/tcl_env.c /^ enum verbonoff {$/ +verbwhich ../tcl/tcl_env.c /^ enum verbwhich {$/ version_check ../rpc_server/c/db_server_util.c /^version_check()$/ +vfprintf ../clib/printf.c /^vfprintf(fp, fmt, ap)$/ +void ../dbinc/db_cxx.in /^ (void *);$/ vsnprintf ../clib/snprintf.c /^vsnprintf(str, n, fmt, ap)$/ -wmask ../clib/memmove.c 53 -word ../clib/memmove.c 48 -wsize ../clib/memmove.c 51 +wakeup_start ../mutex/tm.c /^wakeup_start(id)$/ +wakeup_wait ../mutex/tm.c /^wakeup_wait()$/ +what ../cxx/cxx_except.cpp /^const char *DbException::what() const throw()$/ +wmask ../clib/memmove.c /^#define wmask (wsize - 1)$/ +word ../clib/memmove.c /^typedef int word; \/* "word" used for optimal cop/ +wrap_DB_ENV ../cxx/cxx_env.cpp /^\/\/ static method$/ +wrap_DB_SEQUENCE ../cxx/cxx_seq.cpp /^\/\/ static method$/ +wsize ../clib/memmove.c /^#define wsize sizeof(word)$/ +xa_switch_t ../dbinc/xa.h /^struct xa_switch_t {$/ +xid_t ../dbinc/xa.h /^struct xid_t {$/ diff --git a/db/dist/template/db_server_proc b/db/dist/template/db_server_proc index 224c83684..04ada6b5d 100644 --- a/db/dist/template/db_server_proc +++ b/db/dist/template/db_server_proc @@ -1,32 +1,21 @@ #include "db_config.h" +#include "db_int.h" #ifndef NO_SYSTEM_INCLUDES -#include <sys/types.h> - #include <rpc/rpc.h> - -#include <string.h> #endif - #include "db_server.h" - -#include "db_int.h" #include "dbinc/db_server_int.h" -/* BEGIN __env_get_cachesize_proc */ +/* BEGIN __env_create_proc */ void -__env_get_cachesize_proc(dbenvcl_id, - replyp) - long dbenvcl_id; - __env_get_cachesize_reply *replyp; -/* END __env_get_cachesize_proc */ +__env_create_proc(timeout, replyp) + u_int32_t timeout; + __env_create_reply *replyp; +/* END __env_create_proc */ { int ret; - DB_ENV * dbenv; - ct_entry *dbenv_ctp; - ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV); - dbenv = (DB_ENV *)dbenv_ctp->ct_anyp; /* * XXX Code goes here @@ -36,16 +25,12 @@ __env_get_cachesize_proc(dbenvcl_id, return; } -/* BEGIN __env_cachesize_proc */ +/* BEGIN __env_cdsgroup_begin_proc */ void -__env_cachesize_proc(dbenvcl_id, gbytes, bytes, - ncache, replyp) - long dbenvcl_id; - u_int32_t gbytes; - u_int32_t bytes; - u_int32_t ncache; - __env_cachesize_reply *replyp; -/* END __env_cachesize_proc */ +__env_cdsgroup_begin_proc(dbenvcl_id, replyp) + unsigned int dbenvcl_id; + __env_cdsgroup_begin_reply *replyp; +/* END __env_cdsgroup_begin_proc */ { int ret; DB_ENV * dbenv; @@ -65,7 +50,7 @@ __env_cachesize_proc(dbenvcl_id, gbytes, bytes, /* BEGIN __env_close_proc */ void __env_close_proc(dbenvcl_id, flags, replyp) - long dbenvcl_id; + unsigned int dbenvcl_id; u_int32_t flags; __env_close_reply *replyp; /* END __env_close_proc */ @@ -85,30 +70,12 @@ __env_close_proc(dbenvcl_id, flags, replyp) return; } -/* BEGIN __env_create_proc */ -void -__env_create_proc(timeout, replyp) - u_int32_t timeout; - __env_create_reply *replyp; -/* END __env_create_proc */ -{ - int ret; - - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - /* BEGIN __env_dbremove_proc */ void __env_dbremove_proc(dbenvcl_id, txnpcl_id, name, subdb, flags, replyp) - long dbenvcl_id; - long txnpcl_id; + unsigned int dbenvcl_id; + unsigned int txnpcl_id; char *name; char *subdb; u_int32_t flags; @@ -138,8 +105,8 @@ __env_dbremove_proc(dbenvcl_id, txnpcl_id, name, void __env_dbrename_proc(dbenvcl_id, txnpcl_id, name, subdb, newname, flags, replyp) - long dbenvcl_id; - long txnpcl_id; + unsigned int dbenvcl_id; + unsigned int txnpcl_id; char *name; char *subdb; char *newname; @@ -166,12 +133,13 @@ __env_dbrename_proc(dbenvcl_id, txnpcl_id, name, return; } -/* BEGIN __env_get_encrypt_flags_proc */ +/* BEGIN __env_get_cachesize_proc */ void -__env_get_encrypt_flags_proc(dbenvcl_id, replyp) - long dbenvcl_id; - __env_get_encrypt_flags_reply *replyp; -/* END __env_get_encrypt_flags_proc */ +__env_get_cachesize_proc(dbenvcl_id, + replyp) + unsigned int dbenvcl_id; + __env_get_cachesize_reply *replyp; +/* END __env_get_cachesize_proc */ { int ret; DB_ENV * dbenv; @@ -188,14 +156,12 @@ __env_get_encrypt_flags_proc(dbenvcl_id, replyp) return; } -/* BEGIN __env_encrypt_proc */ +/* BEGIN __env_get_encrypt_flags_proc */ void -__env_encrypt_proc(dbenvcl_id, passwd, flags, replyp) - long dbenvcl_id; - char *passwd; - u_int32_t flags; - __env_encrypt_reply *replyp; -/* END __env_encrypt_proc */ +__env_get_encrypt_flags_proc(dbenvcl_id, replyp) + unsigned int dbenvcl_id; + __env_get_encrypt_flags_reply *replyp; +/* END __env_get_encrypt_flags_proc */ { int ret; DB_ENV * dbenv; @@ -215,7 +181,7 @@ __env_encrypt_proc(dbenvcl_id, passwd, flags, replyp) /* BEGIN __env_get_flags_proc */ void __env_get_flags_proc(dbenvcl_id, replyp) - long dbenvcl_id; + unsigned int dbenvcl_id; __env_get_flags_reply *replyp; /* END __env_get_flags_proc */ { @@ -234,34 +200,10 @@ __env_get_flags_proc(dbenvcl_id, replyp) return; } -/* BEGIN __env_flags_proc */ -void -__env_flags_proc(dbenvcl_id, flags, onoff, replyp) - long dbenvcl_id; - u_int32_t flags; - u_int32_t onoff; - __env_flags_reply *replyp; -/* END __env_flags_proc */ -{ - int ret; - DB_ENV * dbenv; - ct_entry *dbenv_ctp; - - ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV); - dbenv = (DB_ENV *)dbenv_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - /* BEGIN __env_get_home_proc */ void __env_get_home_proc(dbenvcl_id, replyp) - long dbenvcl_id; + unsigned int dbenvcl_id; __env_get_home_reply *replyp; /* END __env_get_home_proc */ { @@ -283,7 +225,7 @@ __env_get_home_proc(dbenvcl_id, replyp) /* BEGIN __env_get_open_flags_proc */ void __env_get_open_flags_proc(dbenvcl_id, replyp) - long dbenvcl_id; + unsigned int dbenvcl_id; __env_get_open_flags_reply *replyp; /* END __env_get_open_flags_proc */ { @@ -306,7 +248,7 @@ __env_get_open_flags_proc(dbenvcl_id, replyp) void __env_open_proc(dbenvcl_id, home, flags, mode, replyp) - long dbenvcl_id; + unsigned int dbenvcl_id; char *home; u_int32_t flags; u_int32_t mode; @@ -331,7 +273,7 @@ __env_open_proc(dbenvcl_id, home, flags, /* BEGIN __env_remove_proc */ void __env_remove_proc(dbenvcl_id, home, flags, replyp) - long dbenvcl_id; + unsigned int dbenvcl_id; char *home; u_int32_t flags; __env_remove_reply *replyp; @@ -352,19 +294,23 @@ __env_remove_proc(dbenvcl_id, home, flags, replyp) return; } -/* BEGIN __txn_abort_proc */ +/* BEGIN __env_set_cachesize_proc */ void -__txn_abort_proc(txnpcl_id, replyp) - long txnpcl_id; - __txn_abort_reply *replyp; -/* END __txn_abort_proc */ +__env_set_cachesize_proc(dbenvcl_id, gbytes, bytes, + ncache, replyp) + unsigned int dbenvcl_id; + u_int32_t gbytes; + u_int32_t bytes; + u_int32_t ncache; + __env_set_cachesize_reply *replyp; +/* END __env_set_cachesize_proc */ { int ret; - DB_TXN * txnp; - ct_entry *txnp_ctp; + DB_ENV * dbenv; + ct_entry *dbenv_ctp; - ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); - txnp = (DB_TXN *)txnp_ctp->ct_anyp; + ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV); + dbenv = (DB_ENV *)dbenv_ctp->ct_anyp; /* * XXX Code goes here @@ -374,26 +320,21 @@ __txn_abort_proc(txnpcl_id, replyp) return; } -/* BEGIN __txn_begin_proc */ +/* BEGIN __env_set_encrypt_proc */ void -__txn_begin_proc(dbenvcl_id, parentcl_id, - flags, replyp) - long dbenvcl_id; - long parentcl_id; +__env_set_encrypt_proc(dbenvcl_id, passwd, flags, replyp) + unsigned int dbenvcl_id; + char *passwd; u_int32_t flags; - __txn_begin_reply *replyp; -/* END __txn_begin_proc */ + __env_set_encrypt_reply *replyp; +/* END __env_set_encrypt_proc */ { int ret; DB_ENV * dbenv; ct_entry *dbenv_ctp; - DB_TXN * parent; - ct_entry *parent_ctp; ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV); dbenv = (DB_ENV *)dbenv_ctp->ct_anyp; - ACTIVATE_CTP(parent_ctp, parentcl_id, CT_TXN); - parent = (DB_TXN *)parent_ctp->ct_anyp; /* * XXX Code goes here @@ -403,20 +344,21 @@ __txn_begin_proc(dbenvcl_id, parentcl_id, return; } -/* BEGIN __txn_commit_proc */ +/* BEGIN __env_set_flags_proc */ void -__txn_commit_proc(txnpcl_id, flags, replyp) - long txnpcl_id; +__env_set_flags_proc(dbenvcl_id, flags, onoff, replyp) + unsigned int dbenvcl_id; u_int32_t flags; - __txn_commit_reply *replyp; -/* END __txn_commit_proc */ + u_int32_t onoff; + __env_set_flags_reply *replyp; +/* END __env_set_flags_proc */ { int ret; - DB_TXN * txnp; - ct_entry *txnp_ctp; + DB_ENV * dbenv; + ct_entry *dbenv_ctp; - ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); - txnp = (DB_TXN *)txnp_ctp->ct_anyp; + ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV); + dbenv = (DB_ENV *)dbenv_ctp->ct_anyp; /* * XXX Code goes here @@ -426,20 +368,26 @@ __txn_commit_proc(txnpcl_id, flags, replyp) return; } -/* BEGIN __txn_discard_proc */ +/* BEGIN __env_txn_begin_proc */ void -__txn_discard_proc(txnpcl_id, flags, replyp) - long txnpcl_id; +__env_txn_begin_proc(dbenvcl_id, parentcl_id, + flags, replyp) + unsigned int dbenvcl_id; + unsigned int parentcl_id; u_int32_t flags; - __txn_discard_reply *replyp; -/* END __txn_discard_proc */ + __env_txn_begin_reply *replyp; +/* END __env_txn_begin_proc */ { int ret; - DB_TXN * txnp; - ct_entry *txnp_ctp; + DB_ENV * dbenv; + ct_entry *dbenv_ctp; + DB_TXN * parent; + ct_entry *parent_ctp; - ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); - txnp = (DB_TXN *)txnp_ctp->ct_anyp; + ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV); + dbenv = (DB_ENV *)dbenv_ctp->ct_anyp; + ACTIVATE_CTP(parent_ctp, parentcl_id, CT_TXN); + parent = (DB_TXN *)parent_ctp->ct_anyp; /* * XXX Code goes here @@ -449,20 +397,23 @@ __txn_discard_proc(txnpcl_id, flags, replyp) return; } -/* BEGIN __txn_prepare_proc */ +/* BEGIN __env_txn_recover_proc */ void -__txn_prepare_proc(txnpcl_id, gid, replyp) - long txnpcl_id; - u_int8_t *gid; - __txn_prepare_reply *replyp; -/* END __txn_prepare_proc */ +__env_txn_recover_proc(dbenvcl_id, count, + flags, replyp, freep) + unsigned int dbenvcl_id; + u_int32_t count; + u_int32_t flags; + __env_txn_recover_reply *replyp; + int * freep; +/* END __env_txn_recover_proc */ { int ret; - DB_TXN * txnp; - ct_entry *txnp_ctp; + DB_ENV * dbenv; + ct_entry *dbenv_ctp; - ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); - txnp = (DB_TXN *)txnp_ctp->ct_anyp; + ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV); + dbenv = (DB_ENV *)dbenv_ctp->ct_anyp; /* * XXX Code goes here @@ -472,16 +423,13 @@ __txn_prepare_proc(txnpcl_id, gid, replyp) return; } -/* BEGIN __txn_recover_proc */ +/* BEGIN __db_create_proc */ void -__txn_recover_proc(dbenvcl_id, count, - flags, replyp, freep) - long dbenvcl_id; - u_int32_t count; +__db_create_proc(dbenvcl_id, flags, replyp) + unsigned int dbenvcl_id; u_int32_t flags; - __txn_recover_reply *replyp; - int * freep; -/* END __txn_recover_proc */ + __db_create_reply *replyp; +/* END __db_create_proc */ { int ret; DB_ENV * dbenv; @@ -502,9 +450,9 @@ __txn_recover_proc(dbenvcl_id, count, void __db_associate_proc(dbpcl_id, txnpcl_id, sdbpcl_id, flags, replyp) - long dbpcl_id; - long txnpcl_id; - long sdbpcl_id; + unsigned int dbpcl_id; + unsigned int txnpcl_id; + unsigned int sdbpcl_id; u_int32_t flags; __db_associate_reply *replyp; /* END __db_associate_proc */ @@ -532,78 +480,10 @@ __db_associate_proc(dbpcl_id, txnpcl_id, sdbpcl_id, return; } -/* BEGIN __db_bt_maxkey_proc */ -void -__db_bt_maxkey_proc(dbpcl_id, maxkey, replyp) - long dbpcl_id; - u_int32_t maxkey; - __db_bt_maxkey_reply *replyp; -/* END __db_bt_maxkey_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_get_bt_minkey_proc */ -void -__db_get_bt_minkey_proc(dbpcl_id, replyp) - long dbpcl_id; - __db_get_bt_minkey_reply *replyp; -/* END __db_get_bt_minkey_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_bt_minkey_proc */ -void -__db_bt_minkey_proc(dbpcl_id, minkey, replyp) - long dbpcl_id; - u_int32_t minkey; - __db_bt_minkey_reply *replyp; -/* END __db_bt_minkey_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - /* BEGIN __db_close_proc */ void __db_close_proc(dbpcl_id, flags, replyp) - long dbpcl_id; + unsigned int dbpcl_id; u_int32_t flags; __db_close_reply *replyp; /* END __db_close_proc */ @@ -623,20 +503,26 @@ __db_close_proc(dbpcl_id, flags, replyp) return; } -/* BEGIN __db_create_proc */ +/* BEGIN __db_cursor_proc */ void -__db_create_proc(dbenvcl_id, flags, replyp) - long dbenvcl_id; +__db_cursor_proc(dbpcl_id, txnpcl_id, + flags, replyp) + unsigned int dbpcl_id; + unsigned int txnpcl_id; u_int32_t flags; - __db_create_reply *replyp; -/* END __db_create_proc */ + __db_cursor_reply *replyp; +/* END __db_cursor_proc */ { int ret; - DB_ENV * dbenv; - ct_entry *dbenv_ctp; + DB * dbp; + ct_entry *dbp_ctp; + DB_TXN * txnp; + ct_entry *txnp_ctp; - ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV); - dbenv = (DB_ENV *)dbenv_ctp->ct_anyp; + 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 @@ -651,8 +537,8 @@ void __db_del_proc(dbpcl_id, txnpcl_id, keydlen, keydoff, keyulen, keyflags, keydata, keysize, flags, replyp) - long dbpcl_id; - long txnpcl_id; + unsigned int dbpcl_id; + unsigned int txnpcl_id; u_int32_t keydlen; u_int32_t keydoff; u_int32_t keyulen; @@ -682,19 +568,41 @@ __db_del_proc(dbpcl_id, txnpcl_id, keydlen, return; } -/* BEGIN __db_get_encrypt_flags_proc */ +/* BEGIN __db_get_proc */ void -__db_get_encrypt_flags_proc(dbpcl_id, replyp) - long dbpcl_id; - __db_get_encrypt_flags_reply *replyp; -/* END __db_get_encrypt_flags_proc */ +__db_get_proc(dbpcl_id, txnpcl_id, keydlen, + keydoff, keyulen, keyflags, keydata, + keysize, datadlen, datadoff, dataulen, + dataflags, datadata, datasize, flags, replyp, freep) + unsigned int dbpcl_id; + unsigned int txnpcl_id; + u_int32_t keydlen; + u_int32_t keydoff; + u_int32_t keyulen; + u_int32_t keyflags; + void *keydata; + u_int32_t keysize; + u_int32_t datadlen; + u_int32_t datadoff; + u_int32_t dataulen; + u_int32_t dataflags; + void *datadata; + u_int32_t datasize; + u_int32_t flags; + __db_get_reply *replyp; + int * freep; +/* END __db_get_proc */ { 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 @@ -704,14 +612,12 @@ __db_get_encrypt_flags_proc(dbpcl_id, replyp) return; } -/* BEGIN __db_encrypt_proc */ +/* BEGIN __db_get_bt_minkey_proc */ void -__db_encrypt_proc(dbpcl_id, passwd, flags, replyp) - long dbpcl_id; - char *passwd; - u_int32_t flags; - __db_encrypt_reply *replyp; -/* END __db_encrypt_proc */ +__db_get_bt_minkey_proc(dbpcl_id, replyp) + unsigned int dbpcl_id; + __db_get_bt_minkey_reply *replyp; +/* END __db_get_bt_minkey_proc */ { int ret; DB * dbp; @@ -728,12 +634,12 @@ __db_encrypt_proc(dbpcl_id, passwd, flags, replyp) return; } -/* BEGIN __db_get_extentsize_proc */ +/* BEGIN __db_get_dbname_proc */ void -__db_get_extentsize_proc(dbpcl_id, replyp) - long dbpcl_id; - __db_get_extentsize_reply *replyp; -/* END __db_get_extentsize_proc */ +__db_get_dbname_proc(dbpcl_id, replyp) + unsigned int dbpcl_id; + __db_get_dbname_reply *replyp; +/* END __db_get_dbname_proc */ { int ret; DB * dbp; @@ -750,13 +656,12 @@ __db_get_extentsize_proc(dbpcl_id, replyp) return; } -/* BEGIN __db_extentsize_proc */ +/* BEGIN __db_get_encrypt_flags_proc */ void -__db_extentsize_proc(dbpcl_id, extentsize, replyp) - long dbpcl_id; - u_int32_t extentsize; - __db_extentsize_reply *replyp; -/* END __db_extentsize_proc */ +__db_get_encrypt_flags_proc(dbpcl_id, replyp) + unsigned int dbpcl_id; + __db_get_encrypt_flags_reply *replyp; +/* END __db_get_encrypt_flags_proc */ { int ret; DB * dbp; @@ -776,7 +681,7 @@ __db_extentsize_proc(dbpcl_id, extentsize, replyp) /* BEGIN __db_get_flags_proc */ void __db_get_flags_proc(dbpcl_id, replyp) - long dbpcl_id; + unsigned int dbpcl_id; __db_get_flags_reply *replyp; /* END __db_get_flags_proc */ { @@ -795,13 +700,12 @@ __db_get_flags_proc(dbpcl_id, replyp) return; } -/* BEGIN __db_flags_proc */ +/* BEGIN __db_get_h_ffactor_proc */ void -__db_flags_proc(dbpcl_id, flags, replyp) - long dbpcl_id; - u_int32_t flags; - __db_flags_reply *replyp; -/* END __db_flags_proc */ +__db_get_h_ffactor_proc(dbpcl_id, replyp) + unsigned int dbpcl_id; + __db_get_h_ffactor_reply *replyp; +/* END __db_get_h_ffactor_proc */ { int ret; DB * dbp; @@ -818,41 +722,19 @@ __db_flags_proc(dbpcl_id, flags, replyp) return; } -/* BEGIN __db_get_proc */ +/* BEGIN __db_get_h_nelem_proc */ void -__db_get_proc(dbpcl_id, txnpcl_id, keydlen, - keydoff, keyulen, keyflags, keydata, - keysize, datadlen, datadoff, dataulen, - dataflags, datadata, datasize, flags, replyp, freep) - long dbpcl_id; - long txnpcl_id; - u_int32_t keydlen; - u_int32_t keydoff; - u_int32_t keyulen; - u_int32_t keyflags; - void *keydata; - u_int32_t keysize; - u_int32_t datadlen; - u_int32_t datadoff; - u_int32_t dataulen; - u_int32_t dataflags; - void *datadata; - u_int32_t datasize; - u_int32_t flags; - __db_get_reply *replyp; - int * freep; -/* END __db_get_proc */ +__db_get_h_nelem_proc(dbpcl_id, replyp) + unsigned int dbpcl_id; + __db_get_h_nelem_reply *replyp; +/* END __db_get_h_nelem_proc */ { 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 @@ -862,12 +744,12 @@ __db_get_proc(dbpcl_id, txnpcl_id, keydlen, return; } -/* BEGIN __db_get_name_proc */ +/* BEGIN __db_get_lorder_proc */ void -__db_get_name_proc(dbpcl_id, replyp) - long dbpcl_id; - __db_get_name_reply *replyp; -/* END __db_get_name_proc */ +__db_get_lorder_proc(dbpcl_id, replyp) + unsigned int dbpcl_id; + __db_get_lorder_reply *replyp; +/* END __db_get_lorder_proc */ { int ret; DB * dbp; @@ -887,7 +769,7 @@ __db_get_name_proc(dbpcl_id, replyp) /* BEGIN __db_get_open_flags_proc */ void __db_get_open_flags_proc(dbpcl_id, replyp) - long dbpcl_id; + unsigned int dbpcl_id; __db_get_open_flags_reply *replyp; /* END __db_get_open_flags_proc */ { @@ -906,12 +788,12 @@ __db_get_open_flags_proc(dbpcl_id, replyp) return; } -/* BEGIN __db_get_h_ffactor_proc */ +/* BEGIN __db_get_pagesize_proc */ void -__db_get_h_ffactor_proc(dbpcl_id, replyp) - long dbpcl_id; - __db_get_h_ffactor_reply *replyp; -/* END __db_get_h_ffactor_proc */ +__db_get_pagesize_proc(dbpcl_id, replyp) + unsigned int dbpcl_id; + __db_get_pagesize_reply *replyp; +/* END __db_get_pagesize_proc */ { int ret; DB * dbp; @@ -928,13 +810,12 @@ __db_get_h_ffactor_proc(dbpcl_id, replyp) return; } -/* BEGIN __db_h_ffactor_proc */ +/* BEGIN __db_get_q_extentsize_proc */ void -__db_h_ffactor_proc(dbpcl_id, ffactor, replyp) - long dbpcl_id; - u_int32_t ffactor; - __db_h_ffactor_reply *replyp; -/* END __db_h_ffactor_proc */ +__db_get_q_extentsize_proc(dbpcl_id, replyp) + unsigned int dbpcl_id; + __db_get_q_extentsize_reply *replyp; +/* END __db_get_q_extentsize_proc */ { int ret; DB * dbp; @@ -951,12 +832,12 @@ __db_h_ffactor_proc(dbpcl_id, ffactor, replyp) return; } -/* BEGIN __db_get_h_nelem_proc */ +/* BEGIN __db_get_re_delim_proc */ void -__db_get_h_nelem_proc(dbpcl_id, replyp) - long dbpcl_id; - __db_get_h_nelem_reply *replyp; -/* END __db_get_h_nelem_proc */ +__db_get_re_delim_proc(dbpcl_id, replyp) + unsigned int dbpcl_id; + __db_get_re_delim_reply *replyp; +/* END __db_get_re_delim_proc */ { int ret; DB * dbp; @@ -973,13 +854,12 @@ __db_get_h_nelem_proc(dbpcl_id, replyp) return; } -/* BEGIN __db_h_nelem_proc */ +/* BEGIN __db_get_re_len_proc */ void -__db_h_nelem_proc(dbpcl_id, nelem, replyp) - long dbpcl_id; - u_int32_t nelem; - __db_h_nelem_reply *replyp; -/* END __db_h_nelem_proc */ +__db_get_re_len_proc(dbpcl_id, replyp) + unsigned int dbpcl_id; + __db_get_re_len_reply *replyp; +/* END __db_get_re_len_proc */ { int ret; DB * dbp; @@ -996,33 +876,19 @@ __db_h_nelem_proc(dbpcl_id, nelem, replyp) return; } -/* BEGIN __db_key_range_proc */ +/* BEGIN __db_get_re_pad_proc */ void -__db_key_range_proc(dbpcl_id, txnpcl_id, keydlen, - keydoff, keyulen, keyflags, keydata, - keysize, flags, replyp) - long dbpcl_id; - long txnpcl_id; - u_int32_t keydlen; - u_int32_t keydoff; - u_int32_t keyulen; - u_int32_t keyflags; - void *keydata; - u_int32_t keysize; - u_int32_t flags; - __db_key_range_reply *replyp; -/* END __db_key_range_proc */ +__db_get_re_pad_proc(dbpcl_id, replyp) + unsigned int dbpcl_id; + __db_get_re_pad_reply *replyp; +/* END __db_get_re_pad_proc */ { 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 @@ -1032,12 +898,16 @@ __db_key_range_proc(dbpcl_id, txnpcl_id, keydlen, return; } -/* BEGIN __db_get_lorder_proc */ +/* BEGIN __db_join_proc */ void -__db_get_lorder_proc(dbpcl_id, replyp) - long dbpcl_id; - __db_get_lorder_reply *replyp; -/* END __db_get_lorder_proc */ +__db_join_proc(dbpcl_id, curs, curslen, + flags, replyp) + unsigned int dbpcl_id; + u_int32_t * curs; + u_int32_t curslen; + u_int32_t flags; + __db_join_reply *replyp; +/* END __db_join_proc */ { int ret; DB * dbp; @@ -1054,20 +924,33 @@ __db_get_lorder_proc(dbpcl_id, replyp) return; } -/* BEGIN __db_lorder_proc */ +/* BEGIN __db_key_range_proc */ void -__db_lorder_proc(dbpcl_id, lorder, replyp) - long dbpcl_id; - u_int32_t lorder; - __db_lorder_reply *replyp; -/* END __db_lorder_proc */ +__db_key_range_proc(dbpcl_id, txnpcl_id, keydlen, + keydoff, keyulen, keyflags, keydata, + keysize, flags, replyp) + unsigned int dbpcl_id; + unsigned int txnpcl_id; + u_int32_t keydlen; + u_int32_t keydoff; + u_int32_t keyulen; + u_int32_t keyflags; + void *keydata; + u_int32_t keysize; + u_int32_t flags; + __db_key_range_reply *replyp; +/* END __db_key_range_proc */ { 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 @@ -1081,8 +964,8 @@ __db_lorder_proc(dbpcl_id, lorder, replyp) void __db_open_proc(dbpcl_id, txnpcl_id, name, subdb, type, flags, mode, replyp) - long dbpcl_id; - long txnpcl_id; + unsigned int dbpcl_id; + unsigned int txnpcl_id; char *name; char *subdb; u_int32_t type; @@ -1110,51 +993,6 @@ __db_open_proc(dbpcl_id, txnpcl_id, name, return; } -/* BEGIN __db_get_pagesize_proc */ -void -__db_get_pagesize_proc(dbpcl_id, replyp) - long dbpcl_id; - __db_get_pagesize_reply *replyp; -/* END __db_get_pagesize_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_pagesize_proc */ -void -__db_pagesize_proc(dbpcl_id, pagesize, replyp) - long dbpcl_id; - u_int32_t pagesize; - __db_pagesize_reply *replyp; -/* END __db_pagesize_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - /* BEGIN __db_pget_proc */ void __db_pget_proc(dbpcl_id, txnpcl_id, skeydlen, @@ -1163,8 +1001,8 @@ __db_pget_proc(dbpcl_id, txnpcl_id, skeydlen, pkeyflags, pkeydata, pkeysize, datadlen, datadoff, dataulen, dataflags, datadata, datasize, flags, replyp, freep) - long dbpcl_id; - long txnpcl_id; + unsigned int dbpcl_id; + unsigned int txnpcl_id; u_int32_t skeydlen; u_int32_t skeydoff; u_int32_t skeyulen; @@ -1213,8 +1051,8 @@ __db_put_proc(dbpcl_id, txnpcl_id, keydlen, keydoff, keyulen, keyflags, keydata, keysize, datadlen, datadoff, dataulen, dataflags, datadata, datasize, flags, replyp, freep) - long dbpcl_id; - long txnpcl_id; + unsigned int dbpcl_id; + unsigned int txnpcl_id; u_int32_t keydlen; u_int32_t keydoff; u_int32_t keyulen; @@ -1251,12 +1089,16 @@ __db_put_proc(dbpcl_id, txnpcl_id, keydlen, return; } -/* BEGIN __db_get_re_delim_proc */ +/* BEGIN __db_remove_proc */ void -__db_get_re_delim_proc(dbpcl_id, replyp) - long dbpcl_id; - __db_get_re_delim_reply *replyp; -/* END __db_get_re_delim_proc */ +__db_remove_proc(dbpcl_id, name, subdb, + flags, replyp) + unsigned int dbpcl_id; + char *name; + char *subdb; + u_int32_t flags; + __db_remove_reply *replyp; +/* END __db_remove_proc */ { int ret; DB * dbp; @@ -1273,13 +1115,17 @@ __db_get_re_delim_proc(dbpcl_id, replyp) return; } -/* BEGIN __db_re_delim_proc */ +/* BEGIN __db_rename_proc */ void -__db_re_delim_proc(dbpcl_id, delim, replyp) - long dbpcl_id; - u_int32_t delim; - __db_re_delim_reply *replyp; -/* END __db_re_delim_proc */ +__db_rename_proc(dbpcl_id, name, subdb, + newname, flags, replyp) + unsigned int dbpcl_id; + char *name; + char *subdb; + char *newname; + u_int32_t flags; + __db_rename_reply *replyp; +/* END __db_rename_proc */ { int ret; DB * dbp; @@ -1296,12 +1142,13 @@ __db_re_delim_proc(dbpcl_id, delim, replyp) return; } -/* BEGIN __db_get_re_len_proc */ +/* BEGIN __db_set_bt_minkey_proc */ void -__db_get_re_len_proc(dbpcl_id, replyp) - long dbpcl_id; - __db_get_re_len_reply *replyp; -/* END __db_get_re_len_proc */ +__db_set_bt_minkey_proc(dbpcl_id, minkey, replyp) + unsigned int dbpcl_id; + u_int32_t minkey; + __db_set_bt_minkey_reply *replyp; +/* END __db_set_bt_minkey_proc */ { int ret; DB * dbp; @@ -1318,13 +1165,14 @@ __db_get_re_len_proc(dbpcl_id, replyp) return; } -/* BEGIN __db_re_len_proc */ +/* BEGIN __db_set_encrypt_proc */ void -__db_re_len_proc(dbpcl_id, len, replyp) - long dbpcl_id; - u_int32_t len; - __db_re_len_reply *replyp; -/* END __db_re_len_proc */ +__db_set_encrypt_proc(dbpcl_id, passwd, flags, replyp) + unsigned int dbpcl_id; + char *passwd; + u_int32_t flags; + __db_set_encrypt_reply *replyp; +/* END __db_set_encrypt_proc */ { int ret; DB * dbp; @@ -1341,13 +1189,13 @@ __db_re_len_proc(dbpcl_id, len, replyp) return; } -/* BEGIN __db_re_pad_proc */ +/* BEGIN __db_set_flags_proc */ void -__db_re_pad_proc(dbpcl_id, pad, replyp) - long dbpcl_id; - u_int32_t pad; - __db_re_pad_reply *replyp; -/* END __db_re_pad_proc */ +__db_set_flags_proc(dbpcl_id, flags, replyp) + unsigned int dbpcl_id; + u_int32_t flags; + __db_set_flags_reply *replyp; +/* END __db_set_flags_proc */ { int ret; DB * dbp; @@ -1364,12 +1212,13 @@ __db_re_pad_proc(dbpcl_id, pad, replyp) return; } -/* BEGIN __db_get_re_pad_proc */ +/* BEGIN __db_set_h_ffactor_proc */ void -__db_get_re_pad_proc(dbpcl_id, replyp) - long dbpcl_id; - __db_get_re_pad_reply *replyp; -/* END __db_get_re_pad_proc */ +__db_set_h_ffactor_proc(dbpcl_id, ffactor, replyp) + unsigned int dbpcl_id; + u_int32_t ffactor; + __db_set_h_ffactor_reply *replyp; +/* END __db_set_h_ffactor_proc */ { int ret; DB * dbp; @@ -1386,16 +1235,13 @@ __db_get_re_pad_proc(dbpcl_id, replyp) return; } -/* BEGIN __db_remove_proc */ +/* BEGIN __db_set_h_nelem_proc */ void -__db_remove_proc(dbpcl_id, name, subdb, - flags, replyp) - long dbpcl_id; - char *name; - char *subdb; - u_int32_t flags; - __db_remove_reply *replyp; -/* END __db_remove_proc */ +__db_set_h_nelem_proc(dbpcl_id, nelem, replyp) + unsigned int dbpcl_id; + u_int32_t nelem; + __db_set_h_nelem_reply *replyp; +/* END __db_set_h_nelem_proc */ { int ret; DB * dbp; @@ -1412,17 +1258,13 @@ __db_remove_proc(dbpcl_id, name, subdb, return; } -/* BEGIN __db_rename_proc */ +/* BEGIN __db_set_lorder_proc */ void -__db_rename_proc(dbpcl_id, name, subdb, - newname, flags, replyp) - long dbpcl_id; - char *name; - char *subdb; - char *newname; - u_int32_t flags; - __db_rename_reply *replyp; -/* END __db_rename_proc */ +__db_set_lorder_proc(dbpcl_id, lorder, replyp) + unsigned int dbpcl_id; + u_int32_t lorder; + __db_set_lorder_reply *replyp; +/* END __db_set_lorder_proc */ { int ret; DB * dbp; @@ -1439,27 +1281,20 @@ __db_rename_proc(dbpcl_id, name, subdb, return; } -/* BEGIN __db_stat_proc */ +/* BEGIN __db_set_pagesize_proc */ void -__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; -/* END __db_stat_proc */ +__db_set_pagesize_proc(dbpcl_id, pagesize, replyp) + unsigned int dbpcl_id; + u_int32_t pagesize; + __db_set_pagesize_reply *replyp; +/* END __db_set_pagesize_proc */ { 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 @@ -1469,13 +1304,13 @@ __db_stat_proc(dbpcl_id, txnpcl_id, return; } -/* BEGIN __db_sync_proc */ +/* BEGIN __db_set_q_extentsize_proc */ void -__db_sync_proc(dbpcl_id, flags, replyp) - long dbpcl_id; - u_int32_t flags; - __db_sync_reply *replyp; -/* END __db_sync_proc */ +__db_set_q_extentsize_proc(dbpcl_id, extentsize, replyp) + unsigned int dbpcl_id; + u_int32_t extentsize; + __db_set_q_extentsize_reply *replyp; +/* END __db_set_q_extentsize_proc */ { int ret; DB * dbp; @@ -1492,15 +1327,85 @@ __db_sync_proc(dbpcl_id, flags, replyp) return; } -/* BEGIN __db_truncate_proc */ +/* BEGIN __db_set_re_delim_proc */ void -__db_truncate_proc(dbpcl_id, txnpcl_id, - flags, replyp) - long dbpcl_id; - long txnpcl_id; +__db_set_re_delim_proc(dbpcl_id, delim, replyp) + unsigned int dbpcl_id; + u_int32_t delim; + __db_set_re_delim_reply *replyp; +/* END __db_set_re_delim_proc */ +{ + int ret; + DB * dbp; + ct_entry *dbp_ctp; + + ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); + dbp = (DB *)dbp_ctp->ct_anyp; + + /* + * XXX Code goes here + */ + + replyp->status = ret; + return; +} + +/* BEGIN __db_set_re_len_proc */ +void +__db_set_re_len_proc(dbpcl_id, len, replyp) + unsigned int dbpcl_id; + u_int32_t len; + __db_set_re_len_reply *replyp; +/* END __db_set_re_len_proc */ +{ + int ret; + DB * dbp; + ct_entry *dbp_ctp; + + ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); + dbp = (DB *)dbp_ctp->ct_anyp; + + /* + * XXX Code goes here + */ + + replyp->status = ret; + return; +} + +/* BEGIN __db_set_re_pad_proc */ +void +__db_set_re_pad_proc(dbpcl_id, pad, replyp) + unsigned int dbpcl_id; + u_int32_t pad; + __db_set_re_pad_reply *replyp; +/* END __db_set_re_pad_proc */ +{ + int ret; + DB * dbp; + ct_entry *dbp_ctp; + + ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); + dbp = (DB *)dbp_ctp->ct_anyp; + + /* + * XXX Code goes here + */ + + replyp->status = ret; + return; +} + +/* BEGIN __db_stat_proc */ +void +__db_stat_proc(dbpcl_id, txnpcl_id, + flags, replyp, freep) + unsigned int dbpcl_id; + unsigned int txnpcl_id; u_int32_t flags; - __db_truncate_reply *replyp; -/* END __db_truncate_proc */ + __db_stat_reply *replyp; + int * freep; +/* END __db_stat_proc */ { int ret; DB * dbp; @@ -1521,26 +1426,20 @@ __db_truncate_proc(dbpcl_id, txnpcl_id, return; } -/* BEGIN __db_cursor_proc */ +/* BEGIN __db_sync_proc */ void -__db_cursor_proc(dbpcl_id, txnpcl_id, - flags, replyp) - long dbpcl_id; - long txnpcl_id; +__db_sync_proc(dbpcl_id, flags, replyp) + unsigned int dbpcl_id; u_int32_t flags; - __db_cursor_reply *replyp; -/* END __db_cursor_proc */ + __db_sync_reply *replyp; +/* END __db_sync_proc */ { 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 @@ -1550,23 +1449,26 @@ __db_cursor_proc(dbpcl_id, txnpcl_id, return; } -/* BEGIN __db_join_proc */ +/* BEGIN __db_truncate_proc */ void -__db_join_proc(dbpcl_id, curs, curslen, +__db_truncate_proc(dbpcl_id, txnpcl_id, flags, replyp) - long dbpcl_id; - u_int32_t * curs; - u_int32_t curslen; + unsigned int dbpcl_id; + unsigned int txnpcl_id; u_int32_t flags; - __db_join_reply *replyp; -/* END __db_join_proc */ + __db_truncate_reply *replyp; +/* END __db_truncate_proc */ { 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 @@ -1576,12 +1478,12 @@ __db_join_proc(dbpcl_id, curs, curslen, return; } -/* BEGIN __dbc_close_proc */ +/* BEGIN __dbc_c_close_proc */ void -__dbc_close_proc(dbccl_id, replyp) - long dbccl_id; - __dbc_close_reply *replyp; -/* END __dbc_close_proc */ +__dbc_c_close_proc(dbccl_id, replyp) + unsigned int dbccl_id; + __dbc_c_close_reply *replyp; +/* END __dbc_c_close_proc */ { int ret; DBC * dbc; @@ -1598,13 +1500,13 @@ __dbc_close_proc(dbccl_id, replyp) return; } -/* BEGIN __dbc_count_proc */ +/* BEGIN __dbc_c_count_proc */ void -__dbc_count_proc(dbccl_id, flags, replyp) - long dbccl_id; +__dbc_c_count_proc(dbccl_id, flags, replyp) + unsigned int dbccl_id; u_int32_t flags; - __dbc_count_reply *replyp; -/* END __dbc_count_proc */ + __dbc_c_count_reply *replyp; +/* END __dbc_c_count_proc */ { int ret; DBC * dbc; @@ -1621,13 +1523,13 @@ __dbc_count_proc(dbccl_id, flags, replyp) return; } -/* BEGIN __dbc_del_proc */ +/* BEGIN __dbc_c_del_proc */ void -__dbc_del_proc(dbccl_id, flags, replyp) - long dbccl_id; +__dbc_c_del_proc(dbccl_id, flags, replyp) + unsigned int dbccl_id; u_int32_t flags; - __dbc_del_reply *replyp; -/* END __dbc_del_proc */ + __dbc_c_del_reply *replyp; +/* END __dbc_c_del_proc */ { int ret; DBC * dbc; @@ -1644,13 +1546,13 @@ __dbc_del_proc(dbccl_id, flags, replyp) return; } -/* BEGIN __dbc_dup_proc */ +/* BEGIN __dbc_c_dup_proc */ void -__dbc_dup_proc(dbccl_id, flags, replyp) - long dbccl_id; +__dbc_c_dup_proc(dbccl_id, flags, replyp) + unsigned int dbccl_id; u_int32_t flags; - __dbc_dup_reply *replyp; -/* END __dbc_dup_proc */ + __dbc_c_dup_reply *replyp; +/* END __dbc_c_dup_proc */ { int ret; DBC * dbc; @@ -1667,13 +1569,13 @@ __dbc_dup_proc(dbccl_id, flags, replyp) return; } -/* BEGIN __dbc_get_proc */ +/* BEGIN __dbc_c_get_proc */ void -__dbc_get_proc(dbccl_id, keydlen, keydoff, +__dbc_c_get_proc(dbccl_id, keydlen, keydoff, keyulen, keyflags, keydata, keysize, datadlen, datadoff, dataulen, dataflags, datadata, datasize, flags, replyp, freep) - long dbccl_id; + unsigned int dbccl_id; u_int32_t keydlen; u_int32_t keydoff; u_int32_t keyulen; @@ -1687,9 +1589,9 @@ __dbc_get_proc(dbccl_id, keydlen, keydoff, void *datadata; u_int32_t datasize; u_int32_t flags; - __dbc_get_reply *replyp; + __dbc_c_get_reply *replyp; int * freep; -/* END __dbc_get_proc */ +/* END __dbc_c_get_proc */ { int ret; DBC * dbc; @@ -1706,15 +1608,15 @@ __dbc_get_proc(dbccl_id, keydlen, keydoff, return; } -/* BEGIN __dbc_pget_proc */ +/* BEGIN __dbc_c_pget_proc */ void -__dbc_pget_proc(dbccl_id, skeydlen, skeydoff, +__dbc_c_pget_proc(dbccl_id, skeydlen, skeydoff, skeyulen, skeyflags, skeydata, skeysize, pkeydlen, pkeydoff, pkeyulen, pkeyflags, pkeydata, pkeysize, datadlen, datadoff, dataulen, dataflags, datadata, datasize, flags, replyp, freep) - long dbccl_id; + unsigned int dbccl_id; u_int32_t skeydlen; u_int32_t skeydoff; u_int32_t skeyulen; @@ -1734,9 +1636,9 @@ __dbc_pget_proc(dbccl_id, skeydlen, skeydoff, void *datadata; u_int32_t datasize; u_int32_t flags; - __dbc_pget_reply *replyp; + __dbc_c_pget_reply *replyp; int * freep; -/* END __dbc_pget_proc */ +/* END __dbc_c_pget_proc */ { int ret; DBC * dbc; @@ -1753,13 +1655,13 @@ __dbc_pget_proc(dbccl_id, skeydlen, skeydoff, return; } -/* BEGIN __dbc_put_proc */ +/* BEGIN __dbc_c_put_proc */ void -__dbc_put_proc(dbccl_id, keydlen, keydoff, +__dbc_c_put_proc(dbccl_id, keydlen, keydoff, keyulen, keyflags, keydata, keysize, datadlen, datadoff, dataulen, dataflags, datadata, datasize, flags, replyp, freep) - long dbccl_id; + unsigned int dbccl_id; u_int32_t keydlen; u_int32_t keydoff; u_int32_t keyulen; @@ -1773,9 +1675,9 @@ __dbc_put_proc(dbccl_id, keydlen, keydoff, void *datadata; u_int32_t datasize; u_int32_t flags; - __dbc_put_reply *replyp; + __dbc_c_put_reply *replyp; int * freep; -/* END __dbc_put_proc */ +/* END __dbc_c_put_proc */ { int ret; DBC * dbc; @@ -1792,3 +1694,94 @@ __dbc_put_proc(dbccl_id, keydlen, keydoff, return; } +/* BEGIN __txn_abort_proc */ +void +__txn_abort_proc(txnpcl_id, replyp) + unsigned int txnpcl_id; + __txn_abort_reply *replyp; +/* END __txn_abort_proc */ +{ + int ret; + DB_TXN * txnp; + ct_entry *txnp_ctp; + + ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); + txnp = (DB_TXN *)txnp_ctp->ct_anyp; + + /* + * XXX Code goes here + */ + + replyp->status = ret; + return; +} + +/* BEGIN __txn_commit_proc */ +void +__txn_commit_proc(txnpcl_id, flags, replyp) + unsigned int txnpcl_id; + u_int32_t flags; + __txn_commit_reply *replyp; +/* END __txn_commit_proc */ +{ + int ret; + DB_TXN * txnp; + ct_entry *txnp_ctp; + + ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); + txnp = (DB_TXN *)txnp_ctp->ct_anyp; + + /* + * XXX Code goes here + */ + + replyp->status = ret; + return; +} + +/* BEGIN __txn_discard_proc */ +void +__txn_discard_proc(txnpcl_id, flags, replyp) + unsigned int txnpcl_id; + u_int32_t flags; + __txn_discard_reply *replyp; +/* END __txn_discard_proc */ +{ + int ret; + DB_TXN * txnp; + ct_entry *txnp_ctp; + + ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); + txnp = (DB_TXN *)txnp_ctp->ct_anyp; + + /* + * XXX Code goes here + */ + + replyp->status = ret; + return; +} + +/* BEGIN __txn_prepare_proc */ +void +__txn_prepare_proc(txnpcl_id, gid, replyp) + unsigned int txnpcl_id; + u_int8_t *gid; + __txn_prepare_reply *replyp; +/* END __txn_prepare_proc */ +{ + int ret; + DB_TXN * txnp; + ct_entry *txnp_ctp; + + ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); + txnp = (DB_TXN *)txnp_ctp->ct_anyp; + + /* + * XXX Code goes here + */ + + replyp->status = ret; + return; +} + diff --git a/db/dist/template/gen_client_ret b/db/dist/template/gen_client_ret index 3d897e609..8d679a749 100644 --- a/db/dist/template/gen_client_ret +++ b/db/dist/template/gen_client_ret @@ -1,11 +1,6 @@ /* Do not edit: automatically built by gen_rpc.awk. */ #include "db_config.h" -#ifndef NO_SYSTEM_INCLUDES -#include <sys/types.h> - -#include <string.h> -#endif #include "db_int.h" #include "dbinc/txn.h" @@ -34,23 +29,21 @@ __dbcl_env_create_ret(dbenv, timeout, replyp) } /* - * PUBLIC: int __dbcl_env_open_ret __P((DB_ENV *, const char *, u_int32_t, int, - * PUBLIC: __env_open_reply *)); + * PUBLIC: int __dbcl_env_cdsgroup_begin_ret __P((DB_ENV *, DB_TXN **, + * PUBLIC: __env_cdsgroup_begin_reply *)); */ int -__dbcl_env_open_ret(dbenv, home, flags, mode, replyp) +__dbcl_env_cdsgroup_begin_ret(dbenv, txnpp, replyp) DB_ENV * dbenv; - const char * home; - u_int32_t flags; - int mode; - __env_open_reply *replyp; + DB_TXN ** txnpp; + __env_cdsgroup_begin_reply *replyp; { int ret; - long env; + long txnid; if (replyp->status != 0) return (replyp->status); - env = replyp->envcl_id; + txnid = replyp->txnidcl_id; /* * XXX Code goes here @@ -60,20 +53,23 @@ __dbcl_env_open_ret(dbenv, home, flags, mode, replyp) } /* - * PUBLIC: int __dbcl_env_remove_ret __P((DB_ENV *, const char *, u_int32_t, - * PUBLIC: __env_remove_reply *)); + * PUBLIC: int __dbcl_env_open_ret __P((DB_ENV *, const char *, u_int32_t, int, + * PUBLIC: __env_open_reply *)); */ int -__dbcl_env_remove_ret(dbenv, home, flags, replyp) +__dbcl_env_open_ret(dbenv, home, flags, mode, replyp) DB_ENV * dbenv; const char * home; u_int32_t flags; - __env_remove_reply *replyp; + int mode; + __env_open_reply *replyp; { int ret; + long env; if (replyp->status != 0) return (replyp->status); + env = replyp->envcl_id; /* * XXX Code goes here @@ -83,12 +79,15 @@ __dbcl_env_remove_ret(dbenv, home, flags, replyp) } /* - * PUBLIC: int __dbcl_txn_abort_ret __P((DB_TXN *, __txn_abort_reply *)); + * PUBLIC: int __dbcl_env_remove_ret __P((DB_ENV *, const char *, u_int32_t, + * PUBLIC: __env_remove_reply *)); */ int -__dbcl_txn_abort_ret(txnp, replyp) - DB_TXN * txnp; - __txn_abort_reply *replyp; +__dbcl_env_remove_ret(dbenv, home, flags, replyp) + DB_ENV * dbenv; + const char * home; + u_int32_t flags; + __env_remove_reply *replyp; { int ret; @@ -103,16 +102,16 @@ __dbcl_txn_abort_ret(txnp, replyp) } /* - * PUBLIC: int __dbcl_txn_begin_ret __P((DB_ENV *, DB_TXN *, DB_TXN **, - * PUBLIC: u_int32_t, __txn_begin_reply *)); + * PUBLIC: int __dbcl_env_txn_begin_ret __P((DB_ENV *, DB_TXN *, DB_TXN **, + * PUBLIC: u_int32_t, __env_txn_begin_reply *)); */ int -__dbcl_txn_begin_ret(dbenv, parent, txnpp, flags, replyp) +__dbcl_env_txn_begin_ret(dbenv, parent, txnpp, flags, replyp) DB_ENV * dbenv; DB_TXN * parent; DB_TXN ** txnpp; u_int32_t flags; - __txn_begin_reply *replyp; + __env_txn_begin_reply *replyp; { int ret; long txnid; @@ -129,41 +128,36 @@ __dbcl_txn_begin_ret(dbenv, parent, txnpp, flags, replyp) } /* - * PUBLIC: int __dbcl_txn_commit_ret __P((DB_TXN *, u_int32_t, - * PUBLIC: __txn_commit_reply *)); + * PUBLIC: int __dbcl_env_txn_recover_ret __P((DB_ENV *, DB_PREPLIST *, long, + * PUBLIC: long *, u_int32_t, __env_txn_recover_reply *)); */ int -__dbcl_txn_commit_ret(txnp, flags, replyp) - DB_TXN * txnp; +__dbcl_env_txn_recover_ret(dbenv, preplist, count, retp, flags, replyp) + DB_ENV * dbenv; + DB_PREPLIST * preplist; + long count; + long * retp; u_int32_t flags; - __txn_commit_reply *replyp; + __env_txn_recover_reply *replyp; { int ret; + u_int32_t *__db_txn; + u_int8_t *__db_gid; + long retcount; if (replyp->status != 0) return (replyp->status); /* - * XXX Code goes here + * XXX Handle list */ - return (replyp->status); -} -/* - * PUBLIC: int __dbcl_txn_discard_ret __P((DB_TXN *, u_int32_t, - * PUBLIC: __txn_discard_reply *)); - */ -int -__dbcl_txn_discard_ret(txnp, flags, replyp) - DB_TXN * txnp; - u_int32_t flags; - __txn_discard_reply *replyp; -{ - int ret; + /* + * XXX Handle list + */ - if (replyp->status != 0) - return (replyp->status); + retcount = replyp->retcount; /* * XXX Code goes here @@ -173,36 +167,22 @@ __dbcl_txn_discard_ret(txnp, flags, replyp) } /* - * PUBLIC: int __dbcl_txn_recover_ret __P((DB_ENV *, DB_PREPLIST *, long, - * PUBLIC: long *, u_int32_t, __txn_recover_reply *)); + * PUBLIC: int __dbcl_db_create_ret __P((DB *, DB_ENV *, u_int32_t, + * PUBLIC: __db_create_reply *)); */ int -__dbcl_txn_recover_ret(dbenv, preplist, count, retp, flags, replyp) +__dbcl_db_create_ret(dbp, dbenv, flags, replyp) + DB * dbp; DB_ENV * dbenv; - DB_PREPLIST * preplist; - long count; - long * retp; u_int32_t flags; - __txn_recover_reply *replyp; + __db_create_reply *replyp; { int ret; - u_int32_t *__db_txn; - u_int8_t *__db_gid; - long retcount; + long db; if (replyp->status != 0) return (replyp->status); - - /* - * XXX Handle list - */ - - - /* - * XXX Handle list - */ - - retcount = replyp->retcount; + db = replyp->dbcl_id; /* * XXX Code goes here @@ -233,22 +213,23 @@ __dbcl_db_close_ret(dbp, flags, replyp) } /* - * PUBLIC: int __dbcl_db_create_ret __P((DB *, DB_ENV *, u_int32_t, - * PUBLIC: __db_create_reply *)); + * PUBLIC: int __dbcl_db_cursor_ret __P((DB *, DB_TXN *, DBC **, u_int32_t, + * PUBLIC: __db_cursor_reply *)); */ int -__dbcl_db_create_ret(dbp, dbenv, flags, replyp) +__dbcl_db_cursor_ret(dbp, txnp, dbcpp, flags, replyp) DB * dbp; - DB_ENV * dbenv; + DB_TXN * txnp; + DBC ** dbcpp; u_int32_t flags; - __db_create_reply *replyp; + __db_cursor_reply *replyp; { int ret; - long db; + long dbcid; if (replyp->status != 0) return (replyp->status); - db = replyp->dbcl_id; + dbcid = replyp->dbcidcl_id; /* * XXX Code goes here @@ -287,6 +268,32 @@ __dbcl_db_get_ret(dbp, txnp, key, data, flags, replyp) } /* + * PUBLIC: int __dbcl_db_join_ret __P((DB *, DBC **, DBC **, u_int32_t, + * PUBLIC: __db_join_reply *)); + */ +int +__dbcl_db_join_ret(dbp, curs, dbcp, flags, replyp) + DB * dbp; + DBC ** curs; + DBC ** dbcp; + u_int32_t flags; + __db_join_reply *replyp; +{ + int ret; + long dbcid; + + if (replyp->status != 0) + return (replyp->status); + dbcid = replyp->dbcidcl_id; + + /* + * XXX Code goes here + */ + + return (replyp->status); +} + +/* * PUBLIC: int __dbcl_db_key_range_ret __P((DB *, DB_TXN *, DBT *, * PUBLIC: DB_KEY_RANGE *, u_int32_t, __db_key_range_reply *)); */ @@ -515,23 +522,17 @@ __dbcl_db_truncate_ret(dbp, txnp, countp, flags, replyp) } /* - * PUBLIC: int __dbcl_db_cursor_ret __P((DB *, DB_TXN *, DBC **, u_int32_t, - * PUBLIC: __db_cursor_reply *)); + * PUBLIC: int __dbcl_dbc_c_close_ret __P((DBC *, __dbc_c_close_reply *)); */ int -__dbcl_db_cursor_ret(dbp, txnp, dbcpp, flags, replyp) - DB * dbp; - DB_TXN * txnp; - DBC ** dbcpp; - u_int32_t flags; - __db_cursor_reply *replyp; +__dbcl_dbc_c_close_ret(dbc, replyp) + DBC * dbc; + __dbc_c_close_reply *replyp; { int ret; - long dbcid; if (replyp->status != 0) return (replyp->status); - dbcid = replyp->dbcidcl_id; /* * XXX Code goes here @@ -541,23 +542,22 @@ __dbcl_db_cursor_ret(dbp, txnp, dbcpp, flags, replyp) } /* - * PUBLIC: int __dbcl_db_join_ret __P((DB *, DBC **, DBC **, u_int32_t, - * PUBLIC: __db_join_reply *)); + * PUBLIC: int __dbcl_dbc_c_count_ret __P((DBC *, db_recno_t *, u_int32_t, + * PUBLIC: __dbc_c_count_reply *)); */ int -__dbcl_db_join_ret(dbp, curs, dbcp, flags, replyp) - DB * dbp; - DBC ** curs; - DBC ** dbcp; +__dbcl_dbc_c_count_ret(dbc, countp, flags, replyp) + DBC * dbc; + db_recno_t * countp; u_int32_t flags; - __db_join_reply *replyp; + __dbc_c_count_reply *replyp; { int ret; - long dbcid; + db_recno_t dupcount; if (replyp->status != 0) return (replyp->status); - dbcid = replyp->dbcidcl_id; + dupcount = replyp->dupcount; /* * XXX Code goes here @@ -567,17 +567,22 @@ __dbcl_db_join_ret(dbp, curs, dbcp, flags, replyp) } /* - * PUBLIC: int __dbcl_dbc_close_ret __P((DBC *, __dbc_close_reply *)); + * PUBLIC: int __dbcl_dbc_c_dup_ret __P((DBC *, DBC **, u_int32_t, + * PUBLIC: __dbc_c_dup_reply *)); */ int -__dbcl_dbc_close_ret(dbc, replyp) +__dbcl_dbc_c_dup_ret(dbc, dbcp, flags, replyp) DBC * dbc; - __dbc_close_reply *replyp; + DBC ** dbcp; + u_int32_t flags; + __dbc_c_dup_reply *replyp; { int ret; + long dbcid; if (replyp->status != 0) return (replyp->status); + dbcid = replyp->dbcidcl_id; /* * XXX Code goes here @@ -587,22 +592,25 @@ __dbcl_dbc_close_ret(dbc, replyp) } /* - * PUBLIC: int __dbcl_dbc_count_ret __P((DBC *, db_recno_t *, u_int32_t, - * PUBLIC: __dbc_count_reply *)); + * PUBLIC: int __dbcl_dbc_c_get_ret __P((DBC *, DBT *, DBT *, u_int32_t, + * PUBLIC: __dbc_c_get_reply *)); */ int -__dbcl_dbc_count_ret(dbc, countp, flags, replyp) +__dbcl_dbc_c_get_ret(dbc, key, data, flags, replyp) DBC * dbc; - db_recno_t * countp; + DBT * key; + DBT * data; u_int32_t flags; - __dbc_count_reply *replyp; + __dbc_c_get_reply *replyp; { int ret; - db_recno_t dupcount; + /* DBT key; */ + /* DBT data; */ if (replyp->status != 0) return (replyp->status); - dupcount = replyp->dupcount; + /* Handle replyp->keydata; */ + /* Handle replyp->datadata; */ /* * XXX Code goes here @@ -612,22 +620,28 @@ __dbcl_dbc_count_ret(dbc, countp, flags, replyp) } /* - * PUBLIC: int __dbcl_dbc_dup_ret __P((DBC *, DBC **, u_int32_t, - * PUBLIC: __dbc_dup_reply *)); + * PUBLIC: int __dbcl_dbc_c_pget_ret __P((DBC *, DBT *, DBT *, DBT *, u_int32_t, + * PUBLIC: __dbc_c_pget_reply *)); */ int -__dbcl_dbc_dup_ret(dbc, dbcp, flags, replyp) +__dbcl_dbc_c_pget_ret(dbc, skey, pkey, data, flags, replyp) DBC * dbc; - DBC ** dbcp; + DBT * skey; + DBT * pkey; + DBT * data; u_int32_t flags; - __dbc_dup_reply *replyp; + __dbc_c_pget_reply *replyp; { int ret; - long dbcid; + /* DBT skey; */ + /* DBT pkey; */ + /* DBT data; */ if (replyp->status != 0) return (replyp->status); - dbcid = replyp->dbcidcl_id; + /* Handle replyp->skeydata; */ + /* Handle replyp->pkeydata; */ + /* Handle replyp->datadata; */ /* * XXX Code goes here @@ -637,25 +651,23 @@ __dbcl_dbc_dup_ret(dbc, dbcp, flags, replyp) } /* - * PUBLIC: int __dbcl_dbc_get_ret __P((DBC *, DBT *, DBT *, u_int32_t, - * PUBLIC: __dbc_get_reply *)); + * PUBLIC: int __dbcl_dbc_c_put_ret __P((DBC *, DBT *, DBT *, u_int32_t, + * PUBLIC: __dbc_c_put_reply *)); */ int -__dbcl_dbc_get_ret(dbc, key, data, flags, replyp) +__dbcl_dbc_c_put_ret(dbc, key, data, flags, replyp) DBC * dbc; DBT * key; DBT * data; u_int32_t flags; - __dbc_get_reply *replyp; + __dbc_c_put_reply *replyp; { int ret; /* DBT key; */ - /* DBT data; */ if (replyp->status != 0) return (replyp->status); /* Handle replyp->keydata; */ - /* Handle replyp->datadata; */ /* * XXX Code goes here @@ -665,28 +677,39 @@ __dbcl_dbc_get_ret(dbc, key, data, flags, replyp) } /* - * PUBLIC: int __dbcl_dbc_pget_ret __P((DBC *, DBT *, DBT *, DBT *, u_int32_t, - * PUBLIC: __dbc_pget_reply *)); + * PUBLIC: int __dbcl_txn_abort_ret __P((DB_TXN *, __txn_abort_reply *)); */ int -__dbcl_dbc_pget_ret(dbc, skey, pkey, data, flags, replyp) - DBC * dbc; - DBT * skey; - DBT * pkey; - DBT * data; +__dbcl_txn_abort_ret(txnp, replyp) + DB_TXN * txnp; + __txn_abort_reply *replyp; +{ + int ret; + + if (replyp->status != 0) + return (replyp->status); + + /* + * XXX Code goes here + */ + + return (replyp->status); +} + +/* + * PUBLIC: int __dbcl_txn_commit_ret __P((DB_TXN *, u_int32_t, + * PUBLIC: __txn_commit_reply *)); + */ +int +__dbcl_txn_commit_ret(txnp, flags, replyp) + DB_TXN * txnp; u_int32_t flags; - __dbc_pget_reply *replyp; + __txn_commit_reply *replyp; { int ret; - /* DBT skey; */ - /* DBT pkey; */ - /* DBT data; */ if (replyp->status != 0) return (replyp->status); - /* Handle replyp->skeydata; */ - /* Handle replyp->pkeydata; */ - /* Handle replyp->datadata; */ /* * XXX Code goes here @@ -696,23 +719,19 @@ __dbcl_dbc_pget_ret(dbc, skey, pkey, data, flags, replyp) } /* - * PUBLIC: int __dbcl_dbc_put_ret __P((DBC *, DBT *, DBT *, u_int32_t, - * PUBLIC: __dbc_put_reply *)); + * PUBLIC: int __dbcl_txn_discard_ret __P((DB_TXN *, u_int32_t, + * PUBLIC: __txn_discard_reply *)); */ int -__dbcl_dbc_put_ret(dbc, key, data, flags, replyp) - DBC * dbc; - DBT * key; - DBT * data; +__dbcl_txn_discard_ret(txnp, flags, replyp) + DB_TXN * txnp; u_int32_t flags; - __dbc_put_reply *replyp; + __txn_discard_reply *replyp; { int ret; - /* DBT key; */ if (replyp->status != 0) return (replyp->status); - /* Handle replyp->keydata; */ /* * XXX Code goes here diff --git a/db/dist/template/rec_btree b/db/dist/template/rec_btree index 0b2c96182..64a123ae3 100644 --- a/db/dist/template/rec_btree +++ b/db/dist/template/rec_btree @@ -1,11 +1,5 @@ #include "db_config.h" -#ifndef NO_SYSTEM_INCLUDES -#include <sys/types.h> - -#include <string.h> -#endif - #include "db_int.h" #include "dbinc/db_page.h" #include "dbinc/__bam.h" @@ -631,3 +625,189 @@ __bam_relink_recover(dbenv, dbtp, lsnp, op, info) out: REC_CLOSE; } +/* + * __bam_relink_recover -- + * Recovery function for relink. + * + * PUBLIC: int __bam_relink_recover + * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); + */ +int +__bam_relink_recover(dbenv, dbtp, lsnp, op, info) + DB_ENV *dbenv; + DBT *dbtp; + DB_LSN *lsnp; + db_recops op; + void *info; +{ + __bam_relink_args *argp; + DB *file_dbp; + DBC *dbc; + DB_MPOOLFILE *mpf; + PAGE *pagep; + int cmp_n, cmp_p, modified, ret; + + REC_PRINT(__bam_relink_print); + REC_INTRO(__bam_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; +} + +/* + * __bam_merge_recover -- + * Recovery function for merge. + * + * PUBLIC: int __bam_merge_recover + * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); + */ +int +__bam_merge_recover(dbenv, dbtp, lsnp, op, info) + DB_ENV *dbenv; + DBT *dbtp; + DB_LSN *lsnp; + db_recops op; + void *info; +{ + __bam_merge_args *argp; + DB *file_dbp; + DBC *dbc; + DB_MPOOLFILE *mpf; + PAGE *pagep; + int cmp_n, cmp_p, modified, ret; + + REC_PRINT(__bam_merge_print); + REC_INTRO(__bam_merge_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; +} + +/* + * __bam_pgno_recover -- + * Recovery function for pgno. + * + * PUBLIC: int __bam_pgno_recover + * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); + */ +int +__bam_pgno_recover(dbenv, dbtp, lsnp, op, info) + DB_ENV *dbenv; + DBT *dbtp; + DB_LSN *lsnp; + db_recops op; + void *info; +{ + __bam_pgno_args *argp; + DB *file_dbp; + DBC *dbc; + DB_MPOOLFILE *mpf; + PAGE *pagep; + int cmp_n, cmp_p, modified, ret; + + REC_PRINT(__bam_pgno_print); + REC_INTRO(__bam_pgno_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/template/rec_crdel b/db/dist/template/rec_crdel index 352e9ae5f..3909fe620 100644 --- a/db/dist/template/rec_crdel +++ b/db/dist/template/rec_crdel @@ -1,77 +1,9 @@ #include "db_config.h" -#ifndef NO_SYSTEM_INCLUDES -#include <sys/types.h> - -#include <string.h> -#endif - #include "db_int.h" -#include "db_page.h" -#include "crdel.h" -#include "log.h" - -/* - * __crdel_fileopen_recover -- - * Recovery function for fileopen. - * - * PUBLIC: int __crdel_fileopen_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__crdel_fileopen_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __crdel_fileopen_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__crdel_fileopen_print); - REC_INTRO(__crdel_fileopen_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/__crdel.h" +#include "dbinc/log.h" /* * __crdel_metasub_recover -- @@ -96,73 +28,11 @@ __crdel_metasub_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__crdel_metasub_print); - REC_INTRO(__crdel_metasub_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; -} - -/* - * __crdel_metapage_recover -- - * Recovery function for metapage. - * - * PUBLIC: int __crdel_metapage_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__crdel_metapage_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __crdel_metapage_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__crdel_metapage_print); - REC_INTRO(__crdel_metapage_read); + REC_INTRO(__crdel_metasub_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 { @@ -188,7 +58,7 @@ __crdel_metapage_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; @@ -198,33 +68,33 @@ out: REC_CLOSE; } /* - * __crdel_old_delete_recover -- - * Recovery function for old_delete. + * __crdel_inmem_create_recover -- + * Recovery function for inmem_create. * - * PUBLIC: int __crdel_old_delete_recover + * PUBLIC: int __crdel_inmem_create_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__crdel_old_delete_recover(dbenv, dbtp, lsnp, op, info) +__crdel_inmem_create_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __crdel_old_delete_args *argp; + __crdel_inmem_create_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__crdel_old_delete_print); - REC_INTRO(__crdel_old_delete_read); + REC_PRINT(__crdel_inmem_create_print); + REC_INTRO(__crdel_inmem_create_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 { @@ -250,7 +120,7 @@ __crdel_old_delete_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; @@ -260,33 +130,33 @@ out: REC_CLOSE; } /* - * __crdel_rename_recover -- - * Recovery function for rename. + * __crdel_inmem_rename_recover -- + * Recovery function for inmem_rename. * - * PUBLIC: int __crdel_rename_recover + * PUBLIC: int __crdel_inmem_rename_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__crdel_rename_recover(dbenv, dbtp, lsnp, op, info) +__crdel_inmem_rename_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __crdel_rename_args *argp; + __crdel_inmem_rename_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__crdel_rename_print); - REC_INTRO(__crdel_rename_read); + REC_PRINT(__crdel_inmem_rename_print); + REC_INTRO(__crdel_inmem_rename_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 { @@ -312,7 +182,7 @@ __crdel_rename_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; @@ -322,33 +192,33 @@ out: REC_CLOSE; } /* - * __crdel_delete_recover -- - * Recovery function for delete. + * __crdel_inmem_remove_recover -- + * Recovery function for inmem_remove. * - * PUBLIC: int __crdel_delete_recover + * PUBLIC: int __crdel_inmem_remove_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__crdel_delete_recover(dbenv, dbtp, lsnp, op, info) +__crdel_inmem_remove_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __crdel_delete_args *argp; + __crdel_inmem_remove_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__crdel_delete_print); - REC_INTRO(__crdel_delete_read); + REC_PRINT(__crdel_inmem_remove_print); + REC_INTRO(__crdel_inmem_remove_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 +244,7 @@ __crdel_delete_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_ctemp b/db/dist/template/rec_ctemp index 6be6d3166..2951189c5 100644 --- a/db/dist/template/rec_ctemp +++ b/db/dist/template/rec_ctemp @@ -1,31 +1,31 @@ /* - * __PREF_FUNC_recover -- + * PREF_FUNC_recover -- * Recovery function for FUNC. * - * PUBLIC: int __PREF_FUNC_recover + * PUBLIC: int PREF_FUNC_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__PREF_FUNC_recover(dbenv, dbtp, lsnp, op, info) +PREF_FUNC_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __PREF_FUNC_args *argp; + PREF_FUNC_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__PREF_FUNC_print); - REC_INTRO(__PREF_FUNC_read); + REC_PRINT(PREF_FUNC_print); + REC_INTRO(PREF_FUNC_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 { @@ -51,7 +51,7 @@ __PREF_FUNC_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 5c4c8f08d..5e3f70cef 100644 --- a/db/dist/template/rec_db +++ b/db/dist/template/rec_db @@ -1,11 +1,5 @@ #include "db_config.h" -#ifndef NO_SYSTEM_INCLUDES -#include <sys/types.h> - -#include <string.h> -#endif - #include "db_int.h" #include "dbinc/db_page.h" #include "dbinc/__db.h" @@ -198,6 +192,68 @@ 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. * @@ -384,6 +440,130 @@ out: REC_CLOSE; } /* + * __db_pg_alloc_recover -- + * Recovery function for pg_alloc. + * + * PUBLIC: int __db_pg_alloc_recover + * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); + */ +int +__db_pg_alloc_recover(dbenv, dbtp, lsnp, op, info) + DB_ENV *dbenv; + DBT *dbtp; + DB_LSN *lsnp; + db_recops op; + void *info; +{ + __db_pg_alloc_args *argp; + DB *file_dbp; + DBC *dbc; + DB_MPOOLFILE *mpf; + PAGE *pagep; + int cmp_n, cmp_p, modified, ret; + + REC_PRINT(__db_pg_alloc_print); + REC_INTRO(__db_pg_alloc_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_pg_free_recover -- + * Recovery function for pg_free. + * + * PUBLIC: int __db_pg_free_recover + * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); + */ +int +__db_pg_free_recover(dbenv, dbtp, lsnp, op, info) + DB_ENV *dbenv; + DBT *dbtp; + DB_LSN *lsnp; + db_recops op; + void *info; +{ + __db_pg_free_args *argp; + DB *file_dbp; + DBC *dbc; + DB_MPOOLFILE *mpf; + PAGE *pagep; + int cmp_n, cmp_p, modified, ret; + + REC_PRINT(__db_pg_free_print); + REC_INTRO(__db_pg_free_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_pg_free_recover -- * Recovery function for pg_free. * @@ -570,6 +750,68 @@ out: REC_CLOSE; } /* + * __db_pg_freedata_recover -- + * Recovery function for pg_freedata. + * + * PUBLIC: int __db_pg_freedata_recover + * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); + */ +int +__db_pg_freedata_recover(dbenv, dbtp, lsnp, op, info) + DB_ENV *dbenv; + DBT *dbtp; + DB_LSN *lsnp; + db_recops op; + void *info; +{ + __db_pg_freedata_args *argp; + DB *file_dbp; + DBC *dbc; + DB_MPOOLFILE *mpf; + PAGE *pagep; + int cmp_n, cmp_p, modified, ret; + + REC_PRINT(__db_pg_freedata_print); + REC_INTRO(__db_pg_freedata_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_pg_prepare_recover -- * Recovery function for pg_prepare. * @@ -755,3 +997,65 @@ __db_pg_init_recover(dbenv, dbtp, lsnp, op, info) out: REC_CLOSE; } +/* + * __db_pg_sort_recover -- + * Recovery function for pg_sort. + * + * PUBLIC: int __db_pg_sort_recover + * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); + */ +int +__db_pg_sort_recover(dbenv, dbtp, lsnp, op, info) + DB_ENV *dbenv; + DBT *dbtp; + DB_LSN *lsnp; + db_recops op; + void *info; +{ + __db_pg_sort_args *argp; + DB *file_dbp; + DBC *dbc; + DB_MPOOLFILE *mpf; + PAGE *pagep; + int cmp_n, cmp_p, modified, ret; + + REC_PRINT(__db_pg_sort_print); + REC_INTRO(__db_pg_sort_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/template/rec_dbreg b/db/dist/template/rec_dbreg index bbdf19d5f..765424ccb 100644 --- a/db/dist/template/rec_dbreg +++ b/db/dist/template/rec_dbreg @@ -1,11 +1,5 @@ #include "db_config.h" -#ifndef NO_SYSTEM_INCLUDES -#include <sys/types.h> - -#include <string.h> -#endif - #include "db_int.h" #include "dbinc/db_page.h" #include "dbinc/__dbreg.h" diff --git a/db/dist/template/rec_fileops b/db/dist/template/rec_fileops index c1487835e..492208635 100644 --- a/db/dist/template/rec_fileops +++ b/db/dist/template/rec_fileops @@ -1,11 +1,5 @@ #include "db_config.h" -#ifndef NO_SYSTEM_INCLUDES -#include <sys/types.h> - -#include <string.h> -#endif - #include "db_int.h" #include "dbinc/db_page.h" #include "dbinc/__fop.h" diff --git a/db/dist/template/rec_hash b/db/dist/template/rec_hash index bcee2131c..dc0303139 100644 --- a/db/dist/template/rec_hash +++ b/db/dist/template/rec_hash @@ -1,15 +1,9 @@ #include "db_config.h" -#ifndef NO_SYSTEM_INCLUDES -#include <sys/types.h> - -#include <string.h> -#endif - #include "db_int.h" -#include "db_page.h" -#include "ham.h" -#include "log.h" +#include "dbinc/db_page.h" +#include "dbinc/__ham.h" +#include "dbinc/log.h" /* * __ham_insdel_recover -- @@ -34,11 +28,11 @@ __ham_insdel_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__ham_insdel_print); - REC_INTRO(__ham_insdel_read); + REC_INTRO(__ham_insdel_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 { @@ -64,7 +58,7 @@ __ham_insdel_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; @@ -96,11 +90,11 @@ __ham_newpage_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__ham_newpage_print); - REC_INTRO(__ham_newpage_read); + REC_INTRO(__ham_newpage_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 { @@ -126,69 +120,7 @@ __ham_newpage_recover(dbenv, dbtp, lsnp, op, info) /* 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; -} - -/* - * __ham_splitmeta_recover -- - * Recovery function for splitmeta. - * - * PUBLIC: int __ham_splitmeta_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__ham_splitmeta_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __ham_splitmeta_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__ham_splitmeta_print); - REC_INTRO(__ham_splitmeta_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)) + if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) goto out; *lsnp = argp->prev_lsn; @@ -220,11 +152,11 @@ __ham_splitdata_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__ham_splitdata_print); - REC_INTRO(__ham_splitdata_read); + REC_INTRO(__ham_splitdata_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 { @@ -250,7 +182,7 @@ __ham_splitdata_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; @@ -282,73 +214,11 @@ __ham_replace_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__ham_replace_print); - REC_INTRO(__ham_replace_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; + REC_INTRO(__ham_replace_read, 1); -out: REC_CLOSE; -} - -/* - * __ham_newpgno_recover -- - * Recovery function for newpgno. - * - * PUBLIC: int __ham_newpgno_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__ham_newpgno_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __ham_newpgno_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__ham_newpgno_print); - REC_INTRO(__ham_newpgno_read); - - 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,69 +244,7 @@ __ham_newpgno_recover(dbenv, dbtp, lsnp, op, info) /* 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; -} - -/* - * __ham_ovfl_recover -- - * Recovery function for ovfl. - * - * PUBLIC: int __ham_ovfl_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__ham_ovfl_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __ham_ovfl_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__ham_ovfl_print); - REC_INTRO(__ham_ovfl_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)) + if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) goto out; *lsnp = argp->prev_lsn; @@ -468,11 +276,11 @@ __ham_copypage_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__ham_copypage_print); - REC_INTRO(__ham_copypage_read); + REC_INTRO(__ham_copypage_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 +306,7 @@ __ham_copypage_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; @@ -530,11 +338,11 @@ __ham_metagroup_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__ham_metagroup_print); - REC_INTRO(__ham_metagroup_read); + REC_INTRO(__ham_metagroup_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 +368,7 @@ __ham_metagroup_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 +378,33 @@ out: REC_CLOSE; } /* - * __ham_groupalloc1_recover -- - * Recovery function for groupalloc1. + * __ham_metagroup_recover -- + * Recovery function for metagroup. * - * PUBLIC: int __ham_groupalloc1_recover + * PUBLIC: int __ham_metagroup_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__ham_groupalloc1_recover(dbenv, dbtp, lsnp, op, info) +__ham_metagroup_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __ham_groupalloc1_args *argp; + __ham_metagroup_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__ham_groupalloc1_print); - REC_INTRO(__ham_groupalloc1_read); + REC_PRINT(__ham_metagroup_print); + REC_INTRO(__ham_metagroup_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 +430,7 @@ __ham_groupalloc1_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 +440,33 @@ out: REC_CLOSE; } /* - * __ham_groupalloc2_recover -- - * Recovery function for groupalloc2. + * __ham_groupalloc_recover -- + * Recovery function for groupalloc. * - * PUBLIC: int __ham_groupalloc2_recover + * PUBLIC: int __ham_groupalloc_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__ham_groupalloc2_recover(dbenv, dbtp, lsnp, op, info) +__ham_groupalloc_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __ham_groupalloc2_args *argp; + __ham_groupalloc_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__ham_groupalloc2_print); - REC_INTRO(__ham_groupalloc2_read); + REC_PRINT(__ham_groupalloc_print); + REC_INTRO(__ham_groupalloc_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 +492,7 @@ __ham_groupalloc2_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; @@ -716,11 +524,11 @@ __ham_groupalloc_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__ham_groupalloc_print); - REC_INTRO(__ham_groupalloc_read); + REC_INTRO(__ham_groupalloc_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 +554,7 @@ __ham_groupalloc_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; @@ -778,11 +586,11 @@ __ham_curadj_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__ham_curadj_print); - REC_INTRO(__ham_curadj_read); + REC_INTRO(__ham_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 +616,7 @@ __ham_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; @@ -840,11 +648,11 @@ __ham_chgpg_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__ham_chgpg_print); - REC_INTRO(__ham_chgpg_read); + REC_INTRO(__ham_chgpg_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 +678,7 @@ __ham_chgpg_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_qam b/db/dist/template/rec_qam index fcd24d6a2..af4f4e97a 100644 --- a/db/dist/template/rec_qam +++ b/db/dist/template/rec_qam @@ -1,77 +1,9 @@ #include "db_config.h" -#ifndef NO_SYSTEM_INCLUDES -#include <sys/types.h> - -#include <string.h> -#endif - #include "db_int.h" -#include "db_page.h" -#include "qam.h" -#include "log.h" - -/* - * __qam_inc_recover -- - * Recovery function for inc. - * - * PUBLIC: int __qam_inc_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__qam_inc_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __qam_inc_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__qam_inc_print); - REC_INTRO(__qam_inc_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/__qam.h" +#include "dbinc/log.h" /* * __qam_incfirst_recover -- @@ -96,11 +28,11 @@ __qam_incfirst_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__qam_incfirst_print); - REC_INTRO(__qam_incfirst_read); + REC_INTRO(__qam_incfirst_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 { @@ -126,7 +58,7 @@ __qam_incfirst_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; @@ -158,11 +90,11 @@ __qam_mvptr_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__qam_mvptr_print); - REC_INTRO(__qam_mvptr_read); + REC_INTRO(__qam_mvptr_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 { @@ -188,7 +120,7 @@ __qam_mvptr_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; @@ -220,11 +152,11 @@ __qam_del_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__qam_del_print); - REC_INTRO(__qam_del_read); + REC_INTRO(__qam_del_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 { @@ -250,7 +182,7 @@ __qam_del_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; @@ -282,135 +214,11 @@ __qam_add_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__qam_add_print); - REC_INTRO(__qam_add_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; -} - -/* - * __qam_delete_recover -- - * Recovery function for delete. - * - * PUBLIC: int __qam_delete_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__qam_delete_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __qam_delete_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__qam_delete_print); - REC_INTRO(__qam_delete_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; -} - -/* - * __qam_rename_recover -- - * Recovery function for rename. - * - * PUBLIC: int __qam_rename_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__qam_rename_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __qam_rename_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__qam_rename_print); - REC_INTRO(__qam_rename_read); + REC_INTRO(__qam_add_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 +244,7 @@ __qam_rename_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; @@ -468,11 +276,11 @@ __qam_delext_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__qam_delext_print); - REC_INTRO(__qam_delext_read); + REC_INTRO(__qam_delext_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 +306,7 @@ __qam_delext_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_rep b/db/dist/template/rec_rep index 872812cd0..8008c9de9 100644 --- a/db/dist/template/rec_rep +++ b/db/dist/template/rec_rep @@ -1,11 +1,5 @@ #include "db_config.h" -#ifndef NO_SYSTEM_INCLUDES -#include <sys/types.h> - -#include <string.h> -#endif - #include "db_int.h" #include "dbinc/db_page.h" #include "dbinc/__rep.h" diff --git a/db/dist/template/rec_txn b/db/dist/template/rec_txn index c66d604f5..d48d51739 100644 --- a/db/dist/template/rec_txn +++ b/db/dist/template/rec_txn @@ -1,44 +1,38 @@ #include "db_config.h" -#ifndef NO_SYSTEM_INCLUDES -#include <sys/types.h> - -#include <string.h> -#endif - #include "db_int.h" -#include "db_page.h" -#include "txn.h" -#include "log.h" +#include "dbinc/db_page.h" +#include "dbinc/__txn.h" +#include "dbinc/log.h" /* - * __txn_old_regop_recover -- - * Recovery function for old_regop. + * __txn_regop_recover -- + * Recovery function for regop. * - * PUBLIC: int __txn_old_regop_recover + * PUBLIC: int __txn_regop_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__txn_old_regop_recover(dbenv, dbtp, lsnp, op, info) +__txn_regop_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __txn_old_regop_args *argp; + __txn_regop_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__txn_old_regop_print); - REC_INTRO(__txn_old_regop_read); + REC_PRINT(__txn_regop_print); + REC_INTRO(__txn_regop_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 { @@ -64,7 +58,7 @@ __txn_old_regop_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; @@ -96,11 +90,11 @@ __txn_regop_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__txn_regop_print); - REC_INTRO(__txn_regop_read); + REC_INTRO(__txn_regop_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 { @@ -126,7 +120,7 @@ __txn_regop_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; @@ -136,33 +130,33 @@ out: REC_CLOSE; } /* - * __txn_old_ckp_recover -- - * Recovery function for old_ckp. + * __txn_ckp_recover -- + * Recovery function for ckp. * - * PUBLIC: int __txn_old_ckp_recover + * PUBLIC: int __txn_ckp_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__txn_old_ckp_recover(dbenv, dbtp, lsnp, op, info) +__txn_ckp_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __txn_old_ckp_args *argp; + __txn_ckp_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__txn_old_ckp_print); - REC_INTRO(__txn_old_ckp_read); + REC_PRINT(__txn_ckp_print); + REC_INTRO(__txn_ckp_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 { @@ -188,7 +182,7 @@ __txn_old_ckp_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; @@ -220,11 +214,11 @@ __txn_ckp_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__txn_ckp_print); - REC_INTRO(__txn_ckp_read); + REC_INTRO(__txn_ckp_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 { @@ -250,7 +244,7 @@ __txn_ckp_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; @@ -260,33 +254,33 @@ out: REC_CLOSE; } /* - * __txn_xa_regop_old_recover -- - * Recovery function for xa_regop_old. + * __txn_child_recover -- + * Recovery function for child. * - * PUBLIC: int __txn_xa_regop_old_recover + * PUBLIC: int __txn_child_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__txn_xa_regop_old_recover(dbenv, dbtp, lsnp, op, info) +__txn_child_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __txn_xa_regop_old_args *argp; + __txn_child_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__txn_xa_regop_old_print); - REC_INTRO(__txn_xa_regop_old_read); + REC_PRINT(__txn_child_print); + REC_INTRO(__txn_child_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 { @@ -312,7 +306,7 @@ __txn_xa_regop_old_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; @@ -344,73 +338,11 @@ __txn_xa_regop_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__txn_xa_regop_print); - REC_INTRO(__txn_xa_regop_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; -} + REC_INTRO(__txn_xa_regop_read, 1); -/* - * __txn_child_old_recover -- - * Recovery function for child_old. - * - * PUBLIC: int __txn_child_old_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__txn_child_old_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __txn_child_old_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__txn_child_old_print); - REC_INTRO(__txn_child_old_read); - - 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 +368,7 @@ __txn_child_old_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 +378,33 @@ out: REC_CLOSE; } /* - * __txn_child_recover -- - * Recovery function for child. + * __txn_recycle_recover -- + * Recovery function for recycle. * - * PUBLIC: int __txn_child_recover + * PUBLIC: int __txn_recycle_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__txn_child_recover(dbenv, dbtp, lsnp, op, info) +__txn_recycle_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __txn_child_args *argp; + __txn_recycle_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__txn_child_print); - REC_INTRO(__txn_child_read); + REC_PRINT(__txn_recycle_print); + REC_INTRO(__txn_recycle_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 +430,7 @@ __txn_child_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/vx_2.0/wpj.in b/db/dist/vx_2.0/wpj.in index a38cf7251..88b27dff2 100644 --- a/db/dist/vx_2.0/wpj.in +++ b/db/dist/vx_2.0/wpj.in @@ -134,27 +134,3 @@ PENTIUMgnu <BEGIN> CORE_INFO_VERSION 2.0 <END> - -<BEGIN> FILE___DB_APPLICATION_NAME__.c_dependDone -FALSE -<END> - -<BEGIN> FILE___DB_APPLICATION_NAME__.c_dependencies - -<END> - -<BEGIN> FILE___DB_APPLICATION_NAME__.c_objects -__DB_APPLICATION_NAME__.o -<END> - -<BEGIN> FILE___DB_APPLICATION_NAME__.c_tool -C/C++ compiler -<END> - -<BEGIN> PROJECT_FILES -$(PRJ_DIR)/__DB_APPLICATION_NAME__.c -<END> - -<BEGIN> userComments -__DB_APPLICATION_NAME__ -<END> diff --git a/db/dist/vx_2.2/wpj.in b/db/dist/vx_2.2/wpj.in index d883ef2b1..17816d9d1 100644 --- a/db/dist/vx_2.2/wpj.in +++ b/db/dist/vx_2.2/wpj.in @@ -168,27 +168,3 @@ PENTIUM2gnu <BEGIN> CORE_INFO_VERSION 2.2 <END> - -<BEGIN> FILE___DB_APPLICATION_NAME__.c_dependDone -FALSE -<END> - -<BEGIN> FILE___DB_APPLICATION_NAME__.c_dependencies - -<END> - -<BEGIN> FILE___DB_APPLICATION_NAME__.c_objects -__DB_APPLICATION_NAME__.o -<END> - -<BEGIN> FILE___DB_APPLICATION_NAME__.c_tool -C/C++ compiler -<END> - -<BEGIN> PROJECT_FILES -$(PRJ_DIR)/__DB_APPLICATION_NAME__.c -<END> - -<BEGIN> userComments -__DB_APPLICATION_NAME__ -<END> diff --git a/db/dist/vx_buildcd b/db/dist/vx_buildcd index a94d78db9..11f473bd9 100755 --- a/db/dist/vx_buildcd +++ b/db/dist/vx_buildcd @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: vx_buildcd,v 1.6 2001/11/05 21:05:58 sue Exp $ +# $Id: vx_buildcd,v 12.1 2006/08/24 14:45:35 bostic Exp $ # # Build the Setup SDK CD image on the VxWorks host machine. @@ -75,7 +75,7 @@ f=$D/filelist.demo (sed -f $s $D/vx_demofile.in) > $t (echo "Building $f" && rm -f $f && cp $t $f) -# Copy the Sleepycat specific files into the SetupSDK area. +# Copy files into the SetupSDK area. (cd $D && cp README.TXT $S) (cd $D && cp LICENSE.TXT $S) (cd $D && cp CONFIG.TCL $S/RESOURCE/TCL) @@ -88,7 +88,7 @@ f=$D/filelist.demo f=../docs/LIB (echo "Building $f" && rm -f $f) cat <<ENDOFLIBTEXT >> $f -{BerkeleyDB.$DB_VERSION_MAJOR.$DB_VERSION_MINOR.$DB_VERSION_PATCH} {Sleepycat Software Berkeley DB} {<b>BerkeleyDB.$DB_VERSION_MAJOR.$DB_VERSION_MINOR.$DB_VERSION_PATCH</b>} {<b><a href="./index.html">BerkeleyDB.$DB_VERSION_MAJOR.$DB_VERSION_MINOR.$DB_VERSION_PATCH</a></b>} {Sleepycat BerkeleyDB} {} {} {} +{BerkeleyDB.$DB_VERSION_MAJOR.$DB_VERSION_MINOR.$DB_VERSION_PATCH} {Berkeley DB} {<b>BerkeleyDB.$DB_VERSION_MAJOR.$DB_VERSION_MINOR.$DB_VERSION_PATCH</b>} {<b><a href="./index.html">BerkeleyDB.$DB_VERSION_MAJOR.$DB_VERSION_MINOR.$DB_VERSION_PATCH</a></b>} {BerkeleyDB} {} {} {} ENDOFLIBTEXT # diff --git a/db/dist/vx_config.in b/db/dist/vx_config.in index 29e679e54..2f9b7d1a0 100644 --- a/db/dist/vx_config.in +++ b/db/dist/vx_config.in @@ -31,12 +31,30 @@ /* Define to 1 if you want a version with run-time diagnostic checking. */ /* #undef DIAGNOSTIC */ +/* Define to 1 if 64-bit types are available. */ +#define HAVE_64BIT_TYPES 1 + +/* Define to 1 if you have the `abort' function. */ +#define HAVE_ABORT 1 + +/* Define to 1 if you have the `atoi' function. */ +#define HAVE_ATOI 1 + +/* Define to 1 if you have the `atol' function. */ +#define HAVE_ATOL 1 + /* Define to 1 if you have the `clock_gettime' function. */ #define HAVE_CLOCK_GETTIME 1 /* Define to 1 if Berkeley DB release includes strong cryptography. */ #define HAVE_CRYPTO 1 +/* Define to 1 if you have the `ctime_r' function. */ +#define HAVE_CTIME_R 1 + +/* Define to 1 if ctime_r takes a buffer length as a third argument. */ +#define HAVE_CTIME_R_3ARG 1 + /* Define to 1 if you have the `directio' function. */ /* #undef HAVE_DIRECTIO */ @@ -50,6 +68,12 @@ /* Define to 1 if you have EXIT_SUCCESS/EXIT_FAILURE #defines. */ #define HAVE_EXIT_SUCCESS 1 +/* Define to 1 if you have the `fchmod' function. */ +/* #undef HAVE_FCHMOD */ + +/* Define to 1 if you have the `fcntl' function. */ +/* #undef HAVE_FCNTL */ + /* Define to 1 if fcntl/F_SETFD denies child access to file descriptors. */ /* #undef HAVE_FCNTL_F_SETFD */ @@ -60,11 +84,17 @@ #define HAVE_FILESYSTEM_NOTZERO 1 /* Define to 1 if you have the `ftruncate' function. */ -/* #undef HAVE_FTRUNCATE */ +#define HAVE_FTRUNCATE 1 + +/* Define to 1 if you have the `getaddrinfo' function. */ +/* #undef HAVE_GETADDRINFO */ /* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 +/* Define to 1 if you have the `getenv' function. */ +#define HAVE_GETENV 1 + /* Define to 1 if you have the `getopt' function. */ /* #undef HAVE_GETOPT */ @@ -83,11 +113,17 @@ /* Define to 1 if you have the <inttypes.h> header file. */ /* #undef HAVE_INTTYPES_H */ -/* Define to 1 if you have the `nsl' library (-lnsl). */ -/* #undef HAVE_LIBNSL */ +/* Define to 1 if you have the `isalpha' function. */ +#define HAVE_ISALPHA 1 + +/* Define to 1 if you have the `isdigit' function. */ +#define HAVE_ISDIGIT 1 + +/* Define to 1 if you have the `isprint' function. */ +#define HAVE_ISPRINT 1 -/* Define to 1 if the system has the type `long long'. */ -/* #undef HAVE_LONG_LONG */ +/* Define to 1 if you have the `isspace' function. */ +#define HAVE_ISSPACE 1 /* Define to 1 if you have the `memcmp' function. */ #define HAVE_MEMCMP 1 @@ -107,6 +143,9 @@ /* Define to 1 if you have the `mmap' function. */ /* #undef HAVE_MMAP */ +/* Define to 1 if you have the `mprotect' function. */ +/* #undef HAVE_MPROTECT */ + /* Define to 1 if you have the `munlock' function. */ /* #undef HAVE_MUNLOCK */ @@ -141,6 +180,9 @@ /* Define to 1 to use the GCC compiler and IA64 assembly language mutexes. */ /* #undef HAVE_MUTEX_IA64_GCC_ASSEMBLY */ +/* Define to 1 to use the GCC compiler and MIPS assembly language mutexes. */ +/* #undef HAVE_MUTEX_MIPS_GCC_ASSEMBLY */ + /* Define to 1 to use the msem_XXX mutexes on systems other than HP-UX. */ /* #undef HAVE_MUTEX_MSEM_INIT */ @@ -182,9 +224,6 @@ /* Define to 1 if mutexes hold system resources. */ #define HAVE_MUTEX_SYSTEM_RESOURCES 1 -/* Define to 1 if fast mutexes are available. */ -#define HAVE_MUTEX_THREADS 1 - /* Define to 1 to configure mutexes intra-process only. */ /* #undef HAVE_MUTEX_THREAD_ONLY */ @@ -209,6 +248,9 @@ /* Define to 1 to use the GCC compiler and Windows mutexes. */ /* #undef HAVE_MUTEX_WIN32_GCC */ +/* Define to 1 to use the GCC compiler and amd64 assembly language mutexes. */ +/* #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY */ + /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */ /* #undef HAVE_MUTEX_X86_GCC_ASSEMBLY */ @@ -221,9 +263,18 @@ /* Define to 1 if you have the `pread' function. */ /* #undef HAVE_PREAD */ +/* Define to 1 if you have the `printf' function. */ +#define HAVE_PRINTF 1 + /* Define to 1 if you have the `pstat_getdynamic' function. */ /* #undef HAVE_PSTAT_GETDYNAMIC */ +/* Define to 1 to configure Berkeley DB for POSIX pthread API. */ +/* #undef HAVE_PTHREAD_API */ + +/* Define to 1 if you have the `pthread_yield' function. */ +#define HAVE_PTHREAD_YIELD 1 + /* Define to 1 if you have the `pwrite' function. */ /* #undef HAVE_PWRITE */ @@ -242,6 +293,9 @@ /* Define to 1 if building replication support. */ #define HAVE_REPLICATION 1 +/* Define to 1 if building the Berkeley DB replication framework. */ +/* #undef HAVE_REPLICATION_THREADS */ + /* Define to 1 if building RPC client/server. */ /* #undef HAVE_RPC */ @@ -251,17 +305,20 @@ /* 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 `sigaction' function. */ +/* #undef HAVE_SIGACTION */ + +/* Define to 1 if thread identifier type db_threadid_t is integral. */ +#define HAVE_SIMPLE_THREAD_TYPE 1 + /* 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 you have the `stat' function. */ +#define HAVE_STAT 1 /* Define to 1 if building statistics support. */ #define HAVE_STATISTICS 1 @@ -275,18 +332,39 @@ /* Define to 1 if you have the `strcasecmp' function. */ /* #undef HAVE_STRCASECMP */ +/* Define to 1 if you have the `strcat' function. */ +#define HAVE_STRCAT 1 + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + /* Define to 1 if you have the `strdup' function. */ /* #undef HAVE_STRDUP */ /* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + /* Define to 1 if you have the <strings.h> header file. */ #define HAVE_STRINGS_H 1 /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 +/* Define to 1 if you have the `strncat' function. */ +#define HAVE_STRNCAT 1 + +/* Define to 1 if you have the `strncmp' function. */ +#define HAVE_STRNCMP 1 + +/* Define to 1 if you have the `strrchr' function. */ +#define HAVE_STRRCHR 1 + +/* Define to 1 if you have the `strsep' function. */ +/* #undef HAVE_STRSEP */ + /* Define to 1 if you have the `strtol' function. */ #define HAVE_STRTOL 1 @@ -328,9 +406,6 @@ /* 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,11 +421,8 @@ /* Define to 1 if you have the `_fstati64' function. */ /* #undef HAVE__FSTATI64 */ -/* Define to a value if using non-standard mutex alignment. */ -/* #undef MUTEX_ALIGN */ - /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "support@sleepycat.com" +#define PACKAGE_BUGREPORT "Oracle Technology Network Berkeley DB forum" /* Define to the full name of this package. */ #define PACKAGE_NAME "Berkeley DB" @@ -385,58 +457,5 @@ /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ -/* - * Exit success/failure macros. - */ -#ifndef HAVE_EXIT_SUCCESS -#define EXIT_FAILURE 1 -#define EXIT_SUCCESS 0 -#endif - -/* - * Don't step on the namespace. Other libraries may have their own - * implementations of these functions, we don't want to use their - * implementations or force them to use ours based on the load order. - */ -#ifndef HAVE_GETCWD -#define getcwd __db_Cgetcwd -#endif -#ifndef HAVE_GETOPT -#define getopt __db_Cgetopt -#define optarg __db_Coptarg -#define opterr __db_Copterr -#define optind __db_Coptind -#define optopt __db_Coptopt -#endif -#ifndef HAVE_MEMCMP -#define memcmp __db_Cmemcmp -#endif -#ifndef HAVE_MEMCPY -#define memcpy __db_Cmemcpy -#endif -#ifndef HAVE_MEMMOVE -#define memmove __db_Cmemmove -#endif -#ifndef HAVE_RAISE -#define raise __db_Craise -#endif -#ifndef HAVE_SNPRINTF -#define snprintf __db_Csnprintf -#endif -#ifndef HAVE_STRCASECMP -#define strcasecmp __db_Cstrcasecmp -#define strncasecmp __db_Cstrncasecmp -#endif -#ifndef HAVE_STRERROR -#define strerror __db_Cstrerror -#endif -#ifndef HAVE_VSNPRINTF -#define vsnprintf __db_Cvsnprintf -#endif - -/* - * !!! - * The following is not part of the automatic configuration setup, but - * provides the information necessary to build Berkeley DB on VxWorks. - */ +#include "clib_port.h" #include "vxWorks.h" diff --git a/db/dist/vx_setup/LICENSE.TXT b/db/dist/vx_setup/LICENSE.TXT index f31971375..7a7fe62bc 100644 --- a/db/dist/vx_setup/LICENSE.TXT +++ b/db/dist/vx_setup/LICENSE.TXT @@ -1,3 +1,3 @@ -Copyright (c) 1996-2004 - Sleepycat Software. All rights reserved. +Copyright (c) 1996-2006 + * Oracle Corporation. All rights reserved. See the file LICENSE for redistribution information. diff --git a/db/dist/vx_setup/README.in b/db/dist/vx_setup/README.in index f96948c37..c8cefacad 100644 --- a/db/dist/vx_setup/README.in +++ b/db/dist/vx_setup/README.in @@ -1,7 +1,7 @@ -README.TXT: Sleepycat Software Berkeley DB @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@ Release v@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@ +README.TXT: Oracle Corporation Berkeley DB @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@ Release v@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@ Information on known problems, changes introduced with the current revision of the CD-ROM, and other product bulletins -can be obtained from the Sleepycat Software web site: +can be obtained from the Oracle Corporation web site: http://www.sleepycat.com/ diff --git a/db/dist/vx_setup/SETUP.BMP b/db/dist/vx_setup/SETUP.BMP Binary files differindex 2918480b8..1b79293d0 100644 --- a/db/dist/vx_setup/SETUP.BMP +++ b/db/dist/vx_setup/SETUP.BMP diff --git a/db/dist/vx_setup/vx_setup.in b/db/dist/vx_setup/vx_setup.in index 7bc3f510c..24fbabc86 100644 --- a/db/dist/vx_setup/vx_setup.in +++ b/db/dist/vx_setup/vx_setup.in @@ -1,8 +1,8 @@ -Sleepycat Software BerkeleyDB @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@ +Oracle Corporation BerkeleyDB @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@ db@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@ demo-db@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@ BerkeleyDB.@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@ @DB_SETUP_DIR@ -Sleepycat Software BerkeleyDB @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@ +Oracle Corporation BerkeleyDB @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@ db@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@ @DB_SETUP_DIR@/filelist.all BerkeleyDB.@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@-Demo @@ -10,4 +10,4 @@ BerkeleyDB.@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@-Demo BerkeleyDB @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@ Demo program demo-db@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@ @DB_SETUP_DIR@/filelist.demo -Sleepycat Software BerkeleyDB @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@ +Oracle Corporation BerkeleyDB @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@ diff --git a/db/dist/win_config.in b/db/dist/win_config.in index 3406c8774..809b73b8e 100644 --- a/db/dist/win_config.in +++ b/db/dist/win_config.in @@ -8,7 +8,6 @@ #define DB_WIN32 1 /* Define to 1 if you want a debugging version. */ -/* #undef DEBUG */ #if defined(_DEBUG) #if !defined(DEBUG) #define DEBUG 1 @@ -24,6 +23,18 @@ /* Define to 1 if you want a version with run-time diagnostic checking. */ /* #undef DIAGNOSTIC */ +/* Define to 1 if 64-bit types are available. */ +#define HAVE_64BIT_TYPES 1 + +/* Define to 1 if you have the `abort' function. */ +#define HAVE_ABORT 1 + +/* Define to 1 if you have the `atoi' function. */ +#define HAVE_ATOI 1 + +/* Define to 1 if you have the `atol' function. */ +#define HAVE_ATOL 1 + /* Define to 1 if you have the `clock_gettime' function. */ /* #undef HAVE_CLOCK_GETTIME */ @@ -32,6 +43,12 @@ #define HAVE_CRYPTO 1 #endif +/* Define to 1 if you have the `ctime_r' function. */ +/* #undef HAVE_CTIME_R */ + +/* Define to 1 if ctime_r takes a buffer length as a third argument. */ +/* #undef HAVE_CTIME_R_3ARG */ + /* Define to 1 if you have the `directio' function. */ /* #undef HAVE_DIRECTIO */ @@ -45,6 +62,12 @@ /* Define to 1 if you have EXIT_SUCCESS/EXIT_FAILURE #defines. */ #define HAVE_EXIT_SUCCESS 1 +/* Define to 1 if you have the `fchmod' function. */ +/* #undef HAVE_FCHMOD */ + +/* Define to 1 if you have the `fcntl' function. */ +/* #undef HAVE_FCNTL */ + /* Define to 1 if fcntl/F_SETFD denies child access to file descriptors. */ /* #undef HAVE_FCNTL_F_SETFD */ @@ -57,11 +80,21 @@ /* Define to 1 if you have the `ftruncate' function. */ #define HAVE_FTRUNCATE 1 +/* Define to 1 if you have the `getaddrinfo' function. */ +/* #undef HAVE_GETADDRINFO */ + /* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 +/* Define to 1 if you have the `getenv' function. */ +#define HAVE_GETENV 1 + /* Define to 1 if you have the `getopt' function. */ -/* #undef HAVE_GETOPT */ +/* + * Windows does not have the getopt function, but as Berkeley DB example + * programs require getopt, we handle it outside of this configuration. + */ +#define HAVE_GETOPT 1 /* Define to 1 if you have the `getrusage' function. */ /* #undef HAVE_GETRUSAGE */ @@ -80,11 +113,17 @@ /* Define to 1 if you have the <inttypes.h> header file. */ /* #undef HAVE_INTTYPES_H */ -/* Define to 1 if you have the `nsl' library (-lnsl). */ -/* #undef HAVE_LIBNSL */ +/* Define to 1 if you have the `isalpha' function. */ +#define HAVE_ISALPHA 1 + +/* Define to 1 if you have the `isdigit' function. */ +#define HAVE_ISDIGIT 1 -/* Define to 1 if the system has the type `long long'. */ -#define HAVE_LONG_LONG 1 +/* Define to 1 if you have the `isprint' function. */ +#define HAVE_ISPRINT 1 + +/* Define to 1 if you have the `isspace' function. */ +#define HAVE_ISSPACE 1 /* Define to 1 if you have the `memcmp' function. */ #define HAVE_MEMCMP 1 @@ -104,6 +143,9 @@ /* Define to 1 if you have the `mmap' function. */ /* #undef HAVE_MMAP */ +/* Define to 1 if you have the `mprotect' function. */ +/* #undef HAVE_MPROTECT */ + /* Define to 1 if you have the `munlock' function. */ /* #undef HAVE_MUNLOCK */ @@ -138,6 +180,9 @@ /* Define to 1 to use the GCC compiler and IA64 assembly language mutexes. */ /* #undef HAVE_MUTEX_IA64_GCC_ASSEMBLY */ +/* Define to 1 to use the GCC compiler and MIPS assembly language mutexes. */ +/* #undef HAVE_MUTEX_MIPS_GCC_ASSEMBLY */ + /* Define to 1 to use the msem_XXX mutexes on systems other than HP-UX. */ /* #undef HAVE_MUTEX_MSEM_INIT */ @@ -179,9 +224,6 @@ /* Define to 1 if mutexes hold system resources. */ /* #undef HAVE_MUTEX_SYSTEM_RESOURCES */ -/* Define to 1 if fast mutexes are available. */ -#define HAVE_MUTEX_THREADS 1 - /* Define to 1 to configure mutexes intra-process only. */ /* #undef HAVE_MUTEX_THREAD_ONLY */ @@ -206,6 +248,9 @@ /* Define to 1 to use the GCC compiler and Windows mutexes. */ /* #undef HAVE_MUTEX_WIN32_GCC */ +/* Define to 1 to use the GCC compiler and amd64 assembly language mutexes. */ +/* #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY */ + /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */ /* #undef HAVE_MUTEX_X86_GCC_ASSEMBLY */ @@ -218,9 +263,18 @@ /* Define to 1 if you have the `pread' function. */ /* #undef HAVE_PREAD */ +/* Define to 1 if you have the `printf' function. */ +#define HAVE_PRINTF 1 + /* Define to 1 if you have the `pstat_getdynamic' function. */ /* #undef HAVE_PSTAT_GETDYNAMIC */ +/* Define to 1 to configure Berkeley DB for POSIX pthread API. */ +/* #undef HAVE_PTHREAD_API */ + +/* Define to 1 if you have the `pthread_yield' function. */ +/* #undef HAVE_PTHREAD_YIELD */ + /* Define to 1 if you have the `pwrite' function. */ /* #undef HAVE_PWRITE */ @@ -243,6 +297,11 @@ #define HAVE_REPLICATION 1 #endif +/* Define to 1 if building the Berkeley DB replication framework. */ +#ifndef HAVE_SMALLBUILD +#define HAVE_REPLICATION_THREADS 1 +#endif + /* Define to 1 if building RPC client/server. */ /* #undef HAVE_RPC */ @@ -252,17 +311,20 @@ /* 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 `sigaction' function. */ +/* #undef HAVE_SIGACTION */ + +/* Define to 1 if thread identifier type db_threadid_t is integral. */ +#define HAVE_SIMPLE_THREAD_TYPE 1 + /* 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 you have the `stat' function. */ +#define HAVE_STAT 1 /* Define to 1 if building statistics support. */ #define HAVE_STATISTICS 1 @@ -276,18 +338,39 @@ /* Define to 1 if you have the `strcasecmp' function. */ /* #undef HAVE_STRCASECMP */ +/* Define to 1 if you have the `strcat' function. */ +#define HAVE_STRCAT 1 + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + /* Define to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 /* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + /* Define to 1 if you have the <strings.h> header file. */ #define HAVE_STRINGS_H 1 /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 +/* Define to 1 if you have the `strncat' function. */ +#define HAVE_STRNCAT 1 + +/* Define to 1 if you have the `strncmp' function. */ +#define HAVE_STRNCMP 1 + +/* Define to 1 if you have the `strrchr' function. */ +#define HAVE_STRRCHR 1 + +/* Define to 1 if you have the `strsep' function. */ +/* #undef HAVE_STRSEP */ + /* Define to 1 if you have the `strtol' function. */ #define HAVE_STRTOL 1 @@ -329,9 +412,6 @@ /* 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,11 +429,8 @@ /* Define to 1 if you have the `_fstati64' function. */ #define HAVE__FSTATI64 1 -/* Define to a value if using non-standard mutex alignment. */ -/* #undef MUTEX_ALIGN */ - /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "support@sleepycat.com" +#define PACKAGE_BUGREPORT "Oracle Technology Network Berkeley DB forum" /* Define to the full name of this package. */ #define PACKAGE_NAME "Berkeley DB" @@ -388,48 +465,7 @@ /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ -/* - * Exit success/failure macros. - */ -#ifndef HAVE_EXIT_SUCCESS -#define EXIT_FAILURE 1 -#define EXIT_SUCCESS 0 -#endif - -/* - * Don't step on the namespace. Other libraries may have their own - * implementations of these functions, we don't want to use their - * implementations or force them to use ours based on the load order. - */ -#ifndef HAVE_GETCWD -#define getcwd __db_Cgetcwd -#endif -#ifndef HAVE_MEMCMP -#define memcmp __db_Cmemcmp -#endif -#ifndef HAVE_MEMCPY -#define memcpy __db_Cmemcpy -#endif -#ifndef HAVE_MEMMOVE -#define memmove __db_Cmemmove -#endif -#ifndef HAVE_RAISE -#define raise __db_Craise -#endif -#ifndef HAVE_SNPRINTF -#define snprintf __db_Csnprintf -#endif -#ifndef HAVE_STRCASECMP -#define strcasecmp __db_Cstrcasecmp -#define strncasecmp __db_Cstrncasecmp -#endif -#ifndef HAVE_STRERROR -#define strerror __db_Cstrerror -#endif -#ifndef HAVE_VSNPRINTF -#define vsnprintf __db_Cvsnprintf -#endif - +#include "clib_port.h" #include "win_db.h" /* diff --git a/db/dist/win_db.in b/db/dist/win_db.in index d623610f4..7e0e6f15b 100644 --- a/db/dist/win_db.in +++ b/db/dist/win_db.in @@ -1,14 +1,28 @@ /*- - * $Id: win_db.in,v 11.4 2004/10/07 13:59:24 carol Exp $ + * $Id: win_db.in,v 12.19 2006/06/19 15:56:39 bostic Exp $ * * The following provides the information necessary to build Berkeley * DB on native Windows, and other Windows environments such as MinGW. */ +/* + * Avoid warnings with Visual Studio 8. + */ +#define _CRT_SECURE_NO_DEPRECATE 1 + +/* + * Windows NT 4.0 and later required for the replication manager. + */ +#ifdef HAVE_REPLICATION_THREADS +#define _WIN32_WINNT 0x0400 +#endif + #include <sys/types.h> #include <sys/stat.h> +#include <sys/timeb.h> #include <direct.h> +#include <errno.h> #include <fcntl.h> #include <io.h> #include <limits.h> @@ -19,7 +33,6 @@ #include <stdlib.h> #include <tchar.h> #include <time.h> -#include <errno.h> /* * To build Tcl interface libraries, the include path must be configured to @@ -32,6 +45,16 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> +#include <winsock2.h> + +#ifdef HAVE_GETADDRINFO +/* + * Need explicit includes for IPv6 support on Windows. Both are necessary to + * ensure that pre WinXP versions have an implementation of the getaddrinfo API. + */ +#include <ws2tcpip.h> +#include <wspiapi.h> +#endif /* * All of the necessary includes have been included, ignore the #includes @@ -40,47 +63,61 @@ #define NO_SYSTEM_INCLUDES /* - * Win32 has getcwd, snprintf and vsnprintf, but under different names. + * Microsoft's C runtime library has fsync, getcwd, getpid, snprintf and + * vsnprintf, but under different names. */ +#define fsync _commit #define getcwd(buf, size) _getcwd(buf, size) +#define getpid _getpid #define snprintf _snprintf #define vsnprintf _vsnprintf +#define h_errno WSAGetLastError() + +/* + * Windows defines off_t to long (i.e., 32 bits). We need to pass 64-bit + * file offsets, so we declare our own. + */ +#define off_t __db_off_t +typedef __int64 off_t; + /* - * Win32 does not define getopt and friends in any header file, so we must. + * Win32 does not have getopt. + * + * The externs are here (instead of using db_config.h and clib_port.h), + * because Berkeley DB example programs use getopt and they can't #include + * those files. */ #if defined(__cplusplus) extern "C" { #endif -extern int optind; -extern char *optarg; 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; \ +#define TO_TSTRING(dbenv, s, ts, ret) do { \ + int __len = (int)strlen(s) + 1; \ ts = NULL; \ if ((ret = __os_malloc((dbenv), \ - __len * sizeof (_TCHAR), &(ts))) == 0 && \ + __len * sizeof(_TCHAR), &(ts))) == 0 && \ MultiByteToWideChar(CP_UTF8, 0, \ (s), -1, (ts), __len) == 0) \ - ret = __os_get_errno(); \ + ret = __os_posix_err(__os_get_syserr()); \ } while (0) -#define FROM_TSTRING(dbenv, ts, s, ret) { \ +#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(); \ + ret = __os_posix_err(__os_get_syserr()); \ } while (0) -#define FREE_STRING(dbenv, s) do { \ +#define FREE_STRING(dbenv, s) do { \ if ((s) != NULL) { \ __os_free((dbenv), (s)); \ (s) = NULL; \ @@ -88,7 +125,19 @@ extern int getopt(int, char * const *, const char *); } 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) +#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 + +#ifndef INVALID_HANDLE_VALUE +#define INVALID_HANDLE_VALUE ((HANDLE)-1) +#endif + +#ifndef INVALID_FILE_ATTRIBUTES +#define INVALID_FILE_ATTRIBUTES ((DWORD)-1) +#endif + +#ifndef INVALID_SET_FILE_POINTER +#define INVALID_SET_FILE_POINTER ((DWORD)-1) #endif diff --git a/db/dist/win_exports.in b/db/dist/win_exports.in index 9087875cc..e1d3023d7 100644 --- a/db/dist/win_exports.in +++ b/db/dist/win_exports.in @@ -1,4 +1,4 @@ -# $Id: win_exports.in,v 1.41 2004/10/12 17:44:10 bostic Exp $ +# $Id: win_exports.in,v 12.20 2006/08/10 08:21:51 alexg Exp $ # Standard interfaces. db_create @@ -9,30 +9,6 @@ db_xa_switch log_compare -# Library configuration interfaces. - db_env_set_func_close - db_env_set_func_dirfree - db_env_set_func_dirlist - 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 - db_env_set_func_seek - db_env_set_func_sleep - db_env_set_func_unlink - db_env_set_func_unmap - db_env_set_func_write - db_env_set_func_yield - # Needed for application-specific logging and recovery routines. __db_add_recovery @@ -65,9 +41,6 @@ __db_panic __db_r_attach __db_r_detach - __db_win32_mutex_init - __db_win32_mutex_lock - __db_win32_mutex_unlock __ham_func2 __ham_func3 __ham_func4 @@ -76,58 +49,78 @@ __lock_id_set __os_calloc __os_closehandle + __os_dirfree + __os_dirlist __os_free + __os_get_syserr + __os_getenv __os_ioinfo __os_malloc + __os_mkdir __os_open __os_openhandle + __os_posix_err __os_read __os_realloc __os_strdup __os_umalloc + __os_unlink __os_write __txn_id_set -#These are needed for linking tools or java. +# These are needed for linking tools or java. __bam_adj_read __bam_cadjust_read __bam_cdel_read __bam_curadj_read + __bam_merge_read __bam_pgin + __bam_pgno_read __bam_pgout __bam_rcuradj_read + __bam_relink_43_read __bam_relink_read __bam_repl_read __bam_root_read __bam_rsplit_read __bam_split_read + __crdel_inmem_create_read + __crdel_inmem_remove_read + __crdel_inmem_rename_read __crdel_metasub_read __db_addrem_read __db_big_read __db_cksum_read + __db_ctime __db_debug_read __db_dispatch + __db_dl __db_dumptree __db_err - __db_fileid_reset + __db_errx __db_getlong __db_getulong __db_global_values __db_isbigendian - __db_lsn_reset + __db_mkpath + __db_msg __db_noop_read __db_omode - __db_overwrite __db_ovref_read + __db_pg_alloc_42_read __db_pg_alloc_read + __db_pg_free_42_read __db_pg_free_read + __db_pg_freedata_42_read __db_pg_freedata_read __db_pg_init_read __db_pg_new_read __db_pg_prepare_read + __db_pg_sort_read __db_pgin __db_pgout __db_pr_callback + __db_relink_42_read __db_rpath __db_stat_pp __db_stat_print_pp @@ -147,8 +140,10 @@ __ham_copypage_read __ham_curadj_read __ham_get_meta + __ham_groupalloc_42_read __ham_groupalloc_read __ham_insdel_read + __ham_metagroup_42_read __ham_metagroup_read __ham_newpage_read __ham_pgin @@ -158,12 +153,19 @@ __ham_splitdata_read __lock_list_print __log_stat_pp + __mutex_set_wait_info + __os_abspath __os_clock + __os_exists __os_get_errno __os_id + __os_mapfile + __os_seek __os_set_errno __os_sleep + __os_spin __os_ufree + __os_unmapfile __os_yield __qam_add_read __qam_del_read @@ -173,7 +175,9 @@ __qam_pgin_out __rep_stat_print __txn_child_read + __txn_ckp_42_read __txn_ckp_read __txn_recycle_read + __txn_regop_42_read __txn_regop_read __txn_xa_regop_read diff --git a/db/dist/winmsi/dbcorewix.in b/db/dist/winmsi/dbcorewix.in new file mode 100644 index 000000000..2ac664a61 --- /dev/null +++ b/db/dist/winmsi/dbcorewix.in @@ -0,0 +1,196 @@ +<!-- $Id: dbcorewix.in,v 1.10 2006/09/14 15:50:50 mjc Exp $
+ -
+ - Dbcorewix.in is the DB core WiX input file, and is used by
+ - s_winmsi to create dbcore.wxs (an input to WiX).
+ - Most everything here is pure 'WiX' syntax within XML,
+ - the exceptions are:
+ - 1) everything is pushed through the m4 preprocessor first.
+ - this makes certain boilerplate actions in the UI tolerable.
+ - We put all needed defines at the top of this file.
+ - 2) a very few identifiers beginning with WIX_DB_*
+ - are predefined as m4 macros on the command line.
+ - These are items that only the caller (s_winmsi) can know.
+ -
+ - M4 makes many things easier, but there are peculiarities.
+ - In particular, if you are using a macro with args, like
+ - TOPSTRIPE, note that *any* occurance of the characters "( ) ,"
+ - are interpreted by m4, even if they occur in an Xml comment or string.
+ - Remember this when editing this file!
+ -
+ - Beyond that, there is a lot to understand about WiX
+ - and how this file operates, to get started, look at
+ - various WiX tutorials, like:
+ - http://www.ondotnet.com/pub/a/dotnet/2004/04/19/wix.html
+ - http://blogs.msdn.com/robmen/archive/2004/04/05/107709.aspx
+ - Also view the lecture covered here:
+ - http://blogs.msdn.com/robmen/archive/2004/09/23/233684.aspx
+ -
+ - Finally, understand that WiX is an XML layering above the concepts
+ - defined by the world of the MSI installer. To really know how to do WiX,
+ - (and especially the UI), you need to understand the MSI installer.
+ - A key point is that MSI (and hence WiX) is not really procedural.
+ - MSI defines a number of tables (like Feature or CustomAction) in
+ - an internal database. WiX merely specifies how to fill these tables,
+ - and the msiexec program merely cranks through the various tables,
+ - processing each row. It is true that you can do procedural things
+ - via CustomActions, but to get them in order, you must specify columns
+ - in the table with things like After="SomeOtherRowId".
+ -
+ - See "About the User Interface" and subordinate documents:
+ - http://msdn.microsoft.com/library/default.asp?url=/library/en-us/msi/setup/about_the_user_interface.asp
+-->
+
+m4_include(WIX_DB_SHARED_WINMSIDIR/dbwix.m4) <!-- Define common macros -->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
+
+ <!-- The ???? stuff asks WiX to create a unique GUID for us -->
+ <Product Id='????????-????-????-????-????????????'
+ Name='Berkeley DB WIX_DB_VERSION' Version='WIX_DB_VERSION.0'
+ Manufacturer='Oracle Corporation' Language='1033'>
+
+ <!-- Store files as a compressed 'cabinet' embedded in the .MSI file. -->
+ <Package Id='????????-????-????-????-????????????'
+ Keywords="Embedded Database Datastore"
+ Description='Berkeley DB WIX_DB_VERSION'
+ Comments='includes sources and binaries' InstallerVersion='200'
+ Compressed='yes' Platforms="Intel"
+ Languages="1033" SummaryCodepage="1252" />
+
+ <Media Id='1' Cabinet='dbcore.cab' EmbedCab='yes' />
+
+ COMMON_PROPERTIES()
+
+ <!-- Declare properties for environment -->
+ WIX_DB_ENV_FEATURE_PROPS()
+
+ <Condition Message=
+ "To install [ProductName], you must be running Windows 2000 or Windows XP.">
+ <![CDATA[VersionNT>=500]]></Condition>
+
+ <Condition Message=
+ "You must have administrative access to install this product.">
+ NOT Priviledged
+ </Condition>
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="DesktopFolder" Name="." SourceName="." />
+ <Directory Id="FavoritesFolder" Name="." SourceName="." />
+
+ <Directory Id="ProgramFilesFolder" Name="." SourceName=".">
+ <Directory Id="OracleFolder" Name="Oracle" LongName="Oracle">
+ <Directory Id="INSTALLDIR" Name="WIX_DB_8CHAR_VERSION"
+ LongName="Berkeley DB WIX_DB_VERSION">
+ <Directory Id="INSTALLUTIL" Name="instutil"
+ LongName="installutil">
+ </Directory>
+
+
+ <!-- Note: these guids must be changed when an installer
+ - for a new release is made available.
+ -
+ - TODO: to play by the rules of components (see
+ - http://blogs.msdn.com/robmen/archive/2003/10/18/56497.aspx,
+ - "Component Rules 101" by Rob Mensching),
+ - we should devise a strategy for ALL guids (remember
+ - many are created by s_winmsi). This should work:
+ -
+ - Each guid is composed of three parts, like so:
+ - PPPPPPPP-VVVV-VVVV-HHHH-HHHHHHHHHHHH
+ - The P part is unique to the product, e.g.
+ - the bdb core installer might always use 9A3FE019.
+ - The V part is the version of the product, e.g.
+ - 4.2.37 might be translated as 0402-0025 # 25 is 37 in hex
+ - The H part is a hash value created from the directory
+ - that houses the component. Like if the component for
+ - the directory "bin/Debug" hashed to 1234567890abcdef,
+ - then the H part is 1234-567890abcdef.
+ -
+ - This scheme guarantees that rebuilds of the installer
+ - over the same release tree get the same GUIDs.
+ - But for a different release tree (which *should* get
+ - installed in a different directory, since install
+ - directories are named by release number), we will get
+ - completely different GUIDs.
+ -->
+ <Component Id="RequiredFiles"
+ Guid="13E1DF48-903B-11D9-8BDE-F66BAD1E3F3A"
+ KeyPath="yes" SharedDllRefCount="yes"
+ Location="either" DiskId="1">
+
+ <File Id="LICENSE.txt" Name="LICENSE.txt"
+ src="WIX_DB_SRCDIR\LICENSE" />
+ <File Id="README.txt" Name="README.txt"
+ src="WIX_DB_SRCDIR\README" />
+ <Registry Id="RootDir.RegistryVal" Root="HKLM"
+ Key="SOFTWARE\Oracle\Berkeley DB\WIX_DB_VERSION"
+ Name="RootDirectory" Value="[INSTALLDIR]" Type="string"
+ Action="write" />
+ <CreateFolder />
+ </Component>
+
+ COMMON_COMPONENTS()
+
+ <!-- <Directory>, <Component> generated from files.in -->
+ WIX_DB_DIRECTORY_STRUCTURE()
+
+ </Directory>
+ </Directory>
+ </Directory>
+ <Directory Id="ProgramMenuFolder" Name="." SourceName=".">
+ <Directory Id="BerkeleyDbMenu" Name="WIX_DB_8CHAR_VERSION"
+ LongName="Berkeley DB WIX_DB_VERSION" />
+ </Directory>
+ </Directory>
+
+ <!-- <File>, <Shortcut> generated from links.in -->
+ WIX_DB_LINKS()
+
+ COMMON_FEATURES(`Berkeley DB')
+
+ <!-- ================================================================ -->
+ <UI>
+
+ <Property Id="DefaultUIFont"><![CDATA[Tahoma8]]></Property>
+ <TextStyle Id="Tahoma8" FaceName="Tahoma" Size="8" />
+
+ DIALOG_WELCOME(MainWelcomeDlg, , ShowLicenseDlg)
+ DIALOG_LICENSE(ShowLicenseDlg, MainWelcomeDlg, TargetFolderDlg,
+ `Berkeley DB')
+ DIALOG_TARGET(TargetFolderDlg, ShowLicenseDlg, FeatureSelectionDlg)
+ DIALOG_FEATURE(FeatureSelectionDlg, TargetFolderDlg, EnvVarDlg,
+ `Debug libraries are needed for working C/C++ examples.')
+ DIALOG_ENVIRONMENT(EnvVarDlg, FeatureSelectionDlg, ReadyToInstallDlg)
+ DIALOG_READY(ReadyToInstallDlg, EnvVarDlg, )
+
+ DIALOG_PROGRESS(ShowProgressDlg, , )
+ DIALOG_SUCCESS(InstallSuccessDlg, , , `Berkeley DB',
+ `Oracle Technology Network Berkeley DB forum')
+ +
+ <!-- Here are extra admin dialogs -->
+ DIALOG_ADMIN_CANCEL(CancelInstallerDlg)
+ DIALOG_ADMIN_NOSPACE(OutOfSpaceDlg, FeatureSelectionDlg)
+ DIALOG_ADMIN_INTERRUPTED(InstallErrorDlg, Return)
+ DIALOG_ADMIN_INTERRUPTED(InstallCancelledDlg, Exit)
+
+
+ <!-- This sequence tells MSI what to do when (at the highest level) -->
+ <InstallUISequence>
+ <Show Dialog="InstallErrorDlg" OnExit="error" />
+ <Show Dialog="InstallCancelledDlg" OnExit="cancel" />
+ <Show Dialog="InstallSuccessDlg" OnExit="success" />
+ <Show Dialog="MainWelcomeDlg" After="CostFinalize" />
+ <Show Dialog="ShowProgressDlg" After="MainWelcomeDlg" />
+ </InstallUISequence>
+
+ COMMON_UI_TEXT()
+ <Property Id="MaxInstallSize">49 MB</Property>
+
+
+ </UI>
+
+ COMMON_EXECUTE_SEQUENCE()
+
+ </Product>
+</Wix>
diff --git a/db/dist/winmsi/dbvarsbat.in b/db/dist/winmsi/dbvarsbat.in new file mode 100644 index 000000000..a39e9d425 --- /dev/null +++ b/db/dist/winmsi/dbvarsbat.in @@ -0,0 +1,25 @@ +@echo off
+
+:: $Id: dbvarsbat.in,v 1.3 2006/09/14 15:50:50 mjc Exp $
+:: This file sets the environment variables needed to run Berkeley DB.
+
+set DBROOTDIR=
+for /F "tokens=3 delims= " %%A in ('REG QUERY "HKLM\SOFTWARE\Oracle\Berkeley DB\WIX_DB_VERSION" /v RootDirectory') do set DBROOTDIR=%%A
+if ERRORLEVEL 2 goto MISSING
+if not defined DBROOTDIR goto MISSING
+
+echo Setting environment variables for Berkeley DB, installed in %DBROOTDIR%
+
+set PATH=%DBROOTDIR%\bin;%DBROOTDIR%\bin\debug;%PATH%
+set CLASSPATH=%CLASSPATH%;%DBROOTDIR%\jar\debug\db.jar;%DBROOTDIR%\jar\debug\dbexamples.jar;%CLASSPATH%;%DBROOTDIR%\jar\db.jar;%DBROOTDIR%\jar\dbexamples.jar
+goto END
+
+:MISSING
+echo
+echo NOTE:
+echo The Berkeley DB version could not be determined.
+echo If you are running on Windows 2000, make sure the
+echo REG.EXE program is installed from the Tools disk"
+echo
+
+:END
diff --git a/db/dist/winmsi/dbwix.m4 b/db/dist/winmsi/dbwix.m4 new file mode 100644 index 000000000..a7fb9b326 --- /dev/null +++ b/db/dist/winmsi/dbwix.m4 @@ -0,0 +1,833 @@ +<!-- $Id: dbwix.m4,v 1.8 2006/09/14 15:50:50 mjc Exp $
+ - This file is included by WiX input files to define m4 macros.
+ - m4 is tricky. It has NO notion of XML comments, so
+ - take care using these names in comments after they are defined,
+ - since they will be expanded (probably what you don't want).
+ -
+ - Note that this file is shared by multiple installers.
+ - If you want to change a definition to customize an individual project,
+ - consider redefining the macro in a local file.
+ -->
+
+<!-- Some basic UI characteristics -->
+m4_define(`DIALOG_WIDTH', `390')
+m4_define(`DIALOG_HEIGHT', `320')
+m4_define(`BOTTOMSTRIPE_Y', `m4_eval(DIALOG_HEIGHT-32)')
+m4_define(`NAVBUTTON_Y', `m4_eval(DIALOG_HEIGHT-23)')
+m4_define(`NAVBUTTON_DIM', `X="`$1'" Y="NAVBUTTON_Y" Width="66" Height="17"')
+
+<!-- _YPOS is a running total of the current Y position -->
+m4_define(`_YPOS', `0')
+m4_define(`SETY', `m4_define(`_YPOS', `$1')')
+m4_define(`INCY', `SETY(m4_eval(_YPOS+(`$1')))')
+
+<!-- PARTIALHEIGHT(yheight [, gap=10 ]) -->
+m4_define(`PARTIALHEIGHT', `Y="_YPOS" Height="`$1'" INCY(`$1') INCY(_GETGAP(`$2'))')
+m4_define(`_GETGAP', `m4_ifelse(`',`$1', 10, `$1')')
+m4_define(`FULLHEIGHT', `Y="_YPOS" Height="m4_eval(BOTTOMSTRIPE_Y - _YPOS - 10)"')
+
+<!-- BOTTOM_Y: bottom of the usable area before nav buttons -->
+m4_define(`BOTTOM_Y', `m4_eval(BOTTOMSTRIPE_Y - 10)')
+
+m4_define(`DIALOGPROP', `Width="DIALOG_WIDTH" Height="DIALOG_HEIGHT"
+ Title="[ProductName] - Installer" NoMinimize="yes"')
+
+m4_define(`TOPSTRIPE', `
+ SETY(`$1')
+ INCY(10)
+<!-- stripe bitmap removed for now until we get better quality bitmaps.
+ <Control Id="TopStripe" Type="Bitmap"
+ X="0" Y="0" Width="DIALOG_WIDTH" Height="`$1'" Text="Stripe" />
+-->
+ <Control Id="TopStripeBorder" Type="Line"
+ X="0" Y="`$1'" Width="DIALOG_WIDTH" Height="0" />
+ <Control Id="TopTitle" Type="Text"
+ X="8" Y="6" Width="292" Height="25" Transparent="yes">
+ <Text>{&MSSansBold8}`$2'</Text>
+ </Control>
+ <Control Id="TopText" Type="Text"
+ X="16" Y="23" Width="m4_eval(DIALOG_WIDTH-34)"
+ Height="m4_eval(`$1' - 19)" Transparent="yes">
+ <Text>`$3'</Text>
+ </Control>')
+
+m4_define(`TEXTCONTROL', `
+ <Control Id="`$1'" Type="Text"
+ X="20" Y="_YPOS" Width="m4_eval(DIALOG_WIDTH-42)" Height="`$2'">
+ <Text>`$3'</Text>
+ </Control>
+ INCY(`$2')')
+
+<!-- TEXTCONTROL2 (name,height,text). No newline -->
+m4_define(`TEXTCONTROL2', `
+ <Control Id="`$1'" Type="Text"
+ X="20" Y="_YPOS" Width="m4_eval(DIALOG_WIDTH-42)" Height="`$2'" Transparent="yes">
+ <Text>`$3'</Text>
+ </Control>')
+
+m4_define(`BOTTOMSTRIPE', `
+ <Control Id="BottomStripeBorder" Type="Line"
+ X="0" Y="BOTTOMSTRIPE_Y" Width="DIALOG_WIDTH" Height="0" />')
+
+m4_define(`NEWDIALOGEVENT', `
+ <Publish Event="NewDialog" Value="`$1'">
+ <![CDATA[1]]>
+ </Publish>')
+
+m4_define(`SPAWNDIALOGEVENT', `
+ <Publish Event="SpawnDialog" Value="`$1'">
+ <![CDATA[1]]>
+ </Publish>')
+
+<!-- use an arrow only if the text is Back, like this: "< Back" -->
+m4_define(`BACKBUTTON_GENERIC', `
+ <Control Id="`$1'" Type="PushButton"
+ NAVBUTTON_DIM(170)
+ Text="m4_ifelse(Back,`$1',< )&`$1'" `$2'>
+ `$3'
+ </Control>')
+
+<!-- use an arrow only if the text is Next, like this: "Next >" -->
+m4_define(`NEXTBUTTON_GENERIC', `
+ <Control Id="`$1'" Type="PushButton"
+ NAVBUTTON_DIM(236)
+ Default="yes" Text="&`$1'm4_ifelse(Next,`$1', >)" `$2'>
+ `$3'
+ </Control>')
+
+m4_define(`CANCELBUTTON_GENERIC', `
+ <Control Id="`$1'" Type="PushButton"
+ NAVBUTTON_DIM(308)
+ Text="`$1'" `$2'>
+ `$3'
+ </Control>')
+
+m4_define(`NEXTBUTTON_NOTDEFAULT', `
+ <Control Id="`$1'" Type="PushButton"
+ NAVBUTTON_DIM(236)
+ Default="no" Text="&`$1'm4_ifelse(Next,`$1', >)" `$2'>
+ `$3'
+ </Control>')
+
+<!-- typical usages -->
+m4_define(`BACKBUTTON_DISABLED', `BACKBUTTON_GENERIC(Back, Disabled="yes")')
+m4_define(`BACKBUTTON', `BACKBUTTON_GENERIC(Back, , NEWDIALOGEVENT(`$1'))')
+m4_define(`NEXTBUTTON_DISABLED', `NEXTBUTTON_GENERIC(Next, Disabled="yes")')
+m4_define(`NEXTBUTTON', `NEXTBUTTON_GENERIC(Next, , NEWDIALOGEVENT(`$1'))')
+m4_define(`CANCELBUTTON', `CANCELBUTTON_GENERIC(Cancel, Cancel="yes",
+ SPAWNDIALOGEVENT(CancelInstallerDlg))')
+
+<!-- a little (imperfect) magic to create some unique GUIDs. -->
+m4_define(`_GUIDSUFFIX', `10000000')
+m4_define(`_SETGUID', `m4_define(`_GUIDSUFFIX', `$1')')
+m4_define(`_GUIDINC', `_SETGUID(m4_eval(_GUIDSUFFIX+1))')
+m4_define(`GUID_CREATE_UNIQUE', `_GUIDINC()WIX_DB_GUID_PREFIX()`'_GUIDSUFFIX()')
+
+<!-- These three defines are data values, used by GUID_CREATE_PERSISTENT -->
+m4_define(`_WIXDB_PRODUCT', WIX_DB_PRODUCT_NAME)
+m4_define(`_WIXDB_VERSION', WIX_DB_VERSION)
+m4_define(`_WIXDB_CURDIR', `unknown')
+m4_define(`_WIXDB_CURFILE', `unknown')
+m4_define(`_WIXDB_SUBDIR', `')
+
+<!-- These defines set the data values above -->
+m4_define(`WIX_DB_SET_PRODUCT', `m4_define(`_WIXDB_PRODUCT', `$1')')
+m4_define(`WIX_DB_SET_VERSION', `m4_define(`_WIXDB_VERSION', `$1')')
+m4_define(`WIX_DB_SET_CURDIR', `m4_define(`_WIXDB_CURDIR', `$1')')
+m4_define(`WIX_DB_SET_CURFILE', `m4_define(`_WIXDB_CURFILE', `$1')')
+m4_define(`WIX_DB_SET_SUBDIR', `m4_define(`_WIXDB_SUBDIR', `$1')')
+
+m4_define(`_LASTCHAR', `m4_substr(`$1',m4_eval(m4_len(`$1')-1))')
+m4_define(`_LOPCHAR', `m4_substr(`$1',0,m4_eval(m4_len(`$1')-1))')
+m4_define(`_CHOPNAME', `m4_ifelse(_LASTCHAR(`$1'),/,`$1',`_CHOPNAME(_LOPCHAR(`$1'))')')
+m4_define(`WIX_DB_BEGIN_SUBDIR', `WIX_DB_SET_SUBDIR(_WIXDB_SUBDIR/`$1')')
+m4_define(`WIX_DB_END_SUBDIR', `WIX_DB_SET_SUBDIR(_LOPCHAR(_CHOPNAME(_WIXDB_SUBDIR)))')
+m4_define(`WIX_DB_CLEAR_SUBDIR', `WIX_DB_SET_SUBDIR()')
+
+<!-- Create a GUID from the current product, directory, file -->
+m4_define(`WIX_DB_PERSISTENT_GUID', `m4_esyscmd(echo "_WIXDB_PRODUCT @@ _WIXDB_VERSION @@ _WIXDB_CURDIR @@ _WIXDB_SUBDIR @@ _WIXDB_CURFILE" | openssl md5 | sed -e "s/^\(........\)\(....\)\(....\)\(....\)\(....\)\(............\)/\1-\2-\3-\4-\5/")')
+
+m4_define(`DB_LICENSE_INTRO', `The following license applies to this copy of software you are about to install. Please read it carefully before proceeding. Select below the nature of the license by which you will use this product. For more information about Oracle Corporation's licensing please contact us at berkeleydb-info_us@oracle.com')
+
+m4_define(`DB_ENVIRONMENT_INTRO', `[ProductName] will need to modify certain environment variables to work properly. If you elect not to set these variables you may find that some utilities`,' scripts and other parts of [ProductName] won't work properly. Please indicate that you skipped this step if you request support help from us.')
+
+m4_define(`COMMON_PROPERTIES', `
+ <Property Id="ApplicationUsers"><![CDATA[AnyUser]]></Property>
+ <Property Id="LicenseType"><![CDATA[Open]]></Property>
+
+ <!-- The ARP* properties affect the Add/Remove Programs dialog -->
+ <Property Id="ARPURLINFOABOUT"><![CDATA[http://www.oracle.com]]></Property>
+ <Property Id="ARPCONTACT"><![CDATA[berkeleydb-info_us@oracle.com]]></Property>
+ <Property Id="ARPNOMODIFY"><![CDATA[1]]></Property>
+ <Property Id="ARPNOREPAIR"><![CDATA[1]]></Property>
+ <!-- TODO: this icon does not work here -->
+ <Property Id="ARPPRODUCTION"><![CDATA[IconWeb]]></Property>
+
+ <Property Id="INSTALLLEVEL"><![CDATA[200]]></Property>
+ <Property Id="FullOrCustom"><![CDATA[Full]]></Property>
+
+ <Property Id="DiscussionCheck" Hidden="yes"><![CDATA[yes]]></Property>
+ <Property Id="AnnouncementsCheck" Hidden="yes"><![CDATA[yes]]></Property>
+ <Property Id="NewsletterCheck" Hidden="yes"><![CDATA[yes]]></Property>
+ <Property Id="EmailAddress" Hidden="yes"></Property>
+ <Property Id="SalesContactCheck" Hidden="yes"><![CDATA[yes]]></Property>
+ <Property Id="EnvironmentSetCheck" Hidden="yes"><![CDATA[1]]></Property>
+ <Property Id="EnvironmentGenCheck" Hidden="yes"><![CDATA[1]]></Property>
+<!-- (PBR) We use DebugCheck to track the state of the debug checkbox -->
+ <Property Id="DebugCheck" Hidden="yes"><![CDATA[yes]]></Property>
+
+ <!-- Part of the build process creates a program instenv.exe
+ - that is installed into InstUtil and used only by the installer.
+ - When a user wants to generate a file with environment vars,
+ - we launch instreg and that program creates it.
+ -
+ - The final location of the instenv.exe program is not known
+ - when we create this property, we set the real value of the
+ - property later.
+ -->
+
+ <Property Id="InstEnvironmentProgram"><![CDATA[0]]></Property>
+<!-- TODO: should not have to hardwire PATH and CLASSPATH here -->
+ <CustomAction Id="InstEnvironment" Property="InstEnvironmentProgram"
+ ExeCommand="[INSTALLDIR]\dbvars.bat PATH=[PATHEscValue] CLASSPATH=[CLASSPATHEscValue]" Return="asyncNoWait"/>
+
+ <!-- Some properties to aid in debugging.
+ - Sometimes creating a msg dialog is the easiest way to see the
+ - value of a property. To make this work when you hit the next
+ - button, add this to your NEXTBUTTON__GENERIC call:
+
+ <Publish Event="DoAction" Value="InstDebug"><![CDATA[1]]></Publish>
+
+ -->
+ <Property Id="DebugUserId">dda</Property>
+ <Property Id="DebugShowProgram">msg.exe</Property>
+
+ <!-- tweek me as needed -->
+ <CustomAction Id="InstDebug" Property="DebugShowProgram"
+ ExeCommand="[DebugUserId] InstEnvironmentProgram=[InstEnvironmentProgram]= EnvironmentGenCheck=[EnvironmentGenCheck]= AlwaysInstall=[!AlwaysInstall]=" Return="asyncNoWait" />
+
+ <Property Id="NULL" Hidden="yes"></Property>
+ <Property Id="FeatureList" Hidden="yes"></Property>
+ <Property Id="DoInstallDebug" Hidden="yes">yes</Property>
+ <Property Id="DoInstallEnvironment" Hidden="yes">yes</Property>
+
+ <Binary Id="OracleLogo" src="WIX_DB_IMAGEDIR\oracle.jpg" />
+ <Binary Id="Stripe" src="WIX_DB_IMAGEDIR\topstripe.ibd" />
+
+ <!-- TODO: does not work yet -->
+ <Binary Id="IconWeb" src="WIX_DB_IMAGEDIR\caticon.ibd" />
+
+ <!-- These are 16x16 Windows ico files -->
+ <Binary Id="IconCreateDir" src="WIX_DB_IMAGEDIR\foldernew.ibd" />
+ <Binary Id="IconUp" src="WIX_DB_IMAGEDIR\folderup.ibd" />
+
+')
+
+m4_define(`COMMON_COMPONENTS', `
+ <Component Id="RequiredCommonFiles"
+ Guid="545CFE00-93D7-11D9-EAD3-F63F68BDEB1A"
+ KeyPath="yes" SharedDllRefCount="yes"
+ Location="either" DiskId="1">
+ <Registry Id="Ext.Registry" Root="HKCR"
+ Key=".bdbsc"
+ Value="Oracle.InformationalShortcut"
+ Type="string" Action="write" />
+ <Registry Id="Name.Registry" Root="HKCR"
+ Key="Oracle.InformationalShortcut"
+ Value="Oracle Corporation Informational Shortcut"
+ Type="string" Action="write" />
+ <Registry Id="Tip.Registry" Root="HKCR"
+ Key="Oracle.InformationalShortcut" Name="InfoTip"
+ Value="Oracle Corporation Informational Shortcut"
+ Type="string" Action="write" />
+ <Registry Id="NoShow.Registry" Root="HKCR"
+ Key="Oracle.InformationalShortcut" Name="NeverShowExt"
+ Type="string" Action="write" />
+ <Registry Id="Icon.Registry" Root="HKCR"
+ Key="Oracle.InformationalShortcut\DefaultIcon"
+ Value="[INSTALLDIR]\installutil\webicon.ico"
+ Type="string" Action="write" />
+ <Registry Id="Command.Registry" Root="HKCR"
+ Key="Oracle.InformationalShortcut\shell\open\command"
+ Value="rundll32.exe shdocvw.dll,OpenURL %1"
+ Type="string" Action="write" />
+ <Registry Id="Explore.Registry" Root="HKCU"
+ Key="Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.bdbsc\OpenWithProgIds\Oracle.InformationalShortcut"
+ Action="write" />
+ <Registry Id="HklmExt.Registry" Root="HKLM"
+ Key="Software\Classes\.bdbsc"
+ Value="Oracle.InformationalShortcut"
+ Type="string" Action="write" />
+ <Registry Id="HklmCommand.Registry" Root="HKLM"
+ Key="Software\Classes\Oracle.InformationalShortcut\shell\open\command"
+ Value="rundll32.exe shdocvw.dll,OpenURL %1"
+ Type="string" Action="write" />
+ </Component>
+')
+
+m4_define(`COMMON_UI_TEXT', `
+ <!-- These are needed to show various canned text -->
+ <UIText Id="AbsentPath" />
+ <UIText Id="NewFolder">Fldr|New Folder</UIText>
+ <UIText Id="bytes">bytes</UIText>
+ <UIText Id="GB">GB</UIText>
+ <UIText Id="KB">KB</UIText>
+ <UIText Id="MB">MB</UIText>
+ <UIText Id="MenuAbsent">This feature will not be installed.</UIText>
+ <UIText Id="MenuAllLocal">This feature, and all subfeatures, will be installed.</UIText>
+ <UIText Id="MenuLocal">This feature will be installed.</UIText>
+ <UIText Id="SelAbsentAbsent">This feature will remain uninstalled.</UIText>
+ <UIText Id="SelAbsentLocal">This feature will be installed.</UIText>
+ <UIText Id="SelChildCostNeg">This feature frees up [1] on your hard drive.</UIText>
+ <UIText Id="SelChildCostPos">This feature requires [1] on your hard drive.</UIText>
+ <UIText Id="SelCostPending">Compiling cost for this feature...</UIText>
+ <UIText Id="SelLocalAbsent">This feature will be completely removed.</UIText>
+ <UIText Id="SelLocalLocal">This feature will remain installed.</UIText>
+ <UIText Id="SelParentCostNegNeg">This feature frees up [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures free up [4] on your hard drive.</UIText>
+ <UIText Id="SelParentCostNegPos">This feature frees up [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures require [4] on your hard drive.</UIText>
+ <UIText Id="SelParentCostPosNeg">This feature requires [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures free up [4] on your hard drive.</UIText>
+ <UIText Id="SelParentCostPosPos">This feature requires [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures require [4] on your hard drive.</UIText>
+ <UIText Id="TimeRemaining">Time remaining: {[1] min }[2] sec</UIText>
+ <UIText Id="VolumeCostAvailable">Available</UIText>
+ <UIText Id="VolumeCostDifference">Differences</UIText>
+ <UIText Id="VolumeCostRequired">Required</UIText>
+ <UIText Id="VolumeCostSize">Disk Size</UIText>
+ <UIText Id="VolumeCostVolume">Volume</UIText>
+')
+
+m4_define(`COMMON_FEATURES', `
+ <!-- Here we list all the features to be installed.
+ - There is one canned feature, the rest of the
+ - features come from features.in, by way of a file
+ - that gets included.
+ -->
+ <Feature Id="AlwaysInstall" Title="Always Install"
+ Description="`$1'" Display="hidden" Level="1"
+ AllowAdvertise="no"
+ ConfigurableDirectory="INSTALLDIR" Absent="disallow">
+ <ComponentRef Id="RequiredFiles" />
+ <ComponentRef Id="RequiredCommonFiles" />
+ </Feature>
+
+ <!-- <Feature>, <ComponentRef> generated from {features,files}.in -->
+ WIX_DB_FEATURE_STRUCTURE()
+')
+
+m4_define(`COMMON_EXECUTE_SEQUENCE', `
+ <!-- TODO: fix comment
+ - We modify the execute sequence to insert some custom actions:
+ - we want the instenv program to run during install (after files
+ - are installed), and during uninstall (before files are removed).
+ - We set a condition on the custom actions to make this happen.
+ - The "!ident" notation indicates the current action for a feature
+ - with that identifier. We use the AlwaysInstall feature because
+ - it is always present in our feature list. A value of 3 means
+ - it is being installed locally, 1 means it is being uninstalled.
+ - TODO: removed for now
+ <Custom Action="InstEnvironment" After="PublishProduct">
+ <![CDATA[Not Installed]]></Custom>
+ -->
+ <InstallExecuteSequence>
+ </InstallExecuteSequence>
+')
+
+<!--
+ - Here are macros for each dialog that is shared by the installers.
+ - The idea for any customization is that each installer
+ - could potentially override a particular dialog.
+ - However, if it is feasible to share code, any of these
+ - dialogs could be parameterized further.
+ -
+ - In general, these macros have 3 parameters.
+ - The first is the id name of the dialog.
+ - The second is the id of the previous dialog (for the Back button).
+ - The third is the id of the next dialog (for the Next button).
+ -->
+m4_define(`DIALOG_WELCOME', `
+ <Dialog Id="`$1'" DIALOGPROP>
+ BOTTOMSTRIPE()
+ BACKBUTTON_DISABLED()
+ CANCELBUTTON()
+ NEXTBUTTON(`$3')
+
+ TOPSTRIPE(54, `Welcome',
+`The Installer will install [ProductName] on your computer.
+To continue, click Next.')
+
+ <Control Id="Logo" Type="Bitmap" Text="OracleLogo"
+ X="0" Width="DIALOG_WIDTH" PARTIALHEIGHT(168) />
+ </Dialog>
+')
+
+<!-- Takes a 4th parameter, a short product name, like "Berkeley DB" -->
+m4_define(`DIALOG_LICENSE', `
+ <RadioGroup Property="LicenseType">
+ <RadioButton Value="Open"
+ X="0" Y="0" Width="310" Height="15"
+ Text="I qualify for the &open source license shown above" />
+ <RadioButton Value="Commercial"
+ X="0" Y="15" Width="310" Height="15"
+ Text="I will need a co&mmercial license when I ship my product" />
+ </RadioGroup>
+
+ <Dialog Id="`$1'" DIALOGPROP>
+
+ TOPSTRIPE(84, `Open Source License', DB_LICENSE_INTRO(`$4'))
+ BOTTOMSTRIPE()
+ BACKBUTTON(`$2')
+ CANCELBUTTON()
+ NEXTBUTTON(`$3')
+
+ <Control Id="LicenseText" Type="ScrollableText" X="8" Width="368"
+ PARTIALHEIGHT(130) Sunken="yes">
+ <Text>WIX_DB_LICENSE_RTF()</Text>
+ </Control>
+
+ <Control Id="LicenseRadio" Type="RadioButtonGroup" X="8" Width="340"
+ PARTIALHEIGHT(35) Property="LicenseType" />
+
+ </Dialog>
+')
+
+m4_define(`DIALOG_TARGET', `
+
+ <RadioGroup Property="ApplicationUsers">
+ <RadioButton Value="AnyUser" X="0" Y="0" Width="270" Height="15"
+ Text="&Anyone who uses this computer (all users)" />
+ <RadioButton Value="CurUser" X="0" Y="15" Width="270" Height="15"
+ Text="Only for the current user" />
+ </RadioGroup>
+
+ <Dialog Id="`$1'" DIALOGPROP>
+
+ TOPSTRIPE(44, `Installation Folder',
+ `Click Next to install to the default folder.')
+ BOTTOMSTRIPE()
+ BACKBUTTON(`$2')
+ CANCELBUTTON()
+
+ NEXTBUTTON_GENERIC(Next,,
+ NEWDIALOGEVENT(`$3')
+ <Publish Event="SetInstallLevel" Value="300">
+ <![CDATA[0]]></Publish>
+ <Publish Property="ALLUSERS" Value="1">
+ <![CDATA[ApplicationUsers = "AnyUser"]]></Publish>
+ <Publish Property="ALLUSERS" Value="{}">
+ <![CDATA[ApplicationUsers = "CurUser"]]></Publish>
+ <Publish Property="SelectedSetupType" Value="Custom">
+ <![CDATA[1]]></Publish>
+
+ )
+
+ TEXTCONTROL(InstallToText, 16, `Install [ProductName] to:')
+
+ <Control Id="ChangeFolder" Type="PushButton" X="318" Y="_YPOS"
+ Width="66" Height="17" Text="&Change...">
+ <Publish Event="SpawnDialog" Value="ChangeFolderDlg">
+ <![CDATA[1]]></Publish>
+ <Publish Property="NewInstallDir" Value="INSTALLDIR">
+ <![CDATA[1]]></Publish>
+ </Control>
+
+ <Control Id="InstallToValue" Type="Text" X="40" Width="250"
+ PARTIALHEIGHT(20, 20)
+ Property="NewInstallDir" Text="[INSTALLDIR]" />
+
+ TEXTCONTROL(InstallForText, 14, `Install [ProductName] for:')
+
+ <Control Id="InstallForRadio" Type="RadioButtonGroup" PARTIALHEIGHT(50)
+ X="40" Width="310" Property="ApplicationUsers" />
+ </Dialog>
+
+ <Dialog Id="ChangeFolderDlg" DIALOGPROP>
+ TOPSTRIPE(44, `Change the Installation Folder',
+ `Browse to the folder you want to install to.')
+ BOTTOMSTRIPE()
+ NEXTBUTTON_GENERIC(OK,,
+ <Publish Event="SetTargetPath"
+ Value="[NewInstallDir]"><![CDATA[1]]></Publish>
+ <Publish Event="EndDialog" Value="Return"><![CDATA[1]]></Publish>
+ )
+ CANCELBUTTON_GENERIC(Cancel, Cancel="yes",
+ <Publish Event="Reset" Value="0"><![CDATA[1]]></Publish>
+ <Publish Event="EndDialog" Value="Return"><![CDATA[1]]></Publish>
+ )
+
+ TEXTCONTROL(LookText, 15, `&Install into:')
+
+ <Control Id="DirCombo" Type="DirectoryCombo"
+ X="20" Width="270" Y="_YPOS" Height="80"
+ Property="NewInstallDir" Indirect="yes" Removable="yes"
+ Fixed="yes" Remote="yes" CDROM="yes" RAMDisk="yes" Floppy="yes" />
+
+ <Control Id="FolderUp" Type="PushButton"
+ X="320" Width="19" Y="_YPOS" Height="19"
+ ToolTip="Up One Level" Icon="yes" FixedSize="yes"
+ IconSize="16" Text="IconUp">
+ <Publish Event="DirectoryListUp" Value="0"><![CDATA[1]]></Publish>
+ </Control>
+
+ <Control Id="FolderCreate" Type="PushButton"
+ X="345" Width="19" Y="_YPOS" Height="19"
+ ToolTip="Create New Folder" Icon="yes" FixedSize="yes"
+ IconSize="16" Text="IconCreateDir">
+ <Publish Event="DirectoryListNew" Value="0"><![CDATA[1]]></Publish>
+ </Control>
+
+ INCY(25)
+ <Control Id="DirList" Type="DirectoryList"
+ X="20" Width="342" PARTIALHEIGHT(100, 5)
+ Property="NewInstallDir" Sunken="yes"
+ Indirect="yes" TabSkip="no" />
+
+ <Control Id="FolderText" Type="Text"
+ X="20" Width="99" PARTIALHEIGHT(14, 1)
+ TabSkip="no" Text="&Folder name:" />
+
+ <Control Id="PathEditControl" Type="PathEdit"
+ X="20" Width="342" PARTIALHEIGHT(17)
+ Property="NewInstallDir" Sunken="yes" Indirect="yes" />
+
+ </Dialog>
+
+')
+
+<!-- Takes a 4th parameter, any extra text (restrictions) for debug libs -->
+m4_define(`DIALOG_FEATURE', `
+ <Dialog Id="`$1'" DIALOGPROP TrackDiskSpace="yes">
+
+ TOPSTRIPE(36, `Feature Selection',
+ `Select the features of [ProductName] you want. Maximum install size is [MaxInstallSize].')
+ BOTTOMSTRIPE()
+ CANCELBUTTON
+ BACKBUTTON(`$2')
+
+ NEXTBUTTON_GENERIC(Next,,
+ <Publish Event="NewDialog" Value="`$3'">
+ <![CDATA[OutOfNoRbDiskSpace <> 1]]></Publish>
+ <Publish Event="NewDialog" Value="OutOfSpaceDlg">
+ <![CDATA[OutOfNoRbDiskSpace = 1]]></Publish>
+ <Publish Property="FullOrCustom" Value="Custom">
+ <![CDATA[1]]></Publish>
+
+ <!--
+ - This updates the FeatureList property and the
+ - properties like PATHValue that track the value
+ - to be displayed for environment variables.
+ -->
+ WIX_DB_ENV_FEATURE_SET()
+ )
+
+
+ <!-- TODO: When the debug checkbox is clicked,
+ - we would like to update the disk space usage numbers
+ - as shown in the SelectionTreeControl. Tried this:
+ <Publish Event="DoAction" Value="CostFinalize">
+ <![CDATA[1]]></Publish>
+ - but it made all the numbers zero. Probably need
+ - to perform a whole sequence, (like CostInitialize,...)
+ -->
+
+
+ TEXTCONTROL(ClickText, 15,
+`Click on an icon in the list below to change how a feature is installed.')
+ INCY(5)
+
+ <Control Id="SelectionTreeControl" Type="SelectionTree"
+ X="8" Width="220" FULLHEIGHT
+ Property="NewInstallDir" Sunken="yes" TabSkip="no" />
+
+ <Control Id="GroupBoxControl" Type="GroupBox"
+ X="235" Width="131" FULLHEIGHT
+ Text="Feature Description" />
+ INCY(15)
+
+ <Control Id="ItemDescription" Type="Text"
+ X="241" Width="120" PARTIALHEIGHT(50) >
+ <Text></Text>
+ <Subscribe Event="SelectionDescription" Attribute="Text" />
+ </Control>
+
+ <Control Id="Size" Type="Text"
+ X="241" Width="120" PARTIALHEIGHT(50)
+ Text="Feature size">
+ <Subscribe Event="SelectionSize" Attribute="Text" />
+ </Control>
+
+ </Dialog>
+')
+
+<!--
+ - Note: for Win/9X, Win/ME
+ - Here we must do costfinalize whenever leaving
+ - this dialog (via Back or Next) because changing whether we have
+ - environment enabled or not changes the list of features
+ - (which is finalized by costfinalize).
+ - Calling costfinalize more than once is apparently not
+ - supported on older (9X,ME) systems.
+ -->
+m4_define(`DIALOG_ENVIRONMENT', `
+ <Dialog Id="`$1'" DIALOGPROP>
+ TOPSTRIPE(84, `Setting Environment Variables', DB_ENVIRONMENT_INTRO)
+ BOTTOMSTRIPE()
+ CANCELBUTTON
+ BACKBUTTON_GENERIC(Back, ,
+ NEWDIALOGEVENT(`$2')
+<!--PBR (4/4/2005) I removed this because it resets the feature choices
+ <Publish Event="DoAction" Value="CostFinalize">
+ <![CDATA[1]]></Publish>
+-->
+ )
+ NEXTBUTTON_GENERIC(Next, ,
+ NEWDIALOGEVENT(`$3')
+<!--PBR (4/4/2005) I removed this because it resets the feature choices
+ <Publish Event="DoAction" Value="CostFinalize">
+ <![CDATA[1]]></Publish>
+-->
+ <Publish Property="DoInstallEnvironment" Value="yes">
+ <![CDATA[EnvironmentSetCheck = "1"]]></Publish>
+ <Publish Property="DoInstallEnvironment" Value="no">
+ <![CDATA[EnvironmentSetCheck <> "1"]]></Publish>
+ )
+
+ <Control Id="SetEnvBox" Type="CheckBox" PARTIALHEIGHT(15, 5)
+ Text="Set the values in the environment variables"
+ X="26" Width="250" Property="EnvironmentSetCheck" CheckBoxValue="1"/>
+ <Control Id="GenEnvBox" Type="CheckBox" PARTIALHEIGHT(15, 8)
+ Text="Generate a dbvars.bat file with the given values"
+ X="26" Width="250" Property="EnvironmentGenCheck" CheckBoxValue="1"/>
+ INCY(5)
+
+ TEXTCONTROL(ReviewText, 12,
+`Here are the new environment values:')
+
+ <Control Id="LargeBox" Type="Text"
+ X="19" Width="340" FULLHEIGHT
+ Disabled="yes" Sunken="yes" Transparent="yes" TabSkip="no" />
+
+ INCY(5)
+
+ <!-- Show the properties for environment -->
+ WIX_DB_ENV_FEATURE_SHOW()
+
+ </Dialog>
+')
+
+m4_define(`DIALOG_READY', `
+ <Dialog Id="`$1'" DIALOGPROP TrackDiskSpace="yes">
+ NEXTBUTTON_GENERIC(Install,,
+ <Publish Event="NewDialog" Value="OutOfSpaceDlg">
+ <![CDATA[OutOfNoRbDiskSpace = 1]]></Publish>
+ <Publish Event="EndDialog" Value="Return">
+ <![CDATA[OutOfNoRbDiskSpace <> 1]]></Publish>
+
+<!-- Note: we set the name of the instenv now because we do not know
+ the installed pathname at the beginning of the execution -->
+
+ <Publish Property="InstEnvironmentProgram"
+ Value="[INSTALLDIR]\installutil\bin\instenv.exe">
+ <![CDATA[1]]></Publish>
+ )
+
+ TOPSTRIPE(44, `Ready', `The installer is ready to begin.')
+ BOTTOMSTRIPE()
+ CANCELBUTTON()
+ BACKBUTTON(`$2')
+
+ TEXTCONTROL(ReviewText, 24,
+`If you want to review or change any of your installation settings, click Back to the Feature Selection. Click Cancel to exit the installer.')
+
+ <Control Id="LargeBox" Type="Text"
+ X="19" Width="340" FULLHEIGHT
+ Disabled="yes" Sunken="yes" Transparent="yes" TabSkip="no" />
+
+ INCY(5)
+
+ <Control Id="DestinationText" Type="Text"
+ X="23" Width="316" PARTIALHEIGHT(11, 4)
+ TabSkip="no" Text="Destination Folder:" />
+
+ <Control Id="DestinationValue" Type="Text"
+ X="37" Width="316" PARTIALHEIGHT(13, 8)
+ TabSkip="no" Text="[INSTALLDIR]" />
+
+ <Control Id="FeatureListText" Type="Text"
+ X="23" Width="316" PARTIALHEIGHT(13, 4)
+ TabSkip="no" Text="Features to be installed:" />
+
+ <Control Id="FeatureListValue" Type="Text"
+ X="37" Width="316" PARTIALHEIGHT(30, 8)
+ TabSkip="no" Text="Shortcuts[FeatureList]" />
+
+ <Control Id="EnvironmentText" Type="Text"
+ X="23" Width="316" PARTIALHEIGHT(15, 0)
+ TabSkip="no" Text="Environment Variables:" />
+
+ <Control Id="EnvironmentValue" Type="Text"
+ X="37" Width="316" PARTIALHEIGHT(20, 0)
+ TabSkip="no" Text="[DoInstallEnvironment]" />
+
+ </Dialog>
+
+')
+
+m4_define(`DIALOG_PROGRESS', `
+ <Dialog Id="`$1'" DIALOGPROP Modeless="yes">
+ BOTTOMSTRIPE()
+ BACKBUTTON_DISABLED()
+ CANCELBUTTON()
+ NEXTBUTTON_DISABLED()
+
+ TOPSTRIPE(44, `Installer Progress', `Installing [ProductName].')
+
+ <Control Id="ActionText" Type="Text"
+ X="59" Y="100" Width="275" Height="12">
+ <Subscribe Event="ActionText" Attribute="Text" />
+ </Control>
+
+ <Control Id="ActionProgress95" Type="ProgressBar"
+ X="59" Y="113" Width="275" Height="12"
+ ProgressBlocks="yes" Text="Progress done">
+ <Subscribe Event="InstallFiles" Attribute="Progress" />
+ <Subscribe Event="MoveFiles" Attribute="Progress" />
+ <Subscribe Event="RemoveFiles" Attribute="Progress" />
+ <Subscribe Event="RemoveRegistryValues" Attribute="Progress" />
+ <Subscribe Event="WriteIniValues" Attribute="Progress" />
+ <Subscribe Event="WriteRegistryValues" Attribute="Progress" />
+ <Subscribe Event="UnmoveFiles" Attribute="Progress" />
+ <Subscribe Event="AdminInstallFinalize" Attribute="Progress" />
+ <Subscribe Event="SetProgress" Attribute="Progress" />
+ </Control>
+ </Dialog>
+')
+
+<!--
+ - Takes two extra parameters (in addition to the usual dialog parms)
+ - 4th: a short product name, like "Berkeley DB"
+ - 5th: a description of where to find online info, like "on www.xyz.com"
+ -->
+m4_define(`DIALOG_SUCCESS', `
+ <Dialog Id="`$1'" DIALOGPROP>
+ BOTTOMSTRIPE()
+ NEXTBUTTON_GENERIC(Finish, Cancel="yes",
+ <Publish Event="DoAction" Value="CleanUp">
+ <![CDATA[ISSCRIPTRUNNING="1"]]></Publish>
+ <Publish Event="EndDialog" Value="Exit">
+ <![CDATA[1]]></Publish>
+ )
+ CANCELBUTTON_GENERIC(Cancel, Disabled="yes", )
+ BACKBUTTON_DISABLED()
+
+ TOPSTRIPE(44, `Installed', `[ProductName] is now installed.')
+
+ TEXTCONTROL(InstallSuccessText, 80,
+`Please go to http://forums.oracle.com/forums/category.jspa?categoryID=18 for any technical issues or contact berkeleydb-info_us@oracle.com for sales and licensing questions.
+
+Information about this product can also be found $5.
+
+Thank you for installing [ProductName].')
+
+ <Control Id="Image" Type="Bitmap" Text="OracleLogo"
+ X="0" Width="DIALOG_WIDTH" FULLHEIGHT TabSkip="no" />
+
+ </Dialog>
+')
+
+
+m4_define(`DIALOG_ADMIN_INTERRUPTED', `
+ <Dialog Id="`$1'" DIALOGPROP>
+ TOPSTRIPE(44, `Interrupted',
+`The installer was interrupted before [ProductName] could be completely installed.')
+
+ BOTTOMSTRIPE()
+ NEXTBUTTON_GENERIC(Finish, Cancel="yes",
+ <Publish Event="DoAction" Value="CleanUp">
+ <![CDATA[ISSCRIPTRUNNING="1"]]></Publish>
+ <Publish Event="EndDialog" Value="Exit">
+ <![CDATA[1]]></Publish>
+ <Condition Action="default">
+ <![CDATA[NOT UpdateStarted]]></Condition>
+ )
+ CANCELBUTTON_GENERIC(Cancel, Disabled="yes",
+ <Publish Property="Suspend" Value="1"><![CDATA[1]]></Publish>
+ <Publish Event="EndDialog" Value="`$2'"><![CDATA[1]]></Publish>
+ <Condition Action="disable"><![CDATA[NOT UpdateStarted]]></Condition>
+ <Condition Action="enable"><![CDATA[UpdateStarted]]></Condition>
+ )
+ BACKBUTTON_GENERIC(Back, Disabled="yes",
+ <Publish Property="Suspend" Value="{}"><![CDATA[1]]></Publish>
+ <Publish Event="EndDialog" Value="`$2'"><![CDATA[1]]></Publish>
+ <Condition Action="disable"><![CDATA[NOT UpdateStarted]]></Condition>
+ <Condition Action="enable"><![CDATA[UpdateStarted]]></Condition>
+ <Condition Action="default"><![CDATA[UpdateStarted]]></Condition>
+ )
+
+ <Control Id="NotModifiedText" Type="Text"
+ X="20" Y="_YPOS" Width="228" Height="50" Transparent="yes">
+ <Text>Your system has not been modified. To complete the installation later, please run the installer again.</Text>
+ <Condition Action="hide"><![CDATA[UpdateStarted]]></Condition>
+ <Condition Action="show"><![CDATA[NOT UpdateStarted]]></Condition>
+ </Control>
+
+ <Control Id="YesModifiedText" Type="Text"
+ X="20" Y="_YPOS" Width="228" Height="50" Transparent="yes">
+ <Text>The product may be partially installed. Any installed elements will be removed when you exit.</Text>
+ <Condition Action="hide"><![CDATA[NOT UpdateStarted]]></Condition>
+ <Condition Action="show"><![CDATA[UpdateStarted]]></Condition>
+ </Control>
+ INCY(30)
+
+ TEXTCONTROL(FinishText, 25, `Click Finish to exit the install.')
+
+ <Control Id="Image" Type="Bitmap"
+ X="0" Width="DIALOG_WIDTH" PARTIALHEIGHT(168) Text="OracleLogo" />
+ </Dialog>
+')
+
+m4_define(`DIALOG_ADMIN_CANCEL', `
+
+ <Dialog Id="`$1'" Width="280" Height="90"
+ Title="[ProductName] - Installer" NoMinimize="yes">
+
+ SETY(20)
+ TEXTCONTROL(CancelText, 24,
+`Are you sure you want to cancel [ProductName] installation?')
+
+ <Control Id="YesButton" Type="PushButton"
+ X="60" Y="60" Width="66" Height="17" Text="&Yes">
+ <Publish Event="DoAction" Value="CleanUp">
+ <![CDATA[ISSCRIPTRUNNING="1"]]></Publish>
+ <Publish Event="EndDialog" Value="Exit"><![CDATA[1]]></Publish>
+ </Control>
+
+ <Control Id="NoButton" Type="PushButton"
+ X="130" Y="60" Width="66" Height="17"
+ Default="yes" Cancel="yes" Text="&No">
+ <Publish Event="EndDialog" Value="Return">
+ <![CDATA[1]]></Publish>
+ </Control>
+
+ </Dialog>
+')
+
+m4_define(`DIALOG_ADMIN_NOSPACE', `
+ <Dialog Id="`$1'" DIALOGPROP>
+ TOPSTRIPE(44, `Out of Disk Space',
+`The disk does not have enough space for the selected features.')
+ BOTTOMSTRIPE()
+
+ CANCELBUTTON_GENERIC(OK, Default="yes" Cancel="yes",
+ <Publish Event="NewDialog" Value="`$2'">
+ <![CDATA[ACTION <> "ADMIN"]]></Publish>
+ )
+
+ TEXTCONTROL(NoSpaceText, 43,
+`The highlighted volumes (if any) do not have enough disk space for the currently selected features. You can either remove files from the highlighted volumes, or choose to install fewer features, or choose a different destination drive.')
+
+ <Control Id="VolumeCostListControl" Type="VolumeCostList"
+ X="23" Width="310" FULLHEIGHT
+ Sunken="yes" Fixed="yes" Remote="yes">
+ <Text>{120}{70}{70}{70}{70}</Text>
+ </Control>
+ </Dialog>
+')
diff --git a/db/dist/winmsi/environment.in b/db/dist/winmsi/environment.in new file mode 100644 index 000000000..860954e54 --- /dev/null +++ b/db/dist/winmsi/environment.in @@ -0,0 +1,23 @@ +# $Id: environment.in,v 1.5 2005/04/15 19:00:19 philipr Exp $
+# Lists environment variables needed to install particular
+# features in Windows. Feature names must be
+# listed in features.in . The meaning of each line is:
+# if a given FEATURE is selected, add to the environment VARIABLE
+# the given VALUE (relative to the root of the tree).
+# Options may be +first or +last to put it at the beginning or end
+# of the variable. The items are processed in the order given here,
+# so an entry with +first will no longer be first if another line
+# with +first follows it.
+
+# Note: columns below must be separated by tabs.
+
+# feature variable value options
+
+DCoreAPI PATH /bin\\debug +first
+CoreAPI PATH /bin +first
+
+# The debug versions go last, they are preferred if they are installed.
+JavaEx CLASSPATH /jar\\dbexamples.jar +last
+JavaAPI CLASSPATH /jar\\db.jar +last
+DJavaEx CLASSPATH /jar\\debug\\dbexamples.jar +last
+DJavaAPI CLASSPATH /jar\\debug\\db.jar +last
diff --git a/db/dist/winmsi/features.in b/db/dist/winmsi/features.in new file mode 100644 index 000000000..04ba54c94 --- /dev/null +++ b/db/dist/winmsi/features.in @@ -0,0 +1,33 @@ +# $Id: features.in,v 1.5 2005/04/15 19:03:35 philipr Exp $
+# Lists features that can be installed on Windows,
+# and their dependencies.
+
+# Note: columns below must be separated by tabs.
+#
+# Feature: the feature identifier. If it is dependent on another feature,
+# that is specified via Dependent/Featurename
+# Short name: the name as it shows in the installer's tree display
+# Description: the description that shows when the item is selected
+#
+# Options are one or more of:
+# +default: the feature is installed by default
+# +required: the feature cannot be deselected (implies default)
+# +invisible: the feature is not shown to the user (implies required)
+#
+
+# feature short name description options
+
+CoreAPI "Core Features" "C/C++ API and required binaries" +required
+CoreAPI/DCoreAPI "Debug Core Features" ""
+CoreTools "Tools and Utilities" "Compiled tools for DB maintenance" +default
+CoreEx "C/C++ Examples" "C and C++ compiled examples (requires debug libraries to function)" +default
+
+JavaAPI "Java" "Java API JAR and JNI native libraries"
+JavaAPI/JavaEx "Java Examples" "Java examples JAR"
+JavaAPI/DJavaAPI "Debug Java" ""
+JavaAPI/DJavaAPI/DJavaEx "Debug Java Examples" ""
+PerlAPI "Perl" "Perl API .pm and .pod files"
+TclAPI "Tcl" "Tcl API binaries"
+TclAPI/DTclAPI "Debug Tcl" ""
+Docs "Documentation" "Documentation for all products"
+Sources "Source files" "Source files for all products" +default
diff --git a/db/dist/winmsi/files.in b/db/dist/winmsi/files.in new file mode 100644 index 000000000..82bcbcdd2 --- /dev/null +++ b/db/dist/winmsi/files.in @@ -0,0 +1,91 @@ +# $Id: files.in,v 1.10 2006/09/14 15:50:50 mjc Exp $
+# Lists files needed to install particular
+# features in Windows. Feature names must be
+# listed in features.in .
+#
+
+# Note: columns below must be separated by tabs.
+# ${PRODUCT_MAJMIN} is a macro for "43" (for BDB 4.3.x)
+
+# feature source file targdir shortname
+
+CoreAPI build_windows/Release/libdb${PRODUCT_MAJMIN}.dll /bin/
+DCoreAPI build_windows/Debug/libdb${PRODUCT_MAJMIN}d.dll /bin/debug/
+DCoreAPI build_windows/Debug/db_dll.pdb /bin/debug/
+CoreAPI build_windows/Release/libdb${PRODUCT_MAJMIN}.lib /lib/
+DCoreAPI build_windows/Debug/libdb${PRODUCT_MAJMIN}d.lib /lib/
+CoreAPI build_windows/Release/msvcr71.dll /bin/
+DCoreAPI build_windows/Debug/msvcr71d.dll /bin/debug/
+CoreAPI build_windows/Release/msvcp71.dll /bin/
+DCoreAPI build_windows/Debug/msvcp71d.dll /bin/debug/
+
+# After the build process, we create an installed_include directory
+# housing all the needed include files, for user convenience
+CoreAPI installed_include/ /include/
+
+CoreAPI ${PRODUCT_SHARED_WINMSIDIR}/images/webicon.ico /installutil/
+CoreAPI ${PRODUCT_STAGE}/dbvars.bat /
+
+# We don't include the .lib files for Java, nobody needs to
+# link C/C++ against the java library
+JavaAPI build_windows/Release/libdb_java${PRODUCT_MAJMIN}.dll /bin/ dbj${PRODUCT_MAJMIN}.dll
+DJavaAPI build_windows/Debug/libdb_java${PRODUCT_MAJMIN}d.dll /bin/debug/ dbj${PRODUCT_MAJMIN}d.dll
+DJavaAPI build_windows/Debug/db_java.pdb /bin/debug/
+JavaAPI build_windows/Release/db.jar /jar/
+DJavaAPI build_windows/Debug/db.jar /jar/debug/
+
+JavaEx build_windows/Release/dbexamples.jar /jar/ dbexam~1.jar
+DJavaEx build_windows/Debug/dbexamples.jar /jar/debug/ dbexam~1.jar
+
+# We don't include the .lib files for Tcl, nobody needs to
+# link C/C++ against the Tcl library
+DTclAPI build_windows/Debug/libdb_tcl${PRODUCT_MAJMIN}d.dll /bin/debug/ dbt${PRODUCT_MAJMIN}d.dll
+DTclAPI build_windows/Debug/db_tcl.pdb /bin/debug/
+TclAPI build_windows/Release/libdb_tcl${PRODUCT_MAJMIN}.dll /bin/ dbt${PRODUCT_MAJMIN}.dll
+
+PerlAPI perl/BerkeleyDB/blib/ /lib/perl/
+
+CoreTools build_windows/Release/db_archive.exe /bin/ db_arc~1.exe
+CoreTools build_windows/Release/db_checkpoint.exe /bin/ db_che~1.exe
+CoreTools build_windows/Release/db_deadlock.exe /bin/ db_dea~1.exe
+CoreTools build_windows/Release/db_dump.exe /bin/ db_dump.exe
+CoreTools build_windows/Release/db_load.exe /bin/ db_load.exe
+CoreTools build_windows/Release/db_printlog.exe /bin/ db_pri~1.exe
+CoreTools build_windows/Release/db_recover.exe /bin/ db_rec~1.exe
+CoreTools build_windows/Release/db_stat.exe /bin/ db_sta~1.exe
+CoreTools build_windows/Release/db_upgrade.exe /bin/ db_upg~1.exe
+CoreTools build_windows/Release/db_verify.exe /bin/ db_ver~1.exe
+
+CoreEx build_windows/Debug/ex_access.exe /bin/debug/ ex_acc~1.exe
+CoreEx build_windows/Debug/ex_access.pdb /bin/debug/ ex_acc~1.pdb
+CoreEx build_windows/Debug/ex_btrec.exe /bin/debug/ ex_btr~1.exe
+CoreEx build_windows/Debug/ex_btrec.pdb /bin/debug/ ex_btr~1.pdb
+CoreEx build_windows/Debug/ex_env.exe /bin/debug/ ex_env.exe
+CoreEx build_windows/Debug/ex_env.pdb /bin/debug/ ex_env.pdb
+CoreEx build_windows/Debug/ex_lock.exe /bin/debug/ ex_loc~1.exe
+CoreEx build_windows/Debug/ex_lock.pdb /bin/debug/ ex_loc~1.pdb
+CoreEx build_windows/Debug/ex_mpool.pdb /bin/debug/ ex_mpo~1.pdb
+CoreEx build_windows/Debug/ex_mpool.exe /bin/debug/ ex_mpo~1.exe
+CoreEx build_windows/Debug/ex_rep_base.exe /bin/debug/ ex_rep~1.exe
+CoreEx build_windows/Debug/ex_rep_base.pdb /bin/debug/ ex_rep~1.pdb
+CoreEx build_windows/Debug/ex_rep_mgr.exe /bin/debug/ ex_rep~2.exe
+CoreEx build_windows/Debug/ex_rep_mgr.pdb /bin/debug/ ex_rep~2.pdb
+CoreEx build_windows/Debug/ex_tpcb.exe /bin/debug/ ex_tpcb.exe
+CoreEx build_windows/Debug/ex_tpcb.pdb /bin/debug/ ex_tpcb.pdb
+
+CoreEx build_windows/Debug/excxx_access.exe /bin/debug/ excxx_ac.exe
+CoreEx build_windows/Debug/excxx_access.pdb /bin/debug/ excxx_ac.pdb
+CoreEx build_windows/Debug/excxx_btrec.exe /bin/debug/ excxx_bt.exe
+CoreEx build_windows/Debug/excxx_btrec.pdb /bin/debug/ excxx_bt.pdb
+CoreEx build_windows/Debug/excxx_env.exe /bin/debug/ excxx_en.exe
+CoreEx build_windows/Debug/excxx_env.pdb /bin/debug/ excxx_en.pdb
+CoreEx build_windows/Debug/excxx_lock.exe /bin/debug/ excxx_lk.exe
+CoreEx build_windows/Debug/excxx_lock.pdb /bin/debug/ excxx_lk.pdb
+CoreEx build_windows/Debug/excxx_mpool.exe /bin/debug/ excxx_mp.exe
+CoreEx build_windows/Debug/excxx_mpool.pdb /bin/debug/ excxx_mp.pdb
+CoreEx build_windows/Debug/excxx_tpcb.exe /bin/debug/ excxx_tp.exe
+CoreEx build_windows/Debug/excxx_tpcb.pdb /bin/debug/ excxx_tp.pdb
+
+Docs ${PRODUCT_STAGE}/docs/ /docs/
+
+Sources ${PRODUCT_STAGE}/Sources/ /db-${PRODUCT_VERSION}/
diff --git a/db/dist/winmsi/images/caticon.ibd b/db/dist/winmsi/images/caticon.ibd Binary files differnew file mode 100644 index 000000000..e8b17bff4 --- /dev/null +++ b/db/dist/winmsi/images/caticon.ibd diff --git a/db/dist/winmsi/images/foldernew.ibd b/db/dist/winmsi/images/foldernew.ibd Binary files differnew file mode 100644 index 000000000..108241368 --- /dev/null +++ b/db/dist/winmsi/images/foldernew.ibd diff --git a/db/dist/winmsi/images/folderup.ibd b/db/dist/winmsi/images/folderup.ibd Binary files differnew file mode 100644 index 000000000..f1d369697 --- /dev/null +++ b/db/dist/winmsi/images/folderup.ibd diff --git a/db/dist/winmsi/images/oracle.jpg b/db/dist/winmsi/images/oracle.jpg Binary files differnew file mode 100644 index 000000000..bfa618e00 --- /dev/null +++ b/db/dist/winmsi/images/oracle.jpg diff --git a/db/dist/winmsi/images/topstripe.ibd b/db/dist/winmsi/images/topstripe.ibd Binary files differnew file mode 100644 index 000000000..be72f9067 --- /dev/null +++ b/db/dist/winmsi/images/topstripe.ibd diff --git a/db/dist/winmsi/images/webicon.ico b/db/dist/winmsi/images/webicon.ico Binary files differnew file mode 100644 index 000000000..d2b225a2a --- /dev/null +++ b/db/dist/winmsi/images/webicon.ico diff --git a/db/dist/winmsi/links.in b/db/dist/winmsi/links.in new file mode 100644 index 000000000..04e021806 --- /dev/null +++ b/db/dist/winmsi/links.in @@ -0,0 +1,17 @@ +# $Id: links.in,v 1.6 2006/09/15 06:52:59 mjc Exp $
+# Lists links to Web sites to be installed on Windows.
+# If the URL starts with file: it is assumed to be a local file,
+# relative to the installation directory.
+
+# Note: columns below must be separated by tabs.
+
+# shortname name URL
+
+oraclecp "Command Prompt" "cmd:dbvars.bat"
+oraclewb "Oracle Website" "http://www.oracle.com"
+oracletn "Oracle Technology Network" "http://forums.oracle.com/forums/category.jspa?categoryID=18"
+oraclech "Change Log for Berkeley DB WIX_DB_VERSION" "http://www.sleepycat.com/update/WIX_DB_VERSION/if.WIX_DB_VERSION.html"
+oraclenw "Berkeley DB Newsgroup" "http://groups-beta.google.com/group/comp.databases.berkeley-db"
+oraclesu "Support for Berkeley DB" "https://metalink.oracle.com/"
+oracleon "Online Documentation" "http://dev.sleepycat.com/documentation/bdb.html"
+oracleld "On disk Documentation" "file:docs/index.html"
diff --git a/db/dist/winmsi/s_winmsi.fcn b/db/dist/winmsi/s_winmsi.fcn new file mode 100644 index 000000000..28a60df2a --- /dev/null +++ b/db/dist/winmsi/s_winmsi.fcn @@ -0,0 +1,1435 @@ +# $Id: s_winmsi.fcn,v 1.12 2006/09/14 15:50:51 mjc Exp $
+#
+# The common functions used by the s_winmsi scripts (both
+# for core DB and DB/XML).
+#
+# This script uses several bash extensions that are convenient
+# since we "know" it will always run under Cygwin: shell functions,
+# 'return', declaration of 'local' variables, $(command) syntax,
+# ${#X} (counting chars), ${X#regexp} (searching) $((expr)) (arithmetic)
+#
+# These functions use 'global' variables:
+# ERRORLOG - a filename
+# PRODUCT_NAME - e.g. "Berkeley DB"
+# PRODUCT_VERSION - e.g. "4.1.25", derived from dist/RELEASE
+# PRODUCT_MAJOR - e.g. "4", (for release 4.1.25) from dist/RELEASE
+# PRODUCT_MINOR - e.g. "1", (for release 4.1.25) from dist/RELEASE
+# PRODUCT_PATCH - e.g. "25", (for release 4.1.25) from dist/RELEASE
+# PRODUCT_MAJMIN - e.g. "41", (for release 4.1.25) from dist/RELEASE
+# PRODUCT_STAGE - the staging directory for temp files and builds
+# PRODUCT_LICENSEDIR - the tree containing LICENSE and README
+# PRODUCT_SUB_BLDDIR - top of the subproduct build e.g. "dbxml-2.0.1/dbxml"
+# PRODUCT_BLDDIR - top of the build tree e.g. "dbxml-2.0.1"
+# PRODUCT_SRCDIR - the dir we unzip to e.g. "dbxml-2.0.1"
+# PRODUCT_DBBUILDDIR - where build_unix dir is for Berkeley DB (for Perl)
+# PRODUCT_SHARED_WINMSIDIR - where the master winmsi directory is
+# PRODUCT_IMAGEDIR - where the images are (usually winmsi/images)
+# PRODUCT_ZIP_FILEFMT - what zip file looks like e.g. "db-X.Y.Z.NC.zip"
+# PRODUCT_MSI_FILEFMT - what msi file looks like e.g. "db-X.Y.Z.NC.msi"
+#
+# Some of these may seem redundant, but there are options to take
+# an already built tree from a different place than where we'll unzip
+# to and take our sources from, for example. This allows a lot of flexibility
+# for development and debugging (especially when these trees can be huge).
+
+# This is the magic tag that creates a new unique GUID in Wix.
+# GUIDs are needed on every <Component ... > entry to ensure
+# that the component can be uninstalled.
+GENGUID='Guid="GUID_CREATE_UNIQUE()"'
+PERSISTGUID='Guid="WIX_DB_PERSISTENT_GUID()"'
+
+# MakeRtf()
+# Standard input is plain text, standard output is RTF.
+#
+MakeRtf() {
+ temp1=/tmp/sbm$$a
+ cat > $temp1
+
+
+# Courier is a good font, but the lines with all caps
+# overflows our current dialog size:
+# {\rtf1\ansi\deff0{\fonttbl{\f0\fnil\fcharset0 Courier New;}}
+# \viewkind4\uc1\pard\lang1033\f0\fs16
+#
+# Using Small fonts works:
+# {\rtf1\ansi\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Small Fonts;}}
+# {\colortbl ;\red0\green0\blue0;}
+# \viewkind4\uc1\pard\cf1\lang1033\f0\fs14
+
+# Arial is the best compromise:
+ sed -e 's/^ *//' << 'EndOfRTFHeader'
+ {\rtf1\ansi\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}}
+ {\colortbl ;\red0\green0\blue0;}
+ \viewkind4\uc1\pard\cf1\lang1033\f0\fs16
+EndOfRTFHeader
+
+# Embedded '<' and '>' can cause problems for Wix
+ sed -e 's:$:\\par:' -e 's:<: \\lquote :' -e 's:>: \\rquote :' < $temp1
+ echo -n '}'
+ rm -f $temp1
+}
+
+# NextId()
+# Get the next available unique id, a simple integer counter.
+# We use a file, rather than a shell variable to track the
+# number, because this is called from subshells at various
+# points, and they cannot affect the variables in the parent shell.
+#
+ComponentID=component.id
+NextId()
+{
+ local id=`cat $ComponentID 2>/dev/null`
+ if [ "$id" = '' ]; then
+ id=0
+ fi
+ id=$(($id + 1))
+ echo "$id" > $ComponentID
+ echo "$id"
+}
+
+# CleanFileName(FILENAME)
+# Removes any strange characters in file names,
+# returning the new name on standard output.
+CleanFileName()
+{
+ echo "$1" | sed -e 's/[-%@!]//g'
+}
+
+# GetShortName(FILENAME)
+# Get a Windows short name for the file,
+# to fit into the 8.3 name space.
+# This is not a great algorithm, but it works.
+# The fact is, the names must be unique, but on
+# Win2000 and WinXP, we'll never see them.
+
+ShortID=short.id
+GetShortName()
+{
+ local name=`echo "$1" | tr '[a-z]' '[A-Z]'`
+
+ # See if the name fits into 8.3. If so,
+ # return it right away.
+ #
+ case "$name" in
+ ?????????*.* ) ;;
+ *.????* ) ;;
+ *.*.* ) ;;
+ *[-%@!]* ) ;;
+ *.* ) echo "$name"
+ return
+ ;;
+ * )
+ if [ "${#1}" -le 8 ]; then
+ echo "$name"
+ return
+ fi
+ ;;
+ esac
+
+ # From NAMEISLONG.EXTLONG, build a name
+ # like NAME~ZZZ.EXT, where ZZZ is a unique (hex)
+ # number we build. This is
+
+ local id=`cat $ShortID 2>/dev/null`
+ if [ "$id" = '' ]; then
+ id=0
+ fi
+ id=$(($id + 1))
+ echo "$id" > $ShortID
+ if [ "$id" -ge 4096 ]; then
+ echo "BADBADBAD.TXT" # return something that will give an error
+ Error "ShortId overflow"
+ exit 1
+ fi
+
+ # Convert the id to hex (I ran out of space using decimal)
+ # This is too slow: id=`echo 16 o $id p | dc`
+ id=`printf "%x" $id`
+
+ # Collect and clean up the part of the name before, and after, the dot
+ local before=`CleanFileName "$name" | sed -e 's/^\([^.]*\)[.].*$/\1/'`
+ local after=`CleanFileName "$name" | sed -e 's/^[^.]*[.]\(.*\)$/\1/'`
+
+ # Make sure the before part fits in 5 chars (not 8, since
+ # we need a few for the unique number).
+ if [ "${#before}" -gt 5 ]; then
+ before=`echo "$before" | sed -e 's/^\(.....\).*/\1/'`
+ fi
+ if [ "${#after}" -gt 3 ]; then
+ after=`echo "$after" | sed -e 's/^\(...\).*/\1/'`
+ fi
+ echo "${before}~${id}.${after}"
+}
+
+# Progress([OPTION,]STRING...)
+# Show a major processing step via echo to stdout and to the error log.
+# An OPTION is "-minor", indicating no big banner.
+#
+Progress()
+{
+ if [ "$1" = -minor ]; then
+ shift
+ else
+ echo "" >> $ERRORLOG
+ echo "============================" >> $ERRORLOG
+ fi
+ echo "$@" >> $ERRORLOG
+ echo "$@" >&15
+}
+
+# Error(STRING...)
+# Show an error in a standard way.
+#
+Error()
+{
+ echo "" >> $ERRORLOG
+ echo "****************** FAIL ******************" >> $ERRORLOG
+ echo "ERROR: $@" >> $ERRORLOG
+ echo "ERROR: $@" >&15
+ echo "See $ERRORLOG for details" >&15
+ return 1
+}
+
+# RequireFileInPath(NAME, PATHVAL, FILE)
+# Look for FILE in the path that has value PATHVAL.
+# The path's name is NAME if it needs to be shown.
+#
+RequireFileInPath()
+{
+ local type="$1"
+ local origpath="$2"
+ local file="$3"
+ local upath="$origpath"
+ if [ "$1" != PATH ]; then
+ upath=`cygpath -up "$origpath"`
+ fi
+
+ SAVEIFS="$IFS"
+ IFS=":"
+ found=no
+ for dir in $upath; do
+ if [ -f "$dir/$file" ]; then
+ IFS="$SAVEIFS"
+ return
+ fi
+ done
+ IFS="$SAVEIFS"
+ Error "File $file not found in $type path: $origpath"
+ exit 1
+}
+
+# Rand4X()
+# Return 4 random hex digits on output
+#
+Rand4X() {
+ # The sed command pads the front with 0's as needed
+ (echo 'obase=16'; echo $RANDOM ) | bc |
+ sed -e 's/^/0000/' -e 's/^.*\(....\)$/\1/'
+
+}
+
+# RunM4()
+# Run M4, making appropriate substitutions.
+# This function uses GLOBAL variables: PRODUCT_VERSION (e.g. "4.1.25")
+# and PRODUCT_LICENSEDIR, which is where certain text files are found
+#
+RunM4() {
+
+ # Given a version number, like 2.3.45, we want to
+ # create a 8 character name for the directory like db2_3_45.
+ # This name is under a "Oracle" directory,
+ # so it only needs to be unique within the universe of BDB versions.
+ # TODO: instead of using a version number like $DB_VERSION,
+ # maybe use $DB_VERSION_UNIQUE_NAME which looks like "_2003"
+
+ local DB_8CHAR_VERSION=`echo $PRODUCT_VERSION | sed -e 's/[.]/_/g'`
+ if [ ${#DB_8CHAR_VERSION} -le 6 ]; then
+ DB_8CHAR_VERSION="db$DB_8CHAR_VERSION"
+ elif [ ${#DB_8CHAR_VERSION} -le 7 ]; then
+ DB_8CHAR_VERSION="d$DB_8CHAR_VERSION"
+ else
+ Error "Version number too large for simple version number algorithm"
+ exit 1
+ fi
+
+ # Remove leading ./ from PRODUCT_LICENSEDIR if present.
+ local licensedir=`cygpath -w "$PRODUCT_LICENSEDIR"`
+
+ # Create a GUID prefix of the form: ????????-????-????-????-????
+ # This leaves 8 digits of GUID to be manipulated by m4.
+ local GUID_PREFIX="`Rand4X``Rand4X`-`Rand4X`-`Rand4X`-`Rand4X`-`Rand4X`"
+
+ # -P requires that all m4 macros, like define, eval, etc.
+ # are prefixed, like m4_define, m4_eval, etc. This avoids
+ # various name conflicts with input files.
+ # TODO: rename DB_SRCDIR as DB_LICENSEDIR
+ m4 -P \
+ -DWIX_DB_VERSION="$PRODUCT_VERSION" \
+ -DWIX_DB_8CHAR_VERSION="$DB_8CHAR_VERSION" \
+ -DWIX_DB_GUID_PREFIX="$GUID_PREFIX" \
+ -DWIX_DB_PRODUCT_NAME="$PRODUCT_NAME" \
+ -DWIX_DB_SRCDIR="$licensedir" \
+ -DWIX_DB_TOP="`cygpath -w $PRODUCT_BLDDIR`" \
+ -DWIX_DB_SHARED_WINMSIDIR="$PRODUCT_SHARED_WINMSIDIR" \
+ -DWIX_DB_IMAGEDIR="`cygpath -w $PRODUCT_IMAGEDIR`" \
+ -DWIX_DB_FEATURE_STRUCTURE="m4_include(features.wixinc)" \
+ -DWIX_DB_DIRECTORY_STRUCTURE="m4_include(directory.wixinc)" \
+ -DWIX_DB_LINKS="m4_include(links.wixinc)" \
+ -DWIX_DB_LICENSE_RTF="m4_include(license.rtf)" \
+ -DWIX_DB_ENV_FEATURE_PROPS="m4_include(envprops.wixinc)" \
+ -DWIX_DB_ENV_FEATURE_SET="m4_include(envset.wixinc)" \
+ -DWIX_DB_ENV_FEATURE_SHOW="m4_include(envshow.wixinc)"
+}
+
+# RunTallow(DIR, OPTIONS)
+# Run Tallow, a tool from the WiX distribution
+RunTallow() {
+ local dir="$1"
+ shift
+
+ Id1=`NextId`
+ Id2=`NextId`
+ Id3=`NextId`
+
+ # Tallow is a tool that walks a tree, producing
+ # a WiX directory heirarchy naming the files.
+ # The IDs it produces are not unique (between tallow
+ # runs), so we must make them so here. Thus "directory78"
+ # becomes "MyFeatureName.123.78" where 123 is an id from NextId.
+ # Secondly, instead of using the tallow output as a separately
+ # compiled fragment, we want to include it directly, so
+ # we need to strip out some extraneous XML entries at the top
+ # and bottom of its output.
+ #
+ # Another thing we do is when we see <Directory></Directory>
+ # pairs, we call m4 macros WIX_DB_{BEGIN,END}_SUBDIR because
+ # we need to track the current directory to generate 'persistent'
+ # GUIDs. See the discussion about GUIDs in dbwix.m4 .
+ #
+ # !!! For stripping out the extraneous XML, we rely heavily
+ # !!! on the output format, so this is likely to be fragile
+ # !!! between versions of tallow. Fortunately, it should fail hard.
+ #
+ echo "=============" >> tallow.log
+ echo tallow -nologo -d `cygpath -w "$dir"` "$@" >> tallow.log
+ echo " <!-- TALLOW output begins here -->"
+ tallow -nologo -d `cygpath -w "$dir"` "$@" > tallow.out || exit 1
+ cat tallow.out >> tallow.log
+ echo "-------------" >> tallow.log
+
+ sed -e '1,/<DirectoryRef/d' -e '/<\/DirectoryRef/,$d' \
+ -e "s/Id=\"directory/Id=\"$feature.$Id1./" \
+ -e "s/Id=\"component/Id=\"$feature.$Id2./" \
+ -e "s/Id=\"file/Id=\"$feature.$Id3./" \
+ -e '/^ <Directory/d' \
+ -e '/^ <\/Directory/d' \
+ -e '/<Directory/s/Name=\"\([^"]*\)"/Name="\1" WIX_DB_BEGIN_SUBDIR(\1) /' \
+ -e '/<\/Directory>/s/$/ WIX_DB_END_SUBDIR()/' \
+ -e "/<Component/s/>/ $PERSISTGUID>/" \
+ < tallow.out > tallow.postsed || exit 1
+
+ echo 'WIX_DB_SET_CURFILE()'
+ echo 'WIX_DB_CLEAR_SUBDIR()'
+ cat tallow.postsed
+ echo 'WIX_DB_CLEAR_SUBDIR()'
+
+ cat tallow.postsed >> tallow.log
+ echo " <!-- TALLOW output ends here -->"
+}
+
+# ProcessFeatures(INFILES, INFEATURES, INENV, OUTDIRECTORIES, OUTFEATURES,
+# OUTSET)
+# Use the files.in and features.in files as
+# input to create two output files, one containing a WiX XML
+# fragment showing directories and needed files,
+# and another containing a WiX XML fragment showing
+# the features in a dependency tree.
+#
+# This creates the heart of the installer flexibility.
+#
+ProcessFeatures() {
+ InFiles="infiles.tmp"; CleanInputFile "$1" "$InFiles" 3 4
+ InFeatures="infeatures.tmp"; CleanInputFile "$2" "$InFeatures" 3 4
+ InEnv="inenv.tmp"; CleanInputFile "$3" "$InEnv" 3 4
+ OutDirs="$4"
+ OutFeatures="$5"
+ OutSet="$6"
+
+ rm -f $OutDirs; touch $OutDirs
+ rm -f $OutFeatures; touch $OutFeatures
+
+ # Initialize the feature list.
+ # This will be expanded (per feature) in ProcessOneFeature
+ #
+ XmlLevel=4
+ Xecho "<Publish Property=\"FeatureList\" Value=\"[NULL]\">" >> $OutSet
+ Xecho " <![CDATA[1]]></Publish>" >> $OutSet
+
+ Dirs=`cut -f 3 < $InFiles | sort | uniq`
+ Prevdir="/"
+ ProcessDirTransition "$Prevdir" "/" >> $OutDirs
+
+ for Dir in $Dirs; do
+ ProcessDirTransition "$Prevdir" "$Dir" >> $OutDirs
+ ProcessOneDirectory "$Dir" < $InFiles >> $OutDirs || exit 1
+ Prevdir="$Dir"
+ done
+ ProcessDirTransition "$Prevdir" "/" >> $OutDirs
+
+ cat $InEnv | (
+ read line
+ while [ "$line" != '' ]; do
+ local FeatureName=`echo "$line" | cut -f 1`
+ local EnvVariable=`echo "$line" | cut -f 2`
+ local EnvValue=`echo "$line" | cut -f 3`
+ local EnvOption=`echo "$line" | cut -f 4`
+ ProcessOneEnv "$FeatureName" "$EnvVariable" "$EnvValue" "$EnvOption" "$OutDirs" "$OutSet"
+ read line
+ done
+ return 0
+ ) || Error "Error processing environment" || exit 1
+
+ cat $InFeatures | (
+ read line
+ while [ "$line" != '' ]; do
+ local FeaturePath=`echo "$line" | cut -f 1`
+ local ShortName=`echo "$line" | cut -f 2 | StripDoubleQuotes`
+ local Description=`echo "$line" | cut -f 3 | StripDoubleQuotes`
+ local FeatureOptions=`echo "$line" | cut -f 4 | StripDoubleQuotes`
+ ProcessOneFeature "$FeaturePath" "$ShortName" "$Description" "$FeatureOptions" "$OutDirs" "$OutFeatures" "$OutSet"
+ read line
+ done
+ return 0
+ ) || Error "Error processing features" || exit 1
+
+# (PBR)
+# This test code didn't work. My hope was that I could force INSTALLLEVEL
+# to 4 and this would then enable the debug features.
+# Xecho "<Publish Property=\"INSTALLLEVEL\" Value=\"4\" />" >> $OutSet
+# Xecho "<Publish Event=\"SetInstallLevel\" Value=\"4\" />" >> $OutSet
+
+}
+
+# ProcessLinks(INLINKS, OUTFEATURES)
+# Process the INLINKS file, and produce XML on stdout.
+# Each line of the input file requires the creation
+# of a '.URL' file in the installation, and a Shortcut
+# in the Windows menu to point to that.
+# Also add the components generated to a feature, put in OUTFEATURES.
+#
+# TODO: We ought to have a Features column in the links.in file,
+# otherwise, the local doc link is always installed.
+#
+ProcessLinks() {
+ # Set a var to a carriage return without actually putting one in this file
+ local CR=`echo A | tr A '\015'`
+ local InLinks="infiles.tmp"; CleanInputFile "$1" "$InLinks" 3 4
+ local here_win=`cygpath -w $(pwd)`
+ # TODO: maybe get a real modification time, but not sure why we need it.
+ local MODTIMEHEX="0000000007DCC301DE"
+ XmlLevel=6
+ local OutFeatures="$2"
+
+ Xecho + "<Feature Id=\"LinksFeature\" Title=\"Links\"" >> $OutFeatures
+ Xecho " Description=\"Links\" Display=\"hidden\"" >> $OutFeatures
+ Xecho " Level=\"1\" AllowAdvertise=\"no\"" >> $OutFeatures
+ Xecho " ConfigurableDirectory=\"INSTALLUTIL\"" >> $$OUTFeatures
+ Xecho " Absent=\"disallow\">" >> $OutFeatures
+
+ Xecho "<DirectoryRef Id=\"INSTALLUTIL\">"
+ Xecho " <Directory Id=\"INSTALLURL\" Name=\"url\">"
+ Xecho "WIX_DB_SET_CURDIR(/installutil/url)"
+ cat $InLinks | (
+ read line
+ while [ "$line" != '' ]; do
+ local Shortname=`echo "$line" | cut -f 1 | StripDoubleQuotes`
+ local Name=`echo "$line" | cut -f 2 | StripDoubleQuotes`
+ local Url=`echo "$line" | cut -f 3 | StripDoubleQuotes`
+ read line
+
+ # We register the name .bdbsc extension to get the proper icon
+ local UrlName="$Shortname.bdbsc"
+ local UrlShortName="$Shortname.d1b"
+ local TargetFile="[INSTALLDIR]\\installutil\\url\\$UrlName"
+ local CreateUrlFile=true
+ local CommandShortcut=false
+ local Program=""
+ case "$Url" in
+ file:* ) CreateUrlFile=false
+ TargetFile=`echo $Url | sed -e 's/file://'`
+ TargetFile="[INSTALLDIR]"`cygpath -w $TargetFile`;;
+ cmd:* ) CreateUrlFile=false
+ UrlName="$Shortname.bat"
+ UrlShortName="$Shortname.bat"
+ TargetFile="[INSTALLDIR]\\installutil\\url\\$UrlName"
+ Program=`echo $Url | sed -e 's/cmd://'`
+ CommandShortcut=true;;
+ esac
+
+ Xecho "WIX_DB_SET_CURFILE($Shortname)"
+ Xecho + "<Component Id=\"Links.$Shortname\""
+ Xecho " $PERSISTGUID"
+ Xecho " SharedDllRefCount=\"yes\" Location=\"either\">"
+
+ if $CreateUrlFile; then
+ echo "[Default]$CR" > $UrlName
+ echo "BASEURL=$Url$CR" | RunM4 >> $UrlName || exit 1
+ echo "[InternetShortcut]$CR" >> $UrlName
+ echo "URL=$Url$CR" | RunM4 >> $UrlName || exit 1
+ echo "Modified=$MODTIMEHEX$CR" >> $UrlName
+ # TODO: we could have an Entry for IconFile=oracleweb.ico IconIndex=1?
+ echo ''
+ Xecho "<File Id=\"File.$Shortname\" "
+ Xecho " LongName=\"$UrlName\" Name=\"$UrlShortName\""
+ Xecho " Compressed=\"yes\" DiskId=\"1\""
+ Xecho " src=\"$here_win\\$UrlName\" />"
+ fi
+
+ if $CommandShortcut; then
+ echo "@echo off" > $UrlName
+ echo "set DBROOTDIR=" >> $UrlName
+ echo "for /F \"tokens=3 delims= \" %%A in ('REG QUERY \"HKLM\\SOFTWARE\\Oracle\\$PRODUCT_NAME\\$PRODUCT_VERSION\" /v RootDirectory') do set DBROOTDIR=%%A" >> $UrlName
+ echo "if ERRORLEVEL 2 goto MISSING" >> $UrlName
+ echo "if not defined DBROOTDIR goto MISSING" >> $UrlName
+ echo "set FN=\"%DBROOTDIR%$Program\"" >> $UrlName
+ echo "if not exist %FN% goto NOTFOUND" >> $UrlName
+ echo "cmd /k \"%DBROOTDIR%$Program\"$CR" >> $UrlName
+ echo "goto END" >> $UrlName
+ echo ":NOTFOUND" >> $UrlName
+ echo "echo" >> $UrlName
+ echo "echo Error: The program does not appear to be installed." >> $UrlName
+ echo "echo" >> $UrlName
+ echo "cmd /k" >> $UrlName
+ echo "goto END" >> $UrlName
+ echo ":MISSING" >> $UrlName
+ echo "echo" >> $UrlName
+ echo "echo NOTE:" >> $UrlName
+ echo "echo The $PRODUCT_NAME version could not be determined." >> $UrlName
+ echo "echo If you are running on Windows 2000, make sure the" >> $UrlName
+ echo "echo REG.EXE program is installed from the Tools disk" >> $UrlName
+ echo "echo" >> $UrlName
+ echo "cmd /k" >> $UrlName
+ echo ":END" >> $UrlName
+
+ Xecho "<File Id=\"File.$Shortname\" "
+ Xecho " LongName=\"$UrlName\" Name=\"$UrlShortName\""
+ Xecho " Compressed=\"yes\" DiskId=\"1\""
+ Xecho " src=\"$here_win\\$UrlName\" />"
+
+ Xecho "<Shortcut Id=\"Short.$Shortname\" Directory=\"BerkeleyDbMenu\""
+ Xecho " Name=\"$Shortname\" LongName=\"$Name\""
+ Xecho " WorkingDirectory=\"[INSTALLDIR]\""
+ Xecho " Target='$TargetFile'"
+ Xecho " Show=\"normal\" />"
+ else
+ Xecho "<Shortcut Id=\"Short.$Shortname\" Directory=\"BerkeleyDbMenu\""
+ Xecho " Name=\"$Shortname\" LongName=\"$Name\""
+ Xecho " Target='$TargetFile'"
+ Xecho " Show=\"normal\" />"
+ fi
+
+
+ Xecho - "</Component>"
+
+ Xecho "<ComponentRef Id=\"Links.$Shortname\" />" >> $OutFeatures
+ done
+ return 0
+ ) || Error "Error processing links" || exit 1
+
+ Xecho "</Directory>"
+ Xecho "</DirectoryRef>"
+ Xecho - "</Feature>" >> $OutFeatures
+}
+
+# ProcessOneDirectory(DIRECTORYNAME)
+# Called by ProcessFeatures.
+# Argument is the directory name to process
+# Standard input is cleaned up files.in (dirname is 3rd column)
+# Standard output will be WiX XML Component/File entries
+#
+ProcessOneDirectory()
+{
+ Dir="$1"
+ grep " ${Dir} " | (
+ read line
+ while [ "$line" != '' ]; do
+ local feature=`echo "$line" | cut -f 1`
+ local srcfile=`echo "$line" | cut -f 2`
+ local targetdir=`echo "$line" | cut -f 3`
+ local shortname=`echo "$line" | cut -f 4`
+
+ ProcessOneDirectoryFile "$feature" "$srcfile" "$targetdir" "$shortname" || exit 1
+ read line
+ done
+ return 0
+ ) || Error "Error processing directory $Dir" || exit 1
+}
+
+# ProcessOneDirectoryFile(DIRECTORYNAME)
+# Called by ProcessOneDirectory to process a single file in a directory.
+# Standard output will be a single WiX XML Component/File entries
+#
+ProcessOneDirectoryFile()
+{
+ local feature="$1"
+ local srcfile="$2"
+ local targetdir="$3"
+ local shortname="$4"
+ local base=`basename $srcfile`
+
+ #echo "processing file $srcfile in $feature to directory $targetdir..." >&2
+
+ # Prepend the WIX_DB_TOP unless the source file is absolute
+
+ local root=
+ local checkfile=
+ local wsrcfile=
+
+ case "$srcfile" in
+ /* ) root=""
+ wsrcfile=`cygpath -w $srcfile`
+ checkfile="$srcfile"
+ ;;
+ * ) root="$PRODUCT_BLDDIR/"
+ wsrcfile="WIX_DB_TOP()\\`cygpath -w $srcfile`"
+ checkfile="$PRODUCT_BLDDIR/$srcfile"
+ ;;
+ esac
+
+ # If srcfile ends in / then we'll use tallow to walk the directory
+ case "$srcfile" in
+ */ ) if [ ! -d "$root$srcfile" ]; then
+ Error "$root$srcfile: not a directory"
+ exit 1
+ fi
+ Progress -minor " expanding $root$srcfile..."
+ RunTallow "$root$srcfile"
+ return 0
+ ;;
+ *'*'* )
+ local dirname=`dirname "$root$srcfile"`
+ RunTallow "$dirname" -df "$base"
+ return 0
+ ;;
+ esac
+
+ if [ "$shortname" = '' ]; then
+ shortname=`GetShortName "$base"`
+ fi
+ ID=`NextId`
+
+ if [ ! -r "$checkfile" ]; then
+ Error "$srcfile: file in feature $feature does not exist"
+ Error " curdir=`pwd`, pathname=$checkfile"
+ exit 1
+ fi
+
+ Xecho "WIX_DB_SET_CURFILE(${base})"
+ Xecho + "<Component Id=\"$feature.$ID\" Location=\"either\" $PERSISTGUID>"
+ Xecho "<File Id=\"${feature}.${ID}\" Name=\"${shortname}\" LongName=\"${base}\" Compressed=\"yes\" KeyPath=\"yes\" DiskId=\"1\" src=\"${wsrcfile}\" />"
+ Xecho - "</Component>"
+ return 0
+}
+
+# ProcessOneFeature(FEATUREPATH, SHORTNAME, DESCRIPTION, OPTS, INDIRECTORYFILE,
+# OUTFEATURE, OUTSET)
+# Called by ProcessFeatures to process a line in the features.in file.
+# The first three arguments are the values of the first three columns:
+# the feature dependency path (e.g. "Java/JavaExamples"), the short
+# name, and a descriptive name. The last argument is the directory
+# file that lists the components. We use the last name of the feature
+# path (e.g. JavaExamples) to locate all components (really directories)
+# named accordingly, so they can be listed as needed parts of the Feature.
+# Standard output will be WiX XML Feature entries.
+#
+ProcessOneFeature() {
+ local featurename="$1"
+ local shortname="$2"
+ local opts="$4"
+ local dirfile="$5"
+ local outfeature="$6"
+ local outset="$7"
+
+ XmlLevel=4
+ local featcount=0
+ local featurestring=""
+ if [ $(SlashCount $featurename) -gt 0 ]; then
+ local parent=`echo $featurename | sed -e 's:/[^/]*$::' -e 's:.*/::'`
+ featurename=`echo $featurename | sed -e 's:^.*/::'`
+ featcount=1
+ Xecho "<FeatureRef Id=\"$parent\">" >> $outfeature
+ fi
+
+
+ # TODO: how to get +default to work?
+ # have tried messing with level="0" (doesn't show it)
+ # InstallDefault=\"source\" (doesn't make a difference)
+ #
+ local leveldebug="Level=\"4\""
+ local levelparam="Level=\"1\""
+ local leveldisable="Level=\"0\""
+ local defparam="InstallDefault=\"source\""
+ local displayparam="Display=\"expand\""
+ local params="AllowAdvertise=\"no\""
+ local regfeature=""
+
+ local descparam=""
+ if [ "$3" != '' ]; then
+ descparam="Description=\"$3\""
+ fi
+
+ local opt
+ local reqtext=""
+ local isdebugFeature=false
+ for opt in $opts; do
+ case "$opt" in
+ +default ) ;;
+ +required ) params="$params Absent=\"disallow\""
+ reqtext=" (required)";;
+ +invisible ) displayparam="Display=\"hidden\""
+ params="$params Absent=\"disallow\"";;
+ +debug ) isdebugFeature=true;;
+
+ * ) Error "features.in: Bad option $opt"
+ exit 1;;
+ esac
+ done
+
+
+# (PBR)
+# I tried to get debugging features to work but I could not. The last thing I
+# tried was to set either ADDSOURCE or INSTALLLEVEL. Neither of these solutions
+# will cause the feature conditions to rerun. The only thing I've found to do
+# that is to rerun CostFinalize. The problem with this is it will re-enable all
+# the options again. I'm keeping the basic framework for +debug support
+ if "$isdebugFeature"; then
+ regfeature="${featurename:1}"
+ echo "regfeature = $regfeature"
+
+ Xecho + "<Feature Id=\"$featurename\" Title=\"$shortname$reqtext\" $descparam $params $displayparam $leveldebug $defparam>" >> $outfeature
+ else
+ Xecho + "<Feature Id=\"$featurename\" Title=\"$shortname$reqtext\" $descparam $params $displayparam $levelparam $defparam>" >> $outfeature
+ fi
+
+
+ grep 'Component.*Id="'$featurename'[.0-9]*"' "$dirfile" | sed -e 's/\(Id="[^"]*"\).*/\1 \/>/' -e 's/Component /ComponentRef /' >> $outfeature
+
+ # Create a separate subfeature for any environment variables
+ # associated with the main feature.
+ # The <Condition> stuff is the magic that enables/disables
+ # setting the environment variables depending on the check box property.
+
+ Xecho + "<Feature Id=\"env.$featurename\" Title=\"env vars\" $params Display=\"hidden\" $levelparam $defparam>" >> $outfeature
+
+ Xecho "<Condition $leveldisable><![CDATA[EnvironmentSetCheck<>1]]></Condition>" >> $outfeature
+ Xecho "<Condition $levelparam><![CDATA[EnvironmentSetCheck=1]]></Condition>" >> $outfeature
+ grep 'Component.*Id="env\.'$featurename'[.0-9]*"' "$dirfile" | sed -e 's/\(Id="[^"]*"\).*/\1 \/>/' -e 's/Component /ComponentRef /' >> $outfeature
+
+ Xecho - "</Feature>" >> $outfeature
+ Xecho - "</Feature>" >> $outfeature
+
+ while [ "$featcount" -gt 0 ]; do
+ Xecho - "</FeatureRef>" >> $outfeature
+ featcount=$(($featcount - 1))
+ done
+
+ # Append the name to the feature list if it is to be installed.
+ # This publish fragment gets 'executed' when leaving the
+ # dialog to select features. Note that we have to quote
+ # the comma for m4 (`,') since this appears in a macro usage.
+ #
+
+# (PBR)
+# This code sets ADDSOURCE to show which debug options to include. This does not work
+ # If this is a debug feature, only turn on the value if the parent is on
+ if "$isdebugFeature"; then
+ regfeature="${featurename:1}"
+
+# Xecho "<Publish Property=\"ADDSOURCE\" Value=\"[ADDSOURCE]\`,'\">" >> $outset
+# Xecho " <![CDATA[&${regfeature} = 3 AND DebugCheck=\"yes\" AND ADDSOURCE <> NULL]]></Publish>" >> $outset
+
+# Xecho "<Publish Property=\"ADDSOURCE\" Value=\"[ADDSOURCE]${featurename}\">" >> $outset
+# Xecho " <![CDATA[&${regfeature} = 3 AND DebugCheck=\"yes\"]]></Publish>" >> $outset
+
+ Xecho "<Publish Property=\"FeatureList\" Value=\"[FeatureList]\`,' ${shortname}\">" >> $outset
+ Xecho " <![CDATA[&${regfeature} = 3 AND DebugCheck=\"yes\"]]></Publish>" >> $outset
+
+ else
+ Xecho "<Publish Property=\"FeatureList\" Value=\"[FeatureList]\`,' ${shortname}\">" >> $outset
+ Xecho " <![CDATA[&${featurename} = 3]]></Publish>" >> $outset
+ fi
+}
+
+# ProcessOneEnv(FEATURE, ENVNAME, ENVVALUE, OPTS, OUTDIRS, OUTSET)
+# Called by ProcessFeatures to process a line in the environment.in file.
+# The four arguments are the values of the four columns.
+# The output will be into two files:
+# OUTDIRS: WiX XML Component entries, that contain environment values.
+# This controls the actual setting of the variables.
+# OUTSET: WiX XML to set the installer variables if an env variable
+# is set or a feature selected.
+#
+ProcessOneEnv() {
+ local feature="$1"
+ local envname="$2"
+ local envvalue="$3"
+ local opts="$4"
+ local outdirs="$5"
+ local outset="$6"
+
+ # Make the path uniform.
+ # echo "c:\Program Files\...\/Lib/Hello" | sed -e 's:\\/:\\:' -e 's:/:\\:g`
+ # This produces c:\Program Files\...\Lib\Hello
+ case "$envvalue" in
+ /* ) envvalue=`echo "$envvalue" | sed -e 's:^/::'`
+ esac
+
+ local path="[INSTALLDIR]$envvalue"
+
+ local opt
+ part="last"
+ for opt in $opts; do
+ case "$opt" in
+ +first ) part="first";;
+ +last ) part="last";;
+ * ) Error "environment.in: Bad option $opt"
+ exit 1;;
+ esac
+ done
+
+ # Generate the OUTDIRS fragment
+ # This looks like:
+ #
+ # <Component Id="env.CoreAPI.43" Guid="4B75755F-1129-292C-3434-238410000247">
+ # <Environment Id="env.44" Name="+-LIB" Action="set"
+ # Permanent="no" Part="first" Value="[INSTALLDIR]Lib" />
+ # </Component>
+ #
+ # Having a unique guid makes uninstall work.
+ # Note: We really want these installed as System rather than
+ # User vars (using the System="yes" tag), but only if user
+ # installs for *all* users. There is no convenient way to
+ # do that, so we leave them as default (User variables).
+
+
+ XmlLevel=4
+ local Id=`NextId`
+ Xecho "WIX_DB_SET_CURFILE(${envname})" >> $outdirs
+ Xecho + "<Component Id=\"env.$feature.$Id\" $PERSISTGUID>" >> $outdirs
+ Id=`NextId`
+
+ Xecho "<Environment Id=\"env.$Id\" Name=\"+-$envname\" Action=\"set\"" >> $outdirs
+ Xecho " Permanent=\"no\" Part=\"$part\" Value=\"$path\" />" >> $outdirs
+
+ Xecho "</Component>" >> $outdirs
+
+ # Generate the OUTSET fragment
+ # This looks like:
+ #
+ # <Publish Property="CLASSPATHValue" Value="[INSTALLDIR]Lib/db.jar;[CLASSPATHValue]">
+ # <![CDATA[&JavaAPI = 3]]></Publish>
+ # <Publish Property="CLASSPATHEscValue" Value="[INSTALLDIR]Lib/db.jar;[CLASSPATHEscValue]">
+ # <![CDATA[&JavaAPI = 3]]></Publish>
+ #
+ # This is equivalent to pseudocode:
+ # if (InstallFeature(JavaAPI)) {
+ # Prepend CLASSPATHValue with "Lib/db.jar;"
+ # Prepend CLASSPATHEscValue with "Lib/db.jar;"
+ # }
+ #
+ XmlLevel=4
+ Xecho "<Publish Property=\"${envname}Value\" Value=\"[INSTALLDIR]${envvalue};[${envname}Value]\">" >> $outset
+ Xecho " <![CDATA[&${feature} = 3]]></Publish>" >> $outset
+
+ Xecho "<Publish Property=\"${envname}EscValue\" Value=\"[INSTALLDIR]${envvalue};[${envname}EscValue]\">" >> $outset
+ Xecho " <![CDATA[&${feature} = 3]]></Publish>" >> $outset
+
+
+}
+
+# CreateProperty(ID, VALUE)
+# Generate a <Property...> tag on the stdout
+CreateProperty() {
+ Xecho "<Property Id=\"$1\" Hidden=\"yes\"><![CDATA[$2]]></Property>"
+}
+
+# ProcessTagProperties(OUTPROPS)
+# Generate some identification tags as properties.
+# This will let us look at an installer and figure out
+# when it was built, etc.
+ProcessTagProperties() {
+ local outprops="$1"
+ local insdate=`date`
+ XmlLevel=4
+
+ CreateProperty _DB_MSI_INSTALLER_DATE "$insdate" >> $outprops
+ CreateProperty _DB_MSI_PRODUCT_NAME "$PRODUCT_NAME" >> $outprops
+ CreateProperty _DB_MSI_PRODUCT_VERSION "$PRODUCT_VERSION" >> $outprops
+ CreateProperty ARPCOMMENTS "Installer for $PRODUCT_NAME $PRODUCT_VERSION built on $insdate" >> $outprops
+}
+
+# ProcessEnv(INENVFILE, INBATFILE, OUTPROPS, OUTSET, OUTSHOW)
+# We generate some Property magic to show the user what is set.
+#
+ProcessEnv() {
+ InEnv="inenv.tmp"; CleanInputFile "$1" "$InEnv" 3 4
+ inbat="$2"
+ outprops="$3"
+ outset="$4"
+ outshow="$5"
+
+ # Get a list of the environment variables
+ local envvar
+ local envvars=`cut -f 2 < $InEnv | sort | uniq`
+
+ # For each environment var, create lines that declare
+ # a pair of properties in the envprops.wixinc file like:
+ #
+ # <Property Id="CLASSPATHValue" Hidden="yes"></Property>
+ # <Property Id="CLASSPATHEscValue" Hidden="yes"></Property>
+ #
+ # And create lines in the envset.wixinc file like:
+ #
+ # <Publish Property="CLASSPATHValue" Value="%CLASSPATH%">
+ # <![CDATA[1]]></Publish>
+ # <Publish Property="CLASSPATHEscValue" Value="\\%CLASSPATH\\%">
+ # <![CDATA[1]]></Publish>
+ #
+ # More will be added to that file later.
+ # Then, create lines in the envshow.wixinc file like:
+ #
+ # <Control Id="CLASSPATHText" Type="Text"
+ # X="23" Width="316" PARTIALHEIGHT(10, 2)
+ # TabSkip="no" Text="CLASSPATH:" />
+ #
+ # <Control Id="CLASSPATHValueText" Type="Text"
+ # X="37" Width="316" PARTIALHEIGHT(20, 7)
+ # TabSkip="no" Text="[CLASSPATHValue]" />
+
+ for envvar in $envvars; do
+ XmlLevel=4
+ CreateProperty "${envvar}Value" "" >> $outprops
+ CreateProperty "${envvar}EscValue" "" >> $outprops
+
+ XmlLevel=4
+ Xecho "<Publish Property=\"${envvar}Value\" Value=\"%${envvar}%\">" >> $outset
+ Xecho " <![CDATA[1]]></Publish>" >> $outset
+ Xecho "<Publish Property=\"${envvar}EscValue\" Value=\"\\%${envvar}\\%\">" >> $outset
+ Xecho " <![CDATA[1]]></Publish>" >> $outset
+
+ XmlLevel=4
+ Xecho "<Control Id=\"${envvar}Text\" Type=\"Text\"" >> $outshow
+ Xecho " X=\"23\" Width=\"316\" PARTIALHEIGHT(10, 2)" >> $outshow
+ Xecho " TabSkip=\"no\" Text=\"${envvar}:\" />" >> $outshow
+
+ Xecho "<Control Id=\"${envvar}ValueText\" Type=\"Text\"" >> $outshow
+ Xecho " X=\"37\" Width=\"316\" PARTIALHEIGHT(20, 7)" >> $outshow
+ Xecho " TabSkip=\"no\" Text=\"[${envvar}Value]\" />" >> $outshow
+
+ done
+
+ # Create the dbvars.bat file from the .bat template file
+ # TODO: the bat template file currently knows the variables
+ # and their values, it should get them from the environment.in
+
+ RunM4 <"$inbat" >"$PRODUCT_STAGE/dbvars.bat" || Error "m4 failed" || exit 1
+}
+
+
+# CleanInputFile(INFILENAME, OUTFILENAME, MINELEMENTS, MAXELEMENTS)
+# A filter to preprocess and validate input files.
+# We end up without comment lines, a single tab between elements,
+# and a trailing tab.
+# Also some selected shell variables are expanded for convenience.
+# We verify that each line has the number of elements that fall within
+# the given min and max.
+#
+CleanInputFile() {
+ sed \
+ -e 's/#.*//' \
+ -e 's/ * / /g' \
+ -e 's/ */ /g' \
+ -e '/^[ ]*$/d' \
+ -e 's/$/ /' \
+ -e 's/ */ /g' \
+ -e 's:\${PRODUCT_VERSION}:'"${PRODUCT_VERSION}":g \
+ -e 's:\${PRODUCT_MAJOR}:'"${PRODUCT_MAJOR}":g \
+ -e 's:\${PRODUCT_MINOR}:'"${PRODUCT_MINOR}":g \
+ -e 's:\${PRODUCT_PATCH}:'"${PRODUCT_PATCH}":g \
+ -e 's:\${PRODUCT_MAJMIN}:'"${PRODUCT_MAJMIN}":g \
+ -e 's:\${PRODUCT_STAGE}:'"${PRODUCT_STAGE}":g \
+ -e 's:\${PRODUCT_SHARED_WINMSIDIR}:'"${PRODUCT_SHARED_WINMSIDIR}":g \
+ -e 's/^[
\t]*$//' \
+ < "$1" > "$2"
+
+ # count tabs on each line
+ sed -e 's/[^\t]//g' -e 's/[\t]/x/g' < "$2" | (
+ read line
+ linecount=1
+ while [ "$line" != '' ]; do
+ chars=`echo "$line" | wc -c`
+ chars=$(($chars - 1)) # Remove newline
+ if [ "$chars" -lt "$3" -o "$chars" -gt "$4" ]; then
+ Error "$1: Input file error on or after line $linecount"
+ fi
+ read line
+ linecount=$(($linecount + 1))
+ done
+ )
+}
+
+# StripDoubleQuotes()
+# In some input files, we allow double quotes around
+# multi-word strings for readability. We strip them
+# here from standard input and write to standard output.
+# We only expect them at the beginning and end.
+#
+StripDoubleQuotes() {
+ sed -e 's/^"//' -e 's/"$//'
+}
+
+# IndentXml(PLUSMINUS_ARG)
+# A global variable $XmlLevel is kept for the indent level.
+# Every call creates blank output that matches the indent level.
+# In addition, with a '-' argument, the indent level
+# decrements by one before printing.
+# With a '+', the indent level increments after printing.
+# This is generally just used by Xecho
+#
+XmlLevel=0
+IndentXml() {
+ if [ "$1" = '-' -a $XmlLevel != 0 ]; then
+ XmlLevel=$(($XmlLevel - 1))
+ fi
+ local idx=0
+ while [ "$idx" != "$XmlLevel" ]; do
+ echo -n ' '
+ idx=$(($idx + 1))
+ done
+ if [ "$1" = '+' ]; then
+ XmlLevel=$(($XmlLevel + 1))
+ fi
+}
+
+# Xecho [ - | + ] ...
+# echoes arguments (like) echo, except that the output
+# is indented for XML first. If +, the indentation changes
+# after printing, if -, the indentation changes before printing.
+#
+Xecho()
+{
+ local xarg=
+ if [ "$1" = '-' -o "$1" = '+' ]; then
+ xarg="$1"
+ shift
+ fi
+ IndentXml $xarg
+ echo "$@"
+}
+
+# SlashCount(PATH)
+# Returns the number of slashes in its argument
+# Note, we are relying on some advanced
+# features of bash shell substitution
+#
+SlashCount()
+{
+ local allslash=`echo "$1" | sed -e 's:[^/]*::g'`
+ echo "${#allslash}"
+}
+
+# ProcessDirTransition(PREVDIR, NEXTDIR)
+# Used by ProcessFeatures to create the parts
+# of an WiX <Directory> heirarchy (on stdout) needed to
+# transition from directory PREVDIR to NEXTDIR.
+# This may include any needed </Directory> entries as well.
+# For example, ProcessDirTransition /Bin/Stuff /Bin/Foo/Bar
+# produces:
+# </Directory> ...to go up one from 'Stuff'
+# <Directory Foo>
+# <Directory Bar>
+#
+ProcessDirTransition() {
+ local p="$1"
+ local n="$2"
+ if [ "$p" = '' ]; then p=/; fi
+ if [ "$n" = '' ]; then n=/; fi
+ local nextdir="$2"
+
+ # The number of slashes in $p is the current directory level.
+ XmlLevel=$(($(SlashCount $p) + 4))
+
+ while [ "$p" != / ]; do
+ if [ "${n#${p}}" != "$n" ]; then
+ break
+ fi
+
+ # go up one level, and keep $p terminated with a /
+ p=`dirname $p`
+ case "$p" in
+ */ ) ;;
+ * ) p=$p/;;
+ esac
+ Xecho - "</Directory>"
+ done
+ n=${n#${p}}
+ while [ "$n" != '' ]; do
+ local dirname=`echo $n | sed -e 's:/.*::'`
+ local cleanname=`CleanFileName "$dirname"`
+ local shortname=`GetShortName "$cleanname"`
+ local dirid=`NextId`
+
+ local larg=""
+ if [ "${shortname}" != "${dirname}" ]; then
+ larg="LongName=\"${dirname}\""
+ fi
+ Xecho + "<Directory Id=\"${cleanname}Dir.$dirid\" Name=\"${shortname}\" $larg>"
+
+ n=`echo $n | sed -e 's:^[^/]*/::'`
+ done
+
+ Xecho "WIX_DB_SET_CURDIR($nextdir)" # Tell the m4 macro what the current dir is
+}
+
+# SetupErrorLog()
+# Given the global variable ERRORLOG for the name of the
+# error output file, do any setup required to make that happen.
+#
+SetupErrorLog() {
+
+ # Before we start to use ERRORLOG, we get a full pathname,
+ # since the caller may change directories at times.
+ case "$ERRORLOG" in
+ /* ) ;;
+ *) ERRORLOG=`pwd`"/$ERRORLOG" ;;
+ esac
+
+ rm -f $ERRORLOG
+
+ # File descriptor tricks.
+ # Duplicate current stderr to 15, as we'll occasionally
+ # need to report progress to it. Then, redirect all
+ # stderr from now on to the ERRORLOG.
+ #
+ exec 15>&2
+ exec 2>>$ERRORLOG
+}
+
+# RequireCygwin
+# Cygwin does not install certain needed components by default.
+# Check to make sure that everything needed by the script
+# and functions is here.
+#
+RequireCygwin() {
+ Progress -minor "checking for Cygwin..."
+ RequireFileInPath PATH "$PATH" m4
+ RequireFileInPath PATH "$PATH" gcc
+ RequireFileInPath PATH "$PATH" make
+ RequireFileInPath PATH "$PATH" unzip
+ RequireFileInPath PATH "$PATH" bc
+ RequireFileInPath PATH "$PATH" openssl # needed for MD5 hashing
+}
+
+# RequireJava()
+# A java SDK (with include files) must be installed
+#
+RequireJava() {
+ Progress -minor "checking for Java..."
+ RequireFileInPath INCLUDE "$INCLUDE" jni.h
+ RequireFileInPath INCLUDE "$INCLUDE" jni_md.h
+ RequireFileInPath PATH "$PATH" jar.exe
+ RequireFileInPath PATH "$PATH" javac.exe
+}
+
+# RequireTcl()
+# A Tcl SDK (with compatible .lib files) must be installed
+#
+RequireTcl() {
+ Progress -minor "checking for Tcl..."
+ RequireFileInPath INCLUDE "$INCLUDE" tcl.h
+ RequireFileInPath LIB "$LIB" tcl84g.lib
+ RequireFileInPath LIB "$LIB" tcl84.lib
+}
+
+# RequireWix()
+# WiX must be installed
+#
+RequireWix() {
+ Progress -minor "checking for WiX..."
+ RequireFileInPath PATH "$PATH" candle.exe
+ RequireFileInPath PATH "$PATH" light.exe
+ RequireFileInPath PATH "$PATH" tallow.exe
+}
+
+# RequirePerl()
+# Perl must be installed
+#
+RequirePerl() {
+ Progress -minor "checking for Perl..."
+ RequireFileInPath PATH "$PATH" perl.exe
+}
+
+# RequirePython()
+# Python (and include files) must be installed
+#
+RequirePython() {
+ Progress -minor "checking for Python..."
+ RequireFileInPath INCLUDE "$INCLUDE" Python.h
+ RequireFileInPath PATH "$PATH" python.exe
+}
+
+# CreateDbPerl()
+# Build Perl interface (for Berkeley DB only).
+#
+CreateDbPerl() {
+
+ # First build Berkeley DB using cygwin, as that version is
+ # needed for the Perl build
+ local here=`pwd`
+ Progress "building using Cygwin tools (needed for perl)"
+ cd "${PRODUCT_DBBUILDDIR}"
+ insdir="${PRODUCT_STAGE}/install_unix"
+ ../dist/configure --prefix="$insdir" >>$ERRORLOG || exit 1
+ make install >>$ERRORLOG || exit 1
+
+ Progress "building perl"
+ cd ../perl/BerkeleyDB
+ BERKELEYDB_INCLUDE="$insdir/installed_include" BERKELEYDB_LIB="$insdir/lib" \
+ perl Makefile.PL >>$ERRORLOG || exit 1
+ make >>$ERRORLOG
+ cd $here
+}
+
+# CreateWindowsSystem()
+# Copy Window system files
+#
+CreateWindowsSystem() {
+ local here=`pwd`
+ Progress "Copy Window system files..."
+ cd "${PRODUCT_SUB_BLDDIR}"
+ cp -f $SYSTEMROOT/system32/msvcr71.dll build_windows/Release/ || exit 1
+ cp -f $SYSTEMROOT/system32/msvcp71.dll build_windows/Release/ || exit 1
+ cp -f $SYSTEMROOT/system32/msvcr71d.dll build_windows/Debug/ || exit 1
+ cp -f $SYSTEMROOT/system32/msvcp71d.dll build_windows/Debug/ || exit 1
+ cd $here
+}
+
+# CreateInclude(DIR, FILES)
+# Create an include directory populated with the files given
+#
+CreateInclude() {
+
+ local incdir="$1"
+ shift
+
+ Progress "creating the "$incdir" directory..."
+ rm -rf "$incdir"
+ mkdir "$incdir" || exit 1
+ cp -r "$@" "$incdir"
+}
+
+# CreateWindowsBuild()
+# Do the windows build as defined by the winbuild.bat file
+#
+CreateWindowsBuild() {
+ local here=`pwd`
+ Progress "building using Windows tools..."
+ cd "${PRODUCT_SUB_BLDDIR}" || exit 1
+
+ # Before starting, copy any installer tools here.
+ # This makes building these tools straightforward
+ # and the results are left in the build directory.
+ #
+ cp -r ${PRODUCT_SHARED_WINMSIDIR}/instenv .
+
+ # We create a wbuild.bat file, which is essentially
+ # identical, except it has the carriage returns added.
+ # This allows us to use our favorite editors on winbuild.bat .
+ #
+ sed -e 's/$//' < ${PRODUCT_STAGE}/../winbuild.bat | tr '\001' '\015' > wbuild.bat
+ # TODO: Needed?
+ rm -f build_windows/Berkeley_DB.sln
+ rm -f winbld.out winbld.err
+ touch winbld.out winbld.err
+ echo "Build output and errors are collected in" >> $ERRORLOG
+ echo " winbld.{out,err} until the build has completed." >> $ERRORLOG
+ cmd.exe /x /c call wbuild.bat
+ status=$?
+ cat winbld.out >> $ERRORLOG
+ if [ -s winbld.err -o "$status" != 0 ]; then
+ cat winbld.err >> $ERRORLOG
+ Error "Errors during windows build"
+ exit 1
+ fi
+ cd $here
+}
+
+# CreateSources(SOURCESDIR,DOCDIR...)
+# Create the sources directory, ignoring things in the docdirs
+#
+CreateSources() {
+ local sources="$1"
+
+ Progress "creating the Sources directory in $sources..."
+ rm -rf "$sources"
+ cp -r ${PRODUCT_SRCDIR} "$sources" || exit 1
+}
+
+# Usage()
+# Show the usage for this script.
+#
+Usage()
+{
+ echo "Usage: s_winmsi [ options ]" >&2
+ echo "Options: " >&2
+ echo " -input file use file rather than ${PRODUCT_ZIP_FILEFMT}" >&2
+ echo " where X.Y.Z is defined by ../RELEASE" >&2
+ echo " -output file use file rather than ${PRODUCT_MSI_FILEFMT}" >&2
+ echo " where X.Y.Z is defined by ../RELEASE" >&2
+ echo " -usebuild DIR use DIR for exes, DLLs, etc. " >&2
+ echo " rather than building from scratch" >&2
+ echo " -preserve preserve the winmsi/msi_staging directory" >&2
+ echo " -skipgen skip generating m4 include files" >&2
+}
+
+# SetupOptions()
+# Parse command line options and set global variables as indicated below.
+#
+SetupOptions() {
+ OPT_USEBUILD=
+ OPT_PRESERVE=false
+ OPT_INFILE=
+ OPT_OUTFILE=
+ OPT_SKIPGEN=false
+ while [ "$#" -gt 0 ]; do
+ arg="$1"; shift
+ case "$arg" in
+ -usebuild ) OPT_USEBUILD="$1"; shift ;;
+ -skipgen ) OPT_SKIPGEN=true ;;
+ -preserve ) OPT_PRESERVE=true;;
+ -input ) OPT_INFILE="$1"; shift ;;
+ -output ) OPT_OUTFILE="$1"; shift ;;
+ * )
+ echo "ERROR: Unknown argument '$arg' to s_winmsi" >&2
+ Usage
+ exit 1
+ ;;
+ esac
+ done
+ if [ "$OPT_INFILE" = '' -o ! -f "$OPT_INFILE" ]; then
+ echo "$OPT_INFILE: not found"
+ exit 1
+ fi
+}
+
+# CreateStage()
+# Create the staging area
+#
+CreateStage() {
+ Progress "creating staging area..."
+ if [ "$PRODUCT_STAGE" = '' ]; then
+ Error "PRODUCT_STAGE not set"
+ exit 1
+ fi
+ if ! $OPT_PRESERVE; then
+ trap 'rm -rf ${PRODUCT_STAGE} ; exit 0' 0 1 2 3 13 15
+ fi
+ rm -rf ${PRODUCT_STAGE} || exit 1
+ mkdir ${PRODUCT_STAGE} || exit 1
+
+ cd ${PRODUCT_STAGE}
+
+ Progress "extracting $OPT_INFILE..."
+ unzip -q ../../$OPT_INFILE || exit 1
+
+ if [ ! -d $PRODUCT_LICENSEDIR ]; then
+ Error "$OPT_INFILE: no top level $PRODUCT_LICENSEDIR directory"
+ exit 1
+ fi
+}
+
+# CreateLicenseRtf(LICENSEIN, LICENSERTF)
+# From a text LICENSE file, create the equivalent in .rtf format.
+#
+CreateLicenseRtf() {
+ local licensein="$1"
+ local licensertf="$2"
+
+ if [ ! -f "$licensein" ]; then
+ Error "License file $licensein: does not exist"
+ exit 1
+ fi
+ Progress "creating ${licensertf}..."
+
+ # Build a list of references to components ids (i.e. directories)
+ # that are listed in the .wxs file. This is needed to refer to
+ # all of the source (sadly it appears there is no better way!)
+ #
+ if ! grep '^=-=-=-=' $licensein > /dev/null; then
+ Error "LICENSE has changed format, this script must be adapted"
+ exit 1
+ fi
+
+ sed -e '1,/^=-=-=-=-=/d' < $licensein | MakeRtf > $licensertf
+}
+
+
+# CreateMsi(INFILE,WXSFILE,MSIFILE)
+# Do the final creation of the output .MSI file.
+# It is assumed that all *.wixinc files are now in place.
+# INFILE is an absolute name of the m4 input WiX file.
+# WXSFILE is a short (basename) of the postprocessed WiX file,
+# after macro expansion, it will be left in staging directory.
+# MSIFILE is a short (basename) of the output .MSI name
+#
+CreateMsi() {
+ local infile="$1"
+ local wxs="$2"
+ local msifile="$3"
+ local o=`echo "$wxs" | sed -e 's/[.]wxs$//' -e 's/$/.wixobj/'`
+
+ rm -f $o $wxs
+
+ # Preprocess the ${PROD}wix.in file, adding the things we need
+ #
+ Progress "Running m4 to create $wxs..."
+ RunM4 < "$infile" > "$PRODUCT_STAGE/$wxs" || Error "m4 failed" || exit 1
+
+ local here=`pwd`
+ cd "$PRODUCT_STAGE"
+ rm -f "$o" "$msifile"
+ Progress "compiling $wxs..."
+ candle -w0 $wxs >> $ERRORLOG || Error "candle (compiler) failed" || exit 1
+
+ Progress "linking .msi file..."
+ light -o "$msifile" $o >> $ERRORLOG || Error "light (linker) failed" || exit 1
+ (rm -f "../../$msifile" && mv "$msifile" ../..) >> $ERRORLOG || exit 1
+ cd $here
+}
+
+# CreateWixIncludeFiles()
+# Do all processing of input files to produce
+# the include files that we need to process the Wix input file.
+#
+CreateWixIncludeFiles() {
+ local here=`pwd`
+ cd "$PRODUCT_STAGE"
+ # Touch all the wix include files in case any end up empty.
+ touch directory.wixinc features.wixinc envprops.wixinc \
+ envset.wixinc envshow.wixinc links.wixinc
+
+ Progress "tagging the installer..."
+ ProcessTagProperties envprops.wixinc
+
+ Progress "processing environment..."
+ ProcessEnv ../environment.in ../dbvarsbat.in envprops.wixinc envset.wixinc envshow.wixinc
+
+ Progress "processing features and files..."
+ ProcessFeatures ../files.in ../features.in ../environment.in \
+ directory.wixinc features.wixinc \
+ envset.wixinc
+
+ Progress "processing links..."
+ ProcessLinks ../links.in features.wixinc > links.wixinc
+ cd $here
+}
diff --git a/db/dist/winmsi/winbuild.bat b/db/dist/winmsi/winbuild.bat new file mode 100644 index 000000000..3783944d8 --- /dev/null +++ b/db/dist/winmsi/winbuild.bat @@ -0,0 +1,113 @@ +@echo off
+:: $Id: winbuild.bat,v 1.6 2005/12/01 03:04:21 bostic Exp $
+:: Helper script to build Berkeley DB libraries and executables
+:: using MSDEV
+::
+
+cd build_windows
+
+:: One of these calls should find the desired batch file
+
+call :TryBat "c:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat" && goto BATFOUND1
+
+call :TryBat "c:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\vsvars32.bat" && goto BATFOUND2
+
+call :TryBat "c:\Program Files\Microsoft Visual Studio.NET\Common7\Tools\vsvars32.bat" && goto BATFOUND3
+
+goto BATNOTFOUND
+
+:BATFOUND1
+echo Using Visual Studio .NET 2003
+goto BATFOUND
+
+:BATFOUND2
+echo Using Visual Studio .NET
+echo *********** CHECK: Make sure the binaries are built with the same system libraries that are shipped.
+goto BATFOUND
+
+:BATFOUND3
+echo Using Visual Studio.NET
+echo *********** CHECK: Make sure the binaries are built with the same system libraries that are shipped.
+goto BATFOUND
+
+:BATFOUND
+:CONVERSION
+start /wait devenv /useenv Berkeley_DB.dsw
+
+:: For some reason, the command doesn't wait, at least on XP.
+:: So we ask for input to continue.
+
+
+echo.
+echo ============================================================
+echo.
+echo Converting the Berkeley DB Workspace to a .NET Solution.
+echo This will run the IDE to interactively convert.
+echo.
+echo When prompted during the conversion, say: Yes-to-All.
+echo When finished with the conversion, do a Save-All and Exit.
+echo Then hit ENTER to continue this script.
+echo.
+echo ============================================================
+set result=y
+set /P result="Continue? [y] "
+if %result% == n goto NSTOP
+
+if exist Berkeley_DB.sln goto ENDCONVERSION
+echo ************* Berkeley_DB.sln was not created ***********
+echo Trying the conversion again...
+goto CONVERSION
+:ENDCONVERSION
+
+::intenv is used to set environment variables but this isn't used anymore
+::devenv /useenv /build Release /project instenv ..\instenv\instenv.sln >> ..\winbld.out 2>&1
+::if not %errorlevel% == 0 goto ERROR
+
+echo Building Berkeley DB
+devenv /useenv /build Debug /project build_all Berkeley_DB.sln >> ..\winbld.out 2>&1
+if not %errorlevel% == 0 goto ERROR
+devenv /useenv /build Release /project build_all Berkeley_DB.sln >> ..\winbld.out 2>&1
+if not %errorlevel% == 0 goto ERROR
+devenv /useenv /build Debug /project db_java Berkeley_DB.sln >> ..\winbld.out 2>&1
+if not %errorlevel% == 0 goto ERROR
+devenv /useenv /build Release /project db_java Berkeley_DB.sln >> ..\winbld.out 2>&1
+if not %errorlevel% == 0 goto ERROR
+devenv /useenv /build Debug /project db_tcl Berkeley_DB.sln >> ..\winbld.out 2>&1
+if not %errorlevel% == 0 goto ERROR
+devenv /useenv /build Release /project db_tcl Berkeley_DB.sln >> ..\winbld.out 2>&1
+if not %errorlevel% == 0 goto ERROR
+
+
+goto END
+
+
+:ERROR
+echo *********** ERROR: during win_build.bat *************
+echo *********** ERROR: during win_build.bat ************* >> ..\winbld.err
+exit 1
+goto END
+
+:NSTOP
+echo *********** ERROR: win_build.bat stop requested *************
+echo *********** ERROR: win_built.bat stop requested ************* >> ..\winbld.err
+exit 2
+goto END
+
+:BATNOTFOUND
+echo *********** ERROR: VC Config batch file not found *************
+echo *********** ERROR: VC Config batch file not found ************* >> ..\winbld.err
+exit 3
+goto END
+
+:: TryBat(BATPATH)
+:: If the BATPATH exists, use it and return 0,
+:: otherwise, return 1.
+
+:TryBat
+:: Filename = %1
+if not exist %1 exit /b 1
+call %1
+exit /b 0
+goto :EOF
+
+:END
|
