From f0dbd8cf8a411a15125d2196d99c3f36cd916413 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Tue, 16 Jan 2018 11:44:43 +0100 Subject: [PATCH] By default require cfitsio library (#2265) --- ChangeLog | 3 ++- NEWS | 6 +++++- configure.ac | 7 ++++++- doc/source/admin/release_history/1.5.rst | 3 ++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 561de1e..e90839c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2018-01-12 +2018-01-16 * Version 1.5.0 released ========================= @@ -10,6 +10,7 @@ Add GSkyMap::counts() and GSkyMap::flux() methods and clip() friend operator (#2290) Add GSkyMap::array() method to Python interface (#2285) Add Off sky regions to GCTAObservation (#2284) + By default require cfitsio library (#2265) CTA observations handle "statistic" attribute in XML file (#2238) Use CSTAT and CHI2 instead of POISSON and GAUSSIAN for statistic (#2237) Changed GObservation::statistics() to statistic() (#2238) diff --git a/NEWS b/NEWS index 8536613..918fca4 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ New Features and Important Changes in GammaLib 1.5.0 -12 January 2018 +16 January 2018 1. Introduction @@ -109,6 +109,10 @@ The return value of the following methods has been changed: A code generator script codegen.py has been added to the dev folder to ease the addition of code extensions to GammaLib. +The configure script now aborts if cfitsio is not found. If GammaLib should be +compiled without cfitsio the --without-cfitsio option has to be specified +explicitly (#2265). + 4. Application module --------------------- diff --git a/configure.ac b/configure.ac index bfa76ef..8f5ca56 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Configuration for GammaLib - a versatile toolbox for high-level analysis # # of astronomical gamma-ray data # # ------------------------------------------------------------------------- # -# Copyright (C) 2006-2017 Juergen Knoedlseder # +# Copyright (C) 2006-2018 Juergen Knoedlseder # # ------------------------------------------------------------------------- # # # # This program is free software: you can redistribute it and/or modify # @@ -1367,6 +1367,11 @@ if [test "x$with_cfitsio" = "xyes"]; then fi + # Break if cfitsio library is not found + if [test "x$has_cfitsio" = "xno"]; then + AC_MSG_ERROR([cfitsio library not found. Install cfitsio library or use --without-cfitsio option.]) + fi + fi # If we have ncurses and readline then add readline support to GammaLib diff --git a/doc/source/admin/release_history/1.5.rst b/doc/source/admin/release_history/1.5.rst index 2760b61..6a77802 100644 --- a/doc/source/admin/release_history/1.5.rst +++ b/doc/source/admin/release_history/1.5.rst @@ -41,6 +41,8 @@ Improvements Add ``GSkyMap::array()`` method to Python interface * [`2284 `_] - Add Off sky regions to ``GCTAObservation`` +* [`2265 `_] - + By default require cfitsio library * [`2238 `_] - ``GCTAObservation`` and ``GCTAOnOffObservation`` handle ``statistic`` attribute in XML file * [`2231 `_] - @@ -90,4 +92,3 @@ Clean up Changed ``GObservation::statistics()`` to ``GObservation::statistic()`` * [`2237 `_] - Use ``CSTAT`` and ``CHI2`` instead of ``POISSON`` and ``GAUSSIAN`` for statistic - -- libgit2 0.21.4