Author: Ole Streicher <debian@liska.ath.cx>
Description: Use the qfits library provided by Debian instead of the
 convienience copy.
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,11 +19,10 @@
 
 AUTOMAKE_OPTIONS = 1.8 foreign
 
-ACLOCAL_AMFLAGS = -I m4macros -I libqfits/m4macros
+ACLOCAL_AMFLAGS = -I m4macros
 
 DISTCLEANFILES = *~
 
-COMPILE_FIRST = libqfits
 
 TOPSUBDIRS = irplib uves flames recipes regtests reflex
 #TOPSUBDIRS = irplib uves recipes
@@ -31,7 +30,6 @@
 COMPILE_LAST =
 
 
-HTML_SUBDIRS =  libqfits
 
 SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS) $(COMPILE_LAST)
 
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -276,7 +276,7 @@
     IRPLIB_INCLUDES='-I$(top_srcdir)/irplib'
     # No -L for IRPLIB which is statically linked
 
-    QF_INCLUDES='-I$(top_srcdir)/libqfits -I$(top_srcdir)/libqfits/src'
+    QF_INCLUDES=''
     QF_LDFLAGS=""
 
 
--- a/configure.ac
+++ b/configure.ac
@@ -89,7 +89,7 @@
 AC_CHECK_DECLS([setenv])
 
 # Check for QFITS
-#CPL_CHECK_QFITS
+CPL_CHECK_QFITS
 
 # Check for CPL presence and usability
 CPL_CHECK_LIBS
@@ -108,7 +108,6 @@
 #                uves/tests/Makefile
 #                recipes/Makefile)
 
-AC_CONFIG_SUBDIRS(libqfits)
 
 AC_CONFIG_FILES(Makefile
                 Makefile.purify
--- a/flames/Makefile.am
+++ b/flames/Makefile.am
@@ -23,8 +23,8 @@
 
 SUBDIRS = . tests
 
-LIBQFITS=$(top_builddir)/libqfits/src/libqfits.la
-QFITS_INCLUDES = -I$(top_srcdir)/libqfits/src/
+LIBQFITS= -lqfits
+QFITS_INCLUDES =
 
 
 if MAINTAINER_MODE
--- a/uves/Makefile.am
+++ b/uves/Makefile.am
@@ -23,8 +23,8 @@
 
 SUBDIRS = . tests
 
-LIBQFITS=$(top_builddir)/libqfits/src/libqfits.la
-QFITS_INCLUDES = -I$(top_srcdir)/libqfits/src/
+LIBQFITS=-lqfits
+QFITS_INCLUDES =
 
 
 if MAINTAINER_MODE
--- a/uves/tests/Makefile.am
+++ b/uves/tests/Makefile.am
@@ -30,7 +30,7 @@
 
 AM_CPPFLAGS = $(all_includes)
 
-LDADD = $(LIBUVES) $(LIBFLAMES) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCEXT) $(LIBCFITSIO)
+LDADD = $(LIBUVES) $(LIBFLAMES) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCEXT) $(LIBCFITSIO) -lqfits
 LDFLAGS = $(CPL_LDFLAGS)
 
 pkginclude_HEADERS =