Merge branch 'PGPRO10' into PGPROEE10

Author: vbwagner

configure

@@ -763,6 +763,7 @@ build_os
 build_vendor
 build_cpu
 build
+PGPRO_EDN
 PGPRO_EDITION
 PGPRO_PACKAGE_NAME
 PG_MAJORVERSION
@@ -2788,7 +2789,11 @@ fi
 PGPRO_VERSION="$PACKAGE_VERSION.1"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="enterprise"
+PGPRO_EDN="ent"
 PRODUCT_NAME="Postgres Pro Enterprise"
+PGPRO_EDITION="standard"
+PRODUCT_NAME="Postgres Pro Standard"
+
 
 
 
@@ -2807,6 +2812,11 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+cat >>confdefs.h <<_ACEOF
+#define PGPRO_EDN "$PGPRO_EDN"
+_ACEOF
+
+
 cat >>confdefs.h <<_ACEOF
 #define PGPRO_VERSION "$PGPRO_VERSION"
 _ACEOF

configure.in

@@ -41,12 +41,17 @@ PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
 PGPRO_VERSION="$PACKAGE_VERSION.1"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="enterprise"
+PGPRO_EDN="ent"
 PRODUCT_NAME="Postgres Pro Enterprise"
+PGPRO_EDITION="standard"
+PRODUCT_NAME="Postgres Pro Standard"
 AC_SUBST(PGPRO_PACKAGE_NAME)
 AC_SUBST(PGPRO_EDITION)
+AC_SUBST(PGPRO_EDN)
 AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string])
 AC_DEFINE_UNQUOTED(PGPRO_PACKAGE_NAME, "$PGPRO_PACKAGE_NAME", [PostgresPro     name as a string])            
 AC_DEFINE_UNQUOTED(PGPRO_EDITION,"$PGPRO_EDITION",[PostgresPro edition])
+AC_DEFINE_UNQUOTED(PGPRO_EDN,"$PGPRO_EDN",[PostgresPro edition abbreviated])
 AC_DEFINE_UNQUOTED(PGPRO_VERSION, "$PGPRO_VERSION", [PostgresPro
 version as a  string])
 

doc/src/sgml/Makefile

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

src/Makefile.global.in

@@ -43,6 +43,7 @@ PGPRO_VERSION = @PGPRO_VERSION@
 PGPRO_PACKAGE_NAME = @PGPRO_PACKAGE_NAME@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PGPRO_EDITION = @PGPRO_EDITION@
+PGPRO_EDN = @PGPRO_EDN@
 PRODUCT_NAME = @PRODUCT_NAME@
 
 # Set top_srcdir, srcdir, and VPATH.