+++ /dev/null
---- a/configure.in
-+++ b/configure.in
-@@ -2317,36 +2317,6 @@ if test "$with_python" = yes; then
- CPPFLAGS=$ac_save_CPPFLAGS
- fi
-
--#
--# Check for DocBook and tools
--#
--PGAC_PATH_XMLLINT
--PGAC_CHECK_DOCBOOK(4.2)
--PGAC_PATH_PROGS(DBTOEPUB, dbtoepub)
--PGAC_PATH_PROGS(XSLTPROC, xsltproc)
--PGAC_PATH_PROGS(FOP, fop)
--
--#
--# Check for test tools
--#
--if test "$enable_tap_tests" = yes; then
-- # Check for necessary modules, unless user has specified the "prove" to use;
-- # in that case it's her responsibility to have a working configuration.
-- # (prove might be part of a different Perl installation than perl, eg on
-- # MSys, so the result of AX_PROG_PERL_MODULES could be irrelevant anyway.)
-- if test -z "$PROVE"; then
-- # Test::More and Time::HiRes are supposed to be part of core Perl,
-- # but some distros omit them in a minimal installation.
-- AX_PROG_PERL_MODULES([IPC::Run Test::More=0.87 Time::HiRes], ,
-- [AC_MSG_ERROR([Additional Perl modules are required to run TAP tests])])
-- fi
-- # Now make sure we know where prove is
-- PGAC_PATH_PROGS(PROVE, prove)
-- if test -z "$PROVE"; then
-- AC_MSG_ERROR([prove not found])
-- fi
--fi
--
- # Thread testing
-
- # We have to run the thread test near the end so we have all our symbols
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
-@@ -93,6 +93,7 @@ static char *event_source = NULL;
+@@ -94,6 +94,7 @@ static char *event_source = NULL;
static char *register_servicename = "PostgreSQL"; /* FIXME: + version ID? */
static char *register_username = NULL;
static char *register_password = NULL;
static char *argv0 = NULL;
static bool allow_core_files = false;
static time_t start_time;
-@@ -2082,6 +2083,9 @@ do_help(void)
+@@ -2055,6 +2056,9 @@ do_help(void)
#endif
printf(_(" -s, --silent only print errors, no informational messages\n"));
printf(_(" -t, --timeout=SECS seconds to wait when using -w option\n"));
printf(_(" -V, --version output version information, then exit\n"));
printf(_(" -w, --wait wait until operation completes (default)\n"));
printf(_(" -W, --no-wait do not wait until operation completes\n"));
-@@ -2294,6 +2298,7 @@ main(int argc, char **argv)
+@@ -2267,6 +2271,7 @@ main(int argc, char **argv)
{"options", required_argument, NULL, 'o'},
{"silent", no_argument, NULL, 's'},
{"timeout", required_argument, NULL, 't'},
{"core-files", no_argument, NULL, 'c'},
{"wait", no_argument, NULL, 'w'},
{"no-wait", no_argument, NULL, 'W'},
-@@ -2334,20 +2339,6 @@ main(int argc, char **argv)
+@@ -2307,20 +2312,6 @@ main(int argc, char **argv)
}
}
env_wait = getenv("PGCTLTIMEOUT");
if (env_wait != NULL)
-@@ -2434,11 +2425,15 @@ main(int argc, char **argv)
+@@ -2407,11 +2398,15 @@ main(int argc, char **argv)
wait_seconds_arg = true;
break;
case 'U':
break;
case 'w':
do_wait = true;
-@@ -2520,6 +2515,41 @@ main(int argc, char **argv)
+@@ -2493,6 +2488,41 @@ main(int argc, char **argv)
exit(1);
}