*** pgsql/configure.in 2005/11/05 16:42:01 1.432 --- pgsql/configure.in 2007/07/14 11:13:28 1.521 *************** *** 1,5 **** dnl Process this file with autoconf to produce a configure script. ! dnl $PostgreSQL: pgsql/configure.in,v 1.431 2005/11/05 04:01:41 pgsql 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.520 2007/07/12 14:36:52 mha Exp $ dnl dnl Developers, please strive to achieve this order: dnl *************** dnl Read the Autoconf manual for details *** 17,32 **** dnl m4_pattern_forbid(^PGAC_)dnl to catch undefined macros ! AC_INIT([PostgreSQL], [8.2devel], [pgsql-bugs@postgresql.org]) 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_CANONICAL_HOST --- 17,32 ---- dnl m4_pattern_forbid(^PGAC_)dnl to catch undefined macros ! AC_INIT([PostgreSQL], [8.3devel], [pgsql-bugs@postgresql.org]) AC_PREREQ(2.59) ! AC_COPYRIGHT([Copyright (c) 1996-2007, 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 as a string]) AC_CANONICAL_HOST *************** PGAC_ARG_REQ(with, template, [], *** 49,55 **** case $host_os in aix*) template=aix ;; - beos*) template=beos ;; bsdi*) template=bsdi ;; cygwin*) template=cygwin ;; darwin*) template=darwin ;; --- 49,54 ---- *************** case $host_os in *** 64,70 **** nextstep*) template=nextstep ;; openbsd*) template=openbsd ;; osf*) template=osf ;; - qnx*) template=qnx4 ;; sco*) template=sco ;; solaris*) template=solaris ;; sunos*) template=sunos4 ;; --- 63,68 ---- *************** AC_SUBST(WANTED_LANGUAGES) *** 166,172 **** # 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]], [default_port=$withval], [default_port=5432]) AC_MSG_RESULT([$default_port]) --- 164,170 ---- # 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]]], [default_port=$withval], [default_port=5432]) AC_MSG_RESULT([$default_port]) *************** PGAC_ARG_BOOL(enable, debug, no, *** 208,213 **** --- 206,232 ---- AC_SUBST(enable_debug) # + # --enable-profiling enables gcc profiling + # + PGAC_ARG_BOOL(enable, profiling, no, + [ --enable-profiling build with profiling enabled ]) + AC_SUBST(enable_profiling) + + # + # DTrace + # + PGAC_ARG_BOOL(enable, dtrace, no, + [ --enable-dtrace build with DTrace support], + [AC_DEFINE([ENABLE_DTRACE], 1, + [Define to 1 to enable DTrace support. (--enable-dtrace)]) + AC_CHECK_PROGS(DTRACE, dtrace) + if test -z "$DTRACE"; then + AC_MSG_ERROR([dtrace not found]) + fi + AC_SUBST(DTRACEFLAGS)]) + AC_SUBST(enable_dtrace) + + # # C compiler # *************** else *** 250,265 **** fi fi if test "$GCC" = yes; then - 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([-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 --- 269,302 ---- fi fi + # Some versions of GCC support some additional useful warning flags. + # Check whether they are supported, and add them to CFLAGS if so. + if test "$GCC" = yes; then ! # ICC pretends to be GCC but it's lying; it doesn't support these options. ! # So we have to check if "GCC" is really ICC. ! AC_TRY_COMPILE([], [@%:@ifndef __INTEL_COMPILER ! choke me ! @%:@endif], [ICC=[yes]], [ICC=[no]]) ! ! if test "$ICC" = no; then ! CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith -Winline" ! ! PGAC_PROG_CC_CFLAGS_OPT([-Wdeclaration-after-statement]) ! PGAC_PROG_CC_CFLAGS_OPT([-Wendif-labels]) ! else ! # Intel compiler has a bug/misoptimization in checking for ! # division by NAN (NaN == 0), -mp1 fixes it, so add it to the ! # CFLAGS. ! PGAC_PROG_CC_CFLAGS_OPT([-mp1]) ! fi # Disable strict-aliasing rules; needed for gcc 3.3+ 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 + PGAC_PROG_CC_CFLAGS_OPT([-qnoansialias]) fi # supply -g if --enable-debug *************** if test "$enable_debug" = yes && test "$ *** 267,272 **** --- 304,320 ---- CFLAGS="$CFLAGS -g" 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, + [Define to 1 to enable profiling. (--enable-profiling)]) + CFLAGS="$CFLAGS -pg" + else + AC_MSG_ERROR([--enable-profiling is supported only when using GCC]) + fi + fi + AC_MSG_NOTICE([using CFLAGS=$CFLAGS]) # We already have this in Makefile.win32, but configure needs it too *************** IFS=$ac_save_IFS *** 368,375 **** # 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' --- 416,429 ---- # 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, [ --enable-thread-safety make client libraries thread-safe]) ! else ! # Win32 should always use threads ! PGAC_ARG_BOOL(enable, thread-safety, yes, [ --enable-thread-safety make client libraries thread-safe]) ! fi ! ! PGAC_ARG_BOOL(enable, thread-safety-force, no, [ --enable-thread-safety-force 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' *************** AC_MSG_RESULT([$with_python]) *** 409,414 **** --- 463,480 ---- AC_SUBST(with_python) # + # GSSAPI + # + AC_MSG_CHECKING([whether to build with GSSAPI support]) + PGAC_ARG_BOOL(with, gssapi, no, [ --with-gssapi build with GSSAPI support], + [ + AC_DEFINE(ENABLE_GSS, 1, [Define to build with GSSAPI support. (--with-gssapi)]) + krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab" + ]) + AC_MSG_RESULT([$with_gssapi]) + AC_SUBST(with_gssapi) + + # # Kerberos 5 # AC_MSG_CHECKING([whether to build with Kerberos 5 support]) *************** AC_SUBST(krb_srvtab) *** 428,434 **** # Kerberos configuration parameters # PGAC_ARG_REQ(with, krb-srvnam, ! [ --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"], --- 494,500 ---- # Kerberos configuration parameters # PGAC_ARG_REQ(with, krb-srvnam, ! [ --with-krb-srvnam=NAME default service principal name in Kerberos [[postgres]]], [], [with_krb_srvnam="postgres"]) AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"], *************** AC_SUBST(with_pam) *** 447,452 **** --- 513,529 ---- # + # LDAP + # + AC_MSG_CHECKING([whether to build with LDAP support]) + PGAC_ARG_BOOL(with, ldap, no, + [ --with-ldap build with LDAP support], + [AC_DEFINE([USE_LDAP], 1, [Define to 1 to build with LDAP support. (--with-ldap)])]) + AC_MSG_RESULT([$with_ldap]) + AC_SUBST(with_ldap) + + + # # Bonjour # AC_MSG_CHECKING([whether to build with Bonjour support]) *************** AC_SUBST(with_openssl) *** 471,477 **** # Readline # 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 --- 548,554 ---- # Readline # PGAC_ARG_BOOL(with, readline, yes, ! [ --without-readline do not use GNU Readline nor BSD Libedit for 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 *************** fi *** 484,489 **** --- 561,613 ---- # + # Prefer libedit + # + PGAC_ARG_BOOL(with, libedit-preferred, no, + [ --with-libedit-preferred prefer BSD Libedit over GNU Readline]) + + + # + # OSSP UUID library + # + PGAC_ARG_BOOL(with, ossp-uuid, no, [ --with-ossp-uuid build with OSSP UUID library for UUID generation]) + AC_SUBST(with_ossp_uuid) + + + # + # XML + # + PGAC_ARG_BOOL(with, libxml, no, [ --with-libxml build with XML support], + [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])]) + + if test "$with_libxml" = yes ; then + AC_CHECK_PROGS(XML2_CONFIG, xml2-config) + if test -n "$XML2_CONFIG"; then + for pgac_option in `$XML2_CONFIG --cflags`; do + case $pgac_option in + -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";; + esac + done + for pgac_option in `$XML2_CONFIG --libs`; do + case $pgac_option in + -L*) LDFLAGS="$LDFLAGS $pgac_option";; + esac + done + fi + fi + + AC_SUBST(with_libxml) + + # + # XSLT + # + PGAC_ARG_BOOL(with, libxslt, no, [ --with-libxslt build with XSLT support], + [AC_DEFINE([USE_LIBXSLT], 1, [Define to 1 to build with XSLT support. (--with-libxslt)])]) + + + AC_SUBST(with_libxslt) + + # # Zlib # PGAC_ARG_BOOL(with, zlib, yes, *************** case $host_os in sysv5*) *** 543,571 **** 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([ ! *** 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 ! if test -z "$YACC"; then ! AC_MSG_WARN([ ! *** Without Bison you will not be able to build PostgreSQL from CVS or *** change any of the parser definition files. You can obtain Bison from *** a GNU mirror site. (If you are using the official distribution of ! *** PostgreSQL then you do not need to worry about this because the Bison *** output is pre-generated.) To use a different yacc program (possible, *** but not recommended), set the environment variable YACC before running *** 'configure'.]) fi AC_SUBST(YFLAGS) --- 667,697 ---- AC_SUBST(ld_R_works) esac AC_PROG_RANLIB AC_PATH_PROG(TAR, tar) PGAC_CHECK_STRIP ! if test -z "$YACC"; then ! 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 to use with PostgreSQL. ! *** Bison version 1.875 or later is required.]) ! YACC="" ! fi fi ! if test -z "$YACC"; then ! AC_MSG_WARN([ ! *** Without Bison you will not be able to build PostgreSQL from CVS nor *** change any of the parser definition files. You can obtain Bison from *** a GNU mirror site. (If you are using the official distribution of ! *** PostgreSQL then you do not need to worry about this, because the Bison *** output is pre-generated.) To use a different yacc program (possible, *** but not recommended), set the environment variable YACC before running *** 'configure'.]) + fi fi AC_SUBST(YFLAGS) *************** if test "$with_python" = yes; then *** 580,627 **** PGAC_CHECK_PYTHON_EMBED_SETUP fi ## ## 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(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 --- 706,744 ---- PGAC_CHECK_PYTHON_EMBED_SETUP fi + # Supply a numeric version string for use by 3rd party add-ons + # awk -F is a regex on some platforms, and not on others, so make "." a tab + [PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' | + tr '.' ' ' | + $AWK '{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 ## + ## Most libraries are included only if they demonstrably provide a function + ## we need, but libm is an exception: always include it, because there are + ## too many compilers that play cute optimization games that will break + ## probes for standard functions such as pow(). + ## ! AC_CHECK_LIB(m, main) ! AC_SEARCH_LIBS(setproctitle, util) ! 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]) ! AC_SEARCH_LIBS(crypt, crypt) # Solaris: AC_SEARCH_LIBS(fdatasync, [rt posix4]) # Cygwin: ! AC_SEARCH_LIBS(shmget, cygipc) if test "$with_readline" = yes; then PGAC_CHECK_READLINE *************** else *** 648,660 **** *** Not using spinlocks will cause poor performance.]) 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', [], --- 765,784 ---- *** Not using spinlocks will cause poor performance.]) fi + if test "$with_gssapi" = yes ; then + if test "$PORTNAME" != "win32"; then + AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [], + [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])]) + else + LIBS="$LIBS -lgssapi32" + fi + 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_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])]) else AC_SEARCH_LIBS(com_err, 'comerr32 -lkrb5_32', [], *************** if test "$with_pam" = yes ; then *** 677,689 **** AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])]) fi ## ## Header files ## 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. --- 801,821 ---- AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])]) fi + if test "$with_libxml" = yes ; then + AC_CHECK_LIB(xml2, xmlSaveToBuffer, [], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])]) + fi + + if test "$with_libxslt" = yes ; then + AC_CHECK_LIB(xslt, xsltLibxmlVersion, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])]) + fi + ## ## Header files ## 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 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. *************** if expr x"$pgac_cv_check_readline" : 'x- *** 722,734 **** 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 --- 854,865 ---- 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.])])])]) + # Note: in a libedit installation, history.h is sometimes a dummy, and may + # not be there at all. Hence, don't complain if not found. We must check + # though, since in yet other versions it is an independent header. AC_CHECK_HEADERS(editline/history.h, [], [AC_CHECK_HEADERS(history.h, [], ! [AC_CHECK_HEADERS(readline/history.h)])]) fi if test "$with_zlib" = yes; then *************** failure. It is possible the compiler is *** 738,743 **** --- 869,879 ---- Use --without-zlib to disable zlib support.])]) fi + if test "$with_gssapi" = yes ; then + AC_CHECK_HEADERS(gssapi/gssapi.h, [], + [AC_CHECK_HEADERS(gssapi.h, [], [AC_MSG_ERROR([gssapi.h header file is required for GSSAPI])])]) + fi + if test "$with_krb5" = yes ; then AC_CHECK_HEADER(krb5.h, [], [AC_MSG_ERROR([header file is required for Kerberos 5])]) fi *************** if test "$with_pam" = yes ; then *** 753,758 **** --- 889,915 ---- [AC_MSG_ERROR([header file or is required for PAM.])])]) fi + if test "$with_libxml" = yes ; then + AC_CHECK_HEADER(libxml/parser.h, [], [AC_MSG_ERROR([header file is required for XML support])]) + fi + + if test "$with_libxslt" = yes ; then + AC_CHECK_HEADER(libxslt/xslt.h, [], [AC_MSG_ERROR([header file is required for XSLT support])]) + fi + + if test "$with_ldap" = yes ; then + if test "$PORTNAME" != "win32"; then + AC_CHECK_HEADERS(ldap.h, [], + [AC_MSG_ERROR([header file is required for LDAP])]) + else + AC_CHECK_HEADERS(winldap.h, [], + [AC_MSG_ERROR([header file is required for LDAP])], + [AC_INCLUDES_DEFAULT + #include + ]) + fi + fi + if test "$with_bonjour" = yes ; then AC_CHECK_HEADER(DNSServiceDiscovery/DNSServiceDiscovery.h, [], [AC_MSG_ERROR([header file is required for Bonjour])]) fi *************** fi *** 763,768 **** --- 920,926 ---- ## m4_defun([AC_PROG_CC_STDC], []) dnl We don't want that. + AC_C_BIGENDIAN AC_C_CONST AC_C_INLINE AC_C_STRINGIZE *************** if test "$with_krb5" = yes; then *** 808,815 **** --- 966,983 ---- [AC_MSG_ERROR([could not determine how to extract Kerberos 5 error messages])], [#include ])], [#include ]) + + # Win32 requires headers to be loaded for __stdcall, so can't use + # AC_CHECK_FUNCS here. + 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_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)]) fi + ## ## Functions, global variables ## *************** PGAC_VAR_INT_TIMEZONE *** 818,826 **** 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], --- 986,998 ---- AC_FUNC_ACCEPT_ARGTYPES PGAC_FUNC_GETTIMEOFDAY_1ARG ! AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getpeereid getrlimit memmove poll pstat readlink setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs]) AC_CHECK_DECLS(fdatasync, [], [], [#include ]) + AC_CHECK_DECLS(posix_fadvise, [], [], [#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 ]) HAVE_IPV6=no AC_CHECK_TYPE([struct sockaddr_in6], *************** fi *** 850,858 **** # 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) ! AC_CHECK_FUNCS(vsnprintf, [], pgac_need_repl_snprintf=yes) # Check whether declares snprintf() and vsnprintf(); if not, --- 1022,1059 ---- # also decide to use snprintf.c if snprintf() is present but does not # have all the features we need --- see below. ! 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 . ! # ! # 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 declares snprintf() and vsnprintf(); if not, *************** AC_CHECK_FUNCS(vsnprintf, [], pgac_need_ *** 863,874 **** AC_CHECK_DECLS([snprintf, vsnprintf]) ! # do this one the hard way in case isinf() is a macro AC_CACHE_CHECK([for isinf], ac_cv_func_isinf, ! [AC_TRY_LINK( ! [#include ], ! [double x = 0.0; int res = isinf(x);], [ac_cv_func_isinf=yes], [ac_cv_func_isinf=no])]) --- 1064,1076 ---- AC_CHECK_DECLS([snprintf, vsnprintf]) ! 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 ! double glob_double; ], ! [return isinf(glob_double) ? 0 : 1;], [ac_cv_func_isinf=yes], [ac_cv_func_isinf=no])]) *************** else *** 880,886 **** 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. --- 1082,1095 ---- AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break]) fi ! # Some versions of libedit contain strlcpy(); so disregard that library while ! # checking for these standard libc functions. ! pgac_save_LIBS="$LIBS" ! LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'` ! ! AC_REPLACE_FUNCS([crypt fseeko getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul unsetenv]) ! ! LIBS="$pgac_save_LIBS" # 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. *************** case $host_os in bsdi*|netbsd*) *** 907,923 **** ac_cv_func_fseeko=yes 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(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 --- 1116,1128 ---- ac_cv_func_fseeko=yes esac # Win32 support if test "$PORTNAME" = "win32"; then AC_LIBOBJ(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.]) fi *************** if test "$with_readline" = yes; then *** 929,942 **** fi - dnl Cannot use AC_CHECK_FUNC because finite may be a macro - AC_MSG_CHECKING(for finite) - AC_TRY_LINK([#include ], - [int dummy=finite(1.0);], - [AC_DEFINE(HAVE_FINITE, 1, [Define to 1 if you have finite().]) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) - dnl Cannot use AC_CHECK_FUNC because sigsetjmp may be a macro dnl (especially on GNU libc) dnl See also comments in c.h. --- 1134,1139 ---- *************** AC_TRY_LINK([#include ], *** 947,952 **** --- 1144,1151 ---- AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)]) + AC_DECL_SYS_SIGLIST + AC_CHECK_FUNC(syslog, [AC_CHECK_HEADER(syslog.h, [AC_DEFINE(HAVE_SYSLOG, 1, [Define to 1 if you have the syslog interface.])])]) *************** AC_FUNC_FSEEKO *** 976,983 **** # 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 --- 1175,1182 ---- # 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. ! # WIN32 doesn't need the pthread tests; it always uses threads ! if test "$enable_thread_safety" = yes -a "$PORTNAME" != "win32"; then ACX_PTHREAD # set thread flags # Some platforms use these, so just defineed them. They can't hurt if they *************** PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_REENT *** 989,1005 **** # 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 --- 1188,1201 ---- # 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 ! 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.]) fi # Check for *_r functions *************** _LIBS="$LIBS" *** 1008,1014 **** --- 1204,1212 ---- 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])]) + fi AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r]) *************** AC_SUBST(PTHREAD_CFLAGS) *** 1029,1034 **** --- 1227,1260 ---- AC_SUBST(PTHREAD_LIBS) + # We can test for libldap_r only after we know PTHREAD_LIBS + if test "$with_ldap" = yes ; then + _LIBS="$LIBS" + if test "$PORTNAME" != "win32"; then + AC_CHECK_LIB(ldap, ldap_bind, [], + [AC_MSG_ERROR([library 'ldap' is required for LDAP])], + [$EXTRA_LDAP_LIBS]) + LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS" + if test "$enable_thread_safety" = yes; then + # on some platforms ldap_r fails to link without PTHREAD_LIBS + AC_CHECK_LIB(ldap_r, ldap_simple_bind, [], + [AC_MSG_ERROR([library 'ldap_r' is required for LDAP])], + [$PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS]) + LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS" + else + LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS" + fi + else + AC_CHECK_LIB(wldap32, ldap_bind, [], [AC_MSG_ERROR([library 'wldap32' is required for LDAP])]) + LDAP_LIBS_FE="-lwldap32" + LDAP_LIBS_BE="-lwldap32" + fi + LIBS="$_LIBS" + fi + AC_SUBST(LDAP_LIBS_FE) + AC_SUBST(LDAP_LIBS_BE) + + # 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. # This check should come after all modifications of compiler or linker *************** AC_TRY_RUN([int main() { return 0; }], *** 1038,1058 **** [AC_MSG_RESULT(ok)], [AC_MSG_RESULT(failed) AC_MSG_ERROR([[ ! *** Could not execute a simple test program. This may be a problem ! *** related to locating shared libraries. Check the file 'config.log' ! *** for the exact reason.]])], [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 && ! # On Win32, libintl replaces snprintf() with its own version that ! # understands arg control, so we don't need our own. In fact, it ! # also uses macros that conflict with ours, so we _can't_ use ! # our own. ! test "$PORTNAME" != "win32"; then PGAC_FUNC_PRINTF_ARG_CONTROL if test $pgac_cv_printf_arg_control != yes ; then pgac_need_repl_snprintf=yes --- 1264,1281 ---- [AC_MSG_RESULT(ok)], [AC_MSG_RESULT(failed) AC_MSG_ERROR([[ ! Could not execute a simple test program. This may be a problem ! related to locating shared libraries. Check the file 'config.log' ! 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 *************** AC_DEFINE_UNQUOTED(UINT64_FORMAT, $UINT6 *** 1127,1133 **** # 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 --- 1350,1356 ---- # 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 *************** AC_CHECK_TYPES([int8, uint8, int64, uint *** 1174,1187 **** AC_CHECK_TYPES(sig_atomic_t, [], [], [#include ]) ! 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 --- 1397,1409 ---- AC_CHECK_TYPES(sig_atomic_t, [], [], [#include ]) ! 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.]) fi fi *************** AC_FUNC_MEMCMP *** 1194,1216 **** # Select semaphore implementation type. ! if test x"$USE_NAMED_POSIX_SEMAPHORES" = x"1" ; then ! AC_DEFINE(USE_NAMED_POSIX_SEMAPHORES, 1, [Define to select named POSIX semaphores.]) ! SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c" ! else ! if test x"$USE_UNNAMED_POSIX_SEMAPHORES" = x"1" ; then ! AC_DEFINE(USE_UNNAMED_POSIX_SEMAPHORES, 1, [Define to select unnamed POSIX semaphores.]) SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c" else ! AC_DEFINE(USE_SYSV_SEMAPHORES, 1, [Define to select SysV-style semaphores.]) ! SEMA_IMPLEMENTATION="src/backend/port/sysv_sema.c" fi fi # Select shared-memory implementation type. ! AC_DEFINE(USE_SYSV_SHARED_MEMORY, 1, [Define to select SysV-style shared memory.]) ! SHMEM_IMPLEMENTATION="src/backend/port/sysv_shmem.c" if test "$enable_nls" = yes ; then --- 1416,1454 ---- # Select semaphore implementation type. ! if test "$PORTNAME" != "win32"; then ! if test x"$USE_NAMED_POSIX_SEMAPHORES" = x"1" ; then ! AC_DEFINE(USE_NAMED_POSIX_SEMAPHORES, 1, [Define to select named POSIX semaphores.]) SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c" else ! if test x"$USE_UNNAMED_POSIX_SEMAPHORES" = x"1" ; then ! AC_DEFINE(USE_UNNAMED_POSIX_SEMAPHORES, 1, [Define to select unnamed POSIX semaphores.]) ! SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c" ! else ! AC_DEFINE(USE_SYSV_SEMAPHORES, 1, [Define to select SysV-style semaphores.]) ! SEMA_IMPLEMENTATION="src/backend/port/sysv_sema.c" ! fi fi + else + AC_DEFINE(USE_WIN32_SEMAPHORES, 1, [Define to select Win32-style semaphores.]) + SEMA_IMPLEMENTATION="src/backend/port/win32_sema.c" fi # Select shared-memory implementation type. ! if test "$PORTNAME" != "win32"; then ! AC_DEFINE(USE_SYSV_SHARED_MEMORY, 1, [Define to select SysV-style shared memory.]) ! SHMEM_IMPLEMENTATION="src/backend/port/sysv_shmem.c" ! else ! AC_DEFINE(USE_WIN32_SHARED_MEMORY, 1, [Define to select Win32-style shared memory.]) ! SHMEM_IMPLEMENTATION="src/backend/port/win32_shmem.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 ! fi ! AC_DEFINE_UNQUOTED(MEMSET_LOOP_LIMIT, ${MEMSET_LOOP_LIMIT}, [Define bytes to use libc memset().]) if test "$enable_nls" = yes ; then *************** AC_CHECK_PROGS(SGMLSPL, sgmlspl) *** 1246,1264 **** # 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 ! 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]) --- 1484,1501 ---- # 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 "$PORTNAME" != "win32" then AC_MSG_CHECKING([thread safety of required library functions]) *************** _CFLAGS="$CFLAGS" *** 1266,1292 **** _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" else ! AC_MSG_WARN([*** Skipping thread test on Win32]) fi fi --- 1503,1528 ---- _LIBS="$LIBS" CFLAGS="$CFLAGS $PTHREAD_CFLAGS -DIN_CONFIGURE" LIBS="$LIBS $PTHREAD_LIBS" ! 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.])], [AC_MSG_RESULT(maybe) AC_MSG_WARN([ *** Skipping thread test program because of cross-compile build. ! *** 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 *************** AC_CONFIG_COMMANDS([check_win32_symlinks *** 1327,1333 **** 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 --- 1563,1569 ---- 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 *** 1338,1342 **** --- 1574,1582 ---- echo >src/include/stamp-h ]) + AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h]) + AC_OUTPUT + # Warn about unknown options + PGAC_ARG_CHECK