--- ChangeLog | 5 +++++ configure.ac | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c16a450..ec948cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-08-03 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Improve configure's outputs for external library + checks. + +2010-08-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Handle libMagick++ dependency with pkg-config. * configure.ac: Use PKG_* macros to find Magick++ path and diff --git a/configure.ac b/configure.ac index efe48d6..d5cdca0 100644 --- a/configure.ac +++ b/configure.ac @@ -193,10 +193,20 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) # Prepare calls to pkg-config PKG_PROG_PKG_CONFIG + +AC_MSG_RESULT([]) +AC_MSG_RESULT([]) +AC_MSG_RESULT([Checking external libraries]) +AC_MSG_RESULT([------------------------------------------------------------]) + + ### Support for FreeImagePlus has been disabled for Olena 1.0. ## OLN_WITH_LIB([FreeImagePlus], [FreeImagePlus.h], [freeimageplus]) # CFITSIO library. +AC_MSG_RESULT([]) +AC_MSG_RESULT([* libcfitsio]) +AC_MSG_RESULT([------------]) OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) @@ -245,23 +255,41 @@ AM_CONDITIONAL(HAVE_MAGICKXX, test "x$have_magickxx" = 'xyes') # TIFF library. +AC_MSG_RESULT([]) +AC_MSG_RESULT([* libtiff]) +AC_MSG_RESULT([---------]) OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) # Grassroots DiCoM (GDCM). +AC_MSG_RESULT([]) +AC_MSG_RESULT([* libgdcm]) +AC_MSG_RESULT([---------]) OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm], [GDCM], [-lgdcmzlib]) # Tesseract. +AC_MSG_RESULT([]) +AC_MSG_RESULT([* Tesseract]) +AC_MSG_RESULT([-----------]) OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], [tesseract], [TESSERACT]) # Qt. +AC_MSG_RESULT([]) +AC_MSG_RESULT([* Qt]) +AC_MSG_RESULT([----]) AT_WITH_QT([+xml], [], [], AC_DEFINE([HAVE_QT], 0, [Define to 1 if we can use Qt]), AC_DEFINE([HAVE_QT], 1)) AM_CONDITIONAL([HAVE_QT], [test x$QT_PATH != x]) +AC_MSG_RESULT([]) +AC_MSG_RESULT([------------------------------------------------------------]) +AC_MSG_RESULT([]) +AC_MSG_RESULT([]) + + ## ---------------------------- ## ## (Bundled) trimesh2 library. ## ## ---------------------------- ## -- 1.5.6.5