*** pgsql/configure.in 2003/06/23 23:51:59 1.267 --- pgsql/configure.in 2005/05/05 11:50:18 1.408 *************** *** 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/configure.in,v 1.407 2005/03/25 00:34:19 tgl 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], [8.1devel], [pgsql-bugs@postgresql.org]) AC_PREREQ(2.53) ! 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) *************** 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 ;; *************** case $host_os in *** 63,70 **** dgux*) template=dgux ;; freebsd*) template=freebsd ;; hpux*) template=hpux ;; ! irix*) template=irix5 ;; ! linux*) template=linux ;; mingw*) template=win32 ;; netbsd*) template=netbsd ;; nextstep*) template=nextstep ;; --- 56,64 ---- dgux*) template=dgux ;; freebsd*) template=freebsd ;; hpux*) template=hpux ;; ! irix*) template=irix ;; ! linux*|gnu*|k*bsd*-gnu) ! template=linux ;; mingw*) template=win32 ;; netbsd*) template=netbsd ;; nextstep*) template=nextstep ;; *************** 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) --- 98,108 ---- 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 **** --- 110,126 ---- ## 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 # --- 148,153 ---- *************** 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) # --- 173,183 ---- # 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 **** --- 194,204 ---- [ --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 **** --- 223,280 ---- 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 + + if test "$GCC" = yes; then + CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith" + + # 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+ + PGAC_PROG_CC_CFLAGS_OPT([-fno-strict-aliasing]) + fi + + # 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 --- 282,288 ---- [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 **** --- 304,323 ---- # + # 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], *************** PGAC_ARG_BOOL(enable, cassert, no, [ -- *** 291,297 **** # Include directories # ac_save_IFS=$IFS ! IFS="${IFS}:" # SRCH_INC comes from the template file for dir in $with_includes $SRCH_INC; do if test -d "$dir"; then --- 337,343 ---- # Include directories # ac_save_IFS=$IFS ! IFS="${IFS}${PATH_SEPARATOR}" # SRCH_INC comes from the template file for dir in $with_includes $SRCH_INC; do if test -d "$dir"; then *************** AC_SUBST(INCLUDES) *** 308,314 **** # Library directories # ac_save_IFS=$IFS ! IFS="${IFS}:" # LIBRARY_DIRS comes from command line, SRCH_LIB from template file. for dir in $LIBRARY_DIRS $SRCH_LIB; do if test -d "$dir"; then --- 354,360 ---- # Library directories # ac_save_IFS=$IFS ! IFS="${IFS}${PATH_SEPARATOR}" # LIBRARY_DIRS comes from command line, SRCH_LIB from template file. for dir in $LIBRARY_DIRS $SRCH_LIB; do if test -d "$dir"; then *************** done *** 320,362 **** 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 # AC_MSG_CHECKING([whether to build with Tcl]) ! PGAC_ARG_BOOL(with, tcl, no, [ --with-tcl build Tcl and Tk interfaces]) AC_MSG_RESULT([$with_tcl]) AC_SUBST([with_tcl]) - # If Tcl is enabled (above) then Tk is also, unless the user disables it using --without-tk - AC_MSG_CHECKING([whether to build with Tk]) - if test "$with_tcl" = yes; then - PGAC_ARG_BOOL(with, tk, yes, [ --without-tk do not build Tk interfaces if Tcl is enabled]) - else - with_tk=no - fi - AC_MSG_RESULT([$with_tk]) - AC_SUBST([with_tk]) - - # We see if the path to the Tcl/Tk configuration scripts is specified. # This will override the use of tclsh to find the paths to search. ! PGAC_ARG_REQ(with, tclconfig, [ --with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR]) ! ! # We see if the path to the Tk configuration scripts is specified. ! # This will override the use of tclsh to find the paths to search. ! ! PGAC_ARG_REQ(with, tkconfig, [ --with-tkconfig=DIR tkConfig.sh is in DIR]) # # Optionally build Perl modules (PL/Perl) --- 366,397 ---- 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]) ! PGAC_ARG_BOOL(enable, thread-safety-force, no, [ --enable-thread-safety-force force thread-safety in spite of thread test failure]) ! if test "$enable_thread_safety" = yes -o \ ! "$enable_thread_safety_force" = yes; then ! enable_thread_safety="yes" # for 'force' ! AC_DEFINE([ENABLE_THREAD_SAFETY], 1, ! [Define to 1 to build client libraries as thread-safe code. (--enable-thread-safety)]) ! fi ! AC_MSG_RESULT([$enable_thread_safety]) ! AC_SUBST(enable_thread_safety) # ! # Optionally build Tcl modules (PL/Tcl) # AC_MSG_CHECKING([whether to build with Tcl]) ! PGAC_ARG_BOOL(with, tcl, no, [ --with-tcl build Tcl modules (PL/Tcl)]) AC_MSG_RESULT([$with_tcl]) AC_SUBST([with_tcl]) # We see if the path to the Tcl/Tk configuration scripts is specified. # This will override the use of tclsh to find the paths to search. ! PGAC_ARG_REQ(with, tclconfig, [ --with-tclconfig=DIR tclConfig.sh is in DIR]) # # Optionally build Perl modules (PL/Perl) *************** 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) *************** AC_SUBST(with_openssl) *** 519,524 **** --- 491,506 ---- # PGAC_ARG_BOOL(with, readline, yes, [ --without-readline do not use Readline]) + # 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 + if test "$PORTNAME" = "win32"; then + if test "$with_readline" = yes; then + AC_MSG_WARN([*** Readline does not work on MinGW --- disabling]) + with_readline=no + fi + fi + # # Zlib *************** PGAC_ARG_BOOL(with, readline, yes, *** 526,532 **** PGAC_ARG_BOOL(with, zlib, yes, [ --without-zlib do not use Zlib]) - # # Elf # --- 508,513 ---- *************** AC_SUBST(ELF_SYS) *** 558,573 **** CPPFLAGS="$CPPFLAGS $INCLUDES" LDFLAGS="$LDFLAGS $LIBDIRS" ! AC_MSG_NOTICE([using CPPFLAGS=$CPPFLAGS]) ! AC_MSG_NOTICE([using LDFLAGS=$LDFLAGS]) ! AC_PROG_AWK PGAC_PATH_FLEX AC_PROG_LN_S ! AC_PROG_LD AC_SUBST(LD) AC_SUBST(with_gnu_ld) case $host_os in sysv5*) AC_CACHE_CHECK([whether ld -R works], [pgac_cv_prog_ld_R], [ --- 539,553 ---- CPPFLAGS="$CPPFLAGS $INCLUDES" LDFLAGS="$LDFLAGS $LIBDIRS" ! AC_ARG_VAR(LDFLAGS_SL) AC_PROG_AWK PGAC_PATH_FLEX AC_PROG_LN_S ! PGAC_PROG_LD AC_SUBST(LD) AC_SUBST(with_gnu_ld) + case $host_os in sysv5*) AC_CACHE_CHECK([whether ld -R works], [pgac_cv_prog_ld_R], [ *************** case $host_os in sysv5*) *** 578,595 **** ld_R_works=$pgac_cv_prog_ld_R AC_SUBST(ld_R_works) esac AC_PROG_RANLIB AC_CHECK_PROGS(LORDER, lorder) AC_PATH_PROG(TAR, tar) PGAC_CHECK_STRIP AC_CHECK_PROGS(YACC, ['bison -y']) if test "$YACC"; then if $YACC --version | sed q | $AWK '{ if ($4 < 1.875) exit 0; else exit 1;}'; then AC_MSG_WARN([ ! *** The installed version of Bison is too old. PostgreSQL needs ! *** Bison version 1.875 or later.]) fi fi --- 558,599 ---- ld_R_works=$pgac_cv_prog_ld_R AC_SUBST(ld_R_works) esac + + # To simplify the build system, we specify the maximal set of + # libraries to link against when building any executable. The linker + # on some platforms optionally allows unused link arguments to be + # elided from the resulting executable, so enable that capability if + # it exists. + # XXX: currently we only support GNU ld; do any other linkers support + # an equivalent feature? + if test "$with_gnu_ld"; then + AC_CACHE_CHECK([whether ld --as-needed works], [pgac_cv_prog_ld_as_needed], + [ + pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,--as-needed" + AC_TRY_LINK([], [], + [pgac_cv_prog_ld_as_needed=yes], + [pgac_cv_prog_ld_as_needed=no]) + if test x"$pgac_cv_prog_ld_as_needed" = x"no"; then + LDFLAGS=$pgac_save_LDFLAGS + fi + ]) + fi + AC_PROG_RANLIB AC_CHECK_PROGS(LORDER, lorder) AC_PATH_PROG(TAR, tar) PGAC_CHECK_STRIP + AC_MSG_NOTICE([using CPPFLAGS=$CPPFLAGS]) + AC_MSG_NOTICE([using LDFLAGS=$LDFLAGS]) + AC_CHECK_PROGS(YACC, ['bison -y']) if test "$YACC"; then if $YACC --version | sed q | $AWK '{ if ($4 < 1.875) exit 0; else exit 1;}'; then AC_MSG_WARN([ ! *** If you are going to modify the grammar files or build from CVS, the installed ! *** version of Bison is too old. Bison version 1.875 or later is required.]) fi fi *************** fi *** 613,619 **** if test "$with_python" = yes; then PGAC_PATH_PYTHON - PGAC_CHECK_PYTHON_MODULE_SETUP PGAC_CHECK_PYTHON_EMBED_SETUP fi --- 617,622 ---- *************** 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 --- 644,667 ---- 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 **** --- 681,693 ---- 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])]) *************** if test "$with_krb4" = yes ; then *** 678,695 **** 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])]) fi if test "$with_openssl" = yes ; then dnl Order matters! ! AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) ! AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) fi if test "$with_pam" = yes ; then --- 695,722 ---- fi if test "$with_krb5" = yes ; then ! 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 dnl Order matters! ! if test "$PORTNAME" != "win32"; then ! AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) ! AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) ! else ! AC_CHECK_LIB(eay32, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'eay32' is required for OpenSSL])]) ! AC_CHECK_LIB(ssleay32, SSL_library_init, [], [AC_MSG_ERROR([library 'ssleay32' is required for OpenSSL])]) ! fi fi if test "$with_pam" = yes ; then *************** fi *** 702,708 **** ## dnl sys/socket.h is required by AC_FUNC_ACCEPT_ARGTYPES ! AC_CHECK_HEADERS([crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h poll.h pwd.h sys/ipc.h sys/poll.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/un.h termios.h utime.h kernel/OS.h kernel/image.h SupportDefs.h]) # At least on IRIX, cpp test for netinet/tcp.h will fail unless # netinet/in.h is included first. --- 729,735 ---- ## dnl sys/socket.h is required by AC_FUNC_ACCEPT_ARGTYPES ! AC_CHECK_HEADERS([crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h langinfo.h poll.h pwd.h sys/ipc.h sys/poll.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/time.h sys/un.h termios.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h]) # At least on IRIX, cpp test for netinet/tcp.h will fail unless # netinet/in.h is included first. *************** AC_CHECK_HEADERS(netinet/tcp.h, [], [], *** 714,734 **** #endif ]) ! if test "$with_readline" = yes; 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 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.])])])]) AC_CHECK_HEADERS(readline/history.h, [], ! [AC_CHECK_HEADERS(editline/history.h, [], ! [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.])])])]) fi if test "$with_zlib" = yes; then --- 741,780 ---- #endif ]) ! if expr x"$pgac_cv_check_readline" : 'x-lreadline' >/dev/null ; then AC_CHECK_HEADERS(readline/readline.h, [], ! [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.])])]) AC_CHECK_HEADERS(readline/history.h, [], ! [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.])])]) ! 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 *************** fi *** 744,750 **** if test "$with_krb5" = yes ; then AC_CHECK_HEADER(krb5.h, [], [AC_MSG_ERROR([header file is required for Kerberos 5])]) - AC_CHECK_HEADER(com_err.h, [], [AC_MSG_ERROR([header file is required for Kerberos 5])]) fi if test "$with_openssl" = yes ; then --- 790,795 ---- *************** 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], [], [], --- 823,829 ---- 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 **** --- 832,842 ---- #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 *************** if test "$with_krb5" = yes; then *** 810,816 **** [#include ]) fi - ## ## Functions, global variables ## --- 860,865 ---- *************** PGAC_VAR_INT_TIMEZONE *** 819,837 **** 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 setproctitle setsid sigprocmask symlink sysconf utime utimes waitpid]) 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( --- 868,886 ---- AC_FUNC_ACCEPT_ARGTYPES PGAC_FUNC_GETTIMEOFDAY_1ARG ! 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 ]) + 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( *************** fi *** 850,856 **** # 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. pgac_need_repl_snprintf=no AC_CHECK_FUNCS(snprintf, [], pgac_need_repl_snprintf=yes) --- 899,905 ---- # 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 all the features we need --- see below. pgac_need_repl_snprintf=no AC_CHECK_FUNCS(snprintf, [], pgac_need_repl_snprintf=yes) *************** 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 --- 931,937 ---- AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break]) fi ! 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 *************** else *** 892,897 **** --- 941,953 ---- 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 *************** ac_cv_func_fseeko=yes *** 900,915 **** esac # Solaris has a very slow qsort in certain cases, so we replace it. ! case $host_os in solaris*) ! AC_LIBOBJ(qsort) ;; ! esac ! # 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 PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER --- 956,975 ---- esac # Solaris has a very slow qsort in certain cases, so we replace it. ! 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) ! AC_LIBOBJ(rand) ! AC_DEFINE([HAVE_SYMLINK], 1, ! [Define to 1 if you have the `symlink' function.]) ! fi if test "$with_readline" = yes; then PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER *************** AC_FUNC_FSEEKO *** 964,1007 **** # # 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) ! # ! # Check for re-entrant versions of certain functions ! # ! # Include special flags if threads are enabled _and_ if required for ! # 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 # This test makes sure that run tests work at all. Sometimes a shared # library is found by the linker, but the runtime linker can't find it. --- 1024,1082 ---- # # 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 ! ACX_PTHREAD # set thread flags ! ! # Some platforms use these, so just defineed them. They can't hurt if they ! # are not supported. ! PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_REENTRANT -D_THREAD_SAFE -D_POSIX_PTHREAD_SEMANTICS" ! ! # At this point, we don't want to muck with the compiler name for threading. ! # Let's see who fails, perhaps AIX. 2004-04-23 ! if test "$PTHREAD_CC" != "$CC"; then AC_MSG_ERROR([ ! PostgreSQL does not support platforms that require a special ! compiler binary for thread-safety. ]) fi + if test "$THREAD_SUPPORT" = no; then + AC_MSG_ERROR([ + Cannot enable threads on your platform. + Your platform is known to not support thread-safe programs. + For details, compile and run src/bin/pg_thread_test. + ]) + fi ! # Check for *_r functions _CFLAGS="$CFLAGS" ! _LIBS="$LIBS" ! CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ! LIBS="$LIBS $PTHREAD_LIBS" ! ! AC_CHECK_HEADER(pthread.h, [], [AC_MSG_ERROR([pthread.h not found, required for --enable-thread-safety])]) ! AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r]) + + # Do test here with the proper thread flags + PGAC_FUNC_GETPWUID_R_5ARG + PGAC_FUNC_STRERROR_R_INT + CFLAGS="$_CFLAGS" ! LIBS="$_LIBS" ! ! else ! # do not use values from template file ! PTHREAD_CFLAGS= ! PTHREAD_LIBS= fi + AC_SUBST(PTHREAD_CFLAGS) + AC_SUBST(PTHREAD_LIBS) + # This test makes sure that run tests work at all. Sometimes a shared # library is found by the linker, but the runtime linker can't find it. *************** AC_MSG_ERROR([[ *** 1018,1023 **** --- 1093,1108 ---- [AC_MSG_RESULT([cross-compiling])]) + # Force use of our snprintf if system's doesn't do arg control + # This feature is used by NLS + if test "$enable_nls" = yes && test $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: dnl (1) figure out if the compiler has a 64-bit int type with working *************** fi *** 1053,1061 **** # If we found "long int" is 64 bits, assume snprintf handles it. If # we found we need to use "long long int", better check. We cope with ! # snprintfs that use either %lld, %qd, or %I64d as the format. If ! # neither works, fall back to our own snprintf emulation (which we ! # know uses %lld). if test "$HAVE_LONG_LONG_INT_64" = yes ; then if test $pgac_need_repl_snprintf = no; then --- 1138,1145 ---- # If we found "long int" is 64 bits, assume snprintf handles it. If # we found we need to use "long long int", better check. We cope with ! # snprintfs that use %lld, %qd, or %I64d as the format. If none of these ! # work, fall back to our own snprintf emulation (which we know uses %lld). if test "$HAVE_LONG_LONG_INT_64" = yes ; then if test $pgac_need_repl_snprintf = no; then *************** if test "$HAVE_LONG_LONG_INT_64" = yes ; *** 1069,1084 **** --- 1153,1176 ---- # Here if we previously decided we needed to use our own snprintf LONG_LONG_INT_FORMAT='%lld' fi + LONG_LONG_UINT_FORMAT=`echo "$LONG_LONG_INT_FORMAT" | sed 's/d$/u/'` INT64_FORMAT="\"$LONG_LONG_INT_FORMAT\"" + UINT64_FORMAT="\"$LONG_LONG_UINT_FORMAT\"" else # Here if we are not using 'long long int' at all INT64_FORMAT='"%ld"' + UINT64_FORMAT='"%lu"' fi AC_DEFINE_UNQUOTED(INT64_FORMAT, $INT64_FORMAT, [Define to the appropriate snprintf format for 64-bit ints, if any.]) + 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_SNPRINTF, 1, [Use replacement snprintf() functions.]) AC_LIBOBJ(snprintf) fi *************** AC_CHECK_TYPES(sig_atomic_t, [], [], [#i *** 1123,1132 **** --- 1215,1234 ---- 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 + 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 *************** if test "$with_tcl" = yes; then *** 1158,1192 **** 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 fi - # Check for Tk configuration script tkConfig.sh - if test "$with_tk" = yes; then - PGAC_PATH_TKCONFIGSH([$with_tkconfig $with_tclconfig]) - PGAC_EVAL_TCLCONFIGSH([$TK_CONFIG_SH], [TK_LIBS,TK_LIB_SPEC,TK_XINCLUDES]) - fi - - # # Check for DocBook and tools # PGAC_PROG_NSGMLS PGAC_PROG_JADE ! PGAC_CHECK_DOCBOOK(3.1) PGAC_PATH_DOCBOOK_STYLESHEETS PGAC_PATH_COLLATEINDEX AC_CHECK_PROGS(SGMLSPL, sgmlspl) # prepare build tree if outside source tree # 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" "." \ --- 1260,1331 ---- 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 + ac_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$TCL_INCLUDE_SPEC $CPPFLAGS" + AC_CHECK_HEADER(tcl.h, [], [AC_MSG_ERROR([header file is required for Tcl])]) + CPPFLAGS=$ac_save_CPPFLAGS fi # # Check for DocBook and tools # PGAC_PROG_NSGMLS PGAC_PROG_JADE ! PGAC_CHECK_DOCBOOK(4.2) PGAC_PATH_DOCBOOK_STYLESHEETS PGAC_PATH_COLLATEINDEX AC_CHECK_PROGS(SGMLSPL, sgmlspl) + # 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 + 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 + proper locking function calls to your applications to guarantee thread + safety. + ]) + elif test "$enable_thread_safety" = yes; 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_MSG_RESULT(yes)], + [AC_MSG_RESULT(no) + AC_MSG_ERROR([ + *** Thread test program failed. Your 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. However, you must then run + *** the program in src/tools/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. + ])]) + CFLAGS="$_CFLAGS" + LIBS="$_LIBS" + fi # prepare build tree if outside source tree # 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 **** --- 1333,1339 ---- AC_MSG_RESULT(done) fi fi + AC_SUBST(vpath_build) AC_CONFIG_FILES([GNUmakefile src/Makefile.global]) *************** AC_CONFIG_LINKS([ *** 1207,1212 **** --- 1347,1364 ---- src/Makefile.port:src/makefiles/Makefile.${template} ]) + if test "$PORTNAME" = "win32"; then + AC_CONFIG_COMMANDS([check_win32_symlinks],[ + # Links sometimes fail undetected on Mingw - + # so here we detect it and warn the user + for FILE in $CONFIG_LINKS + do + # test -e works for symlinks in the MinGW console + test -e `expr "$FILE" : '\([[^:]]*\)'` || AC_MSG_WARN([*** link for $FILE - please fix by hand]) + done + ]) + fi + AC_CONFIG_HEADERS([src/include/pg_config.h], [ # Update timestamp for pg_config.h (see Makefile.global) *************** echo >src/include/stamp-h *** 1214,1216 **** --- 1366,1369 ---- ]) AC_OUTPUT +