Michael Mayer / gammalib

Commit 99d26077a72607251e32843f09dbed1b2e38b657

Authored by Jürgen Knödlseder
2 parents 816e3ee1 2a911c9d

Merge branch 'integration' into devel

Inline Side-by-side
Showing 23 changed files with 123 additions and 53 deletions
ChangeLog
  View file @99d2607
1   -2016-01-04 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
  1 +2016-01-05 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
2 2  
3 3 * Version 1.1.0 released
4 4 =========================
5 5  
6 6  
7   -2016-01-04 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
  7 +2016-01-05 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
8 8  
9 9 * Bug fix version 1.0.1 released
10 10 ================================
11 11  
12 12 Allow usage of numbers in FITS extension names (#1611)
  13 + Solve compatibility issues with Anaconda on Mac OS X (#1607)
13 14  
14 15  
15 16 2015-12-18 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
... ...
... ... @@ -2,7 +2,7 @@ New Features and Important Changes in GammaLib 1.1.0
2 2  
3 3 Author(s) : Juergen Knoedlseder
4 4  
5   -4 January 2016
  5 +5 January 2016
6 6  
7 7  
8 8 1. Introduction
... ...
1 1 GammaLib information
2 2 ====================
3   -Version: 1.0.1 (4 January 2016)
  3 +Version: 1.1.0 (5 January 2016)
4 4 Author: Juergen Knoedlseder (jurgen.knodlseder@irap.omp.eu)
5 5  
6 6  
... ...
configure.ac
  View file @99d2607
... ... @@ -101,17 +101,19 @@ AC_CANONICAL_HOST
101 101 # A special kluge was added for Mac OS X >=10.7. As Apple switched to clang #
102 102 # we search from this version on for the clang compiler. #
103 103 # #
104   -# We also signal whether Mac OS X >=10.11 (El Capitan). #
  104 +# We also signal whether Mac OS X >=10.9 (Mavericks) and Mac OS X >=10.11 #
  105 +# (El Capitan). #
105 106 #############################################################################
106 107 # Set default Mac OS X version flags
107 108 osx_lion=no
  109 +osx_mavericks=no
108 110 osx_el_capitan=no
109 111  
110 112 # Set default compiler lists
111 113 cxx_list="g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++"
112 114 cc_list="gcc cc cl.exe clang"
113 115  
114   -# Check if we have Mac OS X >= 10.7 and >= 10.11
  116 +# Check if we have Mac OS X >= 10.7, >= 10.9 and >= 10.11
115 117 if test `uname -s` = "Darwin"; then
116 118 version=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/' | sed -e 's/\.//g'`
117 119 if [ test $version -ge 107 ]; then
... ... @@ -119,6 +121,9 @@ if test `uname -s` = &quot;Darwin&quot;; then
119 121 cc_list="clang gcc cc cl.exe"
120 122 osx_lion=yes
121 123 fi
  124 + if [ test $version -ge 109 ]; then
  125 + osx_mavericks=yes
  126 + fi
122 127 if [ test $version -ge 1011 ]; then
123 128 osx_el_capitan=yes
124 129 fi
... ... @@ -129,6 +134,12 @@ if [test &quot;x$osx_lion&quot; = &quot;xyes&quot;]; then
129 134 else
130 135 AC_MSG_RESULT(no)
131 136 fi
  137 +AC_MSG_CHECKING([for Mac OS X >= 10.9])
  138 +if [test "x$osx_mavericks" = "xyes"]; then
  139 + AC_MSG_RESULT(yes)
  140 +else
  141 + AC_MSG_RESULT(no)
  142 +fi
132 143 AC_MSG_CHECKING([for Mac OS X >= 10.11])
133 144 if [test "x$osx_el_capitan" = "xyes"]; then
134 145 AC_MSG_RESULT(yes)
... ... @@ -867,19 +878,15 @@ else
867 878  
868 879 # If we have distutils then get python path from distutils ...
869 880 if test -z "$ac_distutils_result"; then
870   - if test ${PYTHON_VERSION} '<' 3; then
871   - python_path=`$PYTHON -c "import distutils.sysconfig; \
872   - print distutils.sysconfig.get_python_inc();"`
873   - else
874   - python_path=`$PYTHON -c "import distutils.sysconfig; \
875   - print(distutils.sysconfig.get_python_inc());"`
876   - fi
  881 +
  882 + # Get Python path
  883 + python_path=`$PYTHON -c "import distutils.sysconfig; \
  884 + print(distutils.sysconfig.get_python_inc());"`
877 885 if test -n "${python_path}"; then
878 886 AC_CHECK_HEADERS($python_path/Python.h, [has_python_h="yes"], [has_python_h="no"])
879 887 python_path="-I$python_path"
880 888 fi
881 889 PYTHON_CPPFLAGS=$python_path
882   - CPPFLAGS="${CPPFLAGS} ${python_path}"
883 890 AC_SUBST([PYTHON_CPPFLAGS])
884 891  
885 892 # ... otherwise check for includes relative to exectuable (obsolete?)
... ... @@ -895,9 +902,30 @@ else
895 902  
896 903 fi
897 904  
898   - # Signal missing Python headers
899   - if test "x$has_python_h" = "xno"; then
900   - AC_MSG_WARN([No Python header file "Python.h" found. Please install appropriate Python development package.])
  905 + # If we have Mavericks then get the MACOSX_DEPLOYMENT_TARGET from Python
  906 + # If the target is older then Mavericks then set the MACOSX_DEPLOYMENT_TARGET
  907 + # to this value as otherwise we get trouble with name mangling (that changed)
  908 + if [test "x$osx_mavericks" = "xyes"]; then
  909 + AC_MSG_CHECKING([Python MACOSX_DEPLOYMENT_TARGET])
  910 + python_target=`$PYTHON -c "from distutils import sysconfig; \
  911 + print(sysconfig.get_config_vars()[['MACOSX_DEPLOYMENT_TARGET']]);" 2> /dev/null`
  912 + python_compact_target=`echo $python_target | sed 's/\(10\.[[0-9]]*\).*/\1/' | sed -e 's/\.//g'`
  913 + case $python_compact_target in
  914 + (*[!0-9]*|'')
  915 + AC_MSG_RESULT(unknown)
  916 + ;;
  917 + (*)
  918 + AC_MSG_RESULT(${python_target})
  919 + if [ test $python_compact_target -le 108 ]; then
  920 + CONFIGURE_MACOSX_DEPLOYMENT_TARGET="$python_target"
  921 + MACOSX_DEPLOYMENT_TARGET="$python_target"
  922 + export MACOSX_DEPLOYMENT_TARGET
  923 + EXPORT_MACOSX_DEPLOYMENT_TARGET=''
  924 + LIBS="${LIBS} -lstdc++"
  925 + AC_MSG_NOTICE([set MACOSX_DEPLOYMENT_TARGET to ${python_target}])
  926 + fi
  927 + ;;
  928 + esac
901 929 fi
902 930  
903 931 fi
... ... @@ -1059,11 +1087,16 @@ fi
1059 1087 # finally we perform system dependent checks. These are: #
1060 1088 # - Darwin: check in /opt/local/lib #
1061 1089 #############################################################################
  1090 +has_editline="no"
1062 1091 has_readline="no"
1063 1092 use_readline="no"
  1093 +LIB_READLINE=
  1094 +LIB_NCURSES=
1064 1095 LIBS_READLINE=
1065 1096 LIBDIR_READLINE=
1066 1097 INCDIR_READLINE=
  1098 +AC_SUBST(LIB_READLINE)
  1099 +AC_SUBST(LIB_NCURSES)
1067 1100 AC_SUBST(LIBS_READLINE)
1068 1101 AC_SUBST(LIBDIR_READLINE)
1069 1102 AC_SUBST(INCDIR_READLINE)
... ... @@ -1087,18 +1120,30 @@ if [test &quot;x$with_readline&quot; = &quot;xyes&quot;;] then
1087 1120 INCDIR_READLINE="$gammalib_prefix/include/readline"
1088 1121 else
1089 1122  
1090   - # Next search for readline in standard path
1091   - AC_CHECK_LIB([readline], [main],
1092   - [AC_MSG_NOTICE([readline found])
1093   - AC_CHECK_HEADER([readline/readline.h],
1094   - [has_readline="yes"
1095   - AC_MSG_NOTICE([readline headers found])],
  1123 + # Next search for editline in standard path (for Mac OS X)
  1124 + AC_CHECK_LIB([edit], [main],
  1125 + [AC_MSG_NOTICE([editline found])
  1126 + AC_CHECK_HEADER([editline/readline.h],
  1127 + [has_editline="yes"
  1128 + AC_MSG_NOTICE([editline headers found])],
1096 1129 [], [])],
1097   - [], [-lncurses])
1098   -
1099   - # If not found then make additional checks
1100   - if [test "x$has_readline" != "xyes";] then
1101   - case $ac_sys_system in
  1130 + [], [-lcurses])
  1131 +
  1132 + # If not found then search now for readline
  1133 + if [test "x$has_editline" != "xyes";] then
  1134 +
  1135 + # Next search for readline in standard path
  1136 + AC_CHECK_LIB([readline], [main],
  1137 + [AC_MSG_NOTICE([readline found])
  1138 + AC_CHECK_HEADER([readline/readline.h],
  1139 + [has_readline="yes"
  1140 + AC_MSG_NOTICE([readline headers found])],
  1141 + [], [])],
  1142 + [], [-lncurses])
  1143 +
  1144 + # If not found then make additional checks
  1145 + if [test "x$has_readline" != "xyes";] then
  1146 + case $ac_sys_system in
1102 1147 Darwin*)
1103 1148 if [test -f /opt/local/lib/libreadline$SHAREDSUFFIX -a \
1104 1149 -f /opt/local/include/readline/readline.h]; then
... ... @@ -1110,17 +1155,25 @@ if [test &quot;x$with_readline&quot; = &quot;xyes&quot;;] then
1110 1155 ;;
1111 1156 *)
1112 1157 ;;
1113   - esac
  1158 + esac
  1159 + fi
1114 1160 fi
1115   -
1116 1161 fi
1117   -
1118 1162 fi
1119 1163  
1120 1164 # If we have ncurses and readline then add readline support to GammaLib
1121   -if [test "x$has_readline" = "xyes" -a "x$has_ncurses" = "xyes"]; then
  1165 +if [test "x$has_editline" = "xyes" -a "x$has_ncurses" = "xyes"]; then
  1166 + use_readline="yes"
  1167 + AC_DEFINE([HAVE_LIBREADLINE], [1], [Define if readline library is available])
  1168 + LIB_READLINE=edit
  1169 + LIB_NCURSES=curses
  1170 + LIBS="${LIBS} -ledit -lcurses"
  1171 + LIBS_READLINE="-ledit -lcurses"
  1172 +elif [test "x$has_readline" = "xyes" -a "x$has_ncurses" = "xyes"]; then
1122 1173 use_readline="yes"
1123 1174 AC_DEFINE([HAVE_LIBREADLINE], [1], [Define if readline library is available])
  1175 + LIB_READLINE=readline
  1176 + LIB_NCURSES=ncurses
1124 1177 LIBS="${LIBS} -lreadline -lncurses"
1125 1178 LIBS_READLINE="-lreadline -lncurses"
1126 1179 fi
... ...
inst/com/Makefile.am
  View file @99d2607
1 1 ## Process this file with automake to produce Makefile.in
2 2  
  3 +# Darwin support
  4 +MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
  5 +@EXPORT_MACOSX_DEPLOYMENT_TARGET@export MACOSX_DEPLOYMENT_TARGET
  6 +
3 7 # Set include directories
4 8 INCLUDES = -I$(top_srcdir)/include \
5 9 -I$(top_srcdir)/src \
... ... @@ -37,7 +41,7 @@ caldb_irfs = caldb/data/cgro/comptel/bcf/u47512_iaq.fits.gz \
37 41 # Build libtool library
38 42 noinst_LTLIBRARIES = libcom.la
39 43 libcom_la_SOURCES = $(sources)
40   -libcom_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  44 +libcom_la_LDFLAGS =
41 45  
42 46 # Distribute calibration database files
43 47 EXTRA_DIST = $(caldb_indx) $(caldb_irfs)
... ...
inst/cta/Makefile.am
  View file @99d2607
1 1 ## Process this file with automake to produce Makefile.in
2 2  
  3 +# Darwin support
  4 +MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
  5 +@EXPORT_MACOSX_DEPLOYMENT_TARGET@export MACOSX_DEPLOYMENT_TARGET
  6 +
3 7 # Set include directories
4 8 INCLUDES = -I$(top_srcdir)/include \
5 9 -I$(top_srcdir)/src \
... ... @@ -110,7 +114,7 @@ pkginclude_HEADERS = include/GCTATypemaps.hpp \
110 114 # Build libtool library
111 115 noinst_LTLIBRARIES = libcta.la
112 116 libcta_la_SOURCES = $(sources)
113   -libcta_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  117 +libcta_la_LDFLAGS =
114 118  
115 119 # Distribute calibration database files
116 120 #EXTRA_DIST = $(caldb_pinx) $(caldb_perf) $(caldb_indx) $(caldb_irf1) $(caldb_irf2)
... ...
inst/lat/Makefile.am
  View file @99d2607
1 1 ## Process this file with automake to produce Makefile.in
2 2  
  3 +# Darwin support
  4 +MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
  5 +@EXPORT_MACOSX_DEPLOYMENT_TARGET@export MACOSX_DEPLOYMENT_TARGET
  6 +
3 7 # Set include directories
4 8 INCLUDES = -I$(top_srcdir)/include \
5 9 -I$(top_builddir)/src \
... ... @@ -112,7 +116,7 @@ caldb_psf = caldb/data/glast/lat/bcf/psf/psf_P6_v3_diff_front.fits \
112 116 # Build libtool library
113 117 noinst_LTLIBRARIES = liblat.la
114 118 liblat_la_SOURCES = $(sources)
115   -liblat_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  119 +liblat_la_LDFLAGS =
116 120  
117 121 # Distribute calibration database files
118 122 EXTRA_DIST = $(caldb_indx) $(caldb_add) $(caldb_ea) $(caldb_edisp) $(caldb_psf)
... ...
inst/mwl/Makefile.am
  View file @99d2607
1 1 ## Process this file with automake to produce Makefile.in
2 2  
  3 +# Darwin support
  4 +MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
  5 +@EXPORT_MACOSX_DEPLOYMENT_TARGET@export MACOSX_DEPLOYMENT_TARGET
  6 +
3 7 # Set include directories
4 8 INCLUDES = -I$(top_srcdir)/include \
5 9 -I$(top_builddir)/src \
... ... @@ -25,4 +29,4 @@ pkginclude_HEADERS = include/GMWLException.hpp \
25 29 # Build libtool library
26 30 noinst_LTLIBRARIES = libmwl.la
27 31 libmwl_la_SOURCES = $(sources)
28   -libmwl_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  32 +libmwl_la_LDFLAGS =
... ...
pyext/setup.py.in
  View file @99d2607
1 1 #############################################################################
2 2 # Disutils setup file for gammalib Python extension module #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2011-2015 Juergen Knoedlseder #
  4 +# Copyright (C) 2011-2016 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -85,8 +85,8 @@ if &#39;@WITH_CFITSIO_TRUE@&#39; != &#39;#&#39;:
85 85 # Add readline library only if available
86 86 if '@WITH_READLINE_TRUE@' != '#':
87 87 sys.stdout.write("Link readline into Python bindings.\n")
88   - libraries.append('readline')
89   - libraries.append('ncurses')
  88 + libraries.append('@LIB_READLINE@')
  89 + libraries.append('@LIB_NCURSES@')
90 90  
91 91 # Add extra libraries
92 92 extra_libs = ('@PYTHON_EXTRA_LIBS@').split(',')
... ...
src/app/Makefile.am
  View file @99d2607
... ... @@ -15,4 +15,4 @@ sources = GApplication.cpp \
15 15 # Build libtool library
16 16 noinst_LTLIBRARIES = libapp.la
17 17 libapp_la_SOURCES = $(sources)
18   -libapp_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  18 +libapp_la_LDFLAGS =
... ...
src/base/Makefile.am
  View file @99d2607
... ... @@ -12,4 +12,4 @@ sources = GBase.cpp \
12 12 # Build libtool library
13 13 noinst_LTLIBRARIES = libbase.la
14 14 libbase_la_SOURCES = $(sources)
15   -libbase_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  15 +libbase_la_LDFLAGS =
... ...
src/fits/Makefile.am
  View file @99d2607
... ... @@ -42,4 +42,4 @@ sources = GFitsHeaderCard.cpp \
42 42 # Build libtool library
43 43 noinst_LTLIBRARIES = libfits.la
44 44 libfits_la_SOURCES = $(sources)
45   -libfits_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  45 +libfits_la_LDFLAGS =
... ...
src/linalg/Makefile.am
  View file @99d2607
... ... @@ -18,4 +18,4 @@ sources = GVector.cpp \
18 18 # Build libtool library
19 19 noinst_LTLIBRARIES = liblinalg.la
20 20 liblinalg_la_SOURCES = $(sources)
21   -liblinalg_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  21 +liblinalg_la_LDFLAGS =
... ...
src/model/Makefile.am
  View file @99d2607
... ... @@ -46,4 +46,4 @@ sources = GModelPar.cpp \
46 46 # Build libtool library
47 47 noinst_LTLIBRARIES = libmodel.la
48 48 libmodel_la_SOURCES = $(sources)
49   -libmodel_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  49 +libmodel_la_LDFLAGS =
... ...
src/numerics/Makefile.am
  View file @99d2607
... ... @@ -15,4 +15,4 @@ sources = GIntegral.cpp \
15 15 # Build libtool library
16 16 noinst_LTLIBRARIES = libnumerics.la
17 17 libnumerics_la_SOURCES = $(sources)
18   -libnumerics_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  18 +libnumerics_la_LDFLAGS =
... ...
src/obs/Makefile.am
  View file @99d2607
... ... @@ -35,4 +35,4 @@ sources = GEnergies.cpp \
35 35 # Build libtool library
36 36 noinst_LTLIBRARIES = libobs.la
37 37 libobs_la_SOURCES = $(sources)
38   -libobs_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  38 +libobs_la_LDFLAGS =
... ...
src/opt/Makefile.am
  View file @99d2607
... ... @@ -15,4 +15,4 @@ sources = GOptimizer.cpp \
15 15 # Build libtool library
16 16 noinst_LTLIBRARIES = libopt.la
17 17 libopt_la_SOURCES = $(sources)
18   -libopt_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  18 +libopt_la_LDFLAGS =
... ...
src/sky/Makefile.am
  View file @99d2607
... ... @@ -29,4 +29,4 @@ sources = GSkyDir.cpp \
29 29 # Build libtool library
30 30 noinst_LTLIBRARIES = libsky.la
31 31 libsky_la_SOURCES = $(sources)
32   -libsky_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  32 +libsky_la_LDFLAGS =
... ...
src/support/Makefile.am
  View file @99d2607
... ... @@ -20,4 +20,4 @@ sources = GException.cpp \
20 20 # Build libtool library
21 21 noinst_LTLIBRARIES = libsupport.la
22 22 libsupport_la_SOURCES = $(sources)
23   -libsupport_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  23 +libsupport_la_LDFLAGS =
... ...
src/test/Makefile.am
  View file @99d2607
... ... @@ -14,4 +14,4 @@ sources = GTestCase.cpp \
14 14 # Build libtool library
15 15 noinst_LTLIBRARIES = libtest.la
16 16 libtest_la_SOURCES = $(sources)
17   -libtest_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
18 17 \ No newline at end of file
  18 +libtest_la_LDFLAGS =
19 19 \ No newline at end of file
... ...
src/vo/Makefile.am
  View file @99d2607
... ... @@ -12,4 +12,4 @@ sources = GVOClient.cpp \
12 12 # Build libtool library
13 13 noinst_LTLIBRARIES = libvo.la
14 14 libvo_la_SOURCES = $(sources)
15   -libvo_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  15 +libvo_la_LDFLAGS =
... ...
src/xml/Makefile.am
  View file @99d2607
... ... @@ -19,4 +19,4 @@ sources = GXml.cpp \
19 19 # Build libtool library
20 20 noinst_LTLIBRARIES = libxml.la
21 21 libxml_la_SOURCES = $(sources)
22   -libxml_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  22 +libxml_la_LDFLAGS =
... ...
src/xspec/Makefile.am
  View file @99d2607
... ... @@ -13,4 +13,4 @@ sources = GArf.cpp \
13 13 # Build libtool library
14 14 noinst_LTLIBRARIES = libxspec.la
15 15 libxspec_la_SOURCES = $(sources)
16   -libxspec_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
  16 +libxspec_la_LDFLAGS =
... ...