Index: trunk/psModules/configure.ac
===================================================================
--- trunk/psModules/configure.ac	(revision 5760)
+++ trunk/psModules/configure.ac	(revision 5842)
@@ -8,8 +8,20 @@
 AM_MAINTAINER_MODE
 
-dnl otherise AC_PROG_CC will default CFLAGS to "-g -02"
-if test -z ${CFLAGS} ; then
-  CFLAGS="-g -O0"
-fi
+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"]
+)
+
 AC_SUBST([CFLAGS])
 
@@ -49,11 +61,11 @@
 
 SRCPATH='${top_srcdir}/src'
-SRCDIRS="astrom config detrend imcombine imsubtract objects"
+SRCDIRS="astrom camera config detrend imcombine imsubtract objects photom"
 # 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=})
 
@@ -69,5 +81,5 @@
 
 if test -z ${PSLIB_CONFIG} ; then
-  PKG_CHECK_MODULES([PSLIB], [pslib >= 0.9.0])
+  PKG_CHECK_MODULES([PSLIB], [pslib >= 0.10.0])
 else
   AC_CHECK_FILE($PSLIB_CONFIG,[],
@@ -92,4 +104,5 @@
   src/Makefile
   src/astrom/Makefile
+  src/camera/Makefile
   src/config/Makefile
   src/detrend/Makefile
@@ -97,6 +110,8 @@
   src/imsubtract/Makefile
   src/objects/Makefile
+  src/photom/Makefile
   test/Makefile
   test/astrom/Makefile
+  test/camera/Makefile
   test/config/Makefile
   test/detrend/Makefile
@@ -104,4 +119,5 @@
   test/imsubtract/Makefile
   test/objects/Makefile
+  test/photom/Makefile
   Doxyfile
   psmodule-config