From 2c19a43fec5abab45a7b3b595c098705b9b93578 Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Thu, 9 Feb 2012 20:28:27 +0000 Subject: [PATCH] [cantera]: fixing configure line error --- Cantera/src/base/Makefile.am | 5 ++++- config.h.in | 2 +- configure.ac | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Cantera/src/base/Makefile.am b/Cantera/src/base/Makefile.am index 688dc57bd..bb72fd831 100644 --- a/Cantera/src/base/Makefile.am +++ b/Cantera/src/base/Makefile.am @@ -14,7 +14,7 @@ AM_CXXFLAGS = $(AM_CPPFLAGS) lib_LTLIBRARIES = $(top_builddir)/build/lib/libctbase.la library_includedir = $(top_builddir)/build/include -library_include_HEADERS = $(h_sources) +library_include_HEADERS = utilities.h otherincludedir = $(top_builddir)/build/include/cantera/kernel otherinclude_HEADERS = $(h_sources) @@ -26,6 +26,9 @@ otherinclude_HEADERS = $(h_sources) __top_builddir__build_lib_libctbase_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libctbase_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_libctbase_include = $(h_sources) +__top_builddir__build_lib_libctbase_includedir = $(prefix)/include + # header file accumulation -- only copy if file updated! all: diff --git a/config.h.in b/config.h.in index c0218cee4..6181f8b67 100755 --- a/config.h.in +++ b/config.h.in @@ -57,7 +57,7 @@ /* Define to add underscore after fortran functions */ #undef LAPACK_FTN_TRAILING_UNDERSCORE -/* Define to lapack functions lowercase */ +/* Define to make lapack functions lowercase */ #undef LAPACK_NAMES_LOWERCASE /* Define to the sub-directory in which libtool stores uninstalled libraries. diff --git a/configure.ac b/configure.ac index 0b1edcb3a..ccad871e0 100644 --- a/configure.ac +++ b/configure.ac @@ -32,8 +32,8 @@ AC_DEFINE([LAPACK_FTN_TRAILING_UNDERSCORE],1,[Define to add underscore after for LAPACK_FTN_TRAILING_UNDERSCORE=1 AC_DEFINE([FTN_TRAILING_UNDERSCORE],1,[Define to add underscore after fortran functions]) FTN_TRAILING_UNDERSCORE=1 -AC_DEFINE([LAPACK_NAMES_LOWERCASE],1,[Define to lapack functions lowercase]) -LAPACK_NAMES_LOWERCASE 1 +AC_DEFINE([LAPACK_NAMES_LOWERCASE],1,[Define to make lapack functions lowercase]) +LAPACK_NAMES_LOWERCASE=1 AC_DEFINE([LAPACK_FTN_STRING_LEN_AT_END],1,[Define to add string to end of lapack functions]) LAPACK_FTN_STRING_LEN_AT_END=1