diff --git a/configure b/configure index 018243a005e9ab33f9355eb93b76a10e41024a44..84d32e20e5649f7ff661d8bb7b7ca01d589b2474 100755 --- a/configure +++ b/configure @@ -1356,8 +1356,6 @@ Optional Features: following [default=05deg]: 0|05deg 0.5 degree global domain 1|5min 5min global domain - 2|euro5min 5min European domain - 3|aus5min 5min Australian domain --enable-coupling enable coupling using the specific backend [default=no]: yes|yac use YAC coupler @@ -3694,10 +3692,6 @@ then : enable_resolution=05deg ;; #( 1|5min) : enable_resolution=5min ;; #( - 2|euro5min) : - enable_resolution=euro5min ;; #( - 3|aus5min) : - enable_resolution=aus5min ;; #( *) : as_fn_error $? "unexpected value for the argument --enable-resolution='$enableval'; see the help message for the valid values of the argument" "$LINENO" 5 ;; esac @@ -3711,20 +3705,11 @@ case $enable_resolution in #( 05deg) : EXEC_FILE_NAME='hd_05.exe' ;; #( 5min) : - EXEC_FILE_NAME='hd_5min.exe' ;; #( - euro5min) : - EXEC_FILE_NAME='hd_5min.exe' ;; #( - aus5min) : - EXEC_FILE_NAME='hd_5min.exe' ;; #( + EXEC_FILE_NAME='hd_5min.exe' + as_fn_append FCFLAGS " ${FC_PP_DEF}HD_5MIN" ;; #( *) : as_fn_error $? "unexpected value for the domain resolution '$enable_resolution'; this is a bug in the configure script" "$LINENO" 5 ;; esac -case $enable_resolution in #( - *5min) : - as_fn_append FCFLAGS " ${FC_PP_DEF}HD_5MIN" ;; #( - *) : - ;; -esac eval "set dummy $acx_lib_search_flags; shift" diff --git a/configure.ac b/configure.ac index b2f29a181e490c84777357efc8c79c31d5e65150..f68a767851ef288453481ee70d11767d4d854309 100644 --- a/configure.ac +++ b/configure.ac @@ -101,14 +101,10 @@ AC_ARG_ENABLE([resolution], The value of the argument must be one of the following @<:@default=05deg@:>@: 0|05deg 0.5 degree global domain - 1|5min 5min global domain - 2|euro5min 5min European domain - 3|aus5min 5min Australian domain], + 1|5min 5min global domain], [AS_CASE([$enableval], [0|05deg], [enable_resolution=05deg], [1|5min], [enable_resolution=5min], - [2|euro5min], [enable_resolution=euro5min], - [3|aus5min], [enable_resolution=aus5min], [AC_MSG_ERROR([unexpected value for the argument dnl --enable-resolution='$enableval'; see the help message for the valid values dnl of the argument])])], @@ -119,15 +115,10 @@ AS_CASE([$enable_resolution], [05deg], [EXEC_FILE_NAME='hd_05.exe'], [5min], - [EXEC_FILE_NAME='hd_5min.exe'], - [euro5min], - [EXEC_FILE_NAME='hd_5min.exe'], - [aus5min], - [EXEC_FILE_NAME='hd_5min.exe'], + [EXEC_FILE_NAME='hd_5min.exe' + AS_VAR_APPEND([FCFLAGS], [" ${FC_PP_DEF}HD_5MIN"])], [AC_MSG_ERROR([unexpected value for the domain resolution dnl '$enable_resolution'; this is a bug in the configure script])]) -AS_CASE([$enable_resolution], - [*5min], [AS_VAR_APPEND([FCFLAGS], [" ${FC_PP_DEF}HD_5MIN"])]) eval "set dummy $acx_lib_search_flags; shift" ACX_LANG_PACKAGE_INIT([NetCDF], ["$FC_INC_FLAG" "$FC_MOD_IN"], ["$@"])