Merge branch 'PGPRO10' into PGPROEE10

Author: vbwagner

configure

@@ -627,6 +627,7 @@ ac_includes_default="\
 #endif"
 
 ac_subst_vars='LTLIBOBJS
+PROJECT_NAME
 PRODUCT_NAME
 PGPRO_VERSION
 vpath_build
@@ -2786,11 +2787,13 @@ else
 fi
 
 
+
 PGPRO_VERSION="$PACKAGE_VERSION.1"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="enterprise"
 PGPRO_EDN="ent"
 PRODUCT_NAME="Postgres Pro Enterprise"
+PROJECT_NAME="Postgres Pro"
 
 
 
@@ -17195,6 +17198,8 @@ fi
 
 
 
+
+
 ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"
 
 

configure.in

@@ -38,11 +38,13 @@ AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major versio
 PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
              [PG_VERSION="$PACKAGE_VERSION$withval"],
              [PG_VERSION="$PACKAGE_VERSION"])
+
 PGPRO_VERSION="$PACKAGE_VERSION.1"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="enterprise"
 PGPRO_EDN="ent"
 PRODUCT_NAME="Postgres Pro Enterprise"
+PROJECT_NAME="Postgres Pro"
 AC_SUBST(PGPRO_PACKAGE_NAME)
 AC_SUBST(PGPRO_EDITION)
 AC_SUBST(PGPRO_EDN)
@@ -2280,6 +2282,8 @@ AC_SUBST(PGPRO_VERSION)
 
 AC_SUBST(PRODUCT_NAME)
 
+AC_SUBST(PROJECT_NAME)
+
 AC_CONFIG_FILES([GNUmakefile src/Makefile.global])
 
 AC_CONFIG_LINKS([

doc/src/sgml/Makefile

@@ -105,6 +105,7 @@ version.sgml: $(top_srcdir)/configure
 	  echo "<!ENTITY productname \"$(PRODUCT_NAME)\">"; \
 	  echo "<!ENTITY edition \"$(PGPRO_EDITION)\">"; \
 	  echo "<!ENTITY edn \"$(PGPRO_EDN)\">"; \
+	  echo "<!ENTITY project \"$(PROJECT_NAME)\">"; \
 	} > $@
 
 features-supported.sgml: $(top_srcdir)/src/backend/catalog/sql_feature_packages.txt $(top_srcdir)/src/backend/catalog/sql_features.txt

src/Makefile.global.in

@@ -45,6 +45,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PGPRO_EDITION = @PGPRO_EDITION@
 PGPRO_EDN = @PGPRO_EDN@
 PRODUCT_NAME = @PRODUCT_NAME@
+PROJECT_NAME = @PROJECT_NAME@
 
 # Set top_srcdir, srcdir, and VPATH.
 ifdef PGXS