Autoconf: Ice-ocean autodetect FMS API

configure.ice_ocean.ac was modified to automatically detect the FMS API.
This replaces the --framework flag, which forced the user to manually
select the appropriate config_src/infra directory.  Now, the appropriate
directory is based on the FMS library detected during configuration.

This will prevent possible FMS1/2 API mixups during compilation.

The ice-ocean and AM2-coupler configure.ac files have also been moved
out of ac/ and into their respective directories.

coupled_AM2_LM3_SIS2/Makefile

@@ -14,7 +14,7 @@ LM3_BUILD ?= ../shared/LM3/build
 # Autoconf configuration
 MOM_CODEBASE ?= ../src/MOM6
 MAKEFILE_IN ?= $(MOM_CODEBASE)/ac/Makefile.in
-CONFIGURE_AC ?= ../ac/configure.coupled.ac
+CONFIGURE_AC ?= configure.coupled.ac
 M4DIR ?= $(MOM_CODEBASE)/ac/m4
 MAKEDEP ?= $(MOM_CODEBASE)/ac/makedep
 

ice_ocean_SIS2/Makefile

@@ -14,7 +14,7 @@ LAND_BUILD ?= ../shared/land_null/build
 # Autoconf configuration
 MOM_CODEBASE ?= ../src/MOM6
 MAKEFILE_IN ?= $(MOM_CODEBASE)/ac/Makefile.in
-CONFIGURE_AC ?= ../ac/configure.ice_ocean.ac
+CONFIGURE_AC ?= configure.ice_ocean.ac
 M4DIR ?= $(MOM_CODEBASE)/ac/m4
 MAKEDEP ?= $(MOM_CODEBASE)/ac/makedep
 

ac/configure.ice_ocean.ac → ice_ocean_SIS2/configure.ice_ocean.ac

@@ -244,6 +244,14 @@ AC_COMPILE_IFELSE(
 )
 
 
+# Determine the FMS IO implementation.
+AX_FC_CHECK_MODULE([fms2_io_mod], [
+  MODEL_FRAMEWORK=${srcdir}/config_src/infra/FMS2
+],[
+  MODEL_FRAMEWORK=${srcdir}/config_src/infra/FMS1
+])
+
+
 # Verify that Python is available
 AC_PATH_PROGS([PYTHON], [python python3 python2], [
   AC_MSG_ERROR([Could not find python.])