Author: Ole Streicher <debian@liska.ath.cx>
Description: Remove the need of a private cfitsio source copy
 However, this patch still needs the files eval_defs.h and
 eval_tab.h copied from the cfitsion source. 
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,12 +12,12 @@
 
 OBJECTS		= ${CFILES:.c=.o}
 LOCAL_OBJ	= ${OBJECTS} ${SHARED_CFILE:.c=.o}
-SHARED_OBJ	= ${LOCAL_OBJ} ${CFITSIO_DIR}/*.o
+SHARED_OBJ	= ${LOCAL_OBJ}
 
 STATIC_LIB	= lib${LIBRARY}.a
 SHARED_LIB	= lib${LIBRARY}${SHLIB_SUFFIX}
 
-IFLAGS		= -I${CFITSIO_DIR} -I${TCL_INC_PATH}
+IFLAGS		= -I${TCL_INC_PATH}
 
 #----------------------------------------------------------------------------
 # Configurable macros:
@@ -35,7 +35,6 @@
 TCL_INC_PATH	= @TCL_INC_PATH@
 TCL_LIB_PATH	= @TCL_PATH@
 TCL_LIB		= @TCL_LIB@
-CFITSIO_DIR	= @CFITSIODIR@
 SHLIB_LD_LIBS 	= @LIBS@ @SHLIB_LD_LIBS@
 
 #----------------------------------------------------------------------------
@@ -52,34 +51,17 @@
 	ar cr ${STATIC_LIB} ${OBJECTS}
 	${RANLIB} ${STATIC_LIB}
 
-${SHARED_LIB}: build-cfitsio ${LOCAL_OBJ}
+${SHARED_LIB}: ${LOCAL_OBJ}
 	@if [ "x${TCL_LIB_PATH}" = x -o "x${TCL_LIB}" = x ]; then \
 		echo "${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} -o ${SHARED_LIB}"; \
 		${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} \
-			-o ${SHARED_LIB}; \
+			-ltcl -lwcs -lcfitsio -o ${SHARED_LIB}; \
 	else \
 		echo "${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} -L${TCL_LIB_PATH} -l${TCL_LIB} -o ${SHARED_LIB}"; \
 		${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} \
 			 -L${TCL_LIB_PATH} -l${TCL_LIB} -o ${SHARED_LIB}; \
 	fi
 
-build-cfitsio:
-	@if [ "x${CFITSIO_DIR}" != x ]; then \
-	    if [ -d "${CFITSIO_DIR}" ]; then \
-		if [ ! -f ${CFITSIO_DIR}/f77_wrap4.o ]; then \
-			echo "Configuring and building in ${CFITSIO_DIR}"; \
-			cd ${CFITSIO_DIR}; ./configure; \
-			${MAKE} stand_alone "CC=${CC}" "CFLAGS=${CFLAGS}" \
-               			"FITSIO_OBJ=" "FITSIO_SRC="; \
-		fi; \
-	    else \
-		echo "CFITSIO_DIR='${CFITSIO_DIR}' does not exist!"; \
-		exit 1; \
-	    fi; \
-	else \
-	    echo "CFITSIO_DIR was not set!"; \
-	    exit 1; \
-	fi
 
 install: all
 	@if [ "x${C_LIB_OPTION}" = xstatic ]; then \
--- a/configure.in
+++ b/configure.in
@@ -56,26 +56,8 @@
   [ --with-itcl Path to itcl source ],
   ITCL_PATH=$withval
 )
-AC_ARG_WITH(
-  cfitsio,
-  [ --with-cfitsio Path to cfitsio source ],
-  CFITSIO=$withval
-)
 # Make sure we have cfitsio before proceeding:
 #-------------------------------------------
-AC_MSG_CHECKING([for cfitsio source directory])
-CFITSIODIR=
-for dir in $CFITSIO ./cfitsio ; do
-    if test -r $dir/eval_defs.h; then
-        CFITSIODIR=$dir
-        AC_MSG_RESULT($dir)
-        break
-    fi
-done
-if test -z "$CFITSIODIR"; then
-    AC_MSG_RESULT([no])
-    AC_MSG_ERROR(Can't find cfitsio.  Use --with-cfitsio to specify the location of the cfitsio source code.)
-fi
 #-------------------------------------------
 AC_ARG_ENABLE(
   shared,
@@ -95,7 +77,6 @@
 changequote([,])
 AC_SUBST(TCL_LIB)
 AC_SUBST(TK_LIB)
-AC_SUBST(CFITSIODIR)
 
 if test $lhea_shared = yes; then
   C_LIB_OPTION=shared