Changeset 5760

Timestamp:

Dec 12, 2005, 10:11:07 AM (20 years ago)

Author:

desonia

Message:

Changes from Bug #627 -- replaced sed with perl and a couple of GCC 4 related
fixes.

Location:

trunk/psModules

Files:

• configure.ac (modified) (4 diffs)
• src/config/pmConfig.c (modified) (3 diffs)
• src/objects/pmObjects.h (modified) (2 diffs)

trunk/psModules/configure.ac

@@ -37 +37 @@
 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 -------------------------------------------------------------------
@@ -79 +92 @@
   src/Makefile
   src/astrom/Makefile
-  src/camera/Makefile
   src/config/Makefile
   src/detrend/Makefile
@@ -85 +97 @@
   src/imsubtract/Makefile
   src/objects/Makefile
-  src/photom/Makefile
   test/Makefile
   test/astrom/Makefile
-  test/camera/Makefile
   test/config/Makefile
   test/detrend/Makefile
@@ -94 +104 @@
   test/imsubtract/Makefile
   test/objects/Makefile
-  test/photom/Makefile
   Doxyfile
   psmodule-config

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-15 20:09:03 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-12-12 20:11:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28 +28 @@
     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",
@@ -359 +359 @@
         } 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) {

trunk/psModules/src/objects/pmObjects.h

@@ -10 +10 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-10 19:53:40 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-12-12 20:11:07 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -36 +36 @@
  * values with specific meanings that other functions can add to or define?
  */
-enum {
+typedef enum {
     PSPHOT_MASK_CLEAR     = 0x00,
     PSPHOT_MASK_INVALID   = 0x01,