Added calculation of two new variables

INSTALL_LIBS_DEP
and
RAW_LIBS_DEP
These are lists of dependencies. The INSTALL_LIBS_DEP contains
the dependency list for LOCAL_LIBS based on the installation
directory.
The RAW_LIBS_DEP contains a list of libraries without the
any absolute path name. See the Chemequil_red1 Makefile.in for
an example of their usage
This commit is contained in:
Harry Moffat 2008-01-06 19:29:32 +00:00
parent 26de212fb9
commit b322a0be28
2 changed files with 74 additions and 4 deletions

44
configure vendored
View file

@ -308,7 +308,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BITCOMPILE BITHARDWARE BITCHANGE ldemulationarg CVF_LIBDIR USE_CLIB_DLL local_inst local_python_inst python_prefix python_win_prefix ctversion homedir ct_libdir ct_bindir ct_incdir ct_incroot ct_datadir ct_demodir ct_templdir ct_tutdir ct_docdir ct_dir ct_mandir COMPACT_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os username ctroot buildinc buildlib buildbin MAKE GRAPHVIZDIR ARCHIVE DO_RANLIB RANLIB CXX_DEPENDS USERDIR INCL_USER_CODE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT use_sundials CVODE_LIBS IDA_LIBS sundials_include CANTERA_DEBUG_MODE COMPILE_PURE_FLUIDS phase_object_files phase_header_files COMPILE_IDEAL_SOLUTIONS COMPILE_ELECTROLYTES NEED_CATHERMO COMPILE_KINETICS COMPILE_HETEROKIN COMPILE_RXNPATH WITH_REACTORS KERNEL KERNEL_OBJ BUILD_CK LIB_DIR COMPILE_VCSNONIDEAL BOOST_INCLUDE BOOST_LIB build_lapack build_blas BLAS_LAPACK_LIBS BLAS_LAPACK_DIR build_with_f2c build_f2c_lib LOCAL_LIB_DIRS LOCAL_LIBS LOCAL_LIBS_DEP CT_SHARED_LIB PYTHON_CMD BUILD_PYTHON NUMARRAY_INC_DIR NUMARRAY_HOME CANTERA_PYTHON_HOME CVSTAG MATLAB_CMD BUILD_MATLAB BUILD_CLIB export_name PIC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS ac_ct_CC CXXCPP EGREP SOEXT SHARED CXX_INCLUDES LCXX_FLAGS LCXX_END_LIBS HAVE_STRIPSYMBOLS F77 FFLAGS ac_ct_F77 FLIBS F90 BUILD_F90 F90FLAGS F90BUILDFLAGS F90LIBS precompile_headers OS_IS_DARWIN OS_IS_WIN OS_IS_CYGWIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT math_libs SO LDSHARED EXTRA_LINK TSCOMPARE_abs INSTALL_abs INSTALL_VERBOSE LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BITCOMPILE BITHARDWARE BITCHANGE ldemulationarg CVF_LIBDIR USE_CLIB_DLL local_inst local_python_inst python_prefix python_win_prefix ctversion homedir ct_libdir ct_bindir ct_incdir ct_incroot ct_datadir ct_demodir ct_templdir ct_tutdir ct_docdir ct_dir ct_mandir COMPACT_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os username ctroot buildinc buildlib buildbin MAKE GRAPHVIZDIR ARCHIVE DO_RANLIB RANLIB CXX_DEPENDS USERDIR INCL_USER_CODE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT use_sundials CVODE_LIBS IDA_LIBS sundials_include CANTERA_DEBUG_MODE COMPILE_PURE_FLUIDS phase_object_files phase_header_files COMPILE_IDEAL_SOLUTIONS COMPILE_ELECTROLYTES NEED_CATHERMO COMPILE_KINETICS COMPILE_HETEROKIN COMPILE_RXNPATH WITH_REACTORS KERNEL KERNEL_OBJ BUILD_CK LIB_DIR COMPILE_VCSNONIDEAL BOOST_INCLUDE BOOST_LIB build_lapack build_blas BLAS_LAPACK_LIBS BLAS_LAPACK_DIR build_with_f2c build_f2c_lib LOCAL_LIB_DIRS LOCAL_LIBS LOCAL_LIBS_DEP INSTALL_LIBS_DEP RAW_LIBS_DEP CT_SHARED_LIB PYTHON_CMD BUILD_PYTHON NUMARRAY_INC_DIR NUMARRAY_HOME CANTERA_PYTHON_HOME CVSTAG MATLAB_CMD BUILD_MATLAB BUILD_CLIB export_name PIC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS ac_ct_CC CXXCPP EGREP SOEXT SHARED CXX_INCLUDES LCXX_FLAGS LCXX_END_LIBS HAVE_STRIPSYMBOLS F77 FFLAGS ac_ct_F77 FLIBS F90 BUILD_F90 F90FLAGS F90BUILDFLAGS F90LIBS precompile_headers OS_IS_DARWIN OS_IS_WIN OS_IS_CYGWIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT math_libs SO LDSHARED EXTRA_LINK TSCOMPARE_abs INSTALL_abs INSTALL_VERBOSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -2915,53 +2915,73 @@ fi
#
LOCAL_LIBS=
LOCAL_LIBS_DEP=
RAW_LIBS_DEP=
INSTALL_LIBS_DEP=
if test -n "$INCL_USER_CODE"
then
LOCAL_LIBS=$LOCAL_LIBS' '-luser
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libuser.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/libuser.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libuser.a
fi
if test -n "$NEED_ONED"
then
LOCAL_LIBS=$LOCAL_LIBS' '-loneD
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/liboneD.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/liboneD.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'liboneD.a
fi
if test -n "$NEED_ZEROD"
then
LOCAL_LIBS=$LOCAL_LIBS' '-lzeroD
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libzeroD.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/libzeroD.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libzeroD.a
fi
LOCAL_LIBS=$LOCAL_LIBS' '-lequil
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libequil.a
INSTALL_LIBS_DEP=$INTALL_LIBS_DEP' '$ct_libdir/libequil.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libequil.a
if test "$WITH_VCSNONIDEAL" = "y" ; then
LOCAL_LIBS=$LOCAL_LIBS' '-lVCSnonideal
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libVCSnonideal.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/libVCSnonideal.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libVCSnonideal.a
fi
if test -n "$COMPILE_KINETICS"
then
LOCAL_LIBS=$LOCAL_LIBS' '-lkinetics
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libkinetics.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/libkinetics.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libkinetics.a
fi
if test -n "$NEED_TRANSPORT"
then
LOCAL_LIBS=$LOCAL_LIBS' '-ltransport
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libtransport.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/libtransport.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libtransport.a
fi
if test -n "$NEED_CATHERMO"
then
LOCAL_LIBS=$LOCAL_LIBS' '-lthermo
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libthermo.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/libthermo.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libthermo.a
fi
LOCAL_LIBS=$LOCAL_LIBS' '-lctnumerics
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libctnumerics.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/libctnumerics.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libctnumerics.a
if test -n "$NEED_CVODE"; then
LOCAL_LIBS=$LOCAL_LIBS' '$CVODE_LIBS
@ -2969,6 +2989,8 @@ fi
LOCAL_LIBS=$LOCAL_LIBS' '-lctbase
LOCAL_LIBS_DEPS=$LOCAL_LIBS_DEPS' '$buildlib/libctbase.a
INSTALL_LIBS_DEPS=$INSTALL_LIBS_DEPS' '$ct_libdir/libctbase.a
RAW_LIBS_DEPS=$RAW_LIBS_DEPS' 'libctbase.a
if test -n "$NEED_LAPACK"
then
@ -2979,24 +3001,32 @@ if test -n "$NEED_MATH"
then
LOCAL_LIBS=$LOCAL_LIBS' '-lctmath
LOCAL_LIBS_DEPS=$LOCAL_LIBS_DEPS' '$buildlib/libctmath.a
INSTALL_LIBS_DEPS=$INSTALL_LIBS_DEPS' '$ct_libdir/libctmath.a
RAW_LIBS_DEPS=$RAW_LIBS_DEPS' 'libctmath.a
fi
if test -n "$NEED_TPX"
then
LOCAL_LIBS=$LOCAL_LIBS' '-ltpx
LOCAL_LIBS_DEPS=$LOCAL_LIBS_DEPS' '$buildlib/libtpx.a
INSTALL_LIBS_DEPS=$INSTALL_LIBS_DEPS' '$ct_libdir/libtpx.a
RAW_LIBS_DEPS=$RAW_LIBS_DEPS' 'libtpx.a
fi
if test -n "$NEED_SPECTRA"
then
LOCAL_LIBS=$LOCAL_LIBS' '-lctspectra
LOCAL_LIBS_DEPS=$LOCAL_LIBS_DEPS' '$buildlib/libctspectra.a
INSTALL_LIBS_DEPS=$INSTALL_LIBS_DEPS' '$ct_libdir/libctspectra.a
RAW_LIBS_DEPS=$RAW_LIBS_DEPS' 'libctspectra.a
fi
if test -n "$NEED_F2C"
then
LOCAL_LIBS=$LOCAL_LIBS' '-lctf2c
LOCAL_LIBS_DEPS=$LOCAL_LIBS_DEPS' '$buildlib/libctf2c.a
INSTALL_LIBS_DEPS=$INSTALL_LIBS_DEPS' '$ct_libdir/libctf2c.a
RAW_LIBS_DEPS=$RAW_LIBS_DEPS' 'libctf2c.a
else
case $ac_sys_system in
Linux) LOCAL_LIBS=$LOCAL_LIBS' '-lg2c;;
@ -3008,6 +3038,8 @@ if test -n "$NEED_CKREADER"
then
LOCAL_LIBS=$LOCAL_LIBS' '-lconverters
LOCAL_LIBS_DEPS=$LOCAL_LIBS_DEPS' '$buildlib/libconverters.a
INSTALL_LIBS_DEPS=$INSTALL_LIBS_DEPS' '$ct_libdir/libconverters.a
RAW_LIBS_DEPS=$RAW_LIBS_DEPS' 'libconverters.a
fi
LOCAL_LIB_DIRS=
@ -3029,6 +3061,8 @@ fi
#-------------------------------------------------
# Language Interfaces
#-------------------------------------------------
@ -8599,7 +8633,7 @@ fi
# Provide some information about the compiler.
echo "$as_me:8602:" \
echo "$as_me:8636:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@ -8802,7 +8836,7 @@ _ACEOF
# flags.
ac_save_FFLAGS=$FFLAGS
FFLAGS="$FFLAGS $ac_verb"
(eval echo $as_me:8805: \"$ac_link\") >&5
(eval echo $as_me:8839: \"$ac_link\") >&5
ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$ac_f77_v_output" >&5
FFLAGS=$ac_save_FFLAGS
@ -8880,7 +8914,7 @@ _ACEOF
# flags.
ac_save_FFLAGS=$FFLAGS
FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
(eval echo $as_me:8883: \"$ac_link\") >&5
(eval echo $as_me:8917: \"$ac_link\") >&5
ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$ac_f77_v_output" >&5
FFLAGS=$ac_save_FFLAGS
@ -10121,6 +10155,8 @@ s,@build_f2c_lib@,$build_f2c_lib,;t t
s,@LOCAL_LIB_DIRS@,$LOCAL_LIB_DIRS,;t t
s,@LOCAL_LIBS@,$LOCAL_LIBS,;t t
s,@LOCAL_LIBS_DEP@,$LOCAL_LIBS_DEP,;t t
s,@INSTALL_LIBS_DEP@,$INSTALL_LIBS_DEP,;t t
s,@RAW_LIBS_DEP@,$RAW_LIBS_DEP,;t t
s,@CT_SHARED_LIB@,$CT_SHARED_LIB,;t t
s,@PYTHON_CMD@,$PYTHON_CMD,;t t
s,@BUILD_PYTHON@,$BUILD_PYTHON,;t t

View file

@ -792,53 +792,73 @@ AC_SUBST(build_f2c_lib)
#
LOCAL_LIBS=
LOCAL_LIBS_DEP=
RAW_LIBS_DEP=
INSTALL_LIBS_DEP=
if test -n "$INCL_USER_CODE"
then
LOCAL_LIBS=$LOCAL_LIBS' '-luser
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libuser.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/libuser.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libuser.a
fi
if test -n "$NEED_ONED"
then
LOCAL_LIBS=$LOCAL_LIBS' '-loneD
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/liboneD.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/liboneD.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'liboneD.a
fi
if test -n "$NEED_ZEROD"
then
LOCAL_LIBS=$LOCAL_LIBS' '-lzeroD
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libzeroD.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/libzeroD.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libzeroD.a
fi
LOCAL_LIBS=$LOCAL_LIBS' '-lequil
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libequil.a
INSTALL_LIBS_DEP=$INTALL_LIBS_DEP' '$ct_libdir/libequil.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libequil.a
if test "$WITH_VCSNONIDEAL" = "y" ; then
LOCAL_LIBS=$LOCAL_LIBS' '-lVCSnonideal
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libVCSnonideal.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/libVCSnonideal.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libVCSnonideal.a
fi
if test -n "$COMPILE_KINETICS"
then
LOCAL_LIBS=$LOCAL_LIBS' '-lkinetics
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libkinetics.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/libkinetics.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libkinetics.a
fi
if test -n "$NEED_TRANSPORT"
then
LOCAL_LIBS=$LOCAL_LIBS' '-ltransport
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libtransport.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/libtransport.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libtransport.a
fi
if test -n "$NEED_CATHERMO"
then
LOCAL_LIBS=$LOCAL_LIBS' '-lthermo
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libthermo.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/libthermo.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libthermo.a
fi
LOCAL_LIBS=$LOCAL_LIBS' '-lctnumerics
LOCAL_LIBS_DEP=$LOCAL_LIBS_DEP' '$buildlib/libctnumerics.a
INSTALL_LIBS_DEP=$INSTALL_LIBS_DEP' '$ct_libdir/libctnumerics.a
RAW_LIBS_DEP=$RAW_LIBS_DEP' 'libctnumerics.a
if test -n "$NEED_CVODE"; then
LOCAL_LIBS=$LOCAL_LIBS' '$CVODE_LIBS
@ -846,6 +866,8 @@ fi
LOCAL_LIBS=$LOCAL_LIBS' '-lctbase
LOCAL_LIBS_DEPS=$LOCAL_LIBS_DEPS' '$buildlib/libctbase.a
INSTALL_LIBS_DEPS=$INSTALL_LIBS_DEPS' '$ct_libdir/libctbase.a
RAW_LIBS_DEPS=$RAW_LIBS_DEPS' 'libctbase.a
if test -n "$NEED_LAPACK"
then
@ -856,24 +878,32 @@ if test -n "$NEED_MATH"
then
LOCAL_LIBS=$LOCAL_LIBS' '-lctmath
LOCAL_LIBS_DEPS=$LOCAL_LIBS_DEPS' '$buildlib/libctmath.a
INSTALL_LIBS_DEPS=$INSTALL_LIBS_DEPS' '$ct_libdir/libctmath.a
RAW_LIBS_DEPS=$RAW_LIBS_DEPS' 'libctmath.a
fi
if test -n "$NEED_TPX"
then
LOCAL_LIBS=$LOCAL_LIBS' '-ltpx
LOCAL_LIBS_DEPS=$LOCAL_LIBS_DEPS' '$buildlib/libtpx.a
INSTALL_LIBS_DEPS=$INSTALL_LIBS_DEPS' '$ct_libdir/libtpx.a
RAW_LIBS_DEPS=$RAW_LIBS_DEPS' 'libtpx.a
fi
if test -n "$NEED_SPECTRA"
then
LOCAL_LIBS=$LOCAL_LIBS' '-lctspectra
LOCAL_LIBS_DEPS=$LOCAL_LIBS_DEPS' '$buildlib/libctspectra.a
INSTALL_LIBS_DEPS=$INSTALL_LIBS_DEPS' '$ct_libdir/libctspectra.a
RAW_LIBS_DEPS=$RAW_LIBS_DEPS' 'libctspectra.a
fi
if test -n "$NEED_F2C"
then
LOCAL_LIBS=$LOCAL_LIBS' '-lctf2c
LOCAL_LIBS_DEPS=$LOCAL_LIBS_DEPS' '$buildlib/libctf2c.a
INSTALL_LIBS_DEPS=$INSTALL_LIBS_DEPS' '$ct_libdir/libctf2c.a
RAW_LIBS_DEPS=$RAW_LIBS_DEPS' 'libctf2c.a
else
case $ac_sys_system in
Linux) LOCAL_LIBS=$LOCAL_LIBS' '-lg2c;;
@ -885,6 +915,8 @@ if test -n "$NEED_CKREADER"
then
LOCAL_LIBS=$LOCAL_LIBS' '-lconverters
LOCAL_LIBS_DEPS=$LOCAL_LIBS_DEPS' '$buildlib/libconverters.a
INSTALL_LIBS_DEPS=$INSTALL_LIBS_DEPS' '$ct_libdir/libconverters.a
RAW_LIBS_DEPS=$RAW_LIBS_DEPS' 'libconverters.a
fi
LOCAL_LIB_DIRS=
@ -905,6 +937,8 @@ fi
AC_SUBST(LOCAL_LIB_DIRS)
AC_SUBST(LOCAL_LIBS)
AC_SUBST(LOCAL_LIBS_DEP)
AC_SUBST(INSTALL_LIBS_DEP)
AC_SUBST(RAW_LIBS_DEP)
#-------------------------------------------------
# Language Interfaces