X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=configure.in;h=109eb0c0b0caa9693ce81ada7508fee0b8561319;hb=e5487f65fdbd05716ade642a3ae1c5c6e85b6f22;hp=ff5964d77e2302fbb4e0c5ace8ad2e09ce2da6f4;hpb=62f09e92beba437a02777c8b2f7988c98a355d1c;p=postgresql diff --git a/configure.in b/configure.in index ff5964d77e..109eb0c0b0 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $PostgreSQL: pgsql/configure.in,v 1.586 2009/01/14 16:39:58 momjian Exp $ +dnl configure.in dnl dnl Developers, please strive to achieve this order: dnl @@ -17,13 +17,13 @@ dnl Read the Autoconf manual for details. dnl m4_pattern_forbid(^PGAC_)dnl to catch undefined macros -AC_INIT([PostgreSQL], [8.4devel], [pgsql-bugs@postgresql.org]) +AC_INIT([PostgreSQL], [9.1devel], [pgsql-bugs@postgresql.org]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required. +m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required. Untested combinations of 'autoconf' and PostgreSQL versions are not recommended. You can remove the check from 'configure.in' but it is then your responsibility whether the result works or not.])]) -AC_COPYRIGHT([Copyright (c) 1996-2009, PostgreSQL Global Development Group]) +AC_COPYRIGHT([Copyright (c) 1996-2011, PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) AC_PREFIX_DEFAULT(/usr/local/pgsql) @@ -230,7 +230,7 @@ AC_SUBST(enable_coverage) # PGAC_ARG_BOOL(enable, dtrace, no, [build with DTrace support], -[AC_DEFINE([ENABLE_DTRACE], 1, +[AC_DEFINE([ENABLE_DTRACE], 1, [Define to 1 to enable DTrace support. (--enable-dtrace)]) AC_CHECK_PROGS(DTRACE, dtrace) if test -z "$DTRACE"; then @@ -262,14 +262,14 @@ AC_DEFINE_UNQUOTED([BLCKSZ], ${BLCKSZ}, [ can set it bigger if you need bigger tuples (although TOAST should reduce the need to have large tuples, since fields can be spread across multiple tuples). - + BLCKSZ must be a power of 2. The maximum possible value of BLCKSZ is currently 2^15 (32768). This is determined by the 15-bit widths of the lp_off and lp_len fields in ItemIdData (see include/storage/itemid.h). - + Changing BLCKSZ requires an initdb. -]) +]) # # Relation segment size @@ -288,7 +288,7 @@ AC_DEFINE_UNQUOTED([RELSEG_SIZE], ${RELSEG_SIZE}, [ RELSEG_SIZE is the maximum number of blocks allowed in one disk file. Thus, the maximum size of a single file is RELSEG_SIZE * BLCKSZ; relations bigger than that are divided into multiple files. - + RELSEG_SIZE * BLCKSZ must be less than your OS' limit on file size. This is often 2 GB or 4GB in a 32-bit operating system, unless you have large file support enabled. By default, we make the limit 1 GB @@ -329,7 +329,7 @@ AC_DEFINE_UNQUOTED([XLOG_BLCKSZ], ${XLOG_BLCKSZ}, [ buffers, else direct I/O may fail. Changing XLOG_BLCKSZ requires an initdb. -]) +]) # # WAL segment size @@ -402,7 +402,7 @@ unset CFLAGS # else: If the template file set something, that is used. # else: If coverage was enabled, don't set anything. # else: If the compiler is GCC, then we use -O2. -# else: If the compiler is something else, then we use -O. +# else: If the compiler is something else, then we use -O, unless debugging. if test "$ac_env_CFLAGS_set" = set; then CFLAGS=$ac_env_CFLAGS_value @@ -421,7 +421,8 @@ fi # Some versions of GCC support some additional useful warning flags. # Check whether they are supported, and add them to CFLAGS if so. -# ICC pretends to be GCC but it's lying; it doesn't support these options. +# ICC pretends to be GCC but it's lying; it doesn't support these flags, +# but has its own. Also check other compiler-specific flags here. if test "$GCC" = yes -a "$ICC" = no; then CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith" @@ -438,8 +439,8 @@ elif test "$ICC" = yes; then PGAC_PROG_CC_CFLAGS_OPT([-mp1]) # Make sure strict aliasing is off (though this is said to be the default) PGAC_PROG_CC_CFLAGS_OPT([-fno-strict-aliasing]) -elif test x"${CC}" = x"xlc"; then - # AIX xlc has to have strict aliasing turned off too +elif test "$PORTNAME" = "aix"; then + # AIX's xlc has to have strict aliasing turned off too PGAC_PROG_CC_CFLAGS_OPT([-qnoansialias]) fi @@ -460,7 +461,7 @@ fi # enable profiling if --enable-profiling if test "$enable_profiling" = yes && test "$ac_cv_prog_cc_g" = yes; then if test "$GCC" = yes; then - AC_DEFINE([PROFILE_PID_DIR], 1, + AC_DEFINE([PROFILE_PID_DIR], 1, [Define to 1 to allow profiling output to be saved separately for each process.]) CFLAGS="$CFLAGS -pg $PLATFORM_PROFILE_FLAGS" else @@ -557,17 +558,8 @@ IFS=$ac_save_IFS # Enable thread-safe client libraries # AC_MSG_CHECKING([allow thread-safe client libraries]) -if test "$PORTNAME" != "win32"; then -PGAC_ARG_BOOL(enable, thread-safety, no, [make client libraries thread-safe]) -else -# Win32 should always use threads -PGAC_ARG_BOOL(enable, thread-safety, yes, [make client libraries thread-safe]) -fi - -PGAC_ARG_BOOL(enable, thread-safety-force, no, [force thread-safety despite thread test failure]) -if test "$enable_thread_safety" = yes -o \ - "$enable_thread_safety_force" = yes; then - enable_thread_safety="yes" # for 'force' +PGAC_ARG_BOOL(enable, thread-safety, yes, [disable thread-safety in client libraries]) +if test "$enable_thread_safety" = yes; then AC_DEFINE([ENABLE_THREAD_SAFETY], 1, [Define to 1 to build client libraries as thread-safe code. (--enable-thread-safety)]) fi @@ -793,7 +785,8 @@ AC_SUBST(ELF_SYS) CPPFLAGS="$CPPFLAGS $INCLUDES" LDFLAGS="$LDFLAGS $LIBDIRS" -AC_ARG_VAR(LDFLAGS_SL) +AC_ARG_VAR(LDFLAGS_EX, [extra linker flags for linking executables only]) +AC_ARG_VAR(LDFLAGS_SL, [extra linker flags for linking shared libraries only]) PGAC_PROG_LD AC_SUBST(LD) @@ -820,12 +813,22 @@ fi AC_PATH_PROG(TAR, tar) AC_PROG_LN_S AC_PROG_AWK +AC_PROG_MKDIR_P +# When Autoconf chooses install-sh as mkdir -p program it tries to generate +# a relative path to it in each makefile where it subsitutes it. This clashes +# with our Makefile.global concept. This workaround helps. +case $MKDIR_P in + *install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';; +esac PGAC_PATH_BISON PGAC_PATH_FLEX PGAC_PATH_PERL if test "$with_perl" = yes; then + if test -z "$PERL"; then + AC_MSG_ERROR([Perl not found]) + fi PGAC_CHECK_PERL_CONFIGS([archlibexp,privlibexp,useshrplib]) PGAC_CHECK_PERL_EMBED_LDFLAGS fi @@ -871,11 +874,8 @@ AC_SEARCH_LIBS(crypt, crypt) # Solaris: AC_SEARCH_LIBS(fdatasync, [rt posix4]) # Required for thread_test.c on Solaris 2.5: -case $host_os in - solaris*) - AC_SEARCH_LIBS(gethostbyname_r, nsl) - ;; -esac +# Other ports use it too (HP-UX) so test unconditionally +AC_SEARCH_LIBS(gethostbyname_r, nsl) # Cygwin: AC_SEARCH_LIBS(shmget, cygipc) @@ -915,7 +915,7 @@ fi if test "$with_krb5" = yes ; then if test "$PORTNAME" != "win32"; then - AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' com_err], [], + AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' com_err 'com_err -lssl -lcrypto'], [], [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])]) AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [], [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])]) @@ -964,7 +964,16 @@ AC_SUBST(OSSP_UUID_LIBS) ## dnl sys/socket.h is required by AC_FUNC_ACCEPT_ARGTYPES -AC_CHECK_HEADERS([crypt.h dld.h fp_class.h getopt.h ieeefp.h langinfo.h poll.h pwd.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/tas.h sys/time.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h]) +AC_CHECK_HEADERS([crypt.h dld.h fp_class.h getopt.h ieeefp.h ifaddrs.h langinfo.h poll.h pwd.h sys/ioctl.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/socket.h sys/sockio.h sys/tas.h sys/time.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h]) + +# On BSD, cpp test for net/if.h will fail unless sys/socket.h +# is included first. +AC_CHECK_HEADERS(net/if.h, [], [], +[AC_INCLUDES_DEFAULT +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +]) # At least on IRIX, cpp test for netinet/tcp.h will fail unless # netinet/in.h is included first. @@ -1061,7 +1070,7 @@ if test "$with_ldap" = yes ; then fi if test "$with_bonjour" = yes ; then - AC_CHECK_HEADER(DNSServiceDiscovery/DNSServiceDiscovery.h, [], [AC_MSG_ERROR([header file is required for Bonjour])]) + AC_CHECK_HEADER(dns_sd.h, [], [AC_MSG_ERROR([header file is required for Bonjour])]) fi # for contrib/uuid-ossp @@ -1079,7 +1088,7 @@ fi m4_defun([AC_PROG_CC_STDC], []) dnl We don't want that. AC_C_BIGENDIAN AC_C_CONST -AC_C_INLINE +PGAC_C_INLINE AC_C_STRINGIZE PGAC_C_SIGNED AC_C_VOLATILE @@ -1090,6 +1099,9 @@ PGAC_STRUCT_SOCKADDR_UN PGAC_STRUCT_SOCKADDR_STORAGE PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS PGAC_STRUCT_ADDRINFO +AC_TYPE_INTPTR_T +AC_TYPE_UINTPTR_T +AC_TYPE_LONG_LONG_INT AC_CHECK_TYPES([struct cmsgcred, struct fcred, struct sockcred], [], [], [#include @@ -1129,11 +1141,25 @@ if test "$with_krb5" = yes; then AC_MSG_CHECKING(for krb5_free_unparsed_name) AC_TRY_LINK([#include ], [krb5_free_unparsed_name(NULL,NULL);], - [AC_DEFINE(HAVE_KRB5_FREE_UNPARSED_NAME, 1, [Define to 1 if you have krb5_free_unparsed_name]) + [AC_DEFINE(HAVE_KRB5_FREE_UNPARSED_NAME, 1, [Define to 1 if you have krb5_free_unparsed_name]) AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)]) fi +# Check largefile support. You might think this is a system service not a +# compiler characteristic, but you'd be wrong. We must check this before +# probing existence of related functions such as fseeko, since the largefile +# defines can affect what is generated for that. +AC_SYS_LARGEFILE + +# Check for largefile support (must be after AC_SYS_LARGEFILE) +AC_CHECK_SIZEOF([off_t]) + +# If we don't have largefile support, can't handle segsize >= 2GB. +if test "$ac_cv_sizeof_off_t" -lt 8 -a "$segsize" != "1"; then + AC_MSG_ERROR([Large file support is not enabled. Segment size cannot be larger than 1GB.]) +fi + ## ## Functions, global variables @@ -1143,10 +1169,28 @@ PGAC_VAR_INT_TIMEZONE AC_FUNC_ACCEPT_ARGTYPES PGAC_FUNC_GETTIMEOFDAY_1ARG -AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getpeereid getpeerucred getrlimit memmove poll posix_fadvise pstat readlink setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs]) +AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getifaddrs getpeereid getpeerucred getrlimit memmove poll pstat readlink scandir setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs]) -AC_CHECK_DECLS(fdatasync, [], [], [#include ]) +AC_REPLACE_FUNCS(fseeko) +case $host_os in + # BSD/OS & NetBSD use a custom fseeko/ftello built on fsetpos/fgetpos + # Mingw uses macros to access Win32 API calls + bsdi*|netbsd*|mingw*) + AC_DEFINE(HAVE_FSEEKO, 1, [Define to 1 because replacement version used.]) + ac_cv_func_fseeko=yes;; + *) + AC_FUNC_FSEEKO;; +esac + +# posix_fadvise() is a no-op on Solaris, so don't incur function overhead +# by calling it, 2009-04-02 +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/gen/posix_fadvise.c +if test "$PORTNAME" != "solaris"; then +AC_CHECK_FUNCS(posix_fadvise) AC_CHECK_DECLS(posix_fadvise, [], [], [#include ]) +fi + +AC_CHECK_DECLS(fdatasync, [], [], [#include ]) AC_CHECK_DECLS([strlcat, strlcpy]) # This is probably only present on Darwin, but may as well check always AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include ]) @@ -1184,8 +1228,8 @@ if test "$PORTNAME" = "win32"; then # # To properly translate all NLS languages strings, we must support the # *printf() %$ format, which allows *printf() arguments to be selected - # by position in the translated string. - # + # by position in the translated string. + # # libintl versions < 0.13 use the native *printf() functions, and Win32 # *printf() doesn't understand %$, so we must use our /port versions, # which do understand %$. libintl versions >= 0.13 include their own @@ -1244,7 +1288,19 @@ fi pgac_save_LIBS="$LIBS" LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'` -AC_REPLACE_FUNCS([crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul unsetenv]) +AC_REPLACE_FUNCS([crypt erand48 getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul]) + +case $host_os in + + # Windows uses a specialised env handler + mingw*) + AC_DEFINE(HAVE_UNSETENV, 1, [Define to 1 because replacement version used.]) + ac_cv_func_unsetenv=yes;; + *) + AC_REPLACE_FUNCS([unsetenv]) + ;; +esac + LIBS="$pgac_save_LIBS" @@ -1260,44 +1316,70 @@ else fi # Similarly, use system's getopt_long() only if system provides struct option. +if test x"$ac_cv_type_struct_option" = xyes ; then + AC_REPLACE_FUNCS([getopt_long]) +else + AC_LIBOBJ(getopt_long) +fi + # Solaris' getopt() doesn't do what we want for long options, so always use -# our versions on that platform. +# our version on that platform. if test "$PORTNAME" = "solaris"; then AC_LIBOBJ(getopt) +fi + +# mingw has adopted a GNU-centric interpretation of optind/optreset, +# so always use our version on Windows. +if test "$PORTNAME" = "win32"; then + AC_LIBOBJ(getopt) AC_LIBOBJ(getopt_long) -elif test x"$ac_cv_type_struct_option" = xyes ; then - AC_REPLACE_FUNCS([getopt_long]) -else - AC_LIBOBJ(getopt_long) +fi + +# Cygwin's erand48() is broken (always returns zero) in some releases, +# so force use of ours. +if test "$PORTNAME" = "cygwin"; then + AC_LIBOBJ(erand48) fi # Win32 support if test "$PORTNAME" = "win32"; then -AC_REPLACE_FUNCS(gettimeofday) -AC_LIBOBJ(kill) -AC_LIBOBJ(open) -AC_LIBOBJ(rand) -AC_LIBOBJ(win32error) -AC_DEFINE([HAVE_SYMLINK], 1, - [Define to 1 if you have the `symlink' function.]) + AC_REPLACE_FUNCS(gettimeofday) + AC_LIBOBJ(kill) + AC_LIBOBJ(open) + AC_LIBOBJ(win32env) + AC_LIBOBJ(win32error) + AC_DEFINE([HAVE_SYMLINK], 1, + [Define to 1 if you have the `symlink' function.]) + AC_CHECK_TYPES(MINIDUMP_TYPE, [pgac_minidump_type=yes], [pgac_minidump_type=no], [ +#define WIN32_LEAN_AND_MEAN +#include +#include +#include ]) +fi +if test x"$pgac_minidump_type" = x"yes" ; then + AC_SUBST(have_win32_dbghelp,yes) +else + AC_SUBST(have_win32_dbghelp,no) fi if test "$with_readline" = yes; then PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER AC_CHECK_FUNCS([rl_completion_matches rl_filename_completion_function]) - AC_CHECK_FUNCS([replace_history_entry]) + AC_CHECK_FUNCS([append_history history_truncate_file]) fi dnl Cannot use AC_CHECK_FUNC because sigsetjmp may be a macro dnl (especially on GNU libc) dnl See also comments in c.h. -AC_MSG_CHECKING(for sigsetjmp) -AC_TRY_LINK([#include ], +AC_CACHE_CHECK([for sigsetjmp], pgac_cv_func_sigsetjmp, +[AC_TRY_LINK([#include ], [sigjmp_buf x; sigsetjmp(x, 1);], - [AC_DEFINE(HAVE_SIGSETJMP, 1, [Define to 1 if you have sigsetjmp().]) -AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) + [pgac_cv_func_sigsetjmp=yes], + [pgac_cv_func_sigsetjmp=no])]) +if test x"$pgac_cv_func_sigsetjmp" = x"yes"; then + AC_DEFINE(HAVE_SIGSETJMP, 1, [Define to 1 if you have sigsetjmp().]) +fi AC_DECL_SYS_SIGLIST @@ -1305,6 +1387,15 @@ AC_CHECK_FUNC(syslog, [AC_CHECK_HEADER(syslog.h, [AC_DEFINE(HAVE_SYSLOG, 1, [Define to 1 if you have the syslog interface.])])]) +AC_CACHE_CHECK([for opterr], pgac_cv_var_int_opterr, +[AC_TRY_LINK([#include ], + [extern int opterr; opterr = 1;], + [pgac_cv_var_int_opterr=yes], + [pgac_cv_var_int_opterr=no])]) +if test x"$pgac_cv_var_int_opterr" = x"yes"; then + AC_DEFINE(HAVE_INT_OPTERR, 1, [Define to 1 if you have the global variable 'int opterr'.]) +fi + AC_CACHE_CHECK([for optreset], pgac_cv_var_int_optreset, [AC_TRY_LINK([#include ], [extern int optreset; optreset = 1;], @@ -1322,17 +1413,6 @@ AC_CHECK_FUNCS(atexit, [], [AC_CHECK_FUNCS(on_exit, [], [AC_MSG_ERROR([neither atexit() nor on_exit() found])])]) -AC_REPLACE_FUNCS(fseeko) -case $host_os in - # BSD/OS & NetBSD use a custom fseeko/ftello built on fsetpos/fgetpos - # Mingw uses macros to access Win32 API calls - bsdi*|netbsd*|mingw*) - AC_DEFINE(HAVE_FSEEKO, 1, [Define to 1 because replacement version used.]) - ac_cv_func_fseeko=yes;; - *) - AC_FUNC_FSEEKO;; -esac - # # Pthreads @@ -1355,13 +1435,7 @@ PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_REENTRANT -D_THREAD_SAFE -D_POSIX_PTHREAD_SEM if test "$PTHREAD_CC" != "$CC"; then AC_MSG_ERROR([ PostgreSQL does not support platforms that require a special compiler -for thread safety.]) -fi - -if test "$THREAD_SUPPORT" = no; then -AC_MSG_ERROR([cannot enable threads on this platform -This platform is known to not support thread-safe programs. For details, -compile and run src/bin/pg_thread_test.]) +for thread safety; use --disable-thread-safety to disable thread safety.]) fi # Check for *_r functions @@ -1371,7 +1445,8 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LIBS="$LIBS $PTHREAD_LIBS" if test "$PORTNAME" != "win32"; then -AC_CHECK_HEADER(pthread.h, [], [AC_MSG_ERROR([pthread.h not found, required for --enable-thread-safety])]) +AC_CHECK_HEADER(pthread.h, [], [AC_MSG_ERROR([ +pthread.h not found; use --disable-thread-safety to disable thread safety])]) fi AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r]) @@ -1462,10 +1537,16 @@ dnl If there is no native snprintf() or it does not handle the 64-bit type, dnl we force our own version of snprintf() to be used instead. dnl Note this test must be run after our initial check for snprintf/vsnprintf. +dnl As of Postgres 8.4, we no longer support compilers without a working +dnl 64-bit type. But we still handle the case of snprintf being broken. + PGAC_TYPE_64BIT_INT([long int]) if test x"$HAVE_LONG_INT_64" = x"no" ; then PGAC_TYPE_64BIT_INT([long long int]) + if test x"$HAVE_LONG_LONG_INT_64" = x"no" ; then + AC_MSG_ERROR([Cannot find a working 64-bit integer type.]) + fi fi @@ -1509,10 +1590,10 @@ else fi AC_DEFINE_UNQUOTED(INT64_FORMAT, $INT64_FORMAT, - [Define to the appropriate snprintf format for 64-bit ints, if any.]) + [Define to the appropriate snprintf format for 64-bit ints.]) AC_DEFINE_UNQUOTED(UINT64_FORMAT, $UINT64_FORMAT, - [Define to the appropriate snprintf format for unsigned 64-bit ints, if any.]) + [Define to the appropriate snprintf format for unsigned 64-bit ints.]) # Now we have checked all the reasons to replace snprintf if test $pgac_need_repl_snprintf = yes; then @@ -1520,15 +1601,13 @@ if test $pgac_need_repl_snprintf = yes; then AC_LIBOBJ(snprintf) fi -# Need a #define for the size of Datum (unsigned long) -AC_CHECK_SIZEOF([unsigned long]) - -# And check size of void *, size_t (enables tweaks for > 32bit address space) +# Check size of void *, size_t (enables tweaks for > 32bit address space) AC_CHECK_SIZEOF([void *]) AC_CHECK_SIZEOF([size_t]) +AC_CHECK_SIZEOF([long]) # Decide whether float4 is passed by value: user-selectable, enabled by default -AC_MSG_CHECKING([whether to build with float4 passed by value]) +AC_MSG_CHECKING([whether to build with float4 passed by value]) PGAC_ARG_BOOL(enable, float4-byval, yes, [disable float4 passed by value], [AC_DEFINE([USE_FLOAT4_BYVAL], 1, [Define to 1 if you want float4 values to be passed by value. (--enable-float4-byval)]) @@ -1542,7 +1621,7 @@ AC_DEFINE_UNQUOTED([FLOAT4PASSBYVAL], [$float4passbyval], [float4 values are pas # If sizeof(Datum) >= 8, this is user-selectable, enabled by default. # If not, trying to select it is an error. AC_MSG_CHECKING([whether to build with float8 passed by value]) -if test $ac_cv_sizeof_unsigned_long -ge 8 ; then +if test $ac_cv_sizeof_void_p -ge 8 ; then PGAC_ARG_BOOL(enable, float8-byval, yes, [disable float8 passed by value]) else PGAC_ARG_BOOL(enable, float8-byval, no, [disable float8 passed by value]) @@ -1597,42 +1676,16 @@ AC_CHECK_TYPES([int8, uint8, int64, uint64], [], [], AC_CHECK_TYPES(sig_atomic_t, [], [], [#include ]) -# If the user did not disable integer datetimes, check that -# there is a working 64-bit integral type to use. -if test x"$USE_INTEGER_DATETIMES" = x"yes" && - test x"$HAVE_LONG_INT_64" = x"no" && - test x"$HAVE_LONG_LONG_INT_64" = x"no" && - test x"$HAVE_INT64" = x"no" ; then - AC_MSG_ERROR([ -Integer-based datetime support requires a 64-bit integer type, -but no such type could be found. The --disable-integer-datetimes -configure option can be used to disable integer-based storage -of datetime values.]) -fi - - if test "$PORTNAME" != "win32" then PGAC_FUNC_POSIX_SIGNALS if test "$pgac_cv_func_posix_signals" != yes -a "$enable_thread_safety" = yes; then AC_MSG_ERROR([ Thread-safety requires POSIX signals, which are not supported by this -operating system.]) +operating system; use --disable-thread-safety to disable thread safety.]) fi fi -if test $ac_cv_func_fseeko = yes; then -AC_SYS_LARGEFILE -fi - -# Check for largefile support (must be after AC_SYS_LARGEFILE) -AC_CHECK_SIZEOF([off_t]) - -# If we don't have largefile support, can't handle segsize >= 2GB. -if test "$ac_cv_sizeof_off_t" -lt 8 -a "$segsize" != "1"; then - AC_MSG_ERROR([Large file support is not enabled. Segment size cannot be larger than 1GB.]) -fi - # SunOS doesn't handle negative byte comparisons properly with +/- return AC_FUNC_MEMCMP @@ -1666,6 +1719,13 @@ else SHMEM_IMPLEMENTATION="src/backend/port/win32_shmem.c" fi +# Select latch implementation type. +if test "$PORTNAME" != "win32"; then + LATCH_IMPLEMENTATION="src/backend/port/unix_latch.c" +else + LATCH_IMPLEMENTATION="src/backend/port/win32_latch.c" +fi + # If not set in template file, set bytes to use libc memset() if test x"$MEMSET_LOOP_LIMIT" = x"" ; then MEMSET_LOOP_LIMIT=1024 @@ -1698,26 +1758,15 @@ PGAC_PROG_JADE PGAC_CHECK_DOCBOOK(4.2) PGAC_PATH_DOCBOOK_STYLESHEETS PGAC_PATH_COLLATEINDEX -AC_CHECK_PROGS(SGMLSPL, sgmlspl) -PGAC_PATH_DOCBOOK2MAN +AC_CHECK_PROGS(XSLTPROC, xsltproc) +AC_CHECK_PROGS(OSX, [osx sgml2xml sx]) # Thread testing # We have to run the thread test near the end so we have all our symbols # defined. Cross compiling throws a warning. # -if test "$enable_thread_safety_force" = yes; then -if test "$PORTNAME" != "win32" -then - AC_MSG_WARN([ -*** Skipping thread test program. --enable-thread-safety-force was used. -*** Run the program in src/test/thread on the your machine and add proper -*** locking function calls to your applications to guarantee thread safety. -]) -else -AC_MSG_WARN([*** skipping thread test on Win32]) -fi -elif test "$enable_thread_safety" = yes; then +if test "$enable_thread_safety" = yes; then if test "$PORTNAME" != "win32" then AC_MSG_CHECKING([thread safety of required library functions]) @@ -1730,13 +1779,9 @@ AC_TRY_RUN([#include "$srcdir/src/test/thread/thread_test.c"], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) AC_MSG_ERROR([thread test program failed -This platform is not thread-safe. Check the file 'config.log' for the -exact reason. - -You can use the configure option --enable-thread-safety-force to force -threads to be enabled. But you must then run the program in -src/test/thread and add locking function calls to your applications to -guarantee thread safety.])], +This platform is not thread-safe. Check the file 'config.log' or compile +and run src/test/thread/thread_test for the exact reason. +Use --disable-thread-safety to disable thread safety.])], [AC_MSG_RESULT(maybe) AC_MSG_WARN([ *** Skipping thread test program because of cross-compile build. @@ -1749,9 +1794,9 @@ AC_MSG_WARN([*** skipping thread test on Win32]) fi fi -# If compiler will take -Wl,--as-needed then add that to LDFLAGS. -# This is much easier than trying to filter LIBS to the minimum for each -# executable. (Note that shared library links won't use this switch, though.) +# If compiler will take -Wl,--as-needed (or various platform-specific +# spellings thereof) then add that to LDFLAGS. This is much easier than +# trying to filter LIBS to the minimum for each executable. # On (at least) some Red-Hat-derived systems, this switch breaks linking to # libreadline; therefore we postpone testing it until we know what library # dependencies readline has. The test code will try to link with $LIBS. @@ -1760,11 +1805,13 @@ if test "$with_readline" = yes; then else link_test_func=exit fi -if test "$PORTNAME" != "darwin"; then - PGAC_PROG_CC_LDFLAGS_OPT([-Wl,--as-needed], $link_test_func) -else - # On Darwin it's spelled -Wl,-dead_strip_dylibs, but don't try that elsewhere + +if test "$PORTNAME" = "darwin"; then PGAC_PROG_CC_LDFLAGS_OPT([-Wl,-dead_strip_dylibs], $link_test_func) +elif test "$PORTNAME" = "openbsd"; then + PGAC_PROG_CC_LDFLAGS_OPT([-Wl,-Bdynamic], $link_test_func) +else + PGAC_PROG_CC_LDFLAGS_OPT([-Wl,--as-needed], $link_test_func) fi @@ -1820,6 +1867,7 @@ AC_CONFIG_LINKS([ src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION} src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION} + src/backend/port/pg_latch.c:${LATCH_IMPLEMENTATION} src/include/dynloader.h:src/backend/port/dynloader/${template}.h src/include/pg_config_os.h:src/include/port/${template}.h src/Makefile.port:src/makefiles/Makefile.${template} @@ -1827,7 +1875,7 @@ AC_CONFIG_LINKS([ if test "$PORTNAME" = "win32"; then AC_CONFIG_COMMANDS([check_win32_symlinks],[ -# Links sometimes fail undetected on Mingw - +# Links sometimes fail undetected on Mingw - # so here we detect it and warn the user for FILE in $CONFIG_LINKS do @@ -1843,9 +1891,7 @@ AC_CONFIG_HEADERS([src/include/pg_config.h], echo >src/include/stamp-h ]) -AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h]) +AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h], + [echo >src/interfaces/ecpg/include/stamp-h]) AC_OUTPUT - -# Warn about unknown options -PGAC_ARG_CHECK