Permalink
Browse files

Ran autoconf with latest changes

  • Loading branch information...
1 parent b091dd3 commit 0a67007ea81575ce53119294f28910af92777610 Christopher Browne committed Sep 24, 2008
Showing with 193 additions and 30 deletions.
  1. +193 −30 configure
View
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for slony1 HEAD_20071004.
+# Generated by GNU Autoconf 2.61 for slony1 HEAD_20080924.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='slony1'
PACKAGE_TARNAME='slony1'
-PACKAGE_VERSION='HEAD_20071004'
-PACKAGE_STRING='slony1 HEAD_20071004'
+PACKAGE_VERSION='HEAD_20080924'
+PACKAGE_STRING='slony1 HEAD_20080924'
PACKAGE_BUGREPORT=''
ac_unique_file="src"
@@ -675,7 +675,7 @@ LD
GCC
YFLAGS
LEXFLAGS
-HEAD_20071004
+HEAD_20080924
with_gnu_ld
enable_rpath
acx_pthread_config
@@ -1236,7 +1236,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures slony1 HEAD_20071004 to adapt to many kinds of systems.
+\`configure' configures slony1 HEAD_20080924 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1301,7 +1301,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of slony1 HEAD_20071004:";;
+ short | recursive ) echo "Configuration of slony1 HEAD_20080924:";;
esac
cat <<\_ACEOF
@@ -1406,7 +1406,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-slony1 configure HEAD_20071004
+slony1 configure HEAD_20080924
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1420,7 +1420,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by slony1 $as_me HEAD_20071004, which was
+It was created by slony1 $as_me HEAD_20080924, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -6782,6 +6782,17 @@ echo "${ECHO_T}$PG_CONFIG_LOCATION" >&6; }
echo $ECHO_N "checking for correct version of PostgreSQL... $ECHO_C" >&6; }
PG_VERSION_MAJOR=`echo $PG_VERSION | cut -d. -f1`
PG_VERSION_MINOR=`echo $PG_VERSION | cut -d. -f2`
+ if test "$PG_VERSION_MAJOR" = "7"; then
+ { echo "$as_me:$LINENO: result: \"error\"" >&5
+echo "${ECHO_T}\"error\"" >&6; }
+ { { echo "$as_me:$LINENO: error: Your version of PostgreSQL ($PG_VERSION) is lower
+ than the required 8.3. Slony-I needs functionality included in
+ a newer version." >&5
+echo "$as_me: error: Your version of PostgreSQL ($PG_VERSION) is lower
+ than the required 8.3. Slony-I needs functionality included in
+ a newer version." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
if test "$PG_VERSION_MAJOR" = "8"; then
if test $PG_VERSION_MINOR -gt 2; then
{ echo "$as_me:$LINENO: result: $PG_VERSION" >&5
@@ -6802,26 +6813,19 @@ echo "$as_me: error: Your version of PostgreSQL ($PG_VERSION) is lower
a newer version." >&2;}
{ (exit 1); exit 1; }; }
fi
- fi
- if test "$PG_VERSION_MAJOR" = "7"; then
- { echo "$as_me:$LINENO: result: \"error\"" >&5
-echo "${ECHO_T}\"error\"" >&6; }
- { { echo "$as_me:$LINENO: error: Your version of PostgreSQL ($PG_VERSION) is lower
- than the required 8.3. Slony-I requires functionality included in
- a newer version." >&5
-echo "$as_me: error: Your version of PostgreSQL ($PG_VERSION) is lower
- than the required 8.3. Slony-I requires functionality included in
- a newer version." >&2;}
- { (exit 1); exit 1; }; }
+ { echo "$as_me:$LINENO: result: $PG_VERSION" >&5
+echo "${ECHO_T}$PG_VERSION" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define PG_VERSION_OK 1
+_ACEOF
+
fi
- if test "$PG_VERSION_MAJOR" = "8"; then
- if test $PG_VERSION_MINOR -gt 0; then
- if test "$PG_SHAREDIR" = ""; then
- PG_SHAREDIR=`$PG_CONFIG_LOCATION --sharedir`/ 2>/dev/null
- echo "pg_config says pg_sharedir is $PG_SHAREDIR"
- fi
- fi
+
+ if test "$PG_SHAREDIR" = ""; then
+ PG_SHAREDIR=`$PG_CONFIG_LOCATION --sharedir`/ 2>/dev/null
+ echo "pg_config says pg_sharedir is $PG_SHAREDIR"
fi
case ${host_os} in
@@ -6888,6 +6892,87 @@ esac
TEMP_LDFLAGS=$LDFLAGS
LDFLAGS="$TEMP_LDFLAGS -L$PG_LIBDIR"
+{ echo "$as_me:$LINENO: checking for PQunescapeBytea in -lpq" >&5
+echo $ECHO_N "checking for PQunescapeBytea in -lpq... $ECHO_C" >&6; }
+if test "${ac_cv_lib_pq_PQunescapeBytea+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpq $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char PQunescapeBytea ();
+int
+main ()
+{
+return PQunescapeBytea ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_pq_PQunescapeBytea=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_pq_PQunescapeBytea=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQunescapeBytea" >&5
+echo "${ECHO_T}$ac_cv_lib_pq_PQunescapeBytea" >&6; }
+if test $ac_cv_lib_pq_PQunescapeBytea = yes; then
+ HAVE_PQUNESCAPEBYTEA=1
+fi
+
+if test -n "$HAVE_PQUNESCAPEBYTEA"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define PG_VERSION_VERIFIED 1
+_ACEOF
+
+else
+ { { echo "$as_me:$LINENO: error: Your version of libpq doesn't have PQunescapeBytea
+ which means that your version of PostgreSQL is lower than 7.3
+ and thus not even remotely supported by Slony-I version 2" >&5
+echo "$as_me: error: Your version of libpq doesn't have PQunescapeBytea
+ which means that your version of PostgreSQL is lower than 7.3
+ and thus not even remotely supported by Slony-I version 2" >&2;}
+ { (exit which requires 8.3+); exit which requires 8.3+; }; }
+fi
+
TEMP_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$TEMP_CPPFLAGS -I$PG_INCLUDEDIR"
@@ -7572,7 +7657,52 @@ _ACEOF
fi
+{ echo "$as_me:$LINENO: checking for typenameTypeId" >&5
+echo $ECHO_N "checking for typenameTypeId... $ECHO_C" >&6; }
+if test -z "$ac_cv_typenameTypeId_args"; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include "postgres.h"
+ #include "parser/parse_type.h"
+int
+main ()
+{
+typenameTypeId(NULL, NULL, NULL);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_typenameTypeId_args=3
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
{ echo "$as_me:$LINENO: checking for typenameTypeId" >&5
echo $ECHO_N "checking for typenameTypeId... $ECHO_C" >&6; }
if test -z "$ac_cv_typenameTypeId_args"; then
@@ -7667,7 +7797,12 @@ if test -z "$ac_cv_typenameTypeId_args"; then
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
else
- if test "$ac_cv_typenameTypeId_args" = 2; then
+ if test "$ac_cv_typenameTypeId_args" = 3; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_TYPENAMETYPEID_3 1
+_ACEOF
+
+ elif test "$ac_cv_typenameTypeId_args" = 2; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_TYPENAMETYPEID_2 1
_ACEOF
@@ -7682,6 +7817,33 @@ _ACEOF
echo "${ECHO_T}yes, and it takes $ac_cv_typenameTypeId_args arguments" >&6; }
fi
+{ echo "$as_me:$LINENO: checking for GetActiveSnapshot" >&5
+echo $ECHO_N "checking for GetActiveSnapshot... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <utils/snapmgr.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "GetActiveSnapshot" >/dev/null 2>&1; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETACTIVESNAPSHOT 1
+_ACEOF
+
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+fi
+rm -f conftest*
+
+
{ echo "$as_me:$LINENO: checking for standard_conforming_strings" >&5
echo $ECHO_N "checking for standard_conforming_strings... $ECHO_C" >&6; }
if test -z "$ac_cv_standard_conforming_strings"; then
@@ -7711,6 +7873,7 @@ rm -f conftest*
fi
+
{ echo "$as_me:$LINENO: checking whether GetTopTransactionId is declared" >&5
echo $ECHO_N "checking whether GetTopTransactionId is declared... $ECHO_C" >&6; }
if test "${ac_cv_have_decl_GetTopTransactionId+set}" = set; then
@@ -11065,7 +11228,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by slony1 $as_me HEAD_20071004, which was
+This file was extended by slony1 $as_me HEAD_20080924, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -11114,7 +11277,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-slony1 config.status HEAD_20071004
+slony1 config.status HEAD_20080924
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -11349,7 +11512,7 @@ LD!$LD$ac_delim
GCC!$GCC$ac_delim
YFLAGS!$YFLAGS$ac_delim
LEXFLAGS!$LEXFLAGS$ac_delim
-HEAD_20071004!$HEAD_20071004$ac_delim
+HEAD_20080924!$HEAD_20080924$ac_delim
with_gnu_ld!$with_gnu_ld$ac_delim
enable_rpath!$enable_rpath$ac_delim
acx_pthread_config!$acx_pthread_config$ac_delim

0 comments on commit 0a67007

Please sign in to comment.