Add PostgreSQL home page to --help output

Per emerging standard in GNU programs and elsewhere.  Autoconf already
has support for specifying a home page, so we can just that.

Reviewed-by: Daniel Gustafsson <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/8d389c5f-7fb5-8e48-9a4a-68cec44786fa%402ndquadrant.com

diff --git a/configure b/configure
index d2c74e530c6812b0377e371d32b09b7a8ca7076a..93ee4a2937098f05526cd4f8722171e2a0049892 100755 (executable)
--- a/configure
+++ b/configure
@@ -585,7 +585,7 @@ PACKAGE_TARNAME='postgresql'
 PACKAGE_VERSION='13devel'
 PACKAGE_STRING='PostgreSQL 13devel'
 PACKAGE_BUGREPORT='[email protected]'
-PACKAGE_URL=''
+PACKAGE_URL='https://www.postgresql.org/'
 
 ac_unique_file="src/backend/access/common/heaptuple.c"
 ac_default_prefix=/usr/local/pgsql
@@ -1600,6 +1600,7 @@ Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <[email protected]>.
+PostgreSQL home page: <https://www.postgresql.org/>.
 _ACEOF
 ac_status=$?
 fi
@@ -19516,7 +19517,8 @@ $config_links
 Configuration commands:
 $config_commands
 
-Report bugs to <[email protected]>."
+Report bugs to <[email protected]>.
+PostgreSQL home page: <https://www.postgresql.org/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

