From 0f00259eccc467cccff27ee624ec395ebd944902 Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Sat, 4 Feb 2012 01:47:28 +0000 Subject: [PATCH] [cantera]: adding typedefs to config.h output --- Cantera/src/base/Makefile.am | 2 +- config.h.in | 24 ++++++++++++++++++++++++ configure.ac | 8 ++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/Cantera/src/base/Makefile.am b/Cantera/src/base/Makefile.am index eac970188..9fdd4fca8 100644 --- a/Cantera/src/base/Makefile.am +++ b/Cantera/src/base/Makefile.am @@ -9,7 +9,7 @@ cc_sources = ct2ctml.cpp ctml.cpp misc.cpp plots.cpp \ PrintCtrl.cpp LogPrintCtrl.cpp mdp_allo.cpp \ checkFinite.cpp -AM_CPPFLAGS = +AM_CPPFLAGS = -I$(top_builddir) AM_CXXFLAGS = $(AM_CPPFLAGS) lib_LTLIBRARIES = $(top_builddir)/build/lib/libctbase.la diff --git a/config.h.in b/config.h.in index d857d0071..afc48b2ae 100755 --- a/config.h.in +++ b/config.h.in @@ -3,6 +3,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H +/* Define to 1 if the system has the type `int32_t'. */ +#undef HAVE_INT32_T + +/* Define to 1 if the system has the type `int64_t'. */ +#undef HAVE_INT64_T + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -27,6 +33,18 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H +/* Define to 1 if the system has the type `uint16_t'. */ +#undef HAVE_UINT16_T + +/* Define to 1 if the system has the type `uint32_t'. */ +#undef HAVE_UINT32_T + +/* Define to 1 if the system has the type `uint64_t'. */ +#undef HAVE_UINT64_T + +/* Define to 1 if the system has the type `uint8_t'. */ +#undef HAVE_UINT8_T + /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H @@ -63,3 +81,9 @@ /* Version number of package */ #undef VERSION + + +typedef double doublereal; // Fortran double precision +typedef int integer; // Fortran integer +typedef int ftnlen; // Fortran hidden string length type + diff --git a/configure.ac b/configure.ac index 194cea0d6..699587014 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,14 @@ AC_SUBST([PACKAGE_URL]) AC_DEFINE([LAPACK_FTN_TRAILING_UNDERSCORE],1,[Define to add underscore after fortran functions]) LAPACK_FTN_TRAILING_UNDERSCORE=1 + +AC_CHECK_TYPES([uint8_t, uint16_t, uint32_t, int32_t, uint64_t, int64_t]) +AH_BOTTOM([ +typedef double doublereal; // Fortran double precision +typedef int integer; // Fortran integer +typedef int ftnlen; // Fortran hidden string length type +]) + # ------------------------------ # Checks for required programs # ------------------------------