Log Message:
-----------
fix brain dead moment of forgetting test returns 0 on GOOD

Modified Files:
--------------
    slony1-engine/config:
        acx_libpq.m4 (r1.6 -> r1.7)
    slony1-engine:
        configure (r1.30 -> r1.31)

-------------- next part --------------
Index: acx_libpq.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/acx_libpq.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lconfig/acx_libpq.m4 -Lconfig/acx_libpq.m4 -u -w -r1.6 -r1.7
--- config/acx_libpq.m4
+++ config/acx_libpq.m4
@@ -35,17 +35,17 @@
     if test "$PG_MAJOR_VERSION" = "7"; then
 	if test $PG_MINOR_VERSION -gt 2; then
 	    AC_MSG_RESULT($PG_VERSION)
-	    AC_DEFINE(PG_VERSION_OK,1,[PostgreSQL 7.3 or later])
+	    AC_DEFINE(PG_VERSION_OK,1,[PostgreSQL 7.3.3 or later])
 	else
 	    AC_MSG_RESULT("error")
 	    AC_MSG_ERROR(Your version of PostgreSQL ($PG_VERSION) is lower 
-	    than the required 7.3.x. Slony-I needs functions included in
+	    than the required 7.3.3. Slony-I needs functions included in
 	    a newer version.)
 	fi
     fi
     if test "$PG_MAJOR_VERSION" = "8"; then
       AC_MSG_RESULT($PG_VERSION)
-      AC_DEFINE(PG_VERSION_OK,1,[PostgreSQL 7.3 or later])
+      AC_DEFINE(PG_VERSION_OK,1,[PostgreSQL 7.3.3 or later])
     fi
 else
     dnl Specify the commandline options here.