diff --git a/configure.in b/configure.in
index a2db1884d3cf6df258bce05faaf1bde5bb29a9f6..e2ae4e2d3e1693a56e958cfcd38cd544b247b70c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [13devel], [[email protected]])
+AC_INIT([PostgreSQL], [13devel], [[email protected]], [], [https://www.postgresql.org/])
 
 m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
 Untested combinations of 'autoconf' and PostgreSQL versions are not

diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index e67f71d97d556b9c1b96b98c2ec204d7aaf832f3..c7d0f9025a43fcdedcaf8090d13e0fd63849d54c 100644 (file)
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -219,8 +219,9 @@ help(const char *progname)
           "  -p, --port=PORT            database server port number\n"
           "  -U, --username=USERNAME    connect as specified database user\n"
           "\nThe default action is to show all database OIDs.\n\n"
-          "Report bugs to <%s>.\n",
-          progname, progname, PACKAGE_BUGREPORT);
+          "Report bugs to <%s>.\n"
+          "%s home page: <%s>\n",
+          progname, progname, PACKAGE_BUGREPORT, PACKAGE_NAME, PACKAGE_URL);
 }
 
 /*

diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index 15604da76508cccc4d2c345b58551e33a7e30c37..74149060a90d0076c86b2a6f9b13a0f86dee7a8d 100644 (file)
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -613,6 +613,7 @@ usage(void)
           "e.g.\n"
           "  restore_command = 'pg_standby /mnt/server/archiverdir %%f %%p %%r'\n");
    printf("\nReport bugs to <%s>.\n", PACKAGE_BUGREPORT);
+   printf("%s home page: <%s>\n", PACKAGE_NAME, PACKAGE_URL);
 }
 
 #ifndef WIN32

diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index b8aa295665962e69a4eed02c7c2d0101d3e6ad5d..92bdf71356b1f9c003c02b6291c10750188b9ba5 100644 (file)
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -437,6 +437,7 @@ usage(const char *progname)
    printf("  -W, --password            force password prompt\n");
    printf("\n");
    printf("Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
+   printf("%s home page: <%s>\n", PACKAGE_NAME, PACKAGE_URL);
 }
 
 

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index e4db3e80af3b1c6442a1d182a55540bc125c6878..b2434437701f8be5ba09eaf107ccab8ae3c721e4 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -40,6 +40,8 @@ VERSION = @PACKAGE_VERSION@
 MAJORVERSION = @PG_MAJORVERSION@
 VERSION_NUM = @PG_VERSION_NUM@
 
+PACKAGE_URL = @PACKAGE_URL@
+
 # Set top_srcdir, srcdir, and VPATH.
 ifdef PGXS
 top_srcdir = $(top_builddir)

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 526361f31bbb3130bfeaf5484fd666bd88cf7aa3..29a7f6d38c8a87876e22d99c4eaf63ce9b0ccc77 100644 (file)
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -389,7 +389,7 @@ endif # PORTNAME == cygwin || PORTNAME == win32
 %.pc: $(MAKEFILE_LIST)
    echo 'Name: lib$(NAME)' >$@
    echo 'Description: PostgreSQL lib$(NAME) library' >>$@
-   echo 'Url: http://www.postgresql.org/' >>$@
+   echo 'Url: $(PACKAGE_URL)' >>$@
    echo 'Version: $(VERSION)' >>$@
    echo 'Requires: ' >>$@
    echo 'Requires.private: $(PKG_CONFIG_REQUIRES_PRIVATE)' >>$@

diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 1bb4ae03b8a2c872dcf908e5e76c5f2b77577455..da3dae9e250f42e10c5d98560e5af9216e11fe05 100644 (file)
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -360,6 +360,7 @@ help(const char *progname)
             "configuration settings and how to set them on the command line or in\n"
             "the configuration file.\n\n"
             "Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 12dd83c230defd612f6ab4253986631d9ec51fe2..a6577486ce9a4e8253423096b8bb1538e295e2a9 100644 (file)
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -2323,6 +2323,7 @@ usage(const char *progname)
    printf(_("\nIf the data directory is not specified, the environment variable PGDATA\n"
             "is used.\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 static void

diff --git a/src/bin/pg_archivecleanup/pg_archivecleanup.c b/src/bin/pg_archivecleanup/pg_archivecleanup.c
index aef99eba30ece9942c3ea54429eb25891ea01cf7..e454bae767de2bc54e936e7c63f6e62421094549 100644 (file)
--- a/src/bin/pg_archivecleanup/pg_archivecleanup.c
+++ b/src/bin/pg_archivecleanup/pg_archivecleanup.c
@@ -270,6 +270,7 @@ usage(void)
             "e.g.\n"
             "  pg_archivecleanup /mnt/server/archiverdir 000000010000000000000010.00000020.backup\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 /*------------ MAIN ----------------------------------------*/

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index b75b6d4da2534ebf8d583a6ef66447440a5b5f4c..48bd838803ba165e94fbc4ef4e25602241519127 100644 (file)
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -397,6 +397,7 @@ usage(void)
    printf(_("  -w, --no-password      never prompt for password\n"));
    printf(_("  -W, --password         force password prompt (should happen automatically)\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 

diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c
index 808078e6b73df8e46614f100afd7a009bf6f4f71..cd05f5fede18fe588143464e6501040bc160f20b 100644 (file)
--- a/src/bin/pg_basebackup/pg_receivewal.c
+++ b/src/bin/pg_basebackup/pg_receivewal.c
@@ -103,6 +103,7 @@ usage(void)
    printf(_("      --create-slot      create a new replication slot (for the slot's name see --slot)\n"));
    printf(_("      --drop-slot        drop the replication slot (for the slot's name see --slot)\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 static bool

diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
index ef2d806fb39451878199f2ddd7a44703298bf228..0da32771184bec27bdef6033f038135e845cd715 100644 (file)
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -104,6 +104,7 @@ usage(void)
    printf(_("  -w, --no-password      never prompt for password\n"));
    printf(_("  -W, --password         force password prompt (should happen automatically)\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 /*

diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c
index b457866048401f81553c0493fae504f88fdb4580..9aa9f756f66da5a09208bc4244c30d8c4475639b 100644 (file)
--- a/src/bin/pg_checksums/pg_checksums.c
+++ b/src/bin/pg_checksums/pg_checksums.c
@@ -89,6 +89,7 @@ usage(void)
    printf(_("\nIf no data directory (DATADIR) is specified, "
             "the environment variable PGDATA\nis used.\n\n"));
    printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 /*

diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 9ff56e2fca4ff2ecf14d33191712c487003420f8..f5410f64187a6c7fdf1c65ffca425577b44f33e4 100644 (file)
--- a/src/bin/pg_config/pg_config.c
+++ b/src/bin/pg_config/pg_config.c
@@ -103,6 +103,7 @@ help(void)
    printf(_("  -?, --help            show this help, then exit\n"));
    printf(_("\nWith no arguments, all known items are shown.\n\n"));
    printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 static void

diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index a53794b9e6655093dd2415b1818612d7b279ea98..e73639df744be4f2872633fcfb4678e18e0f4346 100644 (file)
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -42,6 +42,7 @@ usage(const char *progname)
    printf(_("\nIf no data directory (DATADIR) is specified, "
             "the environment variable PGDATA\nis used.\n\n"));
    printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 72f095fd0d68bbac6c647fe3a48febf758534323..f41084d2dba1aafbcd79d6d9c293057df4961082 100644 (file)
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -2096,6 +2096,7 @@ do_help(void)
 #endif
 
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index d368f00d1df3838e98cd9de4efa42adf2c97d089..ef1539044fde042c541991a806b60e3223e014db 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -1048,6 +1048,7 @@ help(const char *progname)
    printf(_("\nIf no database name is supplied, then the PGDATABASE environment\n"
             "variable value is used.\n\n"));
    printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 static void

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index de311b6ad10e07d1ccd2cb86a164f037674c03c4..0b25526d48f872cbef37991c5df37f43f0eee563 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -671,6 +671,7 @@ help(void)
    printf(_("\nIf -f/--file is not used, then the SQL script will be written to the standard\n"
             "output.\n\n"));
    printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 

diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 3749454b977429f198162825545676366f69f85b..544ae3bc5cdf52e5bd57706de4e2b353e8389b37 100644 (file)
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -520,4 +520,5 @@ usage(const char *progname)
             "multiple times to select multiple objects.\n"));
    printf(_("\nIf no input file name is supplied, then standard input is used.\n\n"));
    printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }

diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index 1f043c918fbd34bc792b1708952946004f2f4301..233441837f8a831bf011fba569c422b39c0ad97d 100644 (file)
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -1224,4 +1224,5 @@ usage(void)
    printf(_("      --wal-segsize=SIZE         size of WAL segments, in megabytes\n"));
    printf(_("  -?, --help                     show this help, then exit\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }

diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 2d9cf6075ab39f4ec6cf5a19b947ce39d74eb7c6..bf2d2983e7e0e2267cd5e4c13239825e83323df0 100644 (file)
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -88,6 +88,7 @@ usage(const char *progname)
    printf(_("  -V, --version                  output version information, then exit\n"));
    printf(_("  -?, --help                     show this help, then exit\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 

diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
index c753a75fa03a290e38a4cc9990aa0f466be24b07..4ef2036ecd670c4d826aed596b517c89e2598ada 100644 (file)
--- a/src/bin/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@ -337,6 +337,7 @@ usage(void)
             "  C:\\> pg_upgrade\n"));
 #endif
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 

diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index 906f7e1f089b28ee299a453cdbc726eb761e6839..279acfa0440c202168121e3de309bfbf51c2ac2f 100644 (file)
--- a/src/bin/pg_waldump/pg_waldump.c
+++ b/src/bin/pg_waldump/pg_waldump.c
@@ -731,6 +731,7 @@ usage(void)
             "                         (optionally, show per-record statistics)\n"));
    printf(_("  -?, --help             show this help, then exit\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 int

diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index 978fca0f47195edde96f53d05c6de53530b2db29..b8864c6ae53f056200c0fad0da128d8407f482bb 100644 (file)
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -681,8 +681,9 @@ usage(void)
           "  -V, --version            output version information, then exit\n"
           "  -?, --help               show this help, then exit\n"
           "\n"
-          "Report bugs to <%s>.\n",
-          progname, progname, PACKAGE_BUGREPORT);
+          "Report bugs to <%s>.\n"
+          "%s home page: <%s>\n",
+          progname, progname, PACKAGE_BUGREPORT, PACKAGE_NAME, PACKAGE_URL);
 }
 
 /* return whether str matches "^\s*[-+]?[0-9]+$" */

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 777d54f085863cac69e0f35e9acaa0899d0cb3ff..1f1f7784261a83ad11c9924cb4daae3e49911555 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -145,6 +145,7 @@ usage(unsigned short int pager)
                      "commands) from within psql, or consult the psql section in the PostgreSQL\n"
                      "documentation.\n\n"));
    fprintf(output, _("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   fprintf(output, _("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 
    ClosePager(output);
 }

diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index d9761b39b26d3b997c8b7c5882d0f97f0729afff..12972de0e91e74c1789743f4a3bb93664b4de148 100644 (file)
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -292,4 +292,5 @@ help(const char *progname)
    printf(_("  --maintenance-db=DBNAME   alternate maintenance database\n"));
    printf(_("\nRead the description of the SQL command CLUSTER for details.\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }

diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index 9fd46a679aa88d9f26cca08eebfab2f41d353fae..1353af97c49ebe66ad6ca937fff776fd8875a18e 100644 (file)
--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -278,4 +278,5 @@ help(const char *progname)
    printf(_("  --maintenance-db=DBNAME      alternate maintenance database\n"));
    printf(_("\nBy default, a database with the same name as the current user is created.\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }

diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index a658701dd2461e564234ec9dee18f291ca67bf6e..cf32fbe1bc8e0072388809bdf4e3acf3ac03231e 100644 (file)
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -376,4 +376,5 @@ help(const char *progname)
    printf(_("  -w, --no-password         never prompt for password\n"));
    printf(_("  -W, --password            force password prompt\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }

diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
index 1b26f9e6de2515fe862e65daf64eebdd50166a3f..3d6be80ffdc037ca44b1340140b321ff9290cd24 100644 (file)
--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -178,4 +178,5 @@ help(const char *progname)
    printf(_("  -W, --password            force password prompt\n"));
    printf(_("  --maintenance-db=DBNAME   alternate maintenance database\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }

diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index a81d4868c4ad5817ead6c8e847181b7fc2d94aa0..fee270d4f6d11ff0977fc2f9d25b9009131c8d4d 100644 (file)
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -176,4 +176,5 @@ help(const char *progname)
    printf(_("  -w, --no-password         never prompt for password\n"));
    printf(_("  -W, --password            force password prompt\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }

diff --git a/src/bin/scripts/pg_isready.c b/src/bin/scripts/pg_isready.c
index ead88a9b5a56a879177e430523ce626a14e88aa0..f397112906468a4db60501f65355747d897eb6d2 100644 (file)
--- a/src/bin/scripts/pg_isready.c
+++ b/src/bin/scripts/pg_isready.c
@@ -236,4 +236,5 @@ help(const char *progname)
    printf(_("  -t, --timeout=SECS       seconds to wait when attempting connection, 0 disables (default: %s)\n"), DEFAULT_CONNECT_TIMEOUT);
    printf(_("  -U, --username=USERNAME  user name to connect as\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }

diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index f680c0d6bdd140c6edda60a29e26b48afd551c3f..54e46181fe71a8ac5f0d4f1bd0da0a7ea2e76b30 100644 (file)
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -775,4 +775,5 @@ help(const char *progname)
    printf(_("  --maintenance-db=DBNAME   alternate maintenance database\n"));
    printf(_("\nRead the description of the SQL command REINDEX for details.\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }

diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index d3952f4150664172736ab41dcb697f8c1bd82538..154084a086e1ea584af1f0fe14fefe8e7e1a6ac7 100644 (file)
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -950,4 +950,5 @@ help(const char *progname)
    printf(_("  --maintenance-db=DBNAME   alternate maintenance database\n"));
    printf(_("\nRead the description of the SQL command VACUUM for details.\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }

diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index a8c93d4934525e2f4c2cbe8cd223dc5b180b27bb..44a6d5119b2c93bdc1616764a6f13b62da636dc2 100644 (file)
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -59,6 +59,7 @@ help(const char *progname)
    printf(_("\nIf no output file is specified, the name is formed by adding .c to the\n"
             "input file name, after stripping off .pgc if present.\n"));
    printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 static void

diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 9270977393d0f015b2420d14bd3fc6600a06edec..a53e4a6243b52cf796e6babc9ba279549d5456de 100644 (file)
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -2072,6 +2072,7 @@ help(void)
    printf(_("if the tests could not be run for some reason.\n"));
    printf(_("\n"));
    printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+   printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
 int

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 6b4a6eec2a467226758d14915cdaced06f4b5dd2..9bb8f57150a49a2dfcfa29691363e3a7226d18d4 100644 (file)
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -146,20 +146,26 @@ sub GenerateFiles
 {
    my $self = shift;
    my $bits = $self->{platform} eq 'Win32' ? 32 : 64;
+   my $ac_init_found = 0;
    my $package_name;
    my $package_version;
    my $package_bugreport;
+   my $package_url;
 
    # Parse configure.in to get version numbers
    open(my $c, '<', "configure.in")
      || confess("Could not open configure.in for reading\n");
    while (<$c>)
    {
-       if (/^AC_INIT\(\[([^\]]+)\], \[([^\]]+)\], \[([^\]]+)\]/)
+       if (/^AC_INIT\(\[([^\]]+)\], \[([^\]]+)\], \[([^\]]+)\], \[([^\]]*)\], \[([^\]]+)\]/)
        {
+           $ac_init_found = 1;
+
            $package_name      = $1;
            $package_version   = $2;
            $package_bugreport = $3;
+           #$package_tarname   = $4;
+           $package_url       = $5;
 
            if ($package_version !~ /^(\d+)(?:\.(\d+))?/)
            {
@@ -171,10 +177,7 @@ sub GenerateFiles
    }
    close($c);
    confess "Unable to parse configure.in for all variables!"
-     if ( $package_name eq ''
-       || $package_version eq ''
-       || $self->{numver} eq ''
-       || $package_bugreport eq '');
+     unless $ac_init_found;
 
    if (IsNewer("src/include/pg_config_os.h", "src/include/port/win32.h"))
    {
@@ -431,7 +434,7 @@ sub GenerateFiles
        PACKAGE_NAME                             => qq{"$package_name"},
        PACKAGE_STRING      => qq{"$package_name $package_version"},
        PACKAGE_TARNAME     => lc qq{"$package_name"},
-       PACKAGE_URL         => undef,
+       PACKAGE_URL         => qq{"$package_url"},
        PACKAGE_VERSION     => qq{"$package_version"},
        PG_INT128_TYPE      => undef,
        PG_INT64_TYPE       => 'long long int',