Michael Mayer / gammalib

Commit d57b9e254996fb407198a4f235315564e8095673

Authored by Jürgen Knödlseder
2 parents 2a911c9d fa36033b

Merge branch 'bugfix-1.0.1' into integration

Inline Side-by-side
Showing 3 changed files with 35 additions and 35 deletions
Makefile.am
  View file @d57b9e2
... ... @@ -25,7 +25,7 @@ doc_DATA = \
25 25 AUTHORS \
26 26 ChangeLog \
27 27 COPYING \
28   - INSTALL \
  28 + INSTALL \
29 29 NEWS \
30 30 README
31 31 docdir = ${datadir}/doc/${PACKAGE}
... ...
configure.ac
  View file @d57b9e2
... ... @@ -889,6 +889,32 @@ else
889 889 PYTHON_CPPFLAGS=$python_path
890 890 AC_SUBST([PYTHON_CPPFLAGS])
891 891  
  892 + # If we have Mavericks then get the MACOSX_DEPLOYMENT_TARGET from Python
  893 + # If the target is older then Mavericks then set the MACOSX_DEPLOYMENT_TARGET
  894 + # to this value as otherwise we get trouble with name mangling (that changed)
  895 + if [test "x$osx_mavericks" = "xyes"]; then
  896 + AC_MSG_CHECKING([Python MACOSX_DEPLOYMENT_TARGET])
  897 + python_target=`$PYTHON -c "from distutils import sysconfig; \
  898 + print(sysconfig.get_config_vars()[['MACOSX_DEPLOYMENT_TARGET']]);" 2> /dev/null`
  899 + python_compact_target=`echo $python_target | sed 's/\(10\.[[0-9]]*\).*/\1/' | sed -e 's/\.//g'`
  900 + case $python_compact_target in
  901 + (*[!0-9]*|'')
  902 + AC_MSG_RESULT(unknown)
  903 + ;;
  904 + (*)
  905 + AC_MSG_RESULT(${python_target})
  906 + if [ test $python_compact_target -le 108 ]; then
  907 + CONFIGURE_MACOSX_DEPLOYMENT_TARGET="$python_target"
  908 + MACOSX_DEPLOYMENT_TARGET="$python_target"
  909 + export MACOSX_DEPLOYMENT_TARGET
  910 + EXPORT_MACOSX_DEPLOYMENT_TARGET=''
  911 + LIBS="${LIBS} -lstdc++"
  912 + AC_MSG_NOTICE([set MACOSX_DEPLOYMENT_TARGET to ${python_target}])
  913 + fi
  914 + ;;
  915 + esac
  916 + fi
  917 +
892 918 # ... otherwise check for includes relative to exectuable (obsolete?)
893 919 else
894 920  
... ... @@ -901,32 +927,6 @@ else
901 927 AC_CHECK_HEADERS($PY_INCLUDE/Python.h, [has_python_h="yes"], [has_python_h="no"])
902 928  
903 929 fi
904   -
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
929   - fi
930 930  
931 931 fi
932 932  
... ...
pyext/setup.py.in
  View file @d57b9e2
... ... @@ -79,12 +79,12 @@ if os.path.exists('@prefix@/lib'):
79 79  
80 80 # Add cfitsio library only if available
81 81 if '@WITH_CFITSIO_TRUE@' != '#':
82   - sys.stdout.write("Link cfitsio into Python bindings.\n")
  82 + sys.stdout.write("Link cfitsio into Python module.\n")
83 83 libraries.append('cfitsio')
84 84  
85 85 # Add readline library only if available
86 86 if '@WITH_READLINE_TRUE@' != '#':
87   - sys.stdout.write("Link readline into Python bindings.\n")
  87 + sys.stdout.write("Link readline into Python module.\n")
88 88 libraries.append('@LIB_READLINE@')
89 89 libraries.append('@LIB_NCURSES@')
90 90  
... ... @@ -114,16 +114,16 @@ for extra_inc_path in extra_inc_paths:
114 114 # Add definitions for instrument specific modules
115 115 inst_modules = []
116 116 if '@WITH_INST_MWL_TRUE@' != '#':
117   - sys.stdout.write("Include multi-wavelength interface in gammalib Python bindings.\n")
  117 + sys.stdout.write("Include multi-wavelength interface in gammalib Python module.\n")
118 118 inst_modules.append('mwl')
119 119 if '@WITH_INST_CTA_TRUE@' != '#':
120   - sys.stdout.write("Include CTA instrument interface in gammalib Python bindings.\n")
  120 + sys.stdout.write("Include CTA instrument interface in gammalib Python module.\n")
121 121 inst_modules.append('cta')
122 122 if '@WITH_INST_LAT_TRUE@' != '#':
123   - sys.stdout.write("Include Fermi/LAT instrument interface in gammalib Python bindings.\n")
  123 + sys.stdout.write("Include Fermi/LAT instrument interface in gammalib Python module.\n")
124 124 inst_modules.append('lat')
125 125 if '@WITH_INST_COM_TRUE@' != '#':
126   - sys.stdout.write("Include COMPTEL instrument interface in gammalib Python bindings.\n")
  126 + sys.stdout.write("Include COMPTEL instrument interface in gammalib Python module.\n")
127 127 inst_modules.append('com')
128 128  
129 129 # Set extension definition for core modules
... ... @@ -270,12 +270,12 @@ data_files=[('@prefix@/share/gammalib/swig', install_files)]
270 270 # Setup
271 271 setup(name='@PACKAGE_NAME@',
272 272 version='@PACKAGE_VERSION@',
273   - description='gammalib Python bindings',
  273 + description='gammalib Python module',
274 274 author='Juergen Knoedlseder',
275 275 author_email='@PACKAGE_BUGREPORT@',
276 276 maintainer='Juergen Knoedlseder',
277 277 maintainer_email='@PACKAGE_BUGREPORT@',
278   - url='http://gammalib.sourceforge.net/',
  278 + url='http://cta.irap.omp.eu/gammalib/',
279 279 packages=[pkg_name],
280 280 ext_package=pkg_name,
281 281 ext_modules=ext_modules,
... ...