Merge remote branch 'origin/master' into edge

Author: automatic-merge

configure

@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for gtkada 18.0w.
 #
-# Report bugs to <report@adacore.com>.
+# Report bugs to <support@adacore.com>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -265,7 +265,7 @@ fi
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell [email protected] and report@adacore.com
+    $as_echo "$0: Please tell [email protected] and support@adacore.com
 $0: about your system, including any error possibly output
 $0: before this message. Then install a modern shell, or
 $0: manually run the script under such a shell if you do
@@ -581,7 +581,7 @@ PACKAGE_NAME='gtkada'
 PACKAGE_TARNAME='gtkada'
 PACKAGE_VERSION='18.0w'
 PACKAGE_STRING='gtkada 18.0w'
-PACKAGE_BUGREPORT='report@adacore.com'
+PACKAGE_BUGREPORT='support@adacore.com'
 PACKAGE_URL=''
 
 ac_subst_vars='LTLIBOBJS
@@ -1372,7 +1372,7 @@ Some influential environment variables:
 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 <report@adacore.com>.
+Report bugs to <support@adacore.com>.
 _ACEOF
 ac_status=$?
 fi
@@ -4960,7 +4960,7 @@ Usage: $0 [OPTION]... [TAG]...
 Configuration files:
 $config_files
 
-Report bugs to <report@adacore.com>."
+Report bugs to <support@adacore.com>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(gtkada,18.0w,report@adacore.com,gtkada)
+AC_INIT(gtkada,18.0w,support@adacore.com,gtkada)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_TARGET
 PKG_PROG_PKG_CONFIG