X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=7d4157bba8a8560a08d5caafce6a4f7dfee3e897;hb=14f29f640a4338650a19f68d9f426d0734353147;hp=3f589441b4e61d925b85bf901f0b4979c3a14e92;hpb=218b4e8dd86016f82c3a71dec9d339240e866505;p=pg-rex%2Fsyncrep.git diff --git a/configure.in b/configure.in index 3f589441b4..7d4157bba8 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $PostgreSQL: pgsql/configure.in,v 1.577 2008/12/11 07:34:07 petere Exp $ +dnl $PostgreSQL: pgsql/configure.in,v 1.597 2009/05/19 22:32:41 petere Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -17,13 +17,13 @@ dnl Read the Autoconf manual for details. dnl m4_pattern_forbid(^PGAC_)dnl to catch undefined macros -AC_INIT([PostgreSQL], [8.4devel], [pgsql-bugs@postgresql.org]) +AC_INIT([PostgreSQL], [8.4beta2], [pgsql-bugs@postgresql.org]) m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required. Untested combinations of 'autoconf' and PostgreSQL versions are not recommended. You can remove the check from 'configure.in' but it is then your responsibility whether the result works or not.])]) -AC_COPYRIGHT([Copyright (c) 1996-2008, PostgreSQL Global Development Group]) +AC_COPYRIGHT([Copyright (c) 1996-2009, PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) AC_PREFIX_DEFAULT(/usr/local/pgsql) @@ -88,7 +88,7 @@ PostgreSQL has apparently not been ported to your platform yet. To try a manual configuration, look into the src/template directory for a similar platform and use the '--with-template=' option. -Please also contact to see about +Please also contact to see about rectifying this. Include the above 'checking host system type...' line. ******************************************************************* @@ -402,7 +402,7 @@ unset CFLAGS # else: If the template file set something, that is used. # else: If coverage was enabled, don't set anything. # else: If the compiler is GCC, then we use -O2. -# else: If the compiler is something else, then we use -O. +# else: If the compiler is something else, then we use -O, unless debugging. if test "$ac_env_CFLAGS_set" = set; then CFLAGS=$ac_env_CFLAGS_value @@ -421,7 +421,8 @@ fi # Some versions of GCC support some additional useful warning flags. # Check whether they are supported, and add them to CFLAGS if so. -# ICC pretends to be GCC but it's lying; it doesn't support these options. +# ICC pretends to be GCC but it's lying; it doesn't support these flags, +# but has its own. Also check other compiler-specific flags here. if test "$GCC" = yes -a "$ICC" = no; then CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith" @@ -438,8 +439,8 @@ elif test "$ICC" = yes; then PGAC_PROG_CC_CFLAGS_OPT([-mp1]) # Make sure strict aliasing is off (though this is said to be the default) PGAC_PROG_CC_CFLAGS_OPT([-fno-strict-aliasing]) -elif test x"${CC}" = x"xlc"; then - # AIX xlc has to have strict aliasing turned off too +elif test "$PORTNAME" = "aix"; then + # AIX's xlc has to have strict aliasing turned off too PGAC_PROG_CC_CFLAGS_OPT([-qnoansialias]) fi @@ -490,16 +491,6 @@ fi AC_PROG_CPP AC_SUBST(GCC) -# Create compiler version string -if test x"$GCC" = x"yes" ; then - cc_string="GCC `${CC} --version | sed q`" -else - cc_string=$CC -fi -AC_DEFINE_UNQUOTED(PG_VERSION_STR, - ["PostgreSQL $PACKAGE_VERSION on $host, compiled by $cc_string"], - [A string containing the version number, platform, and C compiler]) - # # Set up TAS assembly code if needed; the template file has now had its @@ -803,7 +794,7 @@ AC_SUBST(ELF_SYS) CPPFLAGS="$CPPFLAGS $INCLUDES" LDFLAGS="$LDFLAGS $LIBDIRS" -AC_ARG_VAR(LDFLAGS_SL) +AC_ARG_VAR(LDFLAGS_SL, [linker flags for shared library linking]) PGAC_PROG_LD AC_SUBST(LD) @@ -845,12 +836,16 @@ if test "$with_python" = yes; then 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]) +if test "$cross_compiling" = yes && test -z "$with_system_tzdata"; then + AC_PATH_PROG(ZIC, zic) + if test -z "$ZIC"; then + AC_MSG_ERROR([ +When cross-compiling, either use the option --with-system-tzdata to use +existing time-zone data, or set the environment variable ZIC to a zic +program to use during the build.]) + fi +fi + ## ## Libraries @@ -876,6 +871,9 @@ AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt]) AC_SEARCH_LIBS(crypt, crypt) # Solaris: AC_SEARCH_LIBS(fdatasync, [rt posix4]) +# Required for thread_test.c on Solaris 2.5: +# Other ports use it too (HP-UX) so test unconditionally +AC_SEARCH_LIBS(gethostbyname_r, nsl) # Cygwin: AC_SEARCH_LIBS(shmget, cygipc) @@ -1145,8 +1143,15 @@ PGAC_FUNC_GETTIMEOFDAY_1ARG AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getpeereid getpeerucred getrlimit memmove poll pstat readlink setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs]) -AC_CHECK_DECLS(fdatasync, [], [], [#include ]) +# posix_fadvise() is a no-op on Solaris, so don't incur function overhead +# by calling it, 2009-04-02 +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/gen/posix_fadvise.c +if test "$PORTNAME" != "solaris"; then +AC_CHECK_FUNCS(posix_fadvise) AC_CHECK_DECLS(posix_fadvise, [], [], [#include ]) +fi + +AC_CHECK_DECLS(fdatasync, [], [], [#include ]) AC_CHECK_DECLS([strlcat, strlcpy]) # This is probably only present on Darwin, but may as well check always AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include ]) @@ -1244,7 +1249,19 @@ fi pgac_save_LIBS="$LIBS" LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'` -AC_REPLACE_FUNCS([crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul unsetenv]) +AC_REPLACE_FUNCS([crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul]) + +case $host_os in + + # Windows uses a specialised env handler + mingw*) + AC_DEFINE(HAVE_UNSETENV, 1, [Define to 1 because replacement version used.]) + ac_cv_func_unsetenv=yes;; + *) + AC_REPLACE_FUNCS([unsetenv]) + ;; +esac + LIBS="$pgac_save_LIBS" @@ -1260,23 +1277,25 @@ else fi # Similarly, use system's getopt_long() only if system provides struct option. -# Solaris' getopt() doesn't do what we want for long options, so always use -# our versions on that platform. -if test "$PORTNAME" = "solaris"; then - AC_LIBOBJ(getopt) - AC_LIBOBJ(getopt_long) -elif test x"$ac_cv_type_struct_option" = xyes ; then +if test x"$ac_cv_type_struct_option" = xyes ; then AC_REPLACE_FUNCS([getopt_long]) else AC_LIBOBJ(getopt_long) fi +# Solaris' getopt() doesn't do what we want for long options, so always use +# our version on that platform. +if test "$PORTNAME" = "solaris"; then + AC_LIBOBJ(getopt) +fi + # Win32 support if test "$PORTNAME" = "win32"; then AC_REPLACE_FUNCS(gettimeofday) AC_LIBOBJ(kill) AC_LIBOBJ(open) AC_LIBOBJ(rand) +AC_LIBOBJ(win32env) AC_LIBOBJ(win32error) AC_DEFINE([HAVE_SYMLINK], 1, [Define to 1 if you have the `symlink' function.]) @@ -1305,6 +1324,15 @@ AC_CHECK_FUNC(syslog, [AC_CHECK_HEADER(syslog.h, [AC_DEFINE(HAVE_SYSLOG, 1, [Define to 1 if you have the syslog interface.])])]) +AC_CACHE_CHECK([for opterr], pgac_cv_var_int_opterr, +[AC_TRY_LINK([#include ], + [extern int opterr; opterr = 1;], + [pgac_cv_var_int_opterr=yes], + [pgac_cv_var_int_opterr=no])]) +if test x"$pgac_cv_var_int_opterr" = x"yes"; then + AC_DEFINE(HAVE_INT_OPTERR, 1, [Define to 1 if you have the global variable 'int opterr'.]) +fi + AC_CACHE_CHECK([for optreset], pgac_cv_var_int_optreset, [AC_TRY_LINK([#include ], [extern int optreset; optreset = 1;], @@ -1325,7 +1353,8 @@ AC_CHECK_FUNCS(atexit, [], AC_REPLACE_FUNCS(fseeko) case $host_os in # BSD/OS & NetBSD use a custom fseeko/ftello built on fsetpos/fgetpos - bsdi*|netbsd*) + # Mingw uses macros to access Win32 API calls + bsdi*|netbsd*|mingw*) AC_DEFINE(HAVE_FSEEKO, 1, [Define to 1 because replacement version used.]) ac_cv_func_fseeko=yes;; *) @@ -1522,7 +1551,8 @@ fi # Need a #define for the size of Datum (unsigned long) AC_CHECK_SIZEOF([unsigned long]) -# And one for the size of size_t (enables tweaks for > 32bit address space) +# And check size of void *, size_t (enables tweaks for > 32bit address space) +AC_CHECK_SIZEOF([void *]) AC_CHECK_SIZEOF([size_t]) # Decide whether float4 is passed by value: user-selectable, enabled by default @@ -1772,6 +1802,27 @@ AC_MSG_NOTICE([using CFLAGS=$CFLAGS]) AC_MSG_NOTICE([using CPPFLAGS=$CPPFLAGS]) AC_MSG_NOTICE([using LDFLAGS=$LDFLAGS]) +# Create compiler version string +if test x"$GCC" = x"yes" ; then + cc_string="GCC `${CC} --version | sed q`" +elif test x"$SUN_STUDIO_CC" = x"yes" ; then + cc_string=`${CC} -V 2>&1 | sed q` +else + cc_string=$CC +fi + +AC_DEFINE_UNQUOTED(PG_VERSION_STR, + ["PostgreSQL $PACKAGE_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"], + [A string containing the version number, platform, and C compiler]) + +# 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]) + + # 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 @@ -1820,7 +1871,8 @@ AC_CONFIG_HEADERS([src/include/pg_config.h], echo >src/include/stamp-h ]) -AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h]) +AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h], + [echo >src/interfaces/ecpg/include/stamp-h]) AC_OUTPUT