diff options
author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-02-17 17:25:57 +0000 |
---|---|---|
committer | <> | 2015-03-17 16:26:24 +0000 |
commit | 780b92ada9afcf1d58085a83a0b9e6bc982203d1 (patch) | |
tree | 598f8b9fa431b228d29897e798de4ac0c1d3d970 /dist/aclocal | |
parent | 7a2660ba9cc2dc03a69ddfcfd95369395cc87444 (diff) | |
download | berkeleydb-780b92ada9afcf1d58085a83a0b9e6bc982203d1.tar.gz |
Diffstat (limited to 'dist/aclocal')
-rw-r--r-- | dist/aclocal/clock.m4 | 6 | ||||
-rw-r--r-- | dist/aclocal/mmap.m4 | 17 | ||||
-rw-r--r-- | dist/aclocal/mutex.m4 | 62 | ||||
-rw-r--r-- | dist/aclocal/options.m4 | 80 | ||||
-rw-r--r-- | dist/aclocal/sequence.m4 | 8 | ||||
-rw-r--r-- | dist/aclocal/sql.m4 | 11 | ||||
-rw-r--r-- | dist/aclocal/types.m4 | 7 |
7 files changed, 126 insertions, 65 deletions
diff --git a/dist/aclocal/clock.m4 b/dist/aclocal/clock.m4 index a978ffa5..a0c09112 100644 --- a/dist/aclocal/clock.m4 +++ b/dist/aclocal/clock.m4 @@ -3,7 +3,7 @@ # Configure clocks and timers. AC_DEFUN(AC_TIMERS, [ -AC_CHECK_FUNCS(gettimeofday localtime time strftime) +AC_CHECK_FUNCS(gettimeofday localtime localtime_r time strftime) # AIX 4.3 will link applications with calls to clock_gettime, but the # calls always fail. @@ -20,12 +20,14 @@ esac # existence to mean the clock really exists. AC_CACHE_CHECK([for clock_gettime monotonic clock], db_cv_clock_monotonic, [ AC_TRY_RUN([ +#include <time.h> #include <sys/time.h> -main() { +int main() { struct timespec t; return (clock_gettime(CLOCK_MONOTONIC, &t) != 0); }], db_cv_clock_monotonic=yes, db_cv_clock_monotonic=no, AC_TRY_LINK([ +#include <time.h> #include <sys/time.h>], [ struct timespec t; clock_gettime(CLOCK_MONOTONIC, &t); diff --git a/dist/aclocal/mmap.m4 b/dist/aclocal/mmap.m4 index 727c6c35..cb20228c 100644 --- a/dist/aclocal/mmap.m4 +++ b/dist/aclocal/mmap.m4 @@ -1,4 +1,4 @@ -# Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. # Detect mmap capability: If the file underlying an mmap is extended, # does the addressable memory grow too? @@ -28,8 +28,10 @@ if test "$mmap_ok" = "yes" ; then /* Not all these includes are needed, but the minimal set varies from * system to system. */ + #include <stdlib.h> #include <stdio.h> #include <string.h> + #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -41,18 +43,25 @@ if test "$mmap_ok" = "yes" ; then #ifndef MAP_FAILED #define MAP_FAILED (-1) #endif + /* Prevent unused variabl warnings by setting and using it. */ + #define COMPQUIET(n, v) do { \ + (n) = (v); \ + (n) = (n); \ + } while (0) - int catch_sig(sig) + + void catch_sig(sig) int sig; { + COMPQUIET(sig,0); exit(1); } - main() { + int main() { const char *underlying; unsigned gapsize; char *base; - int count, fd, i, mode, open_flags, ret, total_size; + int count, fd, i, mode, open_flags, total_size; char buf[TEST_MMAP_BUFSIZE]; gapsize = 1024; diff --git a/dist/aclocal/mutex.m4 b/dist/aclocal/mutex.m4 index 81f1ea8d..9e02c4af 100644 --- a/dist/aclocal/mutex.m4 +++ b/dist/aclocal/mutex.m4 @@ -5,12 +5,12 @@ AC_DEFUN(AM_PTHREADS_SHARED, [ AC_TRY_RUN([ #include <stdlib.h> #include <pthread.h> -main() { +int main() { pthread_cond_t cond; pthread_mutex_t mutex; pthread_condattr_t condattr; pthread_mutexattr_t mutexattr; - exit ( + return ( pthread_condattr_init(&condattr) || pthread_condattr_setpshared(&condattr, PTHREAD_PROCESS_SHARED) || pthread_mutexattr_init(&mutexattr) || @@ -31,7 +31,7 @@ AC_TRY_LINK([ pthread_mutex_t mutex; pthread_condattr_t condattr; pthread_mutexattr_t mutexattr; - exit ( + return ( pthread_condattr_init(&condattr) || pthread_condattr_setpshared(&condattr, PTHREAD_PROCESS_SHARED) || pthread_mutexattr_init(&mutexattr) || @@ -49,12 +49,12 @@ AC_DEFUN(AM_PTHREADS_PRIVATE, [ AC_TRY_RUN([ #include <stdlib.h> #include <pthread.h> -main() { +int main() { pthread_cond_t cond; pthread_mutex_t mutex; pthread_condattr_t condattr; pthread_mutexattr_t mutexattr; - exit ( + return ( pthread_condattr_init(&condattr) || pthread_mutexattr_init(&mutexattr) || pthread_cond_init(&cond, &condattr) || @@ -73,7 +73,7 @@ AC_TRY_LINK([ pthread_mutex_t mutex; pthread_condattr_t condattr; pthread_mutexattr_t mutexattr; - exit ( + return ( pthread_condattr_init(&condattr) || pthread_mutexattr_init(&mutexattr) || pthread_cond_init(&cond, &condattr) || @@ -89,10 +89,10 @@ AC_DEFUN(AM_PTHREADS_CONDVAR_DUPINITCHK, [ AC_TRY_RUN([ #include <stdlib.h> #include <pthread.h> -main() { +int main() { pthread_cond_t cond; pthread_condattr_t condattr; - exit(pthread_condattr_init(&condattr) || + return (pthread_condattr_init(&condattr) || pthread_cond_init(&cond, &condattr) || pthread_cond_init(&cond, &condattr)); }], [db_cv_pthread_condinit_dupgood="yes"], @@ -102,7 +102,7 @@ AC_TRY_LINK([ #include <pthread.h>], [ pthread_cond_t cond; pthread_condattr_t condattr; - exit(pthread_condattr_init(&condattr) || + return (pthread_condattr_init(&condattr) || pthread_cond_init(&cond, &condattr)); ], [db_cv_pthread_condinit_dupgood="yes"], [db_cv_pthread_condinit_dupgood="no"]))]) @@ -110,10 +110,10 @@ AC_DEFUN(AM_PTHREADS_RWLOCKVAR_DUPINITCHK, [ AC_TRY_RUN([ #include <stdlib.h> #include <pthread.h> -main() { +int main() { pthread_rwlock_t rwlock; pthread_rwlockattr_t rwlockattr; - exit(pthread_rwlockattr_init(&rwlockattr) || + return (pthread_rwlockattr_init(&rwlockattr) || pthread_rwlock_init(&rwlock, &rwlockattr) || pthread_rwlock_init(&rwlock, &rwlockattr)); }], [db_cv_pthread_rwlockinit_dupgood="yes"], @@ -123,7 +123,7 @@ AC_TRY_LINK([ #include <pthread.h>], [ pthread_rwlock_t rwlock; pthread_rwlockattr_t rwlockattr; - exit(pthread_rwlockattr_init(&rwlockattr) || + exit (pthread_rwlockattr_init(&rwlockattr) || pthread_rwlock_init(&rwlock, &rwlockattr)); ], [db_cv_pthread_rwlockinit_dupgood="yes"], [db_cv_pthread_rwlockinit_dupgood="no"]))]) @@ -282,7 +282,7 @@ if test "$db_cv_mutex" = no; then # x86/gcc: FreeBSD, NetBSD, BSD/OS, Linux AC_TRY_COMPILE(,[ #if (defined(i386) || defined(__i386__)) && defined(__GNUC__) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -291,7 +291,7 @@ if test "$db_cv_mutex" = no; then # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux AC_TRY_COMPILE(,[ #if (defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -314,7 +314,7 @@ if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ #if defined(__sparc__) && defined(__GNUC__) asm volatile ("membar #StoreStore|#StoreLoad|#LoadStore"); - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -356,7 +356,7 @@ AC_TRY_LINK([ msem_init(&x, 0); msem_lock(&x, 0); msem_unlock(&x, 0); - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -373,7 +373,7 @@ AC_TRY_LINK([ msem_init(&x, 0); msem_lock(&x, 0); msem_unlock(&x, 0); - exit(0); + return (0); ], [db_cv_mutex=UNIX/msem_init]) fi @@ -395,7 +395,7 @@ fi if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ #if defined(__USLC__) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -452,7 +452,7 @@ fi if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ #if defined(__alpha) && defined(__DECC) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -463,7 +463,7 @@ fi if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ #if defined(__alpha) && defined(__GNUC__) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -474,7 +474,7 @@ fi if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ #if defined(__arm__) && defined(__GNUC__) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -485,7 +485,7 @@ fi if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ #if (defined(__mips) || defined(__mips__)) && defined(__GNUC__) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -496,7 +496,7 @@ fi if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ #if (defined(__hppa) || defined(__hppa__)) && defined(__GNUC__) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -507,7 +507,7 @@ fi if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ #if (defined(__powerpc__) || defined(__ppc__)) && defined(__GNUC__) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -518,7 +518,7 @@ fi if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ #if (defined(mc68020) || defined(sun3)) && defined(__GNUC__) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -529,7 +529,7 @@ fi if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ #if defined(__MVS__) && defined(__IBMC__) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -540,7 +540,7 @@ fi if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ #if defined(__s390__) && defined(__GNUC__) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -551,7 +551,7 @@ fi if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ #if defined(__ia64) && defined(__GNUC__) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -562,7 +562,7 @@ fi if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ #if defined(_UTS) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif @@ -910,9 +910,9 @@ fi if test "$db_cv_atomic" = no; then AC_TRY_COMPILE(,[ #if ((defined(i386) || defined(__i386__)) && defined(__GNUC__)) - exit(0); + return (0); #elif ((defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__)) - exit(0); + return (0); #else FAIL TO COMPILE/LINK #endif diff --git a/dist/aclocal/options.m4 b/dist/aclocal/options.m4 index c007fba6..9bf6d339 100644 --- a/dist/aclocal/options.m4 +++ b/dist/aclocal/options.m4 @@ -175,6 +175,13 @@ AC_ARG_ENABLE(debug_wop, [db_cv_debug_wop="$enable_debug_wop"], [db_cv_debug_wop="no"]) AC_MSG_RESULT($db_cv_debug_wop) +AC_MSG_CHECKING(if --enable-error_history option specified) +AC_ARG_ENABLE(error_history, + [AC_HELP_STRING([--enable-error_history], + [Build a version that records extra information about errors])], + [db_cv_error_history="$enable_error_history"], [db_cv_error_history="no"]) +AC_MSG_RESULT($db_cv_error_history) + AC_MSG_CHECKING(if --enable-diagnostic option specified) AC_ARG_ENABLE(diagnostic, [AC_HELP_STRING([--enable-diagnostic], @@ -354,6 +361,21 @@ AC_ARG_ENABLE(perfmon_statistics, [db_cv_perfmon_statistics="$enable_perfmon_statistics"], [db_cv_perfmon_statistics="no"]) AC_MSG_RESULT($db_cv_perfmon_statistics) +# Application which use failchk can choose to inform all threads waiting on +# mutexes to be notified as soon as possible after a crash thread is detected. +AC_MSG_CHECKING(if --enable-failchk_broadcast option specified) +AC_ARG_ENABLE(failchk_broadcast, + [AC_HELP_STRING([--enable-failchk_broadcast], + [Add support for immediately broadcasting failchk events to all waiting threads])], + [db_cv_failchk_broadcast="$enable_failchk_broadcast"], [db_cv_failchk_broadcast="no"]) +AC_MSG_RESULT($db_cv_failchk_broadcast) +if test "$db_cv_failchk_broadcast" = "yes"; then + AC_DEFINE(HAVE_FAILCHK_BROADCAST) + AH_TEMPLATE(HAVE_FAILCHK_BROADCAST, + [Define to 1 for failchk to inform all waiting threads about crashes.]) + ADDITIONAL_PROGS="$ADDITIONAL_PROGS test_failchk" +fi + AC_MSG_CHECKING(if --enable-uimutexes option specified) AC_ARG_ENABLE(uimutexes, [AC_HELP_STRING([--enable-uimutexes], @@ -388,30 +410,6 @@ if test "$db_cv_atomicfileread" = "yes"; then [Define to 1 if platform reads and writes files atomically.]) fi -# Cryptography support. -# Until Berkeley DB 5.0, this was a simple yes/no decision. -# With the addition of support for Intel Integrated Performance Primitives (ipp) -# things are more complex. There are now three options: -# 1) don't build cryptography (no) -# 2) build using the built-in software implementation (yes) -# 3) build using the Intel IPP implementation (ipp) -# We handle this by making the primary configuration method: -# --with-cryptography={yes|no|ipp} -# which defaults to yes. The old enable/disable-cryptography argument is still -# supported for backwards compatibility. -AC_MSG_CHECKING(if --with-cryptography option specified) -AC_ARG_ENABLE(cryptography, [], [], enableval=$db_cv_build_full) -enable_cryptography="$enableval" -AC_ARG_WITH([cryptography], - AC_HELP_STRING([--with-cryptography=yes|no|ipp], [Build database cryptography support @<:@default=yes@:>@.]), - [], [with_cryptography=$enable_cryptography]) -case "$with_cryptography" in -yes|no|ipp) ;; -*) AC_MSG_ERROR([unknown --with-cryptography argument \'$with_cryptography\']) ;; -esac -db_cv_build_cryptography="$with_cryptography" -AC_MSG_RESULT($db_cv_build_cryptography) - AC_MSG_CHECKING(if --with-mutex=MUTEX option specified) AC_ARG_WITH(mutex, [AC_HELP_STRING([--with-mutex=MUTEX], @@ -480,6 +478,40 @@ if test "$db_cv_jdbc" = "yes" -a "$db_cv_sql" = "no"; then db_cv_sql=$db_cv_jdbc fi +# Cryptography support. +# Until Berkeley DB 5.0, this was a simple yes/no decision. +# With the addition of support for Intel Integrated Performance Primitives (ipp) +# things are more complex. There are now three options: +# 1) don't build cryptography (no) +# 2) build using the built-in software implementation (yes) +# 3) build using the Intel IPP implementation (ipp) +# We handle this by making the primary configuration method: +# --with-cryptography={yes|no|ipp} +# which defaults to yes, unless building the SQL library(--enable-sql). +# The old enable/disable-cryptography argument is still +# supported for backwards compatibility. +AC_MSG_CHECKING(if --with-cryptography option specified) +build_cryptography="$db_cv_build_full"; +if test "$db_cv_sql" = "yes" -a "$build_cryptography" = "yes"; then + build_cryptography="no"; +fi +AC_ARG_ENABLE(cryptography, [], [], [enableval=$build_cryptography]) +enable_cryptography="$enableval" +AC_ARG_WITH([cryptography], + AC_HELP_STRING([--with-cryptography=yes|no|ipp], [Build database cryptography support. The default value is "yes", unless building the SQL library.]), + [], [with_cryptography=$enable_cryptography]) +case "$with_cryptography" in +yes|no|ipp) ;; +*) AC_MSG_ERROR([unknown --with-cryptography argument \'$with_cryptography\']) ;; +esac +db_cv_build_cryptography="$with_cryptography" +if test -d "$topdir/src/crypto" ; then + AC_MSG_RESULT($db_cv_build_cryptography) +else + db_cv_build_cryptography="no" + AC_MSG_WARN(Ignoring --with-cryptography flag value. The NC package builds a Berkeley DB library that does not support encryption.) +fi + # Testing requires Tcl. if test "$db_cv_test" = "yes" -a "$db_cv_tcl" = "no"; then AC_MSG_ERROR([--enable-test requires --enable-tcl]) diff --git a/dist/aclocal/sequence.m4 b/dist/aclocal/sequence.m4 index 6e99b936..fffdcc44 100644 --- a/dist/aclocal/sequence.m4 +++ b/dist/aclocal/sequence.m4 @@ -43,7 +43,9 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [ # test, which won't test for the appropriate printf format strings. if test "$db_cv_build_sequence" = "yes"; then AC_TRY_RUN([ - main() { + #include <stdio.h> + #include <string.h> + int main() { $db_cv_seq_type l; unsigned $db_cv_seq_type u; char buf@<:@100@:>@; @@ -59,7 +61,9 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [ return (1); return (0); }],, [db_cv_build_sequence="no"], - AC_TRY_LINK(,[ + AC_TRY_LINK([ + #include <stdio.h> + #include <string.h>],[ $db_cv_seq_type l; unsigned $db_cv_seq_type u; char buf@<:@100@:>@; diff --git a/dist/aclocal/sql.m4 b/dist/aclocal/sql.m4 index c43edb8d..7b27bf8b 100644 --- a/dist/aclocal/sql.m4 +++ b/dist/aclocal/sql.m4 @@ -91,7 +91,12 @@ esac # !!! END COPIED from autoconf distribution sqlite_dir=$srcdir/../lang/sql/sqlite -(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline" && cat build_config.h >> config.h) || exit 1 +orig_CPPFLAGS="$CPPFLAGS" +jdbc_variables="" +if test "$db_cv_build_cryptography" = "yes"; then + CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1" +fi +(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline " && cat build_config.h >> config.h) || exit 1 # Configure JDBC if --enable-jdbc if test "$db_cv_jdbc" != "no"; then @@ -121,7 +126,6 @@ if test "$db_cv_jdbc" != "no"; then test "$prefix" != "" && jdbc_args="--prefix=$prefix --with-jardir=$prefix/jar" test "$enable_shared" != "" && jdbc_args="$jdbc_args --enable-shared=$enable_shared" test "$enable_static" != "" && jdbc_args="$jdbc_args --enable-static=$enable_static" - test "$cross_compiling" = "yes" && jdbc_args="$jdbc_args --build=$build --host=$host " # 1. The build directory is build_unix/jdbc, so the include paths are relative # to that. @@ -132,6 +136,7 @@ if test "$db_cv_jdbc" != "no"; then $CFLAGS $CPPFLAGS\"" # Set LDFLAGS for JDBC driver test "$LDFLAGS" != "" && jdbc_flags="$jdbc_flags LDFLAGS=\"$LDFLAGS\"" + test "$db_cv_build_cryptography" = "yes" && jdbc_flags="$jdbc_flags HAVE_SQLITE3_KEY=1" # Copy ../lang/sql/jdbc to build_unix/ test ! -d jdbc && cp -r $jdbc_dir . @@ -146,4 +151,6 @@ if test "$db_cv_jdbc" != "no"; then sed "s/@BDB_LIB@/$BDB_LIB/g" Makefile.in.tmp > Makefile.in eval "\$SHELL ./configure --with-sqlite3=../../lang/sql/generated $jdbc_args $jdbc_flags" fi + +CPPFLAGS="$orig_CPPFLAGS" ]) diff --git a/dist/aclocal/types.m4 b/dist/aclocal/types.m4 index c3a2b78d..af7b5354 100644 --- a/dist/aclocal/types.m4 +++ b/dist/aclocal/types.m4 @@ -180,6 +180,13 @@ AC_SUBST(FILE_t_decl) AC_CHECK_TYPE(FILE *,, AC_MSG_ERROR([No FILE type.]), $db_includes) AC_SUBST(off_t_decl) AC_CHECK_TYPE(off_t,, AC_MSG_ERROR([No off_t type.]), $db_includes) +AC_CHECK_SIZEOF(off_t,, $db_includes) + +# db_off_t should be set to a signed integer type that is the same +# size as off_t +AC_SUBST(db_off_t_decl) +AC_CHECK_TYPE(db_off_t,, + [AM_SEARCH_SSIZES(db_off_t_decl, db_off_t, $ac_cv_sizeof_off_t)]) AC_SUBST(pid_t_decl) AC_CHECK_TYPE(pid_t,, AC_MSG_ERROR([No pid_t type.]), $db_includes) AC_SUBST(size_t_decl) |