From 2746301631ce6b34a545b93ffbb492281fac11a9 Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Mon, 6 Feb 2012 19:28:03 +0000 Subject: [PATCH] [cantera]: fixing a linkage issue --- Cantera/ext/f2c_libs/Makefile.am | 7 ++++--- config.h.in | 3 +++ configure.ac | 5 +++-- test_problems/cathermo/DH_graph_acommon/Makefile.am | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Cantera/ext/f2c_libs/Makefile.am b/Cantera/ext/f2c_libs/Makefile.am index 3f3bef961..c1182f413 100644 --- a/Cantera/ext/f2c_libs/Makefile.am +++ b/Cantera/ext/f2c_libs/Makefile.am @@ -27,13 +27,14 @@ cc_sources = abort_.c c_log.c d_atn2.c dfe.c d_prod.c \ system_.c wsle.c z_sin.c c_div.c d_asin.c\ derfc_.c d_nint.c d_tanh.c err.c ftell_.c\ hl_ge.c i_abs.c i_mod.c l_le.c pow_di.c \ - r_cosh.c r_log.c rsne.c \ + r_cosh.c r_log.c rsne.c \ sig_die.c typesize.c wsne.c z_sqrt.c \ c_exp.c d_atan.c d_exp.c dolio.c dtime_.c\ - etime_.c getarg_.c hl_gt.c iargc_.c \ + etime_.c hl_gt.c \ i_nint.c l_lt.c pow_hh.c r_abs.c rdfmt.c \ r_mod.c r_sqrt.c signal_.c uio.c xwsne.c -# arithchk.c + +# arithchk.c getarg_.c iargc_.c h_sources = f2c.h fio.h fmt.h fp.h lio.h rawio.h sysdep1.h diff --git a/config.h.in b/config.h.in index afc48b2ae..304c1711e 100755 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define to add underscore after fortran functions */ +#undef FTN_TRAILING_UNDERSCORE + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H diff --git a/configure.ac b/configure.ac index 699587014..50d2f49bc 100644 --- a/configure.ac +++ b/configure.ac @@ -27,10 +27,11 @@ AC_SUBST([PACKAGE_DESCRIPTION]) PACKAGE_URL="http://code.google.com/p/cantera/" AC_SUBST([PACKAGE_URL]) -# add trailing underscore +# add trailing underscore(s) AC_DEFINE([LAPACK_FTN_TRAILING_UNDERSCORE],1,[Define to add underscore after fortran functions]) LAPACK_FTN_TRAILING_UNDERSCORE=1 - +AC_DEFINE([FTN_TRAILING_UNDERSCORE],1,[Define to add underscore after fortran functions]) +FTN_TRAILING_UNDERSCORE=1 AC_CHECK_TYPES([uint8_t, uint16_t, uint32_t, int32_t, uint64_t, int64_t]) AH_BOTTOM([ diff --git a/test_problems/cathermo/DH_graph_acommon/Makefile.am b/test_problems/cathermo/DH_graph_acommon/Makefile.am index 162babaad..3b1413de9 100644 --- a/test_problems/cathermo/DH_graph_acommon/Makefile.am +++ b/test_problems/cathermo/DH_graph_acommon/Makefile.am @@ -1,13 +1,13 @@ cc_sources = DH_graph_1.cpp -INC = -I. -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel +INC = -I. -I$(top_builddir)/build/include/ AM_CPPFLAGS = $(INC) AM_CXXFLAGS = $(AM_CPPFLAGS) LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++ -AM_LDFLAGS = -L/workspace/src/cantera/pecos_autotools/build/lib/ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ LIBS = $(LINK) bin_PROGRAMS = DH_graph_1