diff options
| -rw-r--r-- | m4/ax_f90_internal_headmod.m4 | 4 | ||||
| -rw-r--r-- | m4/ax_f90_library.m4 | 6 | ||||
| -rw-r--r-- | m4/ax_f90_library_setup.m4 | 6 | ||||
| -rw-r--r-- | m4/ax_f90_module.m4 | 4 | ||||
| -rw-r--r-- | m4/ax_f90_module_extension.m4 | 16 | ||||
| -rw-r--r-- | m4/ax_f90_module_flag.m4 | 12 |
6 files changed, 24 insertions, 24 deletions
diff --git a/m4/ax_f90_internal_headmod.m4 b/m4/ax_f90_internal_headmod.m4 index a2f15a5..9abf022 100644 --- a/m4/ax_f90_internal_headmod.m4 +++ b/m4/ax_f90_internal_headmod.m4 @@ -12,7 +12,7 @@ # # LAST MODIFICATION # -# 2008-04-12 +# 2009-01-08 # # COPYLEFT # @@ -23,7 +23,7 @@ # and this notice are preserved. AC_DEFUN([AX_F90_INTERNAL_HEADMOD],[ -AS_VAR_PUSHDEF([ax_include],[ax_f90_headmod_$2]) +AS_VAR_PUSHDEF([ax_include],[ax_cv_f90_headmod_$2]) AC_MSG_CHECKING([$1]) AC_LANG_PUSH(Fortran) AS_VAR_SET(ax_include,"not found") diff --git a/m4/ax_f90_library.m4 b/m4/ax_f90_library.m4 index da28c9d..2d885d6 100644 --- a/m4/ax_f90_library.m4 +++ b/m4/ax_f90_library.m4 @@ -25,7 +25,7 @@ # # LAST MODIFICATION # -# 2008-04-12 +# 2009-01-08 # # COPYLEFT # @@ -36,8 +36,8 @@ # and this notice are preserved. AC_DEFUN([AX_F90_LIBRARY],[ -AS_VAR_PUSHDEF([ax_ldflags],[ax_f90_ldflags_$1]) -AS_VAR_PUSHDEF([ax_libs],[ax_f90_libs_$1]) +AS_VAR_PUSHDEF([ax_ldflags],[ax_cv_f90_ldflags_$1]) +AS_VAR_PUSHDEF([ax_libs],[ax_cv_f90_libs_$1]) AC_MSG_CHECKING([$1 fortran 90 library]) AC_LANG_PUSH(Fortran) AS_VAR_SET([ax_ldflags],"") diff --git a/m4/ax_f90_library_setup.m4 b/m4/ax_f90_library_setup.m4 index 87609e4..05bc8d4 100644 --- a/m4/ax_f90_library_setup.m4 +++ b/m4/ax_f90_library_setup.m4 @@ -34,10 +34,10 @@ # transmute_into_gold, you can use the following in you configure.ac: # # AX_F90_MODULE_EXTENSION -# if test x$ax_f90_modext = xunknown ; then +# if test x$ax_cv_f90_modext = xunknown ; then # AC_MSG_ERROR([unable to find f90 modules extension]) # fi -# AX_F90_LIBRARY_SETUP(alchemy,[],alchemy.$ax_f90_modext,libalchemy*,[ +# AX_F90_LIBRARY_SETUP(alchemy,[],alchemy.$ax_cv_f90_modext,libalchemy*,[ # use alchemy # call transmute_into_gold('lead') # ]) @@ -48,7 +48,7 @@ # # LAST MODIFICATION # -# 2008-04-12 +# 2009-01-08 # # COPYLEFT # diff --git a/m4/ax_f90_module.m4 b/m4/ax_f90_module.m4 index 02017ed..d59f624 100644 --- a/m4/ax_f90_module.m4 +++ b/m4/ax_f90_module.m4 @@ -25,7 +25,7 @@ # # LAST MODIFICATION # -# 2008-04-12 +# 2009-01-08 # # COPYLEFT # @@ -37,6 +37,6 @@ AC_DEFUN([AX_F90_MODULE],[ AC_REQUIRE([AX_F90_MODULE_FLAG]) - AX_F90_INTERNAL_HEADMOD([$1 fortran 90 module],[$2],"$ax_f90_modflag", + AX_F90_INTERNAL_HEADMOD([$1 fortran 90 module],[$2],"$ax_cv_f90_modflag", [$3],AS_TR_SH(F90_MODULE_$1),[$4],[$5],[$6]) ]) diff --git a/m4/ax_f90_module_extension.m4 b/m4/ax_f90_module_extension.m4 index d5c010a..3c0fe20 100644 --- a/m4/ax_f90_module_extension.m4 +++ b/m4/ax_f90_module_extension.m4 @@ -14,7 +14,7 @@ # # LAST MODIFICATION # -# 2008-04-12 +# 2009-01-08 # # COPYLEFT # @@ -27,7 +27,7 @@ AC_DEFUN([AX_F90_MODULE_EXTENSION],[ AC_CACHE_CHECK([fortran 90 modules extension], -ax_f90_modext, +ax_cv_f90_modext, [AC_LANG_PUSH(Fortran) i=0 while test \( -f tmpdir_$i \) -o \( -d tmpdir_$i \) ; do @@ -44,16 +44,16 @@ AC_COMPILE_IFELSE([ end subroutine conftest_routine end module conftest_module ], - [ax_f90_modext=`ls | sed -n 's,conftest_module\.,,p'` - if test x$ax_f90_modext = x ; then + [ax_cv_f90_modext=`ls | sed -n 's,conftest_module\.,,p'` + if test x$ax_cv_f90_modext = x ; then dnl Some F90 compilers put module filename in uppercase letters - ax_f90_modext=`ls | sed -n 's,CONFTEST_MODULE\.,,p'` - if test x$ax_f90_modext = x ; then - ax_f90_modext="" + ax_cv_f90_modext=`ls | sed -n 's,CONFTEST_MODULE\.,,p'` + if test x$ax_cv_f90_modext = x ; then + ax_cv_f90_modext="" fi fi ], - [ax_f90_modext=""]) + [ax_cv_f90_modext=""]) cd .. rm -fr tmpdir_$i AC_LANG_POP(Fortran) diff --git a/m4/ax_f90_module_flag.m4 b/m4/ax_f90_module_flag.m4 index c131823..ec96624 100644 --- a/m4/ax_f90_module_flag.m4 +++ b/m4/ax_f90_module_flag.m4 @@ -15,7 +15,7 @@ # # LAST MODIFICATION # -# 2008-04-12 +# 2009-01-08 # # COPYLEFT # @@ -29,7 +29,7 @@ AC_DEFUN([AX_F90_MODULE_FLAG],[ AC_CACHE_CHECK([fortran 90 modules inclusion flag], -ax_f90_modflag, +ax_cv_f90_modflag, [AC_LANG_PUSH(Fortran) i=0 while test \( -f tmpdir_$i \) -o \( -d tmpdir_$i \) ; do @@ -47,9 +47,9 @@ AC_COMPILE_IFELSE([ end module conftest_module ],[],[]) cd .. -ax_f90_modflag="not found" +ax_cv_f90_modflag="not found" for ax_flag in "-I " "-M" "-p"; do - if test "$ax_f90_modflag" = "not found" ; then + if test "$ax_cv_f90_modflag" = "not found" ; then ax_save_FCFLAGS="$FCFLAGS" FCFLAGS="$ax_save_FCFLAGS ${ax_flag}tmpdir_$i" AC_COMPILE_IFELSE([ @@ -58,12 +58,12 @@ for ax_flag in "-I " "-M" "-p"; do use conftest_module call conftest_routine end program conftest_program - ],[ax_f90_modflag="$ax_flag"],[]) + ],[ax_cv_f90_modflag="$ax_flag"],[]) FCFLAGS="$ax_save_FCFLAGS" fi done rm -fr tmpdir_$i -if test "$ax_f90_modflag" = "not found" ; then +if test "$ax_cv_f90_modflag" = "not found" ; then AC_MSG_ERROR([unable to find compiler flag for modules inclusion]) fi AC_LANG_POP(Fortran) |