Merge pull request #2501 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:Wflags_changes_develop_merge to develop

* commit 'e6cd19937b0e5fe5b49f7e88b08f15305e0b5af1':
  Squashed commit of the following:
  Add \d to list of characters allowed after '-' in versions.

3 files changed, 6 insertions, 5 deletions

diff --git a/bin/h5vers b/bin/h5vers
index 4200141..659a081 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -213,7 +213,7 @@ my (@curver) = getvers $contents;
 # Determine the new version number.
 my @newver; #new version
 if ($set) {
-  if ($set =~ /(\d+)\.(\d+)\.(\d+)(-([a-zA-Z]\w*))?/) {
+  if ($set =~ /(\d+)\.(\d+)\.(\d+)(-([\da-zA-Z]\w*))?/) {
     @newver = ($1, $2, $3, $5);
   } elsif ($set =~ /(\d+)\D+(\d+)\D+(\d+)(\s*\(([a-zA-Z]\w*)\))?\D*$/) {
     @newver = ($1, $2, $3, $5);
diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags
index 9ae38f6..73f49ba 100644
--- a/config/gnu-cxxflags
+++ b/config/gnu-cxxflags
@@ -306,9 +306,10 @@ fi
 
 # Version-specific g++ flags
 
-
-    # Append more extra warning flags that only gcc 4.9+ know about
-    -Wopenmp-simd"
+# This flag was left behind when moving warnings flags to common files for 
+# both autotools and CMake.
+#    # Append more extra warning flags that only gcc 4.9+ know about
+#    -Wopenmp-simd"
 
 # Clear cxx info if no flags set
 if test "X$cxx_flags_set" = "X"; then
diff --git a/config/gnu-fflags b/config/gnu-fflags
index 2859158..f58f10c 100644
--- a/config/gnu-fflags
+++ b/config/gnu-fflags
@@ -139,7 +139,7 @@ if test "X-gfortran" = "X-$f9x_vendor"; then
     # General #
     ###########
 
-    H5_FCFLAGS="$H5_CFLAGS $(load_gnu_arguments gfort-general)"
+    H5_FCFLAGS="$H5_FCFLAGS $(load_gnu_arguments gfort-general)"
 
     #############################
     # Version-specific warnings #