fixed cfitsio

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@506 32389bae-6d03-0410-99cf-db05cde120eb

2 files changed, 52 insertions, 18 deletions

diff --git a/sci-libs/cfitsio/files/cfitsio-3.030-Makefile.am b/sci-libs/cfitsio/files/cfitsio-3.030-Makefile.am
index 8e3ad4377..ea67cd40d 100644
--- a/sci-libs/cfitsio/files/cfitsio-3.030-Makefile.am
+++ b/sci-libs/cfitsio/files/cfitsio-3.030-Makefile.am
@@ -1,24 +1,31 @@
+AM_CPPFLAGS = -D_REENTRANT
 lib_LTLIBRARIES = libcfitsio.la
-libcfitsio_la_SOURCES = \
-	buffers.c cfileio.c checksum.c compress.c drvrfile.c drvrmem.c \
-	drvrnet.c drvrsmem.c editcol.c edithdu.c eval_l.c eval_y.c \
-	eval_f.c fitscore.c getcol.c getcolb.c getcold.c getcole.c \
-	getcoli.c getcolj.c getcolk.c getcoll.c getcols.c getcolsb.c \
-	getcoluk.c getcolui.c getcoluj.c getkey.c group.c grparser.c \
-	histo.c iraffits.c drvrgsiftp.c \
-	modkey.c putcol.c putcolb.c putcold.c putcole.c putcoli.c \
-	putcolj.c putcolk.c putcoluk.c putcoll.c putcols.c putcolsb.c \
-	putcolu.c putcolui.c putcoluj.c putkey.c region.c scalnull.c \
-	swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \
-	pliocomp.c  fits_hcompress.c fits_hdecompress.c \
-	f77_wrap1.c f77_wrap2.c f77_wrap3.c f77_wrap4.c
-libcfitsio_la_LIBADD = -lm
+FITSIO_SRC = f77_wrap1.c f77_wrap2.c f77_wrap3.c f77_wrap4.c
+CORE_SOURCES = 	buffers.c cfileio.c checksum.c compress.c drvrfile.c drvrmem.c \
+		drvrnet.c drvrsmem.c drvrgsiftp.c editcol.c edithdu.c eval_l.c \
+		eval_y.c eval_f.c fitscore.c getcol.c getcolb.c getcold.c getcole.c \
+		getcoli.c getcolj.c getcolk.c getcoll.c getcols.c getcolsb.c \
+		getcoluk.c getcolui.c getcoluj.c getkey.c group.c grparser.c \
+		histo.c iraffits.c \
+		modkey.c putcol.c putcolb.c putcold.c putcole.c putcoli.c \
+		putcolj.c putcolk.c putcoluk.c putcoll.c putcols.c putcolsb.c \
+		putcolu.c putcolui.c putcoluj.c putkey.c region.c scalnull.c \
+		swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \
+		pliocomp.c fits_hcompress.c fits_hdecompress.c
+
+if F77BUILD
+libcfitsio_la_SOURCES = ${CORE_SOURCES} ${FITSIO_SRC}
+else
+libcfitsio_la_SOURCES = ${CORE_SOURCES}
+endif
+
 include_HEADERS = fitsio.h fitsio2.h longnam.h drvrsmem.h
+
 LDADD = libcfitsio.la
 noinst_PROGRAMS = testprog speed cookbook
 bin_PROGRAMS = fitscopy imcopy listhead
-testprog_SOURCES = testprog.c
 
+testprog_SOURCES = testprog.c
 fitscopy_SOURCES = fitscopy.c
 speed_SOURCES = speed.c
 imcopy_SOURCES = imcopy.c
diff --git a/sci-libs/cfitsio/files/cfitsio-3.030-configure.ac b/sci-libs/cfitsio/files/cfitsio-3.030-configure.ac
index 68ffff440..0167ea41c 100644
--- a/sci-libs/cfitsio/files/cfitsio-3.030-configure.ac
+++ b/sci-libs/cfitsio/files/cfitsio-3.030-configure.ac
@@ -6,6 +6,34 @@ AC_INIT(cfitsio, 3.030, pence@tetra.gsfc.nasa.gov)
 AM_INIT_AUTOMAKE([foreign])
 AC_PROG_LIBTOOL
 
+AC_CHECK_PROGS(FC, f77 xlf cf77 gf77 gfortran g77 af77 ncf f2c ifort g95 , nope)
+if test $FC = 'nope' ; then
+   AC_MSG_WARN(cfitsio: == No acceptable f77 found in \$PATH)
+   AC_MSG_WARN(cfitsio: == Cfitsio will be built without Fortran wrapper support)
+   FC=
+   F77_WRAPPERS=
+else
+  CFORTRANFLAGS=
+  F77_WRAPPERS="\${FITSIO_SRC}"
+  echo $ac_n "checking whether we are using GNU Fortran""... $ac_c" 1>&6
+  if test `$FC --version -c < /dev/null 2> /dev/null | grep -c GNU` -gt 0 -o \
+          `$FC --version -c < /dev/null 2> /dev/null | grep -ic egcs` -gt 0
+  then
+    echo "$ac_t""yes" 1>&6
+    echo $ac_n "cfitsio: == Adding wrapper support for GNU Fortran""... $ac_c" 1>&6
+    CFORTRANFLAGS="-Dg77Fortran"
+    echo "$ac_t"" done" 1>&6
+  else
+    echo "$ac_t""no" 1>&6
+    if test $FC = 'f2c' ; then
+      echo $ac_n "cfitsio: == Adding wrapper support for f2c""... $ac_c" 1>&6
+      CFORTRANFLAGS="-Df2cFortran"
+      echo "$ac_t"" done" 1>&6
+    fi
+  fi
+fi
+
+
 # taken from configure.in
 # determine system type
 #--------------------------------------------------------------------
@@ -223,8 +251,7 @@ AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 AC_DEFINE(HAVE_NET_SERVICES)
 
 # ==================== END OF unix networking SECTION ================
-
-
+AM_CONDITIONAL(F77BUILD, test x$F77WRAPPERS )
+AC_CHECK_LIB(m, cos, [LIBS="$LIBS -lm"])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
-