Update configure file.

diff --git a/configure b/configure
index d0b06e8aed17a69c5f2b40e713933611a6e2b5af..4a436133e1a79c37ba2ee5712778e4103a450baa 100755 (executable)
--- a/configure
+++ b/configure
@@ -15405,6 +15405,17 @@ _ACEOF
 fi
 done
 
+for ac_func in PQpingParams
+do :
+  ac_fn_c_check_func "$LINENO" "PQpingParams" "ac_cv_func_PQpingParams"
+if test "x$ac_cv_func_PQpingParams" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PQPINGPARAMS 1
+_ACEOF
+
+fi
+done
+
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 

diff --git a/src/Makefile.in b/src/Makefile.in
index a0acbde057cd097123bd219a4aefab8608a342fc..b4aaf4e5fbede24c175f1299ff9acf289d85da06 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -308,7 +308,8 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@ \
        -DDEFAULT_CONFIGDIR=\"$(sysconfdir)\" \
-       -DHEALTHCHECK_OPTS=$(HEALTHCHECK_DEBUG)
+       -DHEALTHCHECK_OPTS=$(HEALTHCHECK_DEBUG) \
+       -DPGSQL_BIN_DIR=\"$(PGSQL_BIN_DIR)\"
 
 DLLTOOL = @DLLTOOL@
 DOCBOOKSTYLE = @DOCBOOKSTYLE@

diff --git a/src/include/config.h.in b/src/include/config.h.in
index dcb2f73738f443bc6f1d1124dbb1b70a79d091f1..f1a7d8f271e0d1bef3b5f598eda148bd0c57f23b 100644 (file)
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -131,6 +131,9 @@
 /* Define to 1 if you have the <pam/pam_appl.h> header file. */
 #undef HAVE_PAM_PAM_APPL_H
 
+/* Define to 1 if you have the `PQpingParams' function. */
+#undef HAVE_PQPINGPARAMS
+
 /* Define to 1 if you have the `PQprepare' function. */
 #undef HAVE_PQPREPARE
 

diff --git a/src/parser/gram.c b/src/parser/gram.c
index 21b018cacf81a4b3a037b89f71b3c34ceb16123c..2f133ae6f75345dbaa0af5f2b452632f16b709b9 100644 (file)
--- a/src/parser/gram.c
+++ b/src/parser/gram.c
@@ -27143,7 +27143,7 @@ yyreduce:
 #line 1458 "gram.y" /* yacc.c:1646  */
     {
                                        VariableSetStmt *n = (yyvsp[0].vsetstmt);
-                                       n->type = T_PgpoolVariableSetStmt; /* Hack to keep changes minumum */
+                                       n->type = T_PgpoolVariableSetStmt; /* Hack to keep changes minimum */
                                        n->is_local = false;
                                        (yyval.node) = (Node *) n;
                                }
@@ -27568,7 +27568,7 @@ yyreduce:
 #line 1718 "gram.y" /* yacc.c:1646  */
     {
                                        VariableSetStmt *n = (yyvsp[0].vsetstmt);
-                                       n->type = T_PgpoolVariableSetStmt; /* Hack to keep the changes minumum */
+                                       n->type = T_PgpoolVariableSetStmt; /* Hack to keep the changes minimum */
                                        (yyval.node) = (Node *) n;
                                }
 #line 27575 "gram.c" /* yacc.c:1646  */

diff --git a/src/tools/pgmd5/pool_config.c b/src/tools/pgmd5/pool_config.c
deleted file mode 120000 (symlink)
index 2636b78..0000000
--- a/src/tools/pgmd5/pool_config.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../src/config/pool_config.c
\ No newline at end of file