Mercurial > pytave
changeset 166:f9a4cc5c64bd
configure: simplify handling of missing dependencies
* configure.ac: Error immediately when missing a required dependency.
Show $(PYTHON_LIBS) in configuration summary.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Wed, 06 Apr 2016 14:42:18 -0700 |
| parents | c0964adb41fc |
| children | f31a5f5b5269 |
| files | configure.ac |
| diffstat | 1 files changed, 6 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed Apr 06 14:26:16 2016 -0700 +++ b/configure.ac Wed Apr 06 14:42:18 2016 -0700 @@ -35,24 +35,20 @@ AC_CONFIG_HEADER([config.h]) AC_CONFIG_FILES([Makefile]) -dnl Define a convenience m4 macro for appending to pytave_missing_libs -m4_define([addmissing], [pytave_missing_libs="$1 -$pytave_missing_libs"]) -pytave_missing_libs= - # Find Octave -AX_OCTAVE([OCTAVE_CONFIG], [], [addmissing([Octave development files])]) +AX_OCTAVE([OCTAVE_CONFIG], [], + [AC_MSG_FAILURE([unable to find Octave development files])]) # Pick a Python library to use AX_PYTHON_DEVEL # Look for numpy headers -AX_PYTHON_NUMPY([], [addmissing([NumPy development files])]) +AX_PYTHON_NUMPY([], [AC_MSG_FAILURE([unable to find NumPy development files])]) # Look for boost::python AX_BOOST_PYTHON if test -z "$BOOST_PYTHON_LIB"; then - addmissing([Boost Python development files]) + AC_MSG_FAILURE([unable to find Boost::Python development files]) fi AM_INIT_AUTOMAKE([foreign -Wno-portability]) @@ -85,13 +81,6 @@ [PYTAVE_MODULE_INSTALL_PATH=${prefix}]) AC_SUBST(PYTAVE_MODULE_INSTALL_PATH) -AS_IF([test -n "$pytave_missing_libs"], - [AC_MSG_ERROR([One or more library dependencies could not be resolved. - -Missing dependencies: -$pytave_missing_libs -])]) - AC_OUTPUT AC_MSG_NOTICE([ @@ -101,8 +90,9 @@ Dependencies Octave ............. $OCTAVE_INCLUDEDIR Python ............. $PYTHON_CPPFLAGS + library .......... $PYTHON_LIBS executable ....... $PYTHON - Python boost ....... $BOOST_PYTHON_LIB + Boost::Python ...... $BOOST_PYTHON_LIB Features uselocale .......... $pytave_have_uselocale