Changeset 3139

Timestamp:

Feb 4, 2005, 10:33:20 PM (21 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib

Files:

• configure.in (modified) (4 diffs)
• src/astronomy/slalib.h (modified) (5 diffs)
• src/config.h.in (modified) (1 diff)

trunk/psLib/configure.in

@@ -11 +11 @@
 AC_LANG(C)
 AC_PROG_CC
+AC_PROG_F77
+AC_F77_WRAPPERS
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
@@ -19 +21 @@
 dnl Setup CFLAGS/FFLAGS/LDFLAGS with project-particulars
 CFLAGS="${CFLAGS=} -Wall -std=c99 -D_GNU_SOURCE"
-FFLAGS="-fno-second-underscore -O -fno-f2c"
 LDFLAGS="-release 5"
 
@@ -63 +64 @@
 [GSL_CONFIG=$withval],
 [GSL_CONFIG=`which gsl-config`])
-AC_CHECK_FILE($GSL_CONFIG,[],
+AC_CHECK_FILE($GSL_CONFIG,[AC_MSG_RESULT([yes])],
     [AC_MSG_ERROR([GSL is required.  Obtain it at http://www.gnu.org/software/gsl or use --with-gsl-config to specify location.])])
-CFLAGS="${CFLAGS=} `${GSL_CONFIG} --cflags`"
+AC_MSG_CHECKING([GSL cflags])
+GSL_CFLAGS="`${GSL_CONFIG} --cflags`"
+AC_MSG_RESULT([${GSL_CFLAGS}])
+CFLAGS="${CFLAGS=} ${GSL_CFLAGS}"
 PSLIB_LIBS="${PSLIB_LIBS=} `${GSL_CONFIG} --libs`"
    
@@ -73 +77 @@
 [XML_CONFIG=$withval],
 [XML_CONFIG=`which xml2-config`])
-AC_CHECK_FILE($XML_CONFIG,[],
+AC_CHECK_FILE($XML_CONFIG,[AC_MSG_RESULT([yes])],
     [AC_MSG_ERROR([GNOME XML C parser is required.  Obtain it at http://www.xmlsoft.org or use --with-xml2-config to specify location.])])
-CFLAGS="${CFLAGS=} `${XML_CONFIG} --cflags`"
+AC_MSG_CHECKING([xml2 cflags])
+XML_CFLAGS="`${XML_CONFIG} --cflags`"
+AC_MSG_RESULT([${XML_CFLAGS}])
+CFLAGS="${CFLAGS=} ${XML_CFLAGS}"
 PSLIB_LIBS="${PSLIB_LIBS=} `${XML_CONFIG} --libs`"
 

trunk/psLib/src/astronomy/slalib.h

@@ -7 +7 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-12 21:10:41 $
+*  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-05 08:33:20 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16 +16 @@
 #define SLALIB_H
 
-#ifdef FORTRAN_UNDERSCORE_PREFIX
-#ifdef FORTRAN_DOUBLE_UNDERSCORE_SUFFIX
-#ifdef FORTRAN_UPPERCASE
-#define fslaAoppa _SLA_AOPPA__
-#define fslaAopqk _SLA_AOPQK__
-#define fslaOapqk _SLA_OAPQK__
-#define fslaAirmas _SLA_AIRMAS__
-#else
-#define fslaAoppa _sla_aoppa__
-#define fslaAopqk _sla_aopqk__
-#define fslaOapqk _sla_oapqk__
-#define fslaAirmas _sla_airmas__
-#endif
-#elif FORTRAN_NO_UNDERSCORE_SUFFIX
-#ifdef FORTRAN_UPPERCASE
-#define fslaAoppa _SLA_AOPPA
-#define fslaAopqk _SLA_AOPQK
-#define fslaOapqk _SLA_OAPQK
-#define fslaAirmas _SLA_AIRMAS
-#else
-#define fslaAoppa _sla_aoppa
-#define fslaAopqk _sla_aopqk
-#define fslaOapqk _sla_oapqk
-#define fslaAirmas _sla_airmas
-#endif
-#else
-#ifdef FORTRAN_UPPERCASE
-#define fslaAoppa _SLA_AOPPA_
-#define fslaAopqk _SLA_AOPQK_
-#define fslaOapqk _SLA_OAPQK_
-#define fslaAirmas _SLA_AIRMAS_
-#else
-#define fslaAoppa _sla_aoppa_
-#define fslaAopqk _sla_aopqk_
-#define fslaOapqk _sla_oapqk_
-#define fslaAirmas _sla_airmas_
-#endif
-#endif
-#else
-#ifdef FORTRAN_DOUBLE_UNDERSCORE_SUFFIX
-#ifdef FORTRAN_UPPERCASE
-#define fslaAoppa SLA_AOPPA__
-#define fslaAopqk SLA_AOPQK__
-#define fslaOapqk SLA_OAPQK__
-#define fslaAirmas SLA_AIRMAS__
-#else
-#define fslaAoppa sla_aoppa__
-#define fslaAopqk sla_aopqk__
-#define fslaOapqk sla_oapqk__
-#define fslaAirmas sla_airmas__
-#endif
-#elif FORTRAN_NO_UNDERSCORE_SUFFIX
-#ifdef FORTRAN_UPPERCASE
-#define fslaAoppa SLA_AOPPA
-#define fslaAopqk SLA_AOPQK
-#define fslaOapqk SLA_OAPQK
-#define fslaAirmas SLA_AIRMAS
-#else
-#define fslaAoppa sla_aoppa
-#define fslaAopqk sla_aopqk
-#define fslaOapqk sla_oapqk
-#define fslaAirmas sla_airmas
-#endif
-#else
-#ifdef FORTRAN_UPPERCASE
-#define fslaAoppa SLA_AOPPA_
-#define fslaAopqk SLA_AOPQK_
-#define fslaOapqk SLA_OAPQK_
-#define fslaAirmas SLA_AIRMAS_
-#else
-#define fslaAoppa sla_aoppa_
-#define fslaAopqk sla_aopqk_
-#define fslaOapqk sla_oapqk_
-#define fslaAirmas sla_airmas_
-#endif
-#endif
-#endif
 
+#define fslaAoppa F77_FUNC(sla_aoppa,SLA_AOPPA)
 extern void fslaAoppa(
         const double* date,
@@ -110 +34 @@
     );
 
+#define fslaAopqk F77_FUNC(sla_aopqk,SLA_AOPQK)
 extern void fslaAopqk(
         const double* RAP,
@@ -121 +46 @@
     );
 
+#define fslaOapqk F77_FUNC(sla_oapqk,SLA_OAPQK)
 extern void fslaOapqk(
         char* TYPE,
@@ -130 +56 @@
     );
 
+#define fslaAirmas F77_FUNC(sla_airmas,SLA_AIRMAS)
 extern double fslaAirmas(
         const double* zenithDistance

trunk/psLib/src/config.h.in

@@ -4 +4 @@
 #undef CONFIG_FILE
 
+/* Define to dummy `main' function (if any) required to link to the Fortran
+   libraries. */
+#undef F77_DUMMY_MAIN
+
+/* Define to a macro mangling the given C identifier (in lower and upper
+   case), which must not contain underscores, for linking with Fortran. */
+#undef F77_FUNC
+
+/* As F77_FUNC, but for C identifiers containing underscores. */
+#undef F77_FUNC_
+
+/* Define if F77 and FC dummy `main' functions are identical. */
+#undef FC_DUMMY_MAIN_EQ_F77
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <fftw3.h> header file. */
+#undef HAVE_FFTW3_H
+
+/* Define to 1 if you have the <fitsio.h> header file. */
+#undef HAVE_FITSIO_H
 
 /* Define to 1 if you have the <inttypes.h> header file. */