@@ -138,7 +138,7 @@
 
 AC_CHECK_HEADER(postgres.h, HAVE_LIBPQSERVER=1)
 AC_CHECK_HEADER(utils/typcache.h, AC_DEFINE(HAVE_TYPCACHE,1,[PostgreSQL typcache]),[],[#include "postgres.h"])
-if test -n "$HAVE_LIBPQSERVER" ; then
+if test -n "$HAVE_LIBPQSERVER" -a "$HAVE_TYPCACHE" != "yes"; then
     AC_DEFINE(PG_LIBPQSERVER_VERIFIED,1,[PostgreSQL header check])
 else
     AC_MSG_ERROR(Headers for libpqserver are not found in the includeserverdir.
@@ -149,7 +149,13 @@
 
 LDFLAGS="$TEMP_FLAGS -L$PG_PKGLIBDIR"
 AC_MSG_CHECKING(for plpgsql.so)
-if test -s $PG_PKGLIBDIR"plpgsql.so" || test -s $PG_PKGLIBDIR"plpgsql.sl" || test -s $PG_PKGLIBDIR"plpgsql.dll" ; then
+if test -s $PG_PKGLIBDIR"/plpgsql.so"; then
+    AC_MSG_RESULT(yes)
+    AC_DEFINE(PG_PKGLIBDIR_VERIFIED,1,[PostgreSQL pkglibdir])
+elif test -s $PG_PKGLIBDIR"plpgsql.sl"; then
+    AC_MSG_RESULT(yes)
+    AC_DEFINE(PG_PKGLIBDIR_VERIFIED,1,[PostgreSQL pkglibdir])
+elif test -s $PG_PKGLIBDIR"plpgsql.dll"; then
     AC_MSG_RESULT(yes)
     AC_DEFINE(PG_PKGLIBDIR_VERIFIED,1,[PostgreSQL pkglibdir])
 else
Index: configure
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure,v
retrieving revision 1.30
retrieving revision 1.31
diff -Lconfigure -Lconfigure -u -w -r1.30 -r1.31
--- configure
+++ configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for postgresql-slony1-engine HEAD_20040905.
+# Generated by GNU Autoconf 2.57 for postgresql-slony1-engine HEAD_20040923.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -266,8 +266,8 @@
 # Identity of this package.
 PACKAGE_NAME='postgresql-slony1-engine'
 PACKAGE_TARNAME='postgresql-slony1-engine'
-PACKAGE_VERSION='HEAD_20040905'
-PACKAGE_STRING='postgresql-slony1-engine HEAD_20040905'
+PACKAGE_VERSION='HEAD_20040923'
+PACKAGE_STRING='postgresql-slony1-engine HEAD_20040923'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src"
@@ -777,7 +777,7 @@
   # 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 postgresql-slony1-engine HEAD_20040905 to adapt to many kinds of systems.
+\`configure' configures postgresql-slony1-engine HEAD_20040923 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -838,7 +838,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20040905:";;
+     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20040923:";;
    esac
   cat <<\_ACEOF
 
@@ -928,7 +928,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-postgresql-slony1-engine configure HEAD_20040905
+postgresql-slony1-engine configure HEAD_20040923
 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -943,7 +943,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by postgresql-slony1-engine $as_me HEAD_20040905, which was
+It was created by postgresql-slony1-engine $as_me HEAD_20040923, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
@@ -4282,6 +4282,149 @@
 done
 
 
+for ac_header in inttypes.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
 for ac_func in gettimeofday
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -5107,7 +5250,7 @@
 echo "$as_me:$LINENO: checking for pg_config" >&5
 echo $ECHO_N "checking for pg_config... $ECHO_C" >&6
 
-PGCONFIG_POSSIBLE_LOCATIONS="${with_pgconfigdir} /usr/local/pgsql/bin /usr/local/bin /usr/bin /bin /usr/lib/postgresql/bin /opt/local/pgsql/bin /opt/pgsql/bin/"
+PGCONFIG_POSSIBLE_LOCATIONS="/usr/local/pgsql/bin /usr/local/bin /usr/bin /bin /usr/lib/postgresql/bin /opt/local/pgsql/bin /opt/pgsql/bin/ ${with_pgconfigdir}"
 for i in $PGCONFIG_POSSIBLE_LOCATIONS; do
     if test -x $i/pg_config; then
 	PG_CONFIG_LOCATION="$i/pg_config"
@@ -5145,10 +5288,10 @@
 	    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 7.3.x. Slony-I needs functions included in
+	    than the required 7.3.3. Slony-I needs functions included in
 	    a newer version." >&5
 echo "$as_me: error: Your version of PostgreSQL ($PG_VERSION) is lower
-	    than the required 7.3.x. Slony-I needs functions included in
+	    than the required 7.3.3. Slony-I needs functions included in
 	    a newer version." >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5637,7 +5780,7 @@
 fi
 
 
-if test -n "$HAVE_LIBPQSERVER" ; then
+if test -n "$HAVE_LIBPQSERVER" -a "$HAVE_TYPCACHE" != "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define PG_LIBPQSERVER_VERIFIED 1
@@ -5658,7 +5801,23 @@
 LDFLAGS="$TEMP_FLAGS -L$PG_PKGLIBDIR"
 echo "$as_me:$LINENO: checking for plpgsql.so" >&5
 echo $ECHO_N "checking for plpgsql.so... $ECHO_C" >&6
-if test -s $PG_PKGLIBDIR"plpgsql.so" || test -s $PG_PKGLIBDIR"plpgsql.sl" || test -s $PG_PKGLIBDIR"plpgsql.dll" ; then
+if test -s $PG_PKGLIBDIR"/plpgsql.so"; then
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define PG_PKGLIBDIR_VERIFIED 1
+_ACEOF
+
+elif test -s $PG_PKGLIBDIR"plpgsql.sl"; then
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define PG_PKGLIBDIR_VERIFIED 1
+_ACEOF
+
+elif test -s $PG_PKGLIBDIR"plpgsql.dll"; then
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -6311,7 +6470,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by postgresql-slony1-engine $as_me HEAD_20040905, which was
+This file was extended by postgresql-slony1-engine $as_me HEAD_20040923, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6371,7 +6530,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-postgresql-slony1-engine config.status HEAD_20040905
+postgresql-slony1-engine config.status HEAD_20040923
 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"