Index: trunk/psModules/configure.in
===================================================================
--- trunk/psModules/configure.in	(revision 1777)
+++ trunk/psModules/configure.in	(revision 1786)
@@ -4,34 +4,63 @@
 AM_INIT_AUTOMAKE(psModule, 0.1)
 
-AC_LANG_C
+AC_LANG(C)
 AC_PROG_CC
+
+dnl AC_SUBST(LDFLAGS)
+AC_SUBST(CFLAGS)
 
 CFLAGS="${CFLAGS=} -g2 -Wall -std=c99 -D_GNU_SOURCE"
 
+AC_PROG_INSTALL
+AM_PROG_LIBTOOL
+
 AC_ARG_WITH(psLib,
-[  --with-psLib            Specify location of psLib files],[
-CFLAGS="$CFLAGS -I$withval/include" 
-LDFLAGS="$LDFLAGS -L$withval/lib"
-psLib_prefix=$withval 
+[  --with-psLib=DIR        Specify location of psLib files],[
+CFLAGS="${CFLAGS=} -I$withval/include"
+LDFLAGS="${LDFLAGS=} -L$withval/lib"
+],[
+CFLAGS="${CFLAGS=} -I$PSLIB_ROOT/include"
+LDFLAGS="${LDFLAGS=} -L$PSLIB_ROOT/lib"
 ])
 
 AC_ARG_WITH(sla,
-[  --with-sla              Specify location of SLA.],[
-CFLAGS="$CFLAGS -I$withval/include" 
-SLA_LINK = `$withval/bin/sla_link`
-LDFLAGS="$LDFLAGS $SLA_LINK"
-psLib_prefix=$withval 
+[  --with-sla=DIR          Specify location of SLA.],[
+CFLAGS="${CFLAGS=} -I$withval/include"
+LDFLAGS="${LDFLAGS=} -L$withval/lib"
 ])
 
-AC_ARG_WITH(psLib-includes, [  --with-psLib-includes   Specify location of psLib header files], \
-    CFLAGS="$CFLAGS -I$withval")
+AC_ARG_WITH(cfitsio,
+[  --with-cfitsio=DIR      Specify location of CFITSIO.],[
+CFLAGS="${CFLAGS=} -I$withval/include"
+LDFLAGS="${LDFLAGS=} -L$withval/lib"
+])
 
-AC_ARG_WITH(psLib-lib, [  --with-psLib-lib        Specify location of psLib library file], \
-    LDFLAGS="$LDFLAGS -L$withval")
+AC_ARG_WITH(fftw3,
+[  --with-fftw3=DIR        Specify location of FFTW version 3.],[
+CFLAGS="${CFLAGS=} -I$withval/include"
+LDFLAGS="${LDFLAGS=} -L$withval/lib"
+])
 
+AC_ARG_WITH(gsl,
+[  --with-gsl=DIR          Specify location of GSL.],[
+AC_CHECK_PROG(GSL_CONFIG, $withval/bin/gsl-config, $withval/bin/gsl-config)
+],[
+AC_CHECK_PROG(GSL_CONFIG, gsl-config, `which gsl-config`)
+])
+if test "$GSL_CONFIG" != ""
+then
+    GSL_PREFIX="`${GSL_CONFIG} --prefix`"
+    GSL_LIBS="`${GSL_CONFIG} --libs`"
+    LDFLAGS="${LDFLAGS=} -L$GSL_PREFIX/lib$GSL_LIBS"
+    CFLAGS="${CFLAGS=} -I$GSL_PREFIX/include"
+fi
 
-AC_PROG_INSTALL
-
-AM_PROG_LIBTOOL
+dnl Check the libraries to see if they exist, etc.
+AC_CHECK_LIB(sla,main,,AC_MSG_ERROR(SLA library required))
+AC_CHECK_LIB(cfitsio,main,,AC_MSG_ERROR(CFITSIO library required))
+AC_CHECK_LIB(fftw3f,main,,AC_MSG_ERROR(FFTW3 library required))
+AC_CHECK_LIB(gsl,main,,AC_MSG_ERROR(GSL library required))
+AC_CHECK_LIB(gslcblas,main,,AC_MSG_ERROR(GSL CBLAS library required))
+AC_CHECK_LIB(pslib,main,,AC_MSG_ERROR(psLib library required))
 
 AC_OUTPUT(Makefile src/Makefile)