Autoupdate

.github/scripts/main/hygiene.sh

@@ -18,16 +18,32 @@ CheckConfigure () {
   if [[ -e CHECK_CONFIGURE ]] ; then
     echo "configure generation altered in $1"
     echo 'Verifying that configure.ac generates configure'
+    error=0
     git clean -dfx
     git checkout -f "$1"
+
+    # check for configure generation
     mv configure configure.ref
     make configure
     if ! diff -u configure configure.ref ; then
       echo -e "[\e[31mERROR\e[0m] configure.ac in $1 doesn't generate configure, \
 please run make configure and fixup the commit"
-      ERROR=1
-    else
+      error=1
+    fi
+
+    # check for newer syntax validation
+    cp configure.ac configure.ac.ref
+    autoupdate
+    if ! diff -u configure.ac configure.ac.ref; then
+      echo -e "[\e[31mERROR\e[0m] configure.ac in $1 has not been updated, \
+please run 'autoupdate' and fixup the commit"
+        error=1
+    fi
+
+    if [ $error -eq 0 ]; then
       echo "configure ok for $1"
+    else
+      ERROR=$error
     fi
   fi
 }

configure.ac

@@ -1,6 +1,6 @@
-dnl The line below must be formatted AC_INIT([opam],[VERSION]) with no extra spaces
-AC_INIT([opam],[2.2.0~alpha])
-AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS)
+dnl The line below must be formatted AC_INIT(opam,VERSION) with no extra spaces
+AC_INIT(opam,2.2.0~alpha)
+AC_COPYRIGHT(Copyright  OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -55,36 +55,44 @@ AC_ARG_ENABLE([checks],
 )
 
 AC_ARG_ENABLE([developer_mode],
-  AS_HELP_STRING([--enable-developer-mode],[Enable developer features])
+  AC_HELP_STRING([--enable-developer-mode],
+                 [Enable developer features])
 )
 
 AC_ARG_WITH([mccs],
-  AS_HELP_STRING([--without-mccs],[Compile without a built-in Cudf solver (only works if 'mccs' is not otherwise installed)])
+  AC_HELP_STRING([--without-mccs],
+                 [Compile without a built-in Cudf solver (only works if 'mccs' is not otherwise installed)])
 )
 AC_ARG_WITH([0install-solver],
-  AS_HELP_STRING([--without-0install-solver],[Legacy option (does nothing)])
+  AC_HELP_STRING([--without-0install-solver],
+                 [Legacy option (does nothing)])
 )
 AS_IF([test "x$with_0install_solver" = xno],
   [AC_MSG_ERROR([Compiling opam without 0install solver is no longer possible.])]
 )
 
 
 AC_ARG_WITH([libacl],
-  AS_HELP_STRING([--with-libacl],[Compile opam with libacl support]),,[with_libacl=auto])
+  AC_HELP_STRING([--with-libacl],
+                 [Compile opam with libacl support]),,[with_libacl=auto])
 
 AC_ARG_WITH([private_runtime],
-  AS_HELP_STRING([--with-private-runtime],[For a mingw-w64 build, manifest the runtime DLLs locally in Opam.Runtime.arch]),,[with_private_runtime=no]
+  AC_HELP_STRING([--with-private-runtime],
+                 [For a mingw-w64 build, manifest the runtime DLLs locally in Opam.Runtime.arch]),,[with_private_runtime=no]
 )
 
 AC_ARG_ENABLE([cold_check],
-  AS_HELP_STRING([--enable-cold-check],[Fail on some check necessary for make cold]),[COLD_CHECK=yes],[]
+  AC_HELP_STRING([--enable-cold-check],
+                 [Fail on some check necessary for make cold]),[COLD_CHECK=yes],[]
 )
 
 AC_ARG_WITH([dune],
-  AS_HELP_STRING([--without-dune],[Compile using vendored Dune instead of any in PATH]))
+  AC_HELP_STRING([--without-dune],
+                 [Compile using vendored Dune instead of any in PATH]))
 
 AC_ARG_WITH([vendored-deps],
-  AS_HELP_STRING([--with-vendored-deps],[Use vendored dependencies instead of any available in the compiler installation]))
+  AC_HELP_STRING([--with-vendored-deps],
+                 [Use vendored dependencies instead of any available in the compiler installation]))
 
 AS_IF([test "x" != "x$LIB_PREFIX"], [
   CPATH=$CPATH:$LIB_PREFIX/include