Changeset 11620 for trunk

Timestamp:

07/26/11 15:37:51 (13 years ago)

Author:

tbretz

Message:

Updated output at the end of configure.

Location:

trunk/FACT++

Files:

• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)

trunk/FACT++/configure

@@ -25515 +25515 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
 $as_echo "$as_me: " >&6;}
-if test "$HAVE_ZLIB" = yes; then
+if test "$HAVE_FITS_H" = yes; then
+
+   if test "$HAVE_ZLIB" = yes; then
   :
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  zlib not found. Support for reading zipped files viewer disabled!" >&5
-$as_echo "$as_me: WARNING:  zlib not found. Support for reading zipped files viewer disabled!" >&2;}
-
-fi
-if test "$HAVE_IZSTREAM_H" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  zlib not found. Support for .fits.gz in viewer disabled." >&5
+$as_echo "$as_me: WARNING:  zlib not found. Support for .fits.gz in viewer disabled." >&2;}
+
+fi
+   if test "$HAVE_IZSTREAM_H" = yes; then
   :
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Mars izstream.h not found in gui/RawEventsViwer. Support for reading zipped files in viewer disabled!" >&5
-$as_echo "$as_me: WARNING:  Mars izstream.h not found in gui/RawEventsViwer. Support for reading zipped files in viewer disabled!" >&2;}
-
-fi
-if test "$HAVE_FITS_H" = yes; then
-  :
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Mars fits.h not found in gui/RawEventsViwer. Support for viewer disabled!" >&5
-$as_echo "$as_me: WARNING:  Mars fits.h not found in gui/RawEventsViwer. Support for viewer disabled!" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Mars izstream.h not found in gui/RawEventsViewer. Support for .fits.gz disabled." >&5
+$as_echo "$as_me: WARNING:  Mars izstream.h not found in gui/RawEventsViewer. Support for .fits.gz disabled." >&2;}
+
+fi
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Mars fits.h not found in gui/RawEventsViewer. Target 'viewer' disabled." >&5
+$as_echo "$as_me: WARNING:  Mars fits.h not found in gui/RawEventsViewer. Target 'viewer' disabled." >&2;}
 
 fi

trunk/FACT++/configure.ac

@@ -440 +440 @@
 AC_MSG_NOTICE(--------------------------------------------------------------------)
 AC_MSG_NOTICE()
-AM_COND_IF(HAS_ZLIB,, 
-      AC_MSG_WARN([ zlib not found. Support for reading zipped files viewer disabled!])
-)
-AM_COND_IF(HAS_IZSTREAM_H,, 
-      AC_MSG_WARN([ Mars izstream.h not found in gui/RawEventsViwer. Support for reading zipped files in viewer disabled!])
-)
-AM_COND_IF(HAS_FITS_H,, 
-      AC_MSG_WARN([ Mars fits.h not found in gui/RawEventsViwer. Support for viewer disabled!])
+AM_COND_IF(HAS_FITS_H, [
+   AM_COND_IF(HAS_ZLIB,, 
+      AC_MSG_WARN([ zlib not found. Support for .fits.gz in viewer disabled.])
+   )
+   AM_COND_IF(HAS_IZSTREAM_H,, 
+      AC_MSG_WARN([ Mars izstream.h not found in gui/RawEventsViewer. Support for .fits.gz disabled.])
+   )
+], 
+   AC_MSG_WARN([ Mars fits.h not found in gui/RawEventsViewer. Target 'viewer' disabled.])
 )
 AM_COND_IF(HAS_LIBXP,, 
-      AC_MSG_WARN([ Motif/lesstif not found. The dim gui did will not be built!])
+   AC_MSG_WARN([ Motif/lesstif not found. The dim gui did will not be built!])
 )
 AM_COND_IF(HAS_FITS,, 
-      AC_MSG_WARN([ FITS support disabled. cfitsio/CCfits missing!])
+   AC_MSG_WARN([ FITS support disabled. cfitsio/CCfits missing!])
 )
 AM_COND_IF(HAS_ROOT,