Added configure option --enable-hirlam-extensions.

configure

@@ -628,6 +628,8 @@ BUILD_AVX_TESTS_FALSE
 BUILD_AVX_TESTS_TRUE
 BUILD_SSE42_TESTS_FALSE
 BUILD_SSE42_TESTS_TRUE
+ENABLE_HIRLAM_EXTENSIONS_FALSE
+ENABLE_HIRLAM_EXTENSIONS_TRUE
 ENABLE_ALL_STATIC_FALSE
 ENABLE_ALL_STATIC_TRUE
 subdirs
@@ -839,6 +841,7 @@ with_magics
 with_libxml2
 enable_cdi_lib
 enable_all_static
+enable_hirlam_extensions
 enable_cxx
 '
       ac_precious_vars='build_alias
@@ -1500,6 +1503,8 @@ Optional Features:
                           [default=no]
   --enable-all-static     build a completely statically linked CDO binary
                           [default=no]
+  --enable-hirlam-extensions
+                          HIRLAM extensions [default=no]
   --enable-cxx            Use CXX as default compiler [default=no]
 Optional Packages:
@@ -20934,6 +20939,35 @@ else
   ENABLE_ALL_STATIC_FALSE=
 fi
+#  ----------------------------------------------------------------------
+#  Build CDO with HIRLAM extensions
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HIRLAM extensions" >&5
+$as_echo_n "checking for HIRLAM extensions... " >&6; }
+# Check whether --enable-hirlam-extensions was given.
+if test "${enable_hirlam_extensions+set}" = set; then :
+  enableval=$enable_hirlam_extensions; if test "x$enable_hirlam_extensions" != "xno"; then :
+
+$as_echo "#define HIRLAM_EXTENSIONS 1" >>confdefs.h
+
+                     enable_hirlam_extensions=yes
+else
+  enable_hirlam_extensions=no
+fi
+else
+  enable_hirlam_extensions=no
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_hirlam_extensions" >&5
+$as_echo "$enable_hirlam_extensions" >&6; }
+ if test x$enable_hirlam_extensions = 'xyes'; then
+  ENABLE_HIRLAM_EXTENSIONS_TRUE=
+  ENABLE_HIRLAM_EXTENSIONS_FALSE='#'
+else
+  ENABLE_HIRLAM_EXTENSIONS_TRUE='#'
+  ENABLE_HIRLAM_EXTENSIONS_FALSE=
+fi
+
+#
 #  ----------------------------------------------------------------------
@@ -21342,6 +21376,10 @@ if test -z "${ENABLE_ALL_STATIC_TRUE}" && test -z "${ENABLE_ALL_STATIC_FALSE}";
   as_fn_error $? "conditional \"ENABLE_ALL_STATIC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ENABLE_HIRLAM_EXTENSIONS_TRUE}" && test -z "${ENABLE_HIRLAM_EXTENSIONS_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_HIRLAM_EXTENSIONS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${BUILD_SSE42_TESTS_TRUE}" && test -z "${BUILD_SSE42_TESTS_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_SSE42_TESTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5

m4/acx_options.m4

@@ -518,6 +518,19 @@ AC_ARG_ENABLE([all-static],
               [enable_all_static=no])
 AC_MSG_RESULT([$enable_all_static])
 AM_CONDITIONAL([ENABLE_ALL_STATIC],[test x$enable_all_static = 'xyes'])
+#  ----------------------------------------------------------------------
+#  Build CDO with HIRLAM extensions
+AC_MSG_CHECKING([for HIRLAM extensions])
+AC_ARG_ENABLE([hirlam-extensions],
+              [AS_HELP_STRING([--enable-hirlam-extensions],[HIRLAM extensions [default=no]])],
+              [AS_IF([test "x$enable_hirlam_extensions" != "xno"],
+                    [AC_DEFINE(HIRLAM_EXTENSIONS,[1],[Define to 1 for HIRLAM extensions])
+                     enable_hirlam_extensions=yes],
+                    [enable_hirlam_extensions=no])],
+              [enable_hirlam_extensions=no])
+AC_MSG_RESULT([$enable_hirlam_extensions])
+AM_CONDITIONAL([ENABLE_HIRLAM_EXTENSIONS],[test x$enable_hirlam_extensions = 'xyes'])
+#
 ])
 dnl
 dnl Local Variables:

src/config.h.in

@@ -220,6 +220,9 @@
 /* Define to 1 if you have the <wordexp.h> header file. */
 #undef HAVE_WORDEXP_H
 
+/* Define to 1 for HIRLAM extensions */
+#undef HIRLAM_EXTENSIONS
+
 /* Host name */
 #undef HOST_NAME