dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.386 2004/11/22 03:06:35 pgsql Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.452 2006/02/28 21:59:19 momjian Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
dnl
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
-AC_INIT([PostgreSQL], [8.0.0beta5], [pgsql-bugs@postgresql.org])
+AC_INIT([PostgreSQL], [8.2devel], [pgsql-bugs@postgresql.org])
-AC_PREREQ(2.53)
-AC_COPYRIGHT([Copyright 2004 PostgreSQL Global Development Group])
+AC_PREREQ(2.59)
+AC_COPYRIGHT([Copyright (c) 1996-2005, PostgreSQL Global Development Group])
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
AC_CONFIG_AUX_DIR(config)
AC_PREFIX_DEFAULT(/usr/local/pgsql)
AC_SUBST(configure_args, [$ac_configure_args])
-AC_DEFINE_UNQUOTED(PG_VERSION, "$PACKAGE_VERSION", [PostgreSQL version])
+AC_DEFINE_UNQUOTED(PG_VERSION, "$PACKAGE_VERSION", [PostgreSQL version as a string])
AC_CANONICAL_HOST
case $host_os in
aix*) template=aix ;;
- beos*) template=beos ;;
bsdi*) template=bsdi ;;
cygwin*) template=cygwin ;;
darwin*) template=darwin ;;
nextstep*) template=nextstep ;;
openbsd*) template=openbsd ;;
osf*) template=osf ;;
- qnx*) template=qnx4 ;;
sco*) template=sco ;;
solaris*) template=solaris ;;
sunos*) template=sunos4 ;;
# Default port number (--with-pgport), default 5432
#
AC_MSG_CHECKING([for default port number])
-PGAC_ARG_REQ(with, pgport, [ --with-pgport=PORTNUM change default port number [5432]],
+PGAC_ARG_REQ(with, pgport, [ --with-pgport=PORTNUM change default port number [[5432]]],
[default_port=$withval],
[default_port=5432])
AC_MSG_RESULT([$default_port])
fi
if test "$GCC" = yes; then
- CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith"
+ CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith -Winline"
# Some versions of GCC support some additional useful warning flags.
# Check whether they are supported, and add them to CFLAGS if so.
PGAC_PROG_CC_CFLAGS_OPT([-Wdeclaration-after-statement])
- PGAC_PROG_CC_CFLAGS_OPT([-Wold-style-definition])
PGAC_PROG_CC_CFLAGS_OPT([-Wendif-labels])
# Disable strict-aliasing rules; needed for gcc 3.3+
AC_MSG_RESULT([$with_python])
AC_SUBST(with_python)
-#
-# Kerberos 4
-#
-AC_MSG_CHECKING([whether to build with Kerberos 4 support])
-PGAC_ARG_BOOL(with, krb4, no, [ --with-krb4 build with Kerberos 4 support],
-[
- AC_DEFINE(KRB4, 1, [Define to build with Kerberos 4 support. (--with-krb4)])
- krb_srvtab="/etc/srvtab"
-])
-AC_MSG_RESULT([$with_krb4])
-AC_SUBST(with_krb4)
-
-
#
# Kerberos 5
#
AC_SUBST(with_krb5)
-# Using both Kerberos 4 and Kerberos 5 at the same time isn't going to work.
-if test "$with_krb4" = yes && test "$with_krb5" = yes ; then
- AC_MSG_ERROR([Kerberos 4 and Kerberos 5 support cannot be combined])
-fi
-
AC_SUBST(krb_srvtab)
# Kerberos configuration parameters
#
PGAC_ARG_REQ(with, krb-srvnam,
- [ --with-krb-srvnam=NAME name of the service principal in Kerberos [[postgres]]],
+ [ --with-krb-srvnam=NAME name of the default service principal in Kerberos [[postgres]]],
[],
[with_krb_srvnam="postgres"])
AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"],
- [Define to the name of the PostgreSQL service principal in Kerberos. (--with-krb-srvnam=NAME)])
+ [Define to the name of the default PostgreSQL service principal in Kerberos. (--with-krb-srvnam=NAME)])
#
#
-# Rendezvous
+# Bonjour
#
-AC_MSG_CHECKING([whether to build with Rendezvous support])
-PGAC_ARG_BOOL(with, rendezvous, no,
- [ --with-rendezvous build with Rendezvous support],
- [AC_DEFINE([USE_RENDEZVOUS], 1, [Define to 1 to build with Rendezvous support. (--with-rendezvous)])])
-AC_MSG_RESULT([$with_rendezvous])
-AC_SUBST(with_rendezvous)
+AC_MSG_CHECKING([whether to build with Bonjour support])
+PGAC_ARG_BOOL(with, bonjour, no,
+ [ --with-bonjour build with Bonjour support],
+ [AC_DEFINE([USE_BONJOUR], 1, [Define to 1 to build with Bonjour support. (--with-bonjour)])])
+AC_MSG_RESULT([$with_bonjour])
+AC_SUBST(with_bonjour)
#
AC_SUBST(with_openssl)
+#
+# Prefer libedit
+#
+PGAC_ARG_BOOL(with, libedit-preferred, no,
+ [ --with-libedit-preferred prefer BSD Libedit over GNU Readline])
+
+
#
# Readline
#
PGAC_ARG_BOOL(with, readline, yes,
- [ --without-readline do not use Readline])
+ [ --without-readline do not use GNU Readline / BSD Libedit line editing])
# readline on MinGW has problems with backslashes in psql and other bugs.
# This is particularly a problem with non-US code pages.
# Therefore disable its use until we understand the cause. 2004-07-20
#
PGAC_ARG_BOOL(with, zlib, yes,
[ --without-zlib do not use Zlib])
+AC_SUBST(with_zlib)
#
# Elf
PGAC_CHECK_PYTHON_EMBED_SETUP
fi
+# Supply a numeric version string for use by 3rd party add-ons
+PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' |
+$AWK -F'.' '{printf \"%d%02d%02d\", $1, $2, (NF >= 3) ? $3 : 0}'`"
+AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number])
##
## Libraries
##
-if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha"
-then
- AC_CHECK_LIB(bsd, main)
-fi
-AC_CHECK_LIB(util, setproctitle)
-AC_CHECK_LIB(m, main)
-AC_CHECK_LIB(dl, main)
-AC_CHECK_LIB(nsl, main)
-AC_CHECK_LIB(socket, main)
-AC_CHECK_LIB(ipc, main)
-AC_CHECK_LIB(IPC, main)
-AC_CHECK_LIB(lc, main)
-AC_CHECK_LIB(dld, main)
-AC_CHECK_LIB(ld, main)
-AC_CHECK_LIB(compat, main)
-AC_CHECK_LIB(BSD, main)
-AC_CHECK_LIB(gen, main)
-AC_CHECK_LIB(PW, main)
-AC_CHECK_LIB(resolv, main)
+AC_SEARCH_LIBS(setproctitle, util)
+AC_SEARCH_LIBS(pow, m)
+AC_SEARCH_LIBS(dlopen, dl)
+AC_SEARCH_LIBS(socket, [socket wsock32])
+AC_SEARCH_LIBS(shl_load, dld)
+# We only use libld in port/dynloader/aix.c
+case $host_os in
+ aix*)
+ AC_SEARCH_LIBS(ldopen, ld)
+ ;;
+esac
AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt])
-# QNX:
-AC_CHECK_LIB(unix, main)
-AC_SEARCH_LIBS(crypt, crypt)
-# BeOS:
-if test "$PORTNAME" = "beos"
-then
- AC_CHECK_LIB(bind, __inet_ntoa)
-fi
+AC_SEARCH_LIBS(crypt, crypt)
# Solaris:
AC_SEARCH_LIBS(fdatasync, [rt posix4])
# Cygwin:
-AC_CHECK_LIB(cygipc, shmget)
-# WIN32:
-if test "$PORTNAME" = "win32"
-then
- AC_CHECK_LIB(wsock32, main)
-fi
+AC_SEARCH_LIBS(shmget, cygipc)
if test "$with_readline" = yes; then
PGAC_CHECK_READLINE
*** Not using spinlocks will cause poor performance.])
fi
-if test "$with_krb4" = yes ; then
- AC_CHECK_LIB(des, des_encrypt, [], [AC_MSG_ERROR([library 'des' is required for Kerberos 4])])
- AC_CHECK_LIB(krb, krb_sendauth, [], [AC_MSG_ERROR([library 'krb' is required for Kerberos 4])])
- AC_REPLACE_FUNCS([gethostname])
-fi
-
if test "$with_krb5" = yes ; then
- AC_SEARCH_LIBS(com_err, [krb5 'krb5 -ldes -lasn1 -lroken' com_err], [],
- [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
- AC_SEARCH_LIBS(krb5_encrypt, [krb5 'krb5 -ldes -lasn1 -lroken' crypto k5crypto], [],
- [AC_MSG_ERROR([could not find function 'krb5_encrypt' required for Kerberos 5])])
- AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -ldes -lasn1 -lroken'], [],
- [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
+ if test "$PORTNAME" != "win32"; then
+ AC_SEARCH_LIBS(com_err, [krb5 'krb5 -ldes -lasn1 -lroken' com_err], [],
+ [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
+ AC_SEARCH_LIBS(krb5_encrypt, [krb5 'krb5 -ldes -lasn1 -lroken' crypto k5crypto], [],
+ [AC_MSG_ERROR([could not find function 'krb5_encrypt' required for Kerberos 5])])
+ AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -ldes -lasn1 -lroken'], [],
+ [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
+ else
+ AC_SEARCH_LIBS(com_err, 'comerr32 -lkrb5_32', [],
+ [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
+ fi
fi
if test "$with_openssl" = yes ; then
#endif
])
-if test "$with_readline" = yes; then
+if expr x"$pgac_cv_check_readline" : 'x-lreadline' >/dev/null ; then
AC_CHECK_HEADERS(readline/readline.h, [],
- [AC_CHECK_HEADERS(editline/readline.h, [],
- [AC_CHECK_HEADERS(readline.h, [],
- [AC_MSG_ERROR([readline header not found
+ [AC_CHECK_HEADERS(readline.h, [],
+ [AC_MSG_ERROR([readline header not found
If you have readline already installed, see config.log for details on the
failure. It is possible the compiler isn't looking in the proper directory.
-Use --without-readline to disable readline support.])])])])
+Use --without-readline to disable readline support.])])])
AC_CHECK_HEADERS(readline/history.h, [],
- [AC_CHECK_HEADERS(editline/history.h, [],
- [AC_CHECK_HEADERS(history.h, [],
- [AC_MSG_ERROR([history header not found
+ [AC_CHECK_HEADERS(history.h, [],
+ [AC_MSG_ERROR([history header not found
If you have readline already installed, see config.log for details on the
failure. It is possible the compiler isn't looking in the proper directory.
-Use --without-readline to disable readline support.])])])])
+Use --without-readline to disable readline support.])])])
+fi
+
+if expr x"$pgac_cv_check_readline" : 'x-ledit' >/dev/null ; then
+# Some installations of libedit usurp /usr/include/readline/, which seems
+# bad practice, since in combined installations readline will have its headers
+# there. We might have to resort to AC_EGREP checks to make sure we found
+# the proper header...
+ AC_CHECK_HEADERS(editline/readline.h, [],
+ [AC_CHECK_HEADERS(readline.h, [],
+ [AC_CHECK_HEADERS(readline/readline.h, [],
+ [AC_MSG_ERROR([readline header not found
+If you have libedit already installed, see config.log for details on the
+failure. It is possible the compiler isn't looking in the proper directory.
+Use --without-readline to disable libedit support.])])])])
+ AC_CHECK_HEADERS(editline/history.h, [],
+ [AC_CHECK_HEADERS(history.h, [],
+ [AC_CHECK_HEADERS(readline/history.h, [],
+ [AC_MSG_ERROR([history header not found
+If you have libedit already installed, see config.log for details on the
+failure. It is possible the compiler isn't looking in the proper directory.
+Use --without-readline to disable libedit support.])])])])
fi
if test "$with_zlib" = yes; then
Use --without-zlib to disable zlib support.])])
fi
-if test "$with_krb4" = yes ; then
- AC_CHECK_HEADER(krb.h, [], [AC_MSG_ERROR([header file <krb.h> is required for Kerberos 4])])
-fi
-
if test "$with_krb5" = yes ; then
AC_CHECK_HEADER(krb5.h, [], [AC_MSG_ERROR([header file <krb5.h> is required for Kerberos 5])])
- AC_CHECK_HEADER(com_err.h, [], [AC_MSG_ERROR([header file <com_err.h> is required for Kerberos 5])])
fi
if test "$with_openssl" = yes ; then
[AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])])
fi
-if test "$with_rendezvous" = yes ; then
- AC_CHECK_HEADER(DNSServiceDiscovery/DNSServiceDiscovery.h, [], [AC_MSG_ERROR([header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Rendezvous])])
+if test "$with_bonjour" = yes ; then
+ AC_CHECK_HEADER(DNSServiceDiscovery/DNSServiceDiscovery.h, [], [AC_MSG_ERROR([header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Bonjour])])
fi
[#include <krb5.h>])
fi
+# This is probably only present on Darwin, but may as well check always
+AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include <fcntl.h>])
+
##
## Functions, global variables
##
AC_FUNC_ACCEPT_ARGTYPES
PGAC_FUNC_GETTIMEOFDAY_1ARG
-# SunOS doesn't handle negative byte comparisons properly with +/- return
-AC_FUNC_MEMCMP
-
AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getpeereid memmove poll pstat readlink setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs])
AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>])
HAVE_IPV6=no
AC_CHECK_TYPE([struct sockaddr_in6],
- [AC_CHECK_FUNC(inet_ntop,
- [AC_DEFINE(HAVE_IPV6, 1, [Define to 1 if you have support for IPv6.])
- HAVE_IPV6=yes])],
- [],
+ [AC_DEFINE(HAVE_IPV6, 1, [Define to 1 if you have support for IPv6.])
+ HAVE_IPV6=yes],
+ [],
[$ac_includes_default
#include <netinet/in.h>])
AC_SUBST(HAVE_IPV6)
# We use our snprintf.c emulation if either snprintf() or vsnprintf()
# is missing. Yes, there are machines that have only one. We may
# also decide to use snprintf.c if snprintf() is present but does not
-# have working "long long int" support -- see below.
+# have all the features we need --- see below.
-pgac_need_repl_snprintf=no
-AC_CHECK_FUNCS(snprintf, [], pgac_need_repl_snprintf=yes)
-AC_CHECK_FUNCS(vsnprintf, [], pgac_need_repl_snprintf=yes)
+if test "$PORTNAME" = "win32"; then
+ # Win32 gets snprintf.c built unconditionally.
+ #
+ # 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.
+ #
+ # 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
+ # *printf versions on Win32. The libintl 0.13 release note text is:
+ #
+ # C format strings with positions, as they arise when a translator
+ # needs to reorder a sentence, are now supported on all platforms.
+ # On those few platforms (NetBSD and Woe32) for which the native
+ # printf()/fprintf()/... functions don't support such format
+ # strings, replacements are provided through <libintl.h>.
+ #
+ # We could use libintl >= 0.13's *printf() if we were sure that we had
+ # a litint >= 0.13 at runtime, but seeing that there is no clean way
+ # to guarantee that, it is best to just use our own, so we are sure to
+ # get %$ support. In include/port.h we disable the *printf() macros
+ # that might have been defined by libintl.
+ #
+ # We do this unconditionally whether NLS is used or not so we are sure
+ # that all Win32 libraries and binaries behave the same.
+ pgac_need_repl_snprintf=yes
+else
+ pgac_need_repl_snprintf=no
+ AC_CHECK_FUNCS(snprintf, [], pgac_need_repl_snprintf=yes)
+ AC_CHECK_FUNCS(vsnprintf, [], pgac_need_repl_snprintf=yes)
+fi
# Check whether <stdio.h> declares snprintf() and vsnprintf(); if not,
AC_CHECK_DECLS([snprintf, vsnprintf])
-# do this one the hard way in case isinf() is a macro
+dnl Cannot use AC_CHECK_FUNC because isinf may be a macro
AC_CACHE_CHECK([for isinf], ac_cv_func_isinf,
-[AC_TRY_LINK(
-[#include <math.h>
+[AC_TRY_LINK([
+#include <math.h>
+double glob_double;
],
-[double x = 0.0; int res = isinf(x);],
+[return isinf(glob_double) ? 0 : 1;],
[ac_cv_func_isinf=yes],
[ac_cv_func_isinf=no])])
AC_REPLACE_FUNCS([crypt fseeko getopt getrusage inet_aton random rint srandom strdup strerror strtol strtoul unsetenv])
-# system's version of getaddrinfo(), if any, may be used only if we found
-# a definition for struct addrinfo; see notes in src/include/getaddrinfo.h
+# System's version of getaddrinfo(), if any, may be used only if we found
+# a definition for struct addrinfo; see notes in src/include/getaddrinfo.h.
+# (Note: the AC_TRY_LINK probe fails on Windows, where the available
+# versions of getaddrinfo don't follow normal C call protocol. This is OK
+# because we want to use our own getaddrinfo.c on Windows anyway.)
if test x"$ac_cv_type_struct_addrinfo" = xyes ; then
- AC_REPLACE_FUNCS([getaddrinfo])
+ dnl Cannot use AC_CHECK_FUNC because getaddrinfo may be a macro
+ AC_MSG_CHECKING(for getaddrinfo)
+ AC_TRY_LINK([
+#include <sys/socket.h>
+#include <netdb.h>
+],
+ [return getaddrinfo("", "", NULL, NULL) ? 0 : 1;],
+ [AC_DEFINE(HAVE_GETADDRINFO, 1, [Define to 1 if you have getaddrinfo().])
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)
+ AC_LIBOBJ(getaddrinfo)])
else
AC_LIBOBJ(getaddrinfo)
fi
ac_cv_func_fseeko=yes
esac
-# Solaris has a very slow qsort in certain cases, so we replace it.
+# Solaris has a very slow qsort in certain cases, so we replace it:
+# http://forum.sun.com/thread.jspa?forumID=4&threadID=7231
+# Supposedly it is fixed in Solaris, but not sure which version, and
+# no confirmed testing. 2005-12-16
if test "$PORTNAME" = "solaris"; then
AC_LIBOBJ(qsort)
fi
# Win32 support
if test "$PORTNAME" = "win32"; then
-AC_LIBOBJ(copydir)
AC_LIBOBJ(gettimeofday)
AC_LIBOBJ(kill)
AC_LIBOBJ(open)
dnl Cannot use AC_CHECK_FUNC because finite may be a macro
AC_MSG_CHECKING(for finite)
-AC_TRY_LINK([#include <math.h>],
- [int dummy=finite(1.0);],
+AC_TRY_LINK([
+#include <math.h>
+double glob_double;
+],
+ [return finite(glob_double) ? 0 : 1;],
[AC_DEFINE(HAVE_FINITE, 1, [Define to 1 if you have finite().])
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)])
*** for the exact reason.]])],
[AC_MSG_RESULT([cross-compiling])])
+# --------------------
+# Run tests below here
+# --------------------
+
+# Force use of our snprintf if system's doesn't do arg control
+# See comment above at snprintf test for details.
+if test "$enable_nls" = yes -a "$pgac_need_repl_snprintf" = no; then
+ PGAC_FUNC_PRINTF_ARG_CONTROL
+ if test $pgac_cv_printf_arg_control != yes ; then
+ pgac_need_repl_snprintf=yes
+ fi
+fi
+
dnl Check to see if we have a working 64-bit integer type.
dnl This breaks down into two steps:
AC_DEFINE_UNQUOTED(UINT64_FORMAT, $UINT64_FORMAT,
[Define to the appropriate snprintf format for unsigned 64-bit ints, if any.])
+# Now we have checked all the reasons to replace snprintf
if test $pgac_need_repl_snprintf = yes; then
+ AC_DEFINE(USE_REPL_SNPRINTF, 1, [Use replacement snprintf() functions.])
AC_LIBOBJ(snprintf)
fi
# Need a #define for the size of Datum (unsigned long)
AC_CHECK_SIZEOF([unsigned long])
+# And one for the size of size_t (enables tweaks for > 32bit address space)
+AC_CHECK_SIZEOF([size_t])
+
# Determine memory alignment requirements for the basic C data types.
PGAC_CHECK_ALIGNOF(short)
AC_CHECK_TYPES(sig_atomic_t, [], [], [#include <signal.h>])
+if test x"$template" != x"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 your
+*** operating system.
+])
+fi
+fi
+
if test $ac_cv_func_fseeko = yes; then
AC_SYS_LARGEFILE
fi
+# SunOS doesn't handle negative byte comparisons properly with +/- return
+AC_FUNC_MEMCMP
+
# Select semaphore implementation type.
if test x"$USE_NAMED_POSIX_SEMAPHORES" = x"1" ; then
SHMEM_IMPLEMENTATION="src/backend/port/sysv_shmem.c"
+# If not set in template file, set bytes to use libc memset()
+if test x"$MEMSET_LOOP_LIMIT" = x"" ; then
+ MEMSET_LOOP_LIMIT=1024
+fi
+AC_DEFINE_UNQUOTED(MEMSET_LOOP_LIMIT, ${MEMSET_LOOP_LIMIT}, [Define bytes to use libc memset().])
+
+
if test "$enable_nls" = yes ; then
PGAC_CHECK_GETTEXT
fi
PGAC_EVAL_TCLCONFIGSH([$TCL_CONFIG_SH],
[TCL_INCLUDE_SPEC,TCL_LIB_FILE,TCL_LIBS,TCL_LIB_SPEC,TCL_SHARED_BUILD])
AC_SUBST(TCL_SHLIB_LD_LIBS)dnl don't want to double-evaluate that one
+ # now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
+ ac_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$TCL_INCLUDE_SPEC $CPPFLAGS"
+ AC_CHECK_HEADER(tcl.h, [], [AC_MSG_ERROR([header file <tcl.h> is required for Tcl])])
+ CPPFLAGS=$ac_save_CPPFLAGS
fi
#
# defined. Cross compiling throws a warning.
#
if test "$enable_thread_safety_force" = yes; then
+if test x"$template" != x"win32"
+then
AC_MSG_WARN([
*** Skipping thread test program. --enable-thread-safety-force was used.
-*** Run the program in src/tools/thread on the your machine and add
+*** 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 x"$template" != x"win32"
+then
AC_MSG_CHECKING([thread safety of required library functions])
_CFLAGS="$CFLAGS"
_LIBS="$LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS -DIN_CONFIGURE"
LIBS="$LIBS $PTHREAD_LIBS"
-AC_TRY_RUN([#include "$srcdir/src/tools/thread/thread_test.c"],
+AC_TRY_RUN([#include "$srcdir/src/test/thread/thread_test.c"],
[AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)
AC_MSG_ERROR([
***
*** You can use the configure option --enable-thread-safety-force
*** to force threads to be enabled. However, you must then run
-*** the program in src/tools/thread and add locking function calls
+*** the program in src/test/thread and add locking function calls
*** to your applications to guarantee thread safety.
])],
[AC_MSG_RESULT(maybe)
AC_MSG_WARN([
*** Skipping thread test program because of cross-compile build.
-*** Run the program in src/tools/thread on the target machine.
+*** Run the program in src/test/thread on the target machine.
])])
CFLAGS="$_CFLAGS"
LIBS="$_LIBS"
+else
+AC_MSG_WARN([*** Skipping thread test on Win32])
+fi
fi
# prepare build tree if outside source tree
projects / postgresql / blobdiff