unifying with CMake build

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9722 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2015-05-26 07:24:57 +00:00
parent f499f5a725
commit a4495e79c6
2 changed files with 57 additions and 12 deletions

View File

@ -28,16 +28,18 @@ AC_PROG_MAKE_SET
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_PROG_LIBTOOL
# Check if the fortran test should be included
AC_MSG_CHECKING([if test Fortran])
AC_ARG_ENABLE([fortran-test],
[AC_HELP_STRING([--enable-fortran-test],
[test the Fortran interface @<:@default=yes@:>@])],
[IPQ_FORTRAN=$enableval],
[IPQ_FORTRAN=yes])
# Check if the iphreeqc fortran module is enabled
AC_MSG_CHECKING([whether to enable the IPhreeqc Fortran module])
AC_ARG_ENABLE([fortran-module],
[AC_HELP_STRING([--enable-fortran-module],
[enable the IPhreeqc Fortran module @<:@default=yes@:>@])],
[IPQ_FORTRAN_MODULE=$enableval],
[IPQ_FORTRAN_MODULE=yes])
if test "X$IPQ_FORTRAN" = "Xyes"; then
if test "X$IPQ_FORTRAN_MODULE" = "Xyes"; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
AC_PROG_FC
AC_FC_LIBRARY_LDFLAGS
AC_FC_WRAPPERS
@ -52,12 +54,41 @@ if test "X$IPQ_FORTRAN" = "Xyes"; then
])
AC_SUBST(F77, $FC)
AC_SUBST(FFLAGS, $FCFLAGS)
AC_DEFINE(IPHREEQC_NO_FORTRAN_MODULE)
fi
AM_CONDITIONAL([FORTRAN_MODULE], [test "X$IPQ_FORTRAN_MODULE" = "Xyes"])
# Check if the fortran test should be included
AC_MSG_CHECKING([whether to enable the IPhreeqc Fortran test])
AC_ARG_ENABLE([fortran-test],
[AC_HELP_STRING([--enable-fortran-test],
[enable the IPhreeqc Fortran test @<:@default=no@:>@])],
[IPQ_FORTRAN=$enableval],
[IPQ_FORTRAN=no])
if test "X$IPQ_FORTRAN" = "Xyes"; then
AC_MSG_RESULT(yes)
if test "X$IPQ_FORTRAN_MODULE" != "Xyes"; then
AC_PROG_FC
AC_FC_LIBRARY_LDFLAGS
AC_FC_WRAPPERS
AC_FC_MAIN
m4_ifdef([AC_FC_MODULE_EXTENSION], [AC_FC_MODULE_EXTENSION], [
AX_F90_MODULE_EXTENSION
FC_MODEXT=mod
if test x$ax_cv_f90_modext != xunknown ; then
FC_MODEXT=$ax_cv_f90_modext
fi
AC_SUBST(FC_MODEXT)
])
AC_SUBST(F77, $FC)
AC_SUBST(FFLAGS, $FCFLAGS)
fi
else
AC_MSG_RESULT(no)
fi
AM_CONDITIONAL([BUILD_FORTRAN], [test "X$IPQ_FORTRAN" = "Xyes"])
# Checks for libraries.
# Checks for header files.

View File

@ -185,6 +185,20 @@ sourcedir=$(docdir)/src
dist_source_DATA=$(SRC)
SRC=\
$(top_srcdir)/src/IPhreeqc_interface.F90\
$(top_srcdir)/src/IPhreeqc.f90.inc\
$(top_srcdir)/src/IPhreeqc.f.inc
$(top_srcdir)/src/README.Fortran
if FORTRAN_MODULE
SRC += $(top_srcdir)/src/IPhreeqc_interface.F90
else
include_HEADERS+=\
$(top_srcdir)/src/IPhreeqc.f.inc\
$(top_srcdir)/src/IPhreeqc.f90.inc
libiphreeqc_la_SOURCES+=\
fwrap.h\
fwrap.cpp\
IPhreeqcF.f
endif