support cfitsio headers in cfitsio/fitsio.h

knodlseder
1 parent d5bc6961
Showing 2 changed files with 49 additions and 14 deletions
configure.ac
src/fits/GFitsCfitsio.hpp
@@ -312,26 +312,47 @@ if test &quot;x$with_cfitsio&quot; = &quot;xyes&quot;; then
     *)                    cfitsio_deps="-lm" ;;
   esac
  
-  # First search for cfitsio in the standard paths using the AC_CHECK_LIB
-  # macro. This allows also search in paths that are eventually specified by LDFAGS.
+  # First search for cfitsio in the standard paths using AC_CHECK_LIB
+  # and check for appropriate headers using AC_CHECK_HEADERS. This allows
+  # also to search in paths that are eventually specified by LDFAGS and
+  # CPPFLAGS.
   AC_CHECK_LIB([cfitsio], [ffpss],
                [has_cfitsio="yes"
                 AC_MSG_NOTICE([cfitsio found])],
                [], [${cfitsio_deps}])
+  AC_CHECK_HEADERS([fitsio.h cfitsio/fitsio.h], [break])
+  if test x"$ac_cv_header_fitsio_h" != "xyes" -a x"$ac_cv_header_cfitsio_fitsio_h" != "xyes"; then
+    has_cfitsio="no"
+    AC_MSG_NOTICE([cfitsio headers not found or not usable])
+  fi
  
   # If cfitsio has not been found then search for cfitsio shared library in a some
   # default directories
   if test "x$has_cfitsio" = "xno"; then
     for i in "$gammalib_prefix" /opt/local /usr/local /usr ; do
-      if test -f $i/lib64/libcfitsio.so -o -f $i/lib64/libcfitsio.dylib -a -f $i/include/fitsio.h; then
-        LIBDIR_CFITSIO=$i/lib64
-        INCDIR_CFITSIO=$i/include
-        break
+      if test -f $i/lib64/libcfitsio.so -o -f $i/lib64/libcfitsio.dylib; then
+        if test -f $i/include/fitsio.h; then
+          LIBDIR_CFITSIO=$i/lib64
+          INCDIR_CFITSIO=$i/include
+          break
+        fi
+        if test -f $i/include/cfitsio/fitsio.h; then
+          LIBDIR_CFITSIO=$i/lib64
+          INCDIR_CFITSIO=$i/include/cfitsio/
+          break
+        fi
       fi
-      if test -f $i/lib/libcfitsio.so -o -f $i/lib/libcfitsio.dylib -a -f $i/include/fitsio.h; then
-        LIBDIR_CFITSIO=$i/lib
-        INCDIR_CFITSIO=$i/include
-        break
+      if test -f $i/lib/libcfitsio.so -o -f $i/lib/libcfitsio.dylib; then
+        if test -f $i/include/fitsio.h; then
+          LIBDIR_CFITSIO=$i/lib
+          INCDIR_CFITSIO=$i/include
+          break
+        fi
+        if test -f $i/include/cfitsio/fitsio.h; then
+          LIBDIR_CFITSIO=$i/lib
+          INCDIR_CFITSIO=$i/include/cfitsio
+          break
+        fi
       fi
     done
     if test -n "$LIBDIR_CFITSIO" -a -n "$INCDIR_CFITSIO"; then
@@ -4,10 +4,18 @@
  *  copyright (C) 2008-2011 by Jurgen Knodlseder                           *
  * ----------------------------------------------------------------------- *
  *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *  This program is free software: you can redistribute it and/or modify   *
+ *  it under the terms of the GNU General Public License as published by   *
+ *  the Free Software Foundation, either version 3 of the License, or      *
+ *  (at your option) any later version.                                    *
+ *                                                                         *
+ *  This program is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *  GNU General Public License for more details.                           *
+ *                                                                         *
+ *  You should have received a copy of the GNU General Public License      *
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
  *                                                                         *
  ***************************************************************************/
 /**
@@ -32,7 +40,13 @@
  *                           CFITSIO is available                          *
  ***************************************************************************/
 #if defined(HAVE_LIBCFITSIO)
+#if defined(HAVE_CFITSIO_FITSIO_H)
+#include <cfitsio/fitsio.h>
+#elif defined(HAVE_FITSIO_H)
 #include <fitsio.h>
+#else
+#include <fitsio.h>
+#endif
  
 /* __ Macros _____________________________________________________________ */
 #define __ffclos(A, B) ffclos(A, B)