Michael Mayer / ctools

Commit 0ab3b3fdf8ec74d8d1a96af28a672ede21bd0340

Authored by knodlseder
1 parent 75adf772

remove cfitsio check

Inline Side-by-side
Showing 1 changed file with 8 additions and 39 deletions
configure.ac
  View file @0ab3b3f
... ... @@ -4,7 +4,7 @@
4 4 #
5 5 # Process this file with autoconf to produce a configure script
6 6  
7   -AC_INIT([ctatools], [0.2.0], [knodlseder@cesr.fr], [ctatools], [http://cta.irap.omp.eu/ctatools])
  7 +AC_INIT([ctatools], [0.2.1], [knodlseder@cesr.fr], [ctatools], [http://cta.irap.omp.eu/ctatools])
8 8 AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp])
9 9 AC_CONFIG_MACRO_DIR([m4])
10 10 AC_CONFIG_HEADERS([config.h])
... ... @@ -59,13 +59,14 @@ AC_PROG_INSTALL
59 59 AC_PROG_LIBTOOL
60 60  
61 61  
  62 +
62 63 dnl =================================
63 64 dnl Checks for debugging or profiling
64 65 dnl =================================
65 66 AC_MSG_CHECKING(whether to enable debugging)
66 67 AC_ARG_ENABLE([debug],
67 68 AS_HELP_STRING([--enable-debug],
68   - [turn on debugging (default=no)]),
  69 + [turn on debugging [default=no]]),
69 70 [enable_debug="$enableval"],
70 71 [enable_debug="no"])
71 72 if test "x$enable_debug" = "xyes"; then
... ... @@ -80,7 +81,7 @@ fi
80 81 AC_MSG_CHECKING(whether to enable profiling)
81 82 AC_ARG_ENABLE([profiling],
82 83 AS_HELP_STRING([--enable-profiling],
83   - [turn on profiling (default=no)]),
  84 + [turn on profiling [default=no]]),
84 85 [enable_profiling="$enableval"],
85 86 [enable_profiling="no"])
86 87 if test "x$enable_profiling" = "xyes"; then
... ... @@ -103,6 +104,7 @@ dnl HAVE_SWIG - swig is available
103 104 dnl ENABLE_PYTHON_BINDING - Python binding is requested
104 105 dnl WITH_PYTHON_BINDING - Either has swig or python wraper files
105 106 dnl ========================================================================
  107 +
106 108 # Checks for Python (HAVE_PYTHON)
107 109 AM_PATH_PYTHON([2.2],
108 110 [],
... ... @@ -116,7 +118,7 @@ AM_CONDITIONAL(HAVE_SWIG, test "$SWIG")
116 118 # Python binding enabled?
117 119 AC_ARG_ENABLE([python-binding],
118 120 AS_HELP_STRING([--enable-python-binding],
119   - [build python binding (default=yes)]),
  121 + [build python binding [default=yes]]),
120 122 [ac_enable_python_binding="$enableval"],
121 123 [ac_enable_python_binding="yes"])
122 124 AM_CONDITIONAL(ENABLE_PYTHON_BINDING, test "x$ac_enable_python_binding" = "xyes")
... ... @@ -180,10 +182,10 @@ else
180 182 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$prefix/lib/pkgconfig"
181 183 fi
182 184 has_gammalib="no"
183   -PKG_CHECK_MODULES([GammaLib], [gammalib >= 0.4.5],
  185 +PKG_CHECK_MODULES([GammaLib], [gammalib >= 0.4.7],
184 186 [has_gammalib="yes"],
185 187 [AC_MSG_ERROR([GammaLib library not found])
186   - AC_MSG_ERROR([Make sure that at least version 0.4.5 of GammaLib in installed])
  188 + AC_MSG_ERROR([Make sure that at least version 0.4.7 of GammaLib in installed])
187 189 AC_MSG_ERROR([If GammaLib is not installed in the default location, please adjust the PKG_CONFIG_PATH environment variable])])
188 190 if test "x$has_gammalib" = "xyes"; then
189 191 AC_DEFINE([HAVE_LIBGAMMA], [1], [Define if gammalib is available])
... ... @@ -193,34 +195,6 @@ CPPFLAGS="$CPPFLAGS $GammaLib_CFLAGS"
193 195 LDFLAGS="$LDFLAGS $GammaLib_LIBS"
194 196  
195 197  
196   -dnl ==========================
197   -dnl Checks for cfitsio library
198   -dnl ==========================
199   -
200   -# Search for cfitsio shared library in a some standard directories
201   -for i in "$gammalib_prefix" /usr /usr/local /opt/local ; do
202   - if test -f $i/lib/libcfitsio.so -o -f $i/lib/libcfitsio.dylib -a -f $i/include/fitsio.h; then
203   - LIBDIR_CFITSIO=$i/lib
204   - INCDIR_CFITSIO=$i/include
205   - break
206   - fi
207   - if test -f $i/lib64/libcfitsio.so -o -f $i/lib64/libcfitsio.dylib -a -f $i/include/fitsio.h; then
208   - LIBDIR_CFITSIO=$i/lib64
209   - INCDIR_CFITSIO=$i/include
210   - break
211   - fi
212   -done
213   -if test -n "$LIBDIR_CFITSIO" -a -n "$INCDIR_CFITSIO"; then
214   - has_cfitsio="yes"
215   - LDFLAGS="$LDFLAGS -L$LIBDIR_CFITSIO"
216   - CPPFLAGS="$CPPFLAGS -I$INCDIR_CFITSIO"
217   - AC_SUBST(LIBDIR_CFITSIO)
218   - AC_SUBST(INCDIR_CFITSIO)
219   -else
220   - has_cfitsio="no"
221   -fi
222   -
223   -
224 198 dnl ==================
225 199 dnl Build static code?
226 200 dnl ==================
... ... @@ -271,11 +245,6 @@ if test "x$has_gammalib" = "xyes"; then
271 245 else
272 246 echo " - GammaLib support (no) no gammalib library found"
273 247 fi
274   -if test "x$has_cfitsio" = "xyes"; then
275   - echo " * FITS I/O support (yes) $LIBDIR_CFITSIO $INCDIR_CFITSIO"
276   -else
277   - echo " - FITS I/O support (no) no cfitsio library found"
278   -fi
279 248 if test ! "$SWIG"; then
280 249 echo " - swig (no)"
281 250 else
... ...