Index: trunk/psModules/configure.ac
===================================================================
--- trunk/psModules/configure.ac	(revision 6298)
+++ trunk/psModules/configure.ac	(revision 6872)
@@ -8,20 +8,8 @@
 AM_MAINTAINER_MODE
 
-dnl handle debug building
-AC_ARG_ENABLE(optimize,
-  [AS_HELP_STRING(--enable-optimize,enable compiler optimization)],
-  [AC_MSG_RESULT(compile optimization enabled)
-   CFLAGS="${CFLAGS=} -O2"],
-  [AC_MSG_RESULT([compile optimization disabled])
-   CFLAGS="${CFLAGS=} -O0 -g"]
-)
-
-dnl handle profiler building
-AC_ARG_ENABLE(profile,
-  [AS_HELP_STRING(--enable-profile,enable compiler profiler information inclusion)],
-  [AC_MSG_RESULT(compile optimization enabled)
-   CFLAGS="${CFLAGS=} -fprofile-arcs -ftest-coverage -pg"]
-)
-
+dnl otherise AC_PROG_CC will default CFLAGS to "-g -02"
+if test -z ${CFLAGS} ; then
+  CFLAGS=""
+fi
 AC_SUBST([CFLAGS])
 
@@ -29,8 +17,7 @@
 AC_PROG_CC
 dnl FIXME document why GNU_SOURCE is being set
-dnl AC_GNU_SOURCE
+AC_GNU_SOURCE
 AC_PROG_INSTALL
 AM_PROG_LIBTOOL
-AC_SYS_LARGEFILE
 
 AC_PREFIX_DEFAULT([`pwd`])
@@ -62,12 +49,30 @@
 
 SRCPATH='${top_srcdir}/src'
-SRCDIRS="astrom camera config detrend imcombine imsubtract objects photom"
+SRCDIRS="astrom config detrend imcombine imsubtract objects pslib"
 # escape two escapes at this level so \\ gets passed to the shell and \ to perl
 SRCINC=`echo "${SRCDIRS=}" | ${PERL} -pe "s|(\w+)|-I\\\\${SRCPATH=}/\1|g"`
 SRCINC="-I${SRCPATH=} ${SRCINC=}"
 SRCSUBLIBS=`echo "${SRCDIRS=}" | ${PERL} -pe "s|(\w+)|\1/libpsmodule\1.la|g"`
-AC_SUBST([SRCSUBLIBS],${SRCSUBLIBS=})
-AC_SUBST([SRCINC],${SRCINC=})
+AC_SUBST(SRCSUBLIBS,${SRCSUBLIBS=})
+AC_SUBST(SRCINC,${SRCINC=})
 AC_SUBST([SRCDIRS],${SRCDIRS=})
+
+dnl handle debug building
+AC_ARG_ENABLE(optimize,
+  [AS_HELP_STRING(--enable-optimize,enable compiler optimization)],
+  [AC_MSG_RESULT(compile optimization enabled)
+   CFLAGS="${CFLAGS=} -O2"],
+  [AC_MSG_RESULT([compile optimization disabled])
+   CFLAGS="${CFLAGS=} -O0 -g"]
+)
+
+dnl handle profiler building
+AC_ARG_ENABLE(profile,
+  [AS_HELP_STRING(--enable-profile,enable compiler profiler information inclusion)],
+  [AC_MSG_RESULT(compile optimization enabled)
+   CFLAGS="${CFLAGS=} -pg"]
+)
+
+dnl CFLAGS="${CFLAGS=} -fprofile-arcs -ftest-coverage -pg"]
 
 dnl doxygen -------------------------------------------------------------------
@@ -75,4 +80,8 @@
 AC_CHECK_PROG([doxygen], [doxygen], [true], [false])
 AM_CONDITIONAL(DOXYGEN, test x$doxygen = xtrue)
+
+dnl libjpeg -------------------------------------------------------------------
+
+AC_CHECK_LIB(jpeg,jpeg_CreateCompress,[],[AC_MSG_ERROR([jpeg library not found.])])
 
 dnl pslib ---------------------------------------------------------------------
@@ -82,5 +91,5 @@
 
 if test -z ${PSLIB_CONFIG} ; then
-  PKG_CHECK_MODULES([PSLIB], [pslib >= 0.10.0])
+  PKG_CHECK_MODULES([PSLIB], [pslib >= 0.9.0])
 else
   AC_CHECK_FILE($PSLIB_CONFIG,[],
@@ -105,5 +114,4 @@
   src/Makefile
   src/astrom/Makefile
-  src/camera/Makefile
   src/config/Makefile
   src/detrend/Makefile
@@ -111,8 +119,7 @@
   src/imsubtract/Makefile
   src/objects/Makefile
-  src/photom/Makefile
+  src/pslib/Makefile
   test/Makefile
   test/astrom/Makefile
-  test/camera/Makefile
   test/config/Makefile
   test/detrend/Makefile
@@ -120,5 +127,5 @@
   test/imsubtract/Makefile
   test/objects/Makefile
-  test/photom/Makefile
+  test/pslib/Makefile
   Doxyfile
   psmodule-config