Changeset 3231 for trunk/psLib/configure.ac

Timestamp:

Feb 15, 2005, 1:59:06 PM (21 years ago)

Author:

desonia

Message:

* empty log message *

File:

• trunk/psLib/configure.ac (modified) (8 diffs)

trunk/psLib/configure.ac

@@ -1 @@
-AC_INIT([pslib],[1.4])
+AC_INIT([pslib],[1.4],[robert.desonia@mhpcc.hpc.mil])
 AM_CONFIG_HEADER(src/config.h)
 AM_INIT_AUTOMAKE(pslib, 1.4)
@@ -7 +7 @@
 
 dnl Setup CFLAGS with project-particulars
-CFLAGS="${CFLAGS=} -std=c99 -D_GNU_SOURCE"
+CFLAGS="${CFLAGS=} -std=c99 -Wall"
 SUBDIR="etc src test" dnl don't include 'swig', as it is optional
 AH_VERBATIM([_GNU_SOURCE], 
@@ -30 +30 @@
 AC_LANG(C)
 AC_PROG_CC
+AC_LANG_WERROR
+AC_GNU_SOURCE
+
+AC_LANG_PUSH(Fortran 77)
 AC_PROG_F77
 AC_F77_WRAPPERS
-AC_F77_LIBRARY_LDFLAGS
+AC_LANG_POP(Fortran 77)
+
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
@@ -55 +60 @@
 [CFITSIO_LDFLAGS="-L$withval"])
 CFLAGS="${CFLAGS=} $CFITSIO_CFLAGS"
+LDFLAGS="${LDFLAGS} $CFITSIO_LDFLAGS -lcfitsio"
 PSLIB_LIBS="${PSLIB_LIBS=} $CFITSIO_LDFLAGS -lcfitsio"
 AC_CHECK_HEADERS([fitsio.h],[],
@@ -71 +77 @@
 [FFTW3_LDFLAGS="-L$withval"])
 CFLAGS="${CFLAGS=} $FFTW3_CFLAGS"
+LDFLAGS="${LDFLAGS=} $FFTW3_LDFLAGS -lfftw3f"
 PSLIB_LIBS="${PSLIB_LIBS=} $FFTW3_LDFLAGS -lfftw3f"
 AC_MSG_CHECKING([FFTW header files])
@@ -87 +94 @@
 AC_MSG_RESULT([${GSL_CFLAGS}])
 CFLAGS="${CFLAGS=} ${GSL_CFLAGS}"
+LDFLAGS="${LDFLAGS=} `${GSL_CONFIG} --libs`"
 PSLIB_LIBS="${PSLIB_LIBS=} `${GSL_CONFIG} --libs`"
    
@@ -100 +108 @@
 AC_MSG_RESULT([${XML_CFLAGS}])
 CFLAGS="${CFLAGS=} ${XML_CFLAGS}"
+LDFLAGS="${LDFLAGS=} `${XML_CONFIG} --libs`"
 PSLIB_LIBS="${PSLIB_LIBS=} `${XML_CONFIG} --libs`"
 
@@ -149 +158 @@
 AC_SUBST(DOXYGEN,$DOXYGEN)
 
-CFLAGS="${CFLAGS=} -Wall -Werror"
 CFLAGS="${CFLAGS=}  -DPS_CONFIG_FILE_DEFAULT=\\\"$sysconfdir/pslib/psTime.config\\\""