Index: configure.ac
===================================================================
RCS file: /usr/local/cvs/repositories/pan-starrs/datasys/IPP/psModule/configure.ac,v
retrieving revision 1.15
diff -u -r1.15 configure.ac
--- configure.ac	7 Dec 2005 20:13:18 -0000	1.15
+++ configure.ac	9 Dec 2005 00:29:10 -0000
@@ -36,13 +36,26 @@
 AM_CFLAGS="${AM_CFLAGS=} -Wall -Werror"
 AC_SUBST([AM_CFLAGS])
 
+dnl ------------------- PERL options ---------------------
+  AC_ARG_WITH(perl,
+    [AS_HELP_STRING(--with-perl=FILE,Specify location of PERL executable.)],
+    [AC_CHECK_PROG(PERL, $withval, $withval)],
+    [AC_CHECK_PROG(PERL, perl, `which perl`)])
+    if test "$PERL" == ""
+    then
+      AC_MSG_ERROR([PERL is required.  Use --with-perl to specify its install location.])
+    fi
+    AC_SUBST(PERL,$PERL)
+
 SRCPATH='${top_srcdir}/src'
-SRCDIRS="astrom camera config detrend imcombine imsubtract objects photom"
-SRCINC=`echo "${SRCDIRS=}" | ${SED} "s|\(\\w\+\)|-I\${SRCPATH=}/\1|g"`
-SRCSUBLIBS=`echo "${SRCDIRS=}" | ${SED} "s|\(\\w\+\)|\1/libpsmodule\1.la|g"`
-AC_SUBST([SRCSUBLIBS],${SRCSUBLIBS=})
+SRCDIRS="astrom config detrend imcombine imsubtract objects"
+# 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([SRCDIRS],${SRCDIRS=})
-AC_SUBST([SRCINC],${SRCINC=})
 
 dnl doxygen -------------------------------------------------------------------
 
@@ -78,22 +91,18 @@
   Makefile
   src/Makefile
   src/astrom/Makefile
-  src/camera/Makefile
   src/config/Makefile
   src/detrend/Makefile
   src/imcombine/Makefile
   src/imsubtract/Makefile
   src/objects/Makefile
-  src/photom/Makefile
   test/Makefile
   test/astrom/Makefile
-  test/camera/Makefile
   test/config/Makefile
   test/detrend/Makefile
   test/imcombine/Makefile
   test/imsubtract/Makefile
   test/objects/Makefile
-  test/photom/Makefile
   Doxyfile
   psmodule-config
   psmodule.pc
Index: src/config/pmConfig.c
===================================================================
RCS file: /usr/local/cvs/repositories/pan-starrs/datasys/IPP/psModule/src/config/pmConfig.c,v
retrieving revision 1.4
diff -u -r1.4 pmConfig.c
--- src/config/pmConfig.c	15 Nov 2005 20:09:03 -0000	1.4
+++ src/config/pmConfig.c	9 Dec 2005 00:29:10 -0000
@@ -2,7 +2,7 @@
  *
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.4 $ $Name:  $
+ *  @version $Revision: 1.4 $ $Name: rel9_0 $
  *  @date $Date: 2005/11/15 20:09:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27,7 +27,7 @@
     const char *name,                   // Name of file
     const char *description)            // Description of file
 {
-    int numBadLines = 0;
+    unsigned int numBadLines = 0;
 
     psLogMsg(__func__, PS_LOG_INFO, "Loading %s configuration from file %s\n",
              description, name);
@@ -358,7 +358,7 @@
             camera = psMemIncrRefCounter(cameraItem->data.md);
         } else if (cameraItem->type == PS_DATA_STRING) {
             psTrace(__func__, 5, "Reading camera configuration for %s...\n", cameraItem->name);
-            int badLines = 0;  // Number of bad lines in reading camera configuration
+            unsigned int badLines = 0;  // Number of bad lines in reading camera configuration
             camera = psMetadataConfigParse(NULL, &badLines, cameraItem->data.V, true);
             if (badLines > 0) {
                 psLogMsg(__func__, PS_LOG_WARN, "%d bad lines encountered while reading camera"
Index: src/objects/pmObjects.h
===================================================================
RCS file: /usr/local/cvs/repositories/pan-starrs/datasys/IPP/psModule/src/objects/pmObjects.h,v
retrieving revision 1.2
diff -u -r1.2 pmObjects.h
--- src/objects/pmObjects.h	10 Oct 2005 19:53:40 -0000	1.2
+++ src/objects/pmObjects.h	9 Dec 2005 00:29:10 -0000
@@ -9,7 +9,7 @@
  *
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name:  $
+ *  @version $Revision: 1.2 $ $Name: rel8_0 $
  *  @date $Date: 2005/10/10 19:53:40 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -35,7 +35,7 @@
  * outside of the PSPHOT code.  Perhaps we can set up a registered set of mask
  * values with specific meanings that other functions can add to or define?
  */
-enum {
+typedef enum {
     PSPHOT_MASK_CLEAR     = 0x00,
     PSPHOT_MASK_INVALID   = 0x01,
     PSPHOT_MASK_SATURATED = 0x02,