Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
0aab175b
Commit
0aab175b
authored
Mar 12, 2020
by
Sergey Kosukhin
Browse files
Re-generate F2003 interface only in maintainer mode.
parent
0f110582
Changes
2
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
0aab175b
...
...
@@ -271,9 +271,6 @@ AM_COND_IF([USE_MPI],
# ----------------------------------------------------------------------
# Create the Fortran Interface via iso_c_binding module (Fortran 2003 Standard)
#
# the test for ruby itself is unconditional because ruby is also used in
# the Fortran 2003 ISO C generator
AC_CHECK_PROG([RUBY],[ruby],[ruby])
AC_ARG_ENABLE([iso-c-interface],
[AS_HELP_STRING([--enable-iso-c-interface],
[Create Fortran Interface via iso_c_bindings facility of F2003 [default=no].])],
...
...
@@ -312,12 +309,11 @@ AM_CONDITIONAL(ENABLE_SWIG,[test "x$SWIG" != "x"])
#
AC_ARG_ENABLE([ruby],
[AS_HELP_STRING([--enable-ruby],[ruby language bindings [default=no] (EXPERIMENTAL)])],
[RUBY_INCLUDES="$($RUBY $srcdir/config/interface.rb)"
[AC_CHECK_PROG([RUBY],[ruby],[ruby])
RUBY_INCLUDES="$($RUBY $srcdir/config/interface.rb)"
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES"
AC_CHECK_HEADER([ruby.h],,[enable_ruby=no
RUBY=
], [AC_INCLUDES_DEFAULT])
AC_CHECK_HEADER([ruby.h],,[enable_ruby=no], [AC_INCLUDES_DEFAULT])
CPPFLAGS=$save_CPPFLAGS
AS_IF([test "x$RUBY" != "x"],
[AS_IF([test "x$SWIG" = "x"],
...
...
@@ -329,6 +325,10 @@ AC_ARG_ENABLE([ruby],
[enable_ruby=no])
AM_CONDITIONAL(ENABLE_RUBY,[test "x$enable_ruby" != "xno"])
AS_IF([test "x$enable_ruby" != "xno"],[AC_SUBST([ENABLE_RUBY],[true])],[AC_SUBST([ENABLE_RUBY],[false])])
# Ruby is also used for the Fortran 2003 ISO C generator in maintainer mode.
# Report properly if it's missing:
AS_VAR_IF([RUBY], [], [AS_UNSET([RUBY])])
AM_MISSING_PROG([RUBY], [ruby])
# ----------------------------------------------------------------------
# Create the Python Interface via swig
AC_ARG_ENABLE(python,
...
...
src/Makefile.am
View file @
0aab175b
...
...
@@ -270,8 +270,8 @@ endif
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
$@
mo_cdi.f90
:
@MAINTAINER_MODE_TRUE@
$(top_srcdir)/src/cdi.h $(top_srcdir)/interfaces/f2003/bindGen.rb
$(AM_V_GEN)
$(RUBY)
$(top_srcdir)
/interfaces/f2003/bindGen.rb
$(top_srcdir)
/src/cdi.h
$@
if
FORTRAN_MOD_UC
MO_CDI.$(FCMODEXT)
:
mo_cdi.lo
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment