diff options
| author | Rhys Ulerich <rhys.ulerich@gmail.com> | 2008-11-07 00:07:19 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2008-11-07 00:07:19 +0100 |
| commit | 3a26712ace5ab2a47ea5e8f17d1aec80f373fdc7 (patch) | |
| tree | 0ed92dac4c67c0d22d189c6c6587dfce20e358ca /m4/ax_trilinos_teuchos.m4 | |
| parent | d3e9b1463db867d2c396e0349fd62169c17f9954 (diff) | |
| download | autoconf-archive-3a26712ace5ab2a47ea5e8f17d1aec80f373fdc7.tar.gz | |
Updated AX_TRILINOS macros.
Diffstat (limited to 'm4/ax_trilinos_teuchos.m4')
| -rw-r--r-- | m4/ax_trilinos_teuchos.m4 | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/m4/ax_trilinos_teuchos.m4 b/m4/ax_trilinos_teuchos.m4 index bce4bb1..e9b00b5 100644 --- a/m4/ax_trilinos_teuchos.m4 +++ b/m4/ax_trilinos_teuchos.m4 @@ -8,13 +8,16 @@ # # DESCRIPTION # -# Test for the Trilinos Teuchos -# (http://trilinos.sandia.gov/packages/teuchos) library. On success, -# defines HAVE_LIBTEUCHOS due to AC_CHECK_LIB invocation. +# On success, adds "include Makefile.export.teuchos" statements to every +# Automake file containing @INC_AMINCLUDE@. Requires that Trilinos was +# configured with the --enable-export-makefiles option. +# +# When ACTION-IF-NOT-FOUND is not specified, the default behavior is for +# configure to fail. # # LAST MODIFICATION # -# 2008-08-06 +# 2008-11-02 # # COPYLEFT # @@ -27,15 +30,16 @@ AC_DEFUN([AX_TRILINOS_TEUCHOS],[ AC_REQUIRE([AX_TRILINOS_BASE]) ax_trilinos_teuchos=yes - AC_CHECK_HEADER([Teuchos_Version.hpp],,[ax_trilinos_teuchos=no]) - AC_CHECK_LIB( [teuchos],[main], ,[ax_trilinos_teuchos=no]) + AC_HAVE_LIBRARY([teuchos],[:],[ax_trilinos_teuchos=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([teuchos.macros],[ax_trilinos_teuchos=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([teuchos],[ax_trilinos_teuchos=no]) if test "$ax_trilinos_teuchos" = yes; then - dnl NOP required - : - ifelse([$1], , , [$1]) + : # NOP + ifelse([$1],,, + [$1]) else - dnl NOP required - : - ifelse([$2], , , [$2]) + : # NOP + ifelse([$2],,AC_MSG_ERROR([Trilinos Teuchos not usable]), + [$2]) fi ]) |