Merge branch 'wsdl2h-detect' of https://github.com/olifre/voms into o…

…lifre-wsdl2h-detect

* 'wsdl2h-detect' of https://github.com/olifre/voms:
  wsdl2h.m4: Fix detection of modern wsdl2h versions.
  Fixes for README.md

README.md

@@ -11,7 +11,7 @@ This repository hosts the VOMS server and C++ APIs.
 
 ## Documentation
 
-See the [VOMS wiki](https://github.com/italiangrid/voms/wiki).
+See the [VOMS website](https://italiangrid.github.io/voms).
 
 # Support
 

m4/wsdl2h.m4

@@ -43,8 +43,13 @@ AC_DEFUN([AC_WSDL2H],
 	dnl 
 	dnl @<:@  becomes [
 	dnl @:>@  becomes ]
-	wsdl2h_version=$($WSDL2H -help 2>&1 | grep -o '@<:@0-9@:>@\.@<:@0-9@:>@\.@<:@0-9@:>@*$')
-	
+	dnl
+	dnl Newer versions support -V parameter.
+	wsdl2h_version=$($WSDL2H -V 2>/dev/null)
+	if test -z "$wsdl2h_version"; then
+		wsdl2h_version=$($WSDL2H -help 2>&1 | grep release | grep -o '@<:@0-9@:>@\.@<:@0-9@:>@\.@<:@0-9@:>@*$')
+	fi
+
 	normalized_version=$(printf "%02d%02d%02d" $(echo $wsdl2h_version | tr '.' ' '))
 
 	WSDL2H_FLAGS=""