*** pgsql/configure.in 2003/06/23 23:51:59 1.267 --- pgsql/configure.in 2004/02/02 22:20:32 1.313 *************** *** 1,5 **** dnl Process this file with autoconf to produce a configure script. ! dnl $Header: /projects/cvsroot/pgsql/configure.in,v 1.267 2003/06/23 23:51:59 momjian Exp $ dnl dnl Developers, please strive to achieve this order: dnl --- 1,5 ---- dnl Process this file with autoconf to produce a configure script. ! dnl $PostgreSQL: pgsql-server/configure.in,v 1.312 2004/02/02 16:00:49 momjian Exp $ dnl dnl Developers, please strive to achieve this order: dnl *************** dnl *** 16,33 **** dnl Read the Autoconf manual for details. dnl m4_pattern_forbid(^PGAC_)dnl to catch undefined macros ! dnl ! dnl The GNU folks apparently haven't heard that some people don't use ! dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir". ! m4_define([info], [doc]) ! m4_define([infodir], [docdir]) ! AC_INIT([PostgreSQL], [7.4devel], [pgsql-bugs@postgresql.org]) ! m4_undefine([infodir]) ! m4_undefine([info]) ! AC_SUBST(docdir) AC_PREREQ(2.53) ! AC_COPYRIGHT([Copyright 2002 PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) AC_PREFIX_DEFAULT(/usr/local/pgsql) --- 16,26 ---- dnl Read the Autoconf manual for details. dnl m4_pattern_forbid(^PGAC_)dnl to catch undefined macros ! ! AC_INIT([PostgreSQL], [7.5devel], [pgsql-bugs@postgresql.org]) AC_PREREQ(2.53) ! AC_COPYRIGHT([Copyright 2003 PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) AC_PREFIX_DEFAULT(/usr/local/pgsql) *************** PGAC_ARG_REQ(with, template, [], *** 52,58 **** esac ], [ ! # --with-template not given case $host_os in aix*) template=aix ;; --- 45,51 ---- esac ], [ ! # --with-template not given case $host_os in aix*) template=aix ;; *************** AC_MSG_RESULT([$template]) *** 104,124 **** PORTNAME=$template AC_SUBST(PORTNAME) ! # Pick right test-and-set (TAS) code. Most platforms have inline ! # assembler code in src/include/storage/s_lock.h, so we just use ! # a dummy file here. ! case $host in ! *-*-hpux*) need_tas=yes; tas_file=hpux.s ;; ! sparc-*-solaris*) need_tas=yes; tas_file=solaris_sparc.s ;; ! i?86-*-solaris*) need_tas=yes; tas_file=solaris_i386.s ;; ! *) need_tas=no; tas_file=dummy.s ;; ! esac ! AC_CONFIG_LINKS([src/backend/port/tas.s:src/backend/port/tas/${tas_file}]) ! ! if test "$need_tas" = yes ; then ! TAS=tas.o ! fi ! AC_SUBST(TAS) --- 97,107 ---- PORTNAME=$template AC_SUBST(PORTNAME) ! # Initialize default assumption that we do not need separate assembly code ! # for TAS (test-and-set). This can be overridden by the template file ! # when it's executed. ! need_tas=no ! tas_file=dummy.s *************** AC_SUBST(TAS) *** 126,131 **** --- 109,125 ---- ## Command line options ## + # + # Installation directory for documentation + # + PGAC_ARG(with, docdir, [ --with-docdir=DIR install the documentation in DIR [[PREFIX/doc]] + --without-docdir do not install the documentation], + [AC_MSG_ERROR([option --with-docdir requires an argument])], + [docdir=], + [docdir=$withval], + [docdir='${prefix}/doc']) + AC_SUBST(docdir) + # # Add non-standard directories to the include path *************** PGAC_ARG_BOOL(enable, integer-datetimes, *** 153,167 **** AC_MSG_RESULT([$enable_integer_datetimes]) - # Character set recode (--enable-recode) - # - AC_MSG_CHECKING([whether to build with recode support]) - PGAC_ARG_BOOL(enable, recode, no, [ --enable-recode enable single-byte recode support], - [AC_DEFINE([CYR_RECODE], 1, - [Define to 1 if you want single-byte recode support. (--enable-recode)])]) - AC_MSG_RESULT([$enable_recode]) - - # # NLS # --- 147,152 ---- *************** AC_MSG_RESULT([$default_port]) *** 187,197 **** # Need both of these because some places want an integer and some a string AC_DEFINE_UNQUOTED(DEF_PGPORT, ${default_port}, [Define to the default TCP port number on which the server listens and ! to which clients will try to connect to. This can be overridden at ! run-time, but it's convenient if your clients have the right default ! compiled in. (--with-pgport=PORTNUM)]) AC_DEFINE_UNQUOTED(DEF_PGPORT_STR, "${default_port}", ! [Define to the default TCP port number as string constant.]) AC_SUBST(default_port) # --- 172,182 ---- # Need both of these because some places want an integer and some a string AC_DEFINE_UNQUOTED(DEF_PGPORT, ${default_port}, [Define to the default TCP port number on which the server listens and ! to which clients will try to connect. This can be overridden at run-time, ! but it's convenient if your clients have the right default compiled in. ! (--with-pgport=PORTNUM)]) AC_DEFINE_UNQUOTED(DEF_PGPORT_STR, "${default_port}", ! [Define to the default TCP port number as a string constant.]) AC_SUBST(default_port) # *************** PGAC_ARG_BOOL(enable, rpath, yes, *** 208,213 **** --- 193,203 ---- [ --disable-rpath do not embed shared library search path in executables]) AC_SUBST(enable_rpath) + # + # Spinlocks + # + PGAC_ARG_BOOL(enable, spinlocks, yes, + [ --disable-spinlocks do not use spinlocks]) # # --enable-debug adds -g to compiler flags *************** case $template in *** 232,248 **** --- 222,269 ---- esac AC_PROG_CC([$pgac_cc_list]) + + unset CFLAGS + + # # Read the template + # . "$srcdir/src/template/$template" || exit + # CFLAGS are selected so: + # If the user specifies something in the environment, that is used. + # else: If the template file set something, that is used. + # else: If the compiler is GCC, then we use -O2. + # else: If the compiler is something else, then we use -0. + if test "$ac_env_CFLAGS_set" = set; then CFLAGS=$ac_env_CFLAGS_value + elif test "${CFLAGS+set}" = set; then + : # (keep what template set) + elif test "$GCC" = yes; then + CFLAGS="-O2" + else + # if the user selected debug mode, don't use -O + if test "$enable_debug" != yes; then + CFLAGS="-O" + fi fi + + # Need to specify -fno-strict-aliasing too in case it's gcc 3.3 or later. + PGAC_PROG_CC_NO_STRICT_ALIASING + + # supply -g if --enable-debug if test "$enable_debug" = yes && test "$ac_cv_prog_cc_g" = yes; then CFLAGS="$CFLAGS -g" fi + AC_MSG_NOTICE([using CFLAGS=$CFLAGS]) + # We already have this in Makefile.win32, but configure needs it too + if test "$PORTNAME" = "win32"; then + CPPFLAGS="$CPPFLAGS -I$srcdir/src/include/port/win32 -DEXEC_BACKEND" + fi + # Check if the compiler still works with the template settings AC_MSG_CHECKING([whether the C compiler still works]) AC_TRY_LINK([], [return 0;], *************** AC_TRY_LINK([], [return 0;], *** 250,256 **** [AC_MSG_RESULT(no) AC_MSG_ERROR([cannot proceed])]) ! # Defend against gcc -ffastmath if test "$GCC" = yes; then AC_TRY_COMPILE([], [@%:@ifdef __FAST_MATH__ choke me --- 271,277 ---- [AC_MSG_RESULT(no) AC_MSG_ERROR([cannot proceed])]) ! # Defend against gcc -ffast-math if test "$GCC" = yes; then AC_TRY_COMPILE([], [@%:@ifdef __FAST_MATH__ choke me *************** AC_DEFINE_UNQUOTED(PG_VERSION_STR, *** 272,277 **** --- 293,312 ---- # + # Set up TAS assembly code if needed; the template file has now had its + # chance to request this. + # + AC_CONFIG_LINKS([src/backend/port/tas.s:src/backend/port/tas/${tas_file}]) + + if test "$need_tas" = yes ; then + TAS=tas.o + else + TAS="" + fi + AC_SUBST(TAS) + + + # # Automatic dependency tracking # PGAC_ARG_BOOL(enable, depend, no, [ --enable-depend turn on automatic dependency tracking], *************** done *** 320,333 **** IFS=$ac_save_IFS # ! # Enable libpq to be thread-safe # ! AC_MSG_CHECKING([allow threaded libpq]) ! PGAC_ARG_BOOL(with, threads, no, [ --with-threads allow libpq and ecpg to be thread-safe], ! [AC_DEFINE([USE_THREADS], 1, [Define to 1 to build libpq and ecpg to be thread-safe. (--with-threads)])]) ! ! AC_MSG_RESULT([$with_threads]) ! AC_SUBST(with_threads) # # Tcl/Tk --- 355,368 ---- IFS=$ac_save_IFS # ! # Enable thread-safe client libraries # ! AC_MSG_CHECKING([allow thread-safe client libraries]) ! PGAC_ARG_BOOL(enable, thread-safety, no, [ --enable-thread-safety make client libraries thread-safe], ! [AC_DEFINE([ENABLE_THREAD_SAFETY], 1, ! [Define to 1 to build client libraries as thread-safe code. (--enable-thread-safety)])]) ! AC_MSG_RESULT([$enable_thread_safety]) ! AC_SUBST(enable_thread_safety) # # Tcl/Tk *************** AC_MSG_RESULT([$with_perl]) *** 367,428 **** AC_SUBST(with_perl) # ! # Optionally build Python interface module # AC_MSG_CHECKING([whether to build Python modules]) ! PGAC_ARG_BOOL(with, python, no, [ --with-python build Python interface module]) AC_MSG_RESULT([$with_python]) AC_SUBST(with_python) # - # Optionally build the Java/JDBC tools - # - AC_MSG_CHECKING([whether to build Java/JDBC tools]) - PGAC_ARG_BOOL(with, java, no, [ --with-java build JDBC interface and Java tools], - [AC_MSG_RESULT(yes) - PGAC_PATH_ANT - if test -z "$ANT"; then - AC_MSG_ERROR([Ant is required to build Java components - If you have Ant already installed, see config.log for details on the failure.]) - fi - if "$ANT" -version | sed q | egrep -v ' 1\.[[5-9]]| [[2-9]]\.' >/dev/null ; then - AC_MSG_ERROR([Ant version >= 1.5 is required to build Java components]) - fi], - [AC_MSG_RESULT(no)]) - AC_SUBST(with_java) - - dnl A note on the Kerberos and OpenSSL options: - dnl - dnl The user can give an argument to the option in order the specify - dnl the base path of the respective installation (what he specified - dnl perhaps as --prefix). If no argument is given ($withval is "yes") - dnl then we take the path where the package installs by default. This - dnl way the user doesn't have to use redundant --with-includes and - dnl --with-libraries options, but he can still use them if the layout - dnl is non-standard. - - # # Kerberos 4 # AC_MSG_CHECKING([whether to build with Kerberos 4 support]) ! PGAC_ARG_OPTARG(with, krb4, [[ --with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]]], ! [krb4_prefix=/usr/athena], ! [krb4_prefix=$withval], [ - AC_MSG_RESULT(yes) AC_DEFINE(KRB4, 1, [Define to build with Kerberos 4 support. (--with-krb4)]) - - if test -d "$krb4_prefix/include"; then - INCLUDES="$INCLUDES -I$krb4_prefix/include" - fi - if test -d "$krb4_prefix/lib"; then - LIBDIRS="$LIBDIRS -L$krb4_prefix/lib" - fi - krb_srvtab="/etc/srvtab" ! ], ! [AC_MSG_RESULT(no)]) ! AC_SUBST(with_krb4) --- 402,424 ---- AC_SUBST(with_perl) # ! # Optionally build Python modules (PL/Python) # AC_MSG_CHECKING([whether to build Python modules]) ! PGAC_ARG_BOOL(with, python, no, [ --with-python build Python modules (PL/Python)]) 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) *************** AC_SUBST(with_krb4) *** 430,453 **** # Kerberos 5 # AC_MSG_CHECKING([whether to build with Kerberos 5 support]) ! PGAC_ARG_OPTARG(with, krb5, [[ --with-krb5[=DIR] build with Kerberos 5 support [/usr/athena]]], ! [krb5_prefix=/usr/athena], ! [krb5_prefix=$withval], [ - AC_MSG_RESULT([yes]) AC_DEFINE(KRB5, 1, [Define to build with Kerberos 5 support. (--with-krb5)]) - - if test -d "$krb5_prefix/include"; then - INCLUDES="$INCLUDES -I$krb5_prefix/include" - fi - if test -d "$krb5_prefix/lib"; then - LIBDIRS="$LIBDIRS -L$krb5_prefix/lib" - fi - krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab" ! ], ! [AC_MSG_RESULT(no)]) ! AC_SUBST(with_krb5) --- 426,437 ---- # Kerberos 5 # AC_MSG_CHECKING([whether to build with Kerberos 5 support]) ! PGAC_ARG_BOOL(with, krb5, no, [ --with-krb5 build with Kerberos 5 support], [ AC_DEFINE(KRB5, 1, [Define to build with Kerberos 5 support. (--with-krb5)]) krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab" ! ]) ! AC_MSG_RESULT([$with_krb5]) AC_SUBST(with_krb5) *************** AC_SUBST(krb_srvtab) *** 463,469 **** # Kerberos configuration parameters # PGAC_ARG_REQ(with, krb-srvnam, ! [ --with-krb-srvnam=NAME name of the service principal in Kerberos [postgres]], [], [with_krb_srvnam="postgres"]) AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"], --- 447,453 ---- # Kerberos configuration parameters # PGAC_ARG_REQ(with, krb-srvnam, ! [ --with-krb-srvnam=NAME name of the service principal in Kerberos [[postgres]]], [], [with_krb_srvnam="postgres"]) AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"], *************** AC_SUBST(with_rendezvous) *** 495,516 **** # # OpenSSL # ! PGAC_ARG_OPTARG(with, openssl, ! [[ --with-openssl[=DIR] build with OpenSSL support [/usr/local/ssl]]], ! [openssl_prefix=/usr/local/ssl], ! [openssl_prefix=$withval], ! [ ! AC_MSG_RESULT([building with OpenSSL support]) ! AC_DEFINE([USE_SSL], 1, [Define to build with (Open)SSL support. (--with-openssl)]) ! ! if test -d "${openssl_prefix}/include" ; then ! INCLUDES="$INCLUDES -I${openssl_prefix}/include" ! fi ! if test -d "${openssl_prefix}/lib" ; then ! LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib" ! fi ! ]) ! AC_SUBST(with_openssl) --- 479,488 ---- # # OpenSSL # ! AC_MSG_CHECKING([whether to build with OpenSSL support]) ! PGAC_ARG_BOOL(with, openssl, no, [ --with-openssl build with OpenSSL support], ! [AC_DEFINE([USE_SSL], 1, [Define to build with (Open)SSL support. (--with-openssl)])]) ! AC_MSG_RESULT([$with_openssl]) AC_SUBST(with_openssl) *************** PGAC_ARG_BOOL(with, readline, yes, *** 526,532 **** PGAC_ARG_BOOL(with, zlib, yes, [ --without-zlib do not use Zlib]) - # # Elf # --- 498,503 ---- *************** fi *** 613,619 **** if test "$with_python" = yes; then PGAC_PATH_PYTHON - PGAC_CHECK_PYTHON_MODULE_SETUP PGAC_CHECK_PYTHON_EMBED_SETUP fi --- 584,589 ---- *************** AC_CHECK_LIB(BSD, main) *** 641,657 **** AC_CHECK_LIB(gen, main) AC_CHECK_LIB(PW, main) AC_CHECK_LIB(resolv, main) - AC_CHECK_LIB(wsock32, main) AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt]) # QNX: AC_CHECK_LIB(unix, main) AC_SEARCH_LIBS(crypt, crypt) # BeOS: ! AC_CHECK_LIB(bind, __inet_ntoa) # Solaris: AC_SEARCH_LIBS(fdatasync, [rt posix4]) # Cygwin: AC_CHECK_LIB(cygipc, shmget) if test "$with_readline" = yes; then PGAC_CHECK_READLINE --- 611,634 ---- AC_CHECK_LIB(gen, main) AC_CHECK_LIB(PW, main) AC_CHECK_LIB(resolv, main) 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 # 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 if test "$with_readline" = yes; then PGAC_CHECK_READLINE *************** failure. It is possible the compiler is *** 671,676 **** --- 648,660 ---- Use --without-zlib to disable zlib support.])]) fi + if test "$enable_spinlocks" = yes; then + AC_DEFINE(HAVE_SPINLOCKS, 1, [Define to 1 if you have spinlocks.]) + else + AC_MSG_WARN([ + *** 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])]) *************** PGAC_STRUCT_TIMEZONE *** 778,784 **** PGAC_UNION_SEMUN PGAC_STRUCT_SOCKADDR_UN PGAC_STRUCT_SOCKADDR_STORAGE ! PGAC_STRUCT_SOCKADDR_STORAGE_SS_FAMILY PGAC_STRUCT_ADDRINFO AC_CHECK_TYPES([struct cmsgcred, struct fcred, struct sockcred], [], [], --- 762,768 ---- PGAC_UNION_SEMUN PGAC_STRUCT_SOCKADDR_UN PGAC_STRUCT_SOCKADDR_STORAGE ! PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS PGAC_STRUCT_ADDRINFO AC_CHECK_TYPES([struct cmsgcred, struct fcred, struct sockcred], [], [], *************** AC_CHECK_TYPES([struct cmsgcred, struct *** 787,792 **** --- 771,781 ---- #include #include ]) + AC_CHECK_TYPES([struct option], [], [], + [#ifdef HAVE_GETOPT_H + #include + #endif]) + if test "$with_zlib" = yes; then # Check that defines z_streamp (versions before about 1.0.4 # did not). While we could work around the lack of z_streamp, it *************** AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasy *** 826,837 **** AC_CHECK_DECLS(fdatasync, [], [], [#include ]) 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.])])], [], [$ac_includes_default #include ]) AC_CACHE_CHECK([for PS_STRINGS], [pgac_cv_var_PS_STRINGS], [AC_TRY_LINK( --- 815,829 ---- AC_CHECK_DECLS(fdatasync, [], [], [#include ]) + 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_includes_default #include ]) + AC_SUBST(HAVE_IPV6) AC_CACHE_CHECK([for PS_STRINGS], [pgac_cv_var_PS_STRINGS], [AC_TRY_LINK( *************** else *** 882,888 **** AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break]) fi ! AC_REPLACE_FUNCS([crypt fseeko getopt getopt_long getrusage inet_aton random rint srandom strcasecmp strdup strerror strtol strtoul]) # 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 --- 874,880 ---- AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break]) fi ! AC_REPLACE_FUNCS([crypt fseeko getopt getrusage inet_aton random rint srandom strcasecmp strdup strerror strtol strtoul]) # 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 *************** else *** 892,897 **** --- 884,896 ---- AC_LIBOBJ(getaddrinfo) 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 + # BSD/OS & NetBSD use a custom fseeko/ftello built on fsetpos/fgetpos # We override the previous test that said fseeko/ftello didn't exist # OS tests are also done in include/c.h and port/fseeko.c *************** esac *** 906,914 **** # Win32 can't to rename or unlink on an open file case $host_os in mingw*) - AC_LIBOBJ(dirmod) AC_LIBOBJ(copydir) ! AC_LIBOBJ(gettimeofday) ;; esac if test "$with_readline" = yes; then --- 905,918 ---- # Win32 can't to rename or unlink on an open file case $host_os in mingw*) AC_LIBOBJ(copydir) ! AC_LIBOBJ(gettimeofday) ! AC_LIBOBJ(pipe) ! AC_LIBOBJ(rand) ;; ! esac ! ! case $host_os in mingw*|cygwin*) ! AC_LIBOBJ(dirmod) ;; esac if test "$with_readline" = yes; then *************** AC_FUNC_FSEEKO *** 964,984 **** # # For each platform, we need to know about any special compile and link # libraries, and whether the normal C function names are thread-safe. # ! NEED_REENTRANT_FUNC_NAMES=no ! if test "$with_threads" = yes; then ! AC_CHECK_HEADER(pthread.h, [], [AC_MSG_ERROR([pthread.h not found, required for --with-threads])]) ! if test "$SUPPORTS_THREADS" != yes; then AC_MSG_ERROR([ Cannot enable threads on your platform. Please report your platform threading info to the PostgreSQL mailing lists ! so it can be added to the next release. Report any compile flags, link flags, functions, or libraries required for threading support. ]) fi fi ! AC_SUBST(THREAD_CFLAGS) AC_SUBST(THREAD_LIBS) --- 968,994 ---- # # For each platform, we need to know about any special compile and link # libraries, and whether the normal C function names are thread-safe. + # See the comment at the top of src/port/thread.c for more information. # ! if test "$enable_thread_safety" = yes; then ! AC_CHECK_HEADER(pthread.h, [], [AC_MSG_ERROR([pthread.h not found, required for --enable-thread-safetys])]) ! if test "$THREAD_SUPPORT" != yes; then AC_MSG_ERROR([ Cannot enable threads on your platform. Please report your platform threading info to the PostgreSQL mailing lists ! so it can be added to the next release. Report all compile flags, link flags, functions, or libraries required for threading support. + See the comment at the top of src/port/thread.c for more information. ]) fi + else + # do not use values from template file + THREAD_CPPFLAGS= + THREAD_LIBS= fi ! AC_SUBST(THREAD_SUPPORT) ! AC_SUBST(THREAD_CPPFLAGS) AC_SUBST(THREAD_LIBS) *************** AC_SUBST(THREAD_LIBS) *** 989,1005 **** # threading on this platform. Some platforms have *_r functions but # their natively named funcs are threadsafe, and should be used instead. # ! # One trick here is that if the don't call AC_CHECK_FUNCS, the # functions are marked "not found", which is perfect. # ! if test "$NEED_REENTRANT_FUNC_NAMES" = yes ; then _CFLAGS="$CFLAGS" ! _LIB="$LIBS" ! CFLAGS="$CFLAGS $TREAD_CFLAGS" LIBS="$LIBS $THREAD_LIBS" AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r]) CFLAGS="$_CFLAGS" ! LIB="$_LIBS" fi --- 999,1015 ---- # threading on this platform. Some platforms have *_r functions but # their natively named funcs are threadsafe, and should be used instead. # ! # One trick here is that if we don't call AC_CHECK_FUNCS, the # functions are marked "not found", which is perfect. # ! if test "$enable_thread_safety" = yes -a "$NEED_REENTRANT_FUNCS" = yes ; then _CFLAGS="$CFLAGS" ! _LIBS="$LIBS" ! CFLAGS="$CFLAGS $THREAD_CPPFLAGS" LIBS="$LIBS $THREAD_LIBS" AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r]) CFLAGS="$_CFLAGS" ! LIBS="$_LIBS" fi *************** fi *** 1172,1178 **** # PGAC_PROG_NSGMLS PGAC_PROG_JADE ! PGAC_CHECK_DOCBOOK(3.1) PGAC_PATH_DOCBOOK_STYLESHEETS PGAC_PATH_COLLATEINDEX AC_CHECK_PROGS(SGMLSPL, sgmlspl) --- 1182,1188 ---- # PGAC_PROG_NSGMLS PGAC_PROG_JADE ! PGAC_CHECK_DOCBOOK(4.2) PGAC_PATH_DOCBOOK_STYLESHEETS PGAC_PATH_COLLATEINDEX AC_CHECK_PROGS(SGMLSPL, sgmlspl) *************** AC_CHECK_PROGS(SGMLSPL, sgmlspl) *** 1182,1192 **** # Note 1: test -ef might not exist, but it's more reliable than `pwd`. # Note 2: /bin/pwd might be better than shell's built-in at getting # a symlink-free name. ! if test "$no_create" != yes; then ! if ( test "$srcdir" -ef . ) >/dev/null 2>&1 || test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then ! : ! else ! AC_SUBST(vpath_build, yes) _AS_ECHO_N([preparing build tree... ]) pgac_abs_top_srcdir=`cd "$srcdir" && pwd` $SHELL "$ac_aux_dir/prep_buildtree" "$pgac_abs_top_srcdir" "." \ --- 1192,1202 ---- # Note 1: test -ef might not exist, but it's more reliable than `pwd`. # Note 2: /bin/pwd might be better than shell's built-in at getting # a symlink-free name. ! if ( test "$srcdir" -ef . ) >/dev/null 2>&1 || test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then ! vpath_build=no ! else ! vpath_build=yes ! if test "$no_create" != yes; then _AS_ECHO_N([preparing build tree... ]) pgac_abs_top_srcdir=`cd "$srcdir" && pwd` $SHELL "$ac_aux_dir/prep_buildtree" "$pgac_abs_top_srcdir" "." \ *************** if test "$no_create" != yes; then *** 1194,1199 **** --- 1204,1210 ---- AC_MSG_RESULT(done) fi fi + AC_SUBST(vpath_build) AC_CONFIG_FILES([GNUmakefile src/Makefile.global])