Account for compilers that generate module files in uppercase.

configure.ac

@@ -286,7 +286,8 @@ AS_IF([test "x${enable_isoc}" = "xyes"],
 AC_SUBST([CDI_F90_INTERFACE_FCFLAGS])
 #  Check the module extension of the fortran compiler
 AS_IF([test -n "$FC" && test "X$FC" != "Xno"],
-  [ACX_SL_FC_MOD_SUFFIX(,[FCMODEXT=mod])])
+  [ACX_SL_FC_MOD_SUFFIX(,[FCMODEXT=mod])
+   AM_CONDITIONAL([FORTRAN_MOD_UC],[test "x$FCMODCASE" = "xuc"])])
 # -----------------------------------------------------------------------
 # Check for SWIG - Generator for script-language bindings
 AC_ARG_ENABLE(swig,

examples/Makefile.am

@@ -29,11 +29,15 @@ cdi_copy_SOURCES         = cdi_copy.c
 #
 cdi_read_f2003_SOURCES   = cdi_read_f2003.f90
 cdi_read_f2003_LDADD     = $(top_builddir)/src/libcdi_f2003.la $(top_builddir)/src/libcdi.la
-cdi_read_f2003.$(OBJEXT): $(top_builddir)/src/mo_cdi.$(FCMODEXT)
 #
 cdi_write_f2003_SOURCES  = cdi_write_f2003.f90
 cdi_write_f2003_LDADD    = $(top_builddir)/src/libcdi_f2003.la $(top_builddir)/src/libcdi.la
-cdi_write_f2003.$(OBJEXT): $(top_builddir)/src/mo_cdi.$(FCMODEXT)
+
+if FORTRAN_MOD_UC
+cdi_read_f2003.$(OBJEXT) cdi_write_f2003.$(OBJEXT): $(top_builddir)/src/MO_CDI.$(FCMODEXT)
+else
+cdi_read_f2003.$(OBJEXT) cdi_write_f2003.$(OBJEXT): $(top_builddir)/src/mo_cdi.$(FCMODEXT)
+endif
 
 #
 if ENABLE_ALL_STATIC

m4/acx_sl_mod_suffix.m4

@@ -70,13 +70,13 @@ AC_DEFUN([ACX_SL_FC_MOD_SUFFIX],
      acx_fc_mod_name=
    m4_foreach([acx_fc_mod_name],dnl
      [[conftest.$FCMODEXT], [conftest.mod], [conftest.MOD], [conftest.M],
-      [CONFTEST.MOD]],dnl
+      [CONFTEST.MOD], [CONFTEST.mod]],dnl
      [AS_IF([test -n "acx_fc_mod_name" -a -f "acx_fc_mod_name"],dnl
         [[acx_fc_mod_name]="acx_fc_mod_name" ; break])
      ])
      break
    done
-   rm -f conftest*
+   rm -f conftest* CONFTEST*
    AC_LANG_POP([Fortran])
 dnl
    AS_CASE(["$acx_fc_mod_name"],dnl
@@ -86,6 +86,8 @@ dnl
      [conftest.MOD], [FCMODEXT=MOD],
      [conftest.M], [FCMODEXT=M],
      [CONFTEST.MOD], [FCMODEXT=MOD
+        ac_fc_mod_uppercase=yes],
+     [CONFTEST.mod], [FCMODEXT=mod
         ac_fc_mod_uppercase=yes])
    AC_MSG_RESULT([${FCMODEXT-not found}])
    AS_VAR_TEST_SET([FCMODEXT], [$1], [m4_ifval([$2],[$2],dnl

src/Makefile.am

@@ -16,7 +16,6 @@ if USE_FC
 endif
 if CREATE_ISOC
   lib_LTLIBRARIES += libcdi_f2003.la
-  include_HEADERS += mo_cdi.$(FCMODEXT)
 endif
 else
   noinst_LTLIBRARIES += libcdi.la
@@ -175,6 +174,15 @@ EXTRA_DIST += \
 
 
 libcdi_f2003_la_SOURCES = mo_cdi.f90
+libcdi_f2003_ladir = $(includedir)
+nodist_libcdi_f2003_la_HEADERS =
+if CREATE_ISOC
+if FORTRAN_MOD_UC
+nodist_libcdi_f2003_la_HEADERS += MO_CDI.$(FCMODEXT)
+else
+nodist_libcdi_f2003_la_HEADERS += mo_cdi.$(FCMODEXT)
+endif
+endif
 libcdi_f2003_la_LIBADD = libcdi.la
 
 libcdiresunpack_la_SOURCES = \
@@ -261,7 +269,12 @@ endif
 #
 mo_cdi.f90: $(top_srcdir)/src/cdi.h $(top_srcdir)/interfaces/f2003/bindGen.rb
 	$(RUBY) $(top_srcdir)/interfaces/f2003/bindGen.rb $(top_srcdir)/src/cdi.h $@
+
+if FORTRAN_MOD_UC
+MO_CDI.$(FCMODEXT): mo_cdi.lo
+else
 mo_cdi.$(FCMODEXT): mo_cdi.lo
+endif
 	@if test ! -f $@; then rm -f $<; $(MAKE) $<; fi
 #
 pkgconfig/cdi.pc: pkgconfig/cdi.pc.in ../config.status
@@ -281,8 +294,12 @@ all-local: $(LOCALTARGETS)
 CLEANFILES  = `ls *~`
 #CLEANFILES += cdilib.c
 if CREATE_ISOC
+if FORTRAN_MOD_UC
+CLEANFILES += MO_CDI.$(FCMODEXT)
+else
 CLEANFILES += mo_cdi.$(FCMODEXT)
 endif
+endif
 
 if ENABLE_CDI_LIB
 PKGCONFIG_FILES = pkgconfig/cdi.pc