Merge branch 'integration' into devel

Jürgen Knödlseder
2 parents 8ff8bdd7 6aea09e8
Showing 20 changed files with 62 additions and 30 deletions
ChangeLog
NEWS
README
configure.ac
pyext/setup.py.in
src/ctbin/Makefile.am
src/ctbkgcube/Makefile.am
src/ctbutterfly/Makefile.am
src/ctcubemask/Makefile.am
src/cterror/Makefile.am
src/ctexpcube/Makefile.am
src/ctlike/Makefile.am
src/ctmodel/Makefile.am
src/ctobssim/Makefile.am
src/ctpsfcube/Makefile.am
src/ctselect/Makefile.am
src/ctskymap/Makefile.am
src/cttsmap/Makefile.am
src/ctulimit/Makefile.am
src/support/Makefile.am
-2016-01-04  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
+2016-01-06  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
         * Version 1.1.0 released
         ========================
-2015-12-20  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
+2016-01-06  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
         * Bug fix version 1.0.1 released
         ================================
         Re-enable ctmodel computation for stacked analysis (#1609)
+        Solve compatibility issues with Anaconda on Mac OS X (#1607)
 2015-12-18  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
@@ -2,7 +2,7 @@ New Features and Important Changes in ctools 1.1.0
 Author(s) : Juergen Knoedlseder
-4 January 2016
+6 January 2016
 1. Introduction
 ctools information
 ==================
-Version:             1.1.0dev (4 January 2016)
+Version:             1.1.0dev (6 January 2016)
 Author:              Juergen Knodlseder (jurgen.knodlseder@irap.omp.eu)
 GammaLib dependency: 1.1.0dev
@@ -93,10 +93,12 @@ AC_CANONICAL_HOST
 # A special kluge was added for Mac OS X >=10.7. As Apple switched to clang #
 # we search from this version on for the clang compiler.                    #
 #                                                                           #
-# We also signal whether Mac OS X >=10.11 (El Capitan).                     #
+# We also signal whether Mac OS X >=10.9 (Mavericks) and Mac OS X >=10.11   #
+# (El Capitan).                                                             #
 #############################################################################
 # Set default Mac OS X version flags
 osx_lion=no
+osx_mavericks=no
 osx_el_capitan=no
 # Set default compiler lists
@@ -111,6 +113,9 @@ if test `uname -s` = &quot;Darwin&quot;; then
     cc_list="clang gcc cc cl.exe"
     osx_lion=yes
   fi
+  if [ test $version -ge 109 ]; then
+    osx_mavericks=yes
+  fi
   if [ test $version -ge 1011 ]; then
     osx_el_capitan=yes
   fi
@@ -121,6 +126,12 @@ if [test &quot;x$osx_lion&quot; = &quot;xyes&quot;]; then
 else
         AC_MSG_RESULT(no)
 fi
+AC_MSG_CHECKING([for Mac OS X >= 10.9])
+if [test "x$osx_mavericks" = "xyes"]; then
+        AC_MSG_RESULT(yes)
+else
+        AC_MSG_RESULT(no)
+fi
 AC_MSG_CHECKING([for Mac OS X >= 10.11])
 if [test "x$osx_el_capitan" = "xyes"]; then
         AC_MSG_RESULT(yes)
@@ -633,21 +644,41 @@ else
     # If we have distutils then get python path from distutils ...
     if test -z "$ac_distutils_result"; then
-      if test ${PYTHON_VERSION} '<' 3; then
-        python_path=`$PYTHON -c "import distutils.sysconfig; \
-                                 print distutils.sysconfig.get_python_inc();"`
-      else
-        python_path=`$PYTHON -c "import distutils.sysconfig; \
-                                 print(distutils.sysconfig.get_python_inc());"`
-      fi                                         
+      python_path=`$PYTHON -c "import distutils.sysconfig; \
+                               print(distutils.sysconfig.get_python_inc());"`
       if test -n "${python_path}"; then
         AC_CHECK_HEADERS($python_path/Python.h, [has_python_h="yes"], [has_python_h="no"]) 
         python_path="-I$python_path"
       fi
       PYTHON_CPPFLAGS=$python_path
-      CPPFLAGS="${CPPFLAGS} ${python_path}"
       AC_SUBST([PYTHON_CPPFLAGS])
+      # If we have Mavericks then get the MACOSX_DEPLOYMENT_TARGET from Python
+      # If the target is older then Mavericks then set the MACOSX_DEPLOYMENT_TARGET
+      # to this value as otherwise we get trouble with name mangling (that changed)
+      if [test "x$osx_mavericks" = "xyes"]; then
+        AC_MSG_CHECKING([Python MACOSX_DEPLOYMENT_TARGET])
+        python_target=`$PYTHON -c "from distutils import sysconfig; \
+                                   print(sysconfig.get_config_vars()[['MACOSX_DEPLOYMENT_TARGET']]);" 2> /dev/null`
+        python_compact_target=`echo $python_target | sed 's/\(10\.[[0-9]]*\).*/\1/' | sed -e 's/\.//g'`
+        case $python_compact_target in
+          (*[!0-9]*|'')
+            AC_MSG_RESULT(unknown)
+            ;;
+          (*)
+            AC_MSG_RESULT(${python_target})
+            if [ test $python_compact_target -le 108 ]; then
+              CONFIGURE_MACOSX_DEPLOYMENT_TARGET="$python_target"
+              MACOSX_DEPLOYMENT_TARGET="$python_target"
+              export MACOSX_DEPLOYMENT_TARGET
+              EXPORT_MACOSX_DEPLOYMENT_TARGET=''
+              LIBS="${LIBS} -lstdc++"
+              AC_MSG_NOTICE([set MACOSX_DEPLOYMENT_TARGET to ${python_target}])
+            fi
+            ;;
+        esac
+      fi
+
     # ... otherwise check for includes relative to exectuable (obsolete?)
     else                             
@@ -121,10 +121,10 @@ if &#39;@IS_ELCAPITAN_TRUE@&#39; != &#39;#&#39;:
 # Setup
 setup(name='@PACKAGE_NAME@',
       version='@PACKAGE_VERSION@',
-      description='ctools Python bindings',
+      description='ctools Python module',
       author='Juergen Knoedlseder',
       author_email='@PACKAGE_BUGREPORT@',
-      url='http://gammalib.sourceforge.net/',
+      url='http://cta.irap.omp.eu/ctools/',
       py_modules=['ctools.tools'],
       ext_modules=[Extension('ctools._tools', ['ctools/tools_wrap.cpp'],
                              include_dirs=include_dirs,
@@ -12,7 +12,7 @@ sources = ctbin.cpp
 # Libtool library
 noinst_LTLIBRARIES = libctbin.la
 libctbin_la_SOURCES = $(sources)
-libctbin_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libctbin_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
 ctbin_SOURCES = main.cpp
@@ -12,7 +12,7 @@ sources = ctbkgcube.cpp
 # Libtool library
 noinst_LTLIBRARIES = libctbkgcube.la
 libctbkgcube_la_SOURCES = $(sources)
-libctbkgcube_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libctbkgcube_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
 ctbkgcube_SOURCES = main.cpp
@@ -12,7 +12,7 @@ sources = ctbutterfly.cpp
 # Libtool library
 noinst_LTLIBRARIES = libctbutterfly.la
 libctbutterfly_la_SOURCES = $(sources)
-libctbutterfly_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libctbutterfly_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
 ctbutterfly_SOURCES = main.cpp
@@ -12,7 +12,7 @@ sources = ctcubemask.cpp
 # Libtool library (only needed for python bindings)
 noinst_LTLIBRARIES = libctcubemask.la
 libctcubemask_la_SOURCES = $(sources)
-libctcubemask_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libctcubemask_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
 ctcubemask_SOURCES = main.cpp
@@ -12,7 +12,7 @@ sources = cterror.cpp
 # Libtool library
 noinst_LTLIBRARIES = libcterror.la
 libcterror_la_SOURCES = $(sources)
-libcterror_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libcterror_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
 cterror_SOURCES = main.cpp
@@ -12,7 +12,7 @@ sources = ctexpcube.cpp
 # Libtool library
 noinst_LTLIBRARIES = libctexpcube.la
 libctexpcube_la_SOURCES = $(sources)
-libctexpcube_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libctexpcube_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
 ctexpcube_SOURCES = main.cpp
@@ -12,7 +12,7 @@ sources = ctlike.cpp
 # Libtool library
 noinst_LTLIBRARIES = libctlike.la
 libctlike_la_SOURCES = $(sources)
-libctlike_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libctlike_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
 ctlike_SOURCES = main.cpp
@@ -12,7 +12,7 @@ sources = ctmodel.cpp
 # Libtool library
 noinst_LTLIBRARIES = libctmodel.la
 libctmodel_la_SOURCES = $(sources)
-libctmodel_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libctmodel_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
 ctmodel_SOURCES = main.cpp
@@ -12,7 +12,7 @@ sources = ctobssim.cpp
 # Libtool library
 noinst_LTLIBRARIES = libctobssim.la
 libctobssim_la_SOURCES = $(sources)
-libctobssim_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libctobssim_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
 ctobssim_SOURCES = main.cpp
@@ -12,7 +12,7 @@ sources = ctpsfcube.cpp
 # Libtool library
 noinst_LTLIBRARIES = libctpsfcube.la
 libctpsfcube_la_SOURCES = $(sources)
-libctpsfcube_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libctpsfcube_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
 ctpsfcube_SOURCES = main.cpp
@@ -12,7 +12,7 @@ sources = ctselect.cpp
 # Libtool library (only needed for python bindings)
 noinst_LTLIBRARIES = libctselect.la
 libctselect_la_SOURCES = $(sources)
-libctselect_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libctselect_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
 ctselect_SOURCES = main.cpp
@@ -12,7 +12,7 @@ sources = ctskymap.cpp
 # Libtool library
 noinst_LTLIBRARIES = libctskymap.la
 libctskymap_la_SOURCES = $(sources)
-libctskymap_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libctskymap_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
 ctskymap_SOURCES = main.cpp
@@ -12,7 +12,7 @@ sources = cttsmap.cpp
 # Libtool library
 noinst_LTLIBRARIES = libcttsmap.la
 libcttsmap_la_SOURCES = $(sources)
-libcttsmap_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libcttsmap_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
 cttsmap_SOURCES = main.cpp
@@ -12,7 +12,7 @@ sources = ctulimit.cpp
 # Libtool library
 noinst_LTLIBRARIES = libctulimit.la
 libctulimit_la_SOURCES = $(sources)
-libctulimit_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libctulimit_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
 ctulimit_SOURCES = main.cpp
@@ -6,4 +6,4 @@ sources = ctool.cpp
 # Build libtool library
 noinst_LTLIBRARIES = libsupport.la
 libsupport_la_SOURCES = $(sources)
-libsupport_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
+libsupport_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@