Changeset 10693


Ignore:
Timestamp:
May 13, 2011, 11:24:35 AM (8 years ago)
Author:
tbretz
Message:
Implemented support for compilation without fits.
Location:
trunk/FACT++
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/Makefile.am

    r10671 r10693  
    234234test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
    235235
    236 dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h src/Fits.cc
     236dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h
     237if HAS_FITS
     238dataLogger_SOURCES += src/Fits.cc
     239endif
    237240dataLogger_LDADD   = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    238241    libConfiguration.la
  • trunk/FACT++/Makefile.in

    r10673 r10693  
    6060@IS_FALSE@      sched astro fadctrl
    6161
    62 @HAS_HELP2MAN_TRUE@am__append_3 = $(dist_man1_MANS)
    63 @HAS_GROFF_TRUE@am__append_4 = $(dist_man1_MANS:.man=.html)
    64 @HAS_GROFF_TRUE@am__append_5 = $(dist_man1_MANS:.man=.html) 
     62@HAS_FITS_TRUE@am__append_3 = src/Fits.cc
     63@HAS_HELP2MAN_TRUE@am__append_4 = $(dist_man1_MANS)
     64@HAS_GROFF_TRUE@am__append_5 = $(dist_man1_MANS:.man=.html)
    6565@HAS_GROFF_TRUE@am__append_6 = $(dist_man1_MANS:.man=.html)
    66 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.pdf)
     66@HAS_GROFF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.html)
    6767@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_8 = $(dist_man1_MANS:.man=.pdf)
    6868@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_9 = $(dist_man1_MANS:.man=.pdf)
     69@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_10 = $(dist_man1_MANS:.man=.pdf)
    6970subdir = .
    7071ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    170171chatserv_DEPENDENCIES = libTools.la libStateMachine.la \
    171172        libConfiguration.la libTime.la libDim.la libDim++.la
     173am__dataLogger_SOURCES_DIST = src/dataLogger.cc src/LocalControl.cc \
     174        src/LocalControl.h src/Fits.cc
     175@HAS_FITS_TRUE@am__objects_1 = src/Fits.$(OBJEXT)
    172176am_dataLogger_OBJECTS = src/dataLogger.$(OBJEXT) \
    173         src/LocalControl.$(OBJEXT) src/Fits.$(OBJEXT)
     177        src/LocalControl.$(OBJEXT) $(am__objects_1)
    174178dataLogger_OBJECTS = $(am_dataLogger_OBJECTS)
    175179dataLogger_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
     
    195199        gui/MainWindow.cc gui/CheckBoxDelegate.cc gui/HtmlDelegate.cc \
    196200        gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc
    197 am__objects_1 =
    198 @HAS_GUI_TRUE@am__objects_2 = gui/design.$(OBJEXT)
    199 @HAS_GUI_TRUE@am__objects_3 = gui/DockWindow.moc.$(OBJEXT) \
     201am__objects_2 =
     202@HAS_GUI_TRUE@am__objects_3 = gui/design.$(OBJEXT)
     203@HAS_GUI_TRUE@am__objects_4 = gui/DockWindow.moc.$(OBJEXT) \
    200204@HAS_GUI_TRUE@  gui/MainWindow.moc.$(OBJEXT)
    201 am__objects_4 = $(am__objects_1) $(am__objects_2) $(am__objects_3)
    202 @HAS_GUI_TRUE@am__objects_5 = gui/DockWindow.$(OBJEXT) \
     205am__objects_5 = $(am__objects_2) $(am__objects_3) $(am__objects_4)
     206@HAS_GUI_TRUE@am__objects_6 = gui/DockWindow.$(OBJEXT) \
    203207@HAS_GUI_TRUE@  gui/MainWindow.$(OBJEXT)
    204 am_fact_OBJECTS = $(am__objects_4) $(am__objects_5) \
     208am_fact_OBJECTS = $(am__objects_5) $(am__objects_6) \
    205209        gui/CheckBoxDelegate.$(OBJEXT) gui/HtmlDelegate.$(OBJEXT) \
    206210        gui/fact.$(OBJEXT) gui/FactGui.$(OBJEXT) \
     
    317321        $(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
    318322        astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \
    319         $(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
    320         $(dns_SOURCES) $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) \
    321         $(fadctrl_SOURCES) fitsgrep.c $(ftm_SOURCES) \
    322         $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) sched.c \
    323         $(scheduler_SOURCES) $(test_SOURCES) $(test3_SOURCES) \
    324         $(time_SOURCES) $(triggerschedule_SOURCES)
     323        $(am__dataLogger_SOURCES_DIST) $(dclient5_SOURCES) \
     324        $(did_SOURCES) $(dns_SOURCES) $(dserver2_SOURCES) \
     325        $(am__fact_SOURCES_DIST) $(fadctrl_SOURCES) fitsgrep.c \
     326        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
     327        $(logtime_SOURCES) sched.c $(scheduler_SOURCES) \
     328        $(test_SOURCES) $(test3_SOURCES) $(time_SOURCES) \
     329        $(triggerschedule_SOURCES)
    325330man1dir = $(mandir)/man1
    326331NROFF = nroff
     
    601606
    602607#-------------------------------------------------------------------------
    603 CLEANFILES = $(BUILT_SOURCES) $(am__append_6) $(am__append_9)
     608CLEANFILES = $(BUILT_SOURCES) $(am__append_7) $(am__append_10)
    604609dist_noinst_SCRIPTS = autogen.sh
    605610EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
     
    608613        dim/README_v14.txt dim/README_v17.txt dim/README_v16.txt \
    609614        dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
    610         $(DIALOGS) $(RESOURCES) $(am__append_5) $(am__append_8)
     615        $(DIALOGS) $(RESOURCES) $(am__append_6) $(am__append_9)
    611616dns_LDADD = libDim.la
    612617dns_SOURCES = dim/src/dns.c
     
    741746test_SOURCES = src/test.cc
    742747test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
    743 dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h src/Fits.cc
     748dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc \
     749        src/LocalControl.h $(am__append_3)
    744750dataLogger_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    745751    libConfiguration.la
     
    778784
    779785#-------------------------------------------------------------------------
    780 MAN_TARGETS = $(am__append_3) $(am__append_4) $(am__append_7)
     786MAN_TARGETS = $(am__append_4) $(am__append_5) $(am__append_8)
    781787all: $(BUILT_SOURCES)
    782788        $(MAKE) $(AM_MAKEFLAGS) all-am
  • trunk/FACT++/configure

    r10682 r10693  
    751751IS_FALSE_FALSE
    752752IS_FALSE_TRUE
     753HAS_FITS_FALSE
     754HAS_FITS_TRUE
     755HAS_CCFITS_FALSE
     756HAS_CCFITS_TRUE
     757HAS_CFITSIO_FALSE
     758HAS_CFITSIO_TRUE
    753759HAS_GUI_FALSE
    754760HAS_GUI_TRUE
     
    44504456  lt_cv_nm_interface="BSD nm"
    44514457  echo "int some_variable = 0;" > conftest.$ac_ext
    4452   (eval echo "\"\$as_me:4452: $ac_compile\"" >&5)
     4458  (eval echo "\"\$as_me:4458: $ac_compile\"" >&5)
    44534459  (eval "$ac_compile" 2>conftest.err)
    44544460  cat conftest.err >&5
    4455   (eval echo "\"\$as_me:4455: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
     4461  (eval echo "\"\$as_me:4461: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    44564462  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    44574463  cat conftest.err >&5
    4458   (eval echo "\"\$as_me:4458: output\"" >&5)
     4464  (eval echo "\"\$as_me:4464: output\"" >&5)
    44594465  cat conftest.out >&5
    44604466  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     
    56625668*-*-irix6*)
    56635669  # Find out which ABI we are using.
    5664   echo '#line 5664 "configure"' > conftest.$ac_ext
     5670  echo '#line 5670 "configure"' > conftest.$ac_ext
    56655671  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    56665672  (eval $ac_compile) 2>&5
     
    75907596   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    75917597   -e 's:$: $lt_compiler_flag:'`
    7592    (eval echo "\"\$as_me:7592: $lt_compile\"" >&5)
     7598   (eval echo "\"\$as_me:7598: $lt_compile\"" >&5)
    75937599   (eval "$lt_compile" 2>conftest.err)
    75947600   ac_status=$?
    75957601   cat conftest.err >&5
    7596    echo "$as_me:7596: \$? = $ac_status" >&5
     7602   echo "$as_me:7602: \$? = $ac_status" >&5
    75977603   if (exit $ac_status) && test -s "$ac_outfile"; then
    75987604     # The compiler can only warn and ignore the option if not recognized
     
    79297935   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79307936   -e 's:$: $lt_compiler_flag:'`
    7931    (eval echo "\"\$as_me:7931: $lt_compile\"" >&5)
     7937   (eval echo "\"\$as_me:7937: $lt_compile\"" >&5)
    79327938   (eval "$lt_compile" 2>conftest.err)
    79337939   ac_status=$?
    79347940   cat conftest.err >&5
    7935    echo "$as_me:7935: \$? = $ac_status" >&5
     7941   echo "$as_me:7941: \$? = $ac_status" >&5
    79367942   if (exit $ac_status) && test -s "$ac_outfile"; then
    79377943     # The compiler can only warn and ignore the option if not recognized
     
    80348040   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80358041   -e 's:$: $lt_compiler_flag:'`
    8036    (eval echo "\"\$as_me:8036: $lt_compile\"" >&5)
     8042   (eval echo "\"\$as_me:8042: $lt_compile\"" >&5)
    80378043   (eval "$lt_compile" 2>out/conftest.err)
    80388044   ac_status=$?
    80398045   cat out/conftest.err >&5
    8040    echo "$as_me:8040: \$? = $ac_status" >&5
     8046   echo "$as_me:8046: \$? = $ac_status" >&5
    80418047   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    80428048   then
     
    80898095   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80908096   -e 's:$: $lt_compiler_flag:'`
    8091    (eval echo "\"\$as_me:8091: $lt_compile\"" >&5)
     8097   (eval echo "\"\$as_me:8097: $lt_compile\"" >&5)
    80928098   (eval "$lt_compile" 2>out/conftest.err)
    80938099   ac_status=$?
    80948100   cat out/conftest.err >&5
    8095    echo "$as_me:8095: \$? = $ac_status" >&5
     8101   echo "$as_me:8101: \$? = $ac_status" >&5
    80968102   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    80978103   then
     
    1047310479  lt_status=$lt_dlunknown
    1047410480  cat > conftest.$ac_ext <<_LT_EOF
    10475 #line 10475 "configure"
     10481#line 10481 "configure"
    1047610482#include "confdefs.h"
    1047710483
     
    1056910575  lt_status=$lt_dlunknown
    1057010576  cat > conftest.$ac_ext <<_LT_EOF
    10571 #line 10571 "configure"
     10577#line 10577 "configure"
    1057210578#include "confdefs.h"
    1057310579
     
    1252512531   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1252612532   -e 's:$: $lt_compiler_flag:'`
    12527    (eval echo "\"\$as_me:12527: $lt_compile\"" >&5)
     12533   (eval echo "\"\$as_me:12533: $lt_compile\"" >&5)
    1252812534   (eval "$lt_compile" 2>conftest.err)
    1252912535   ac_status=$?
    1253012536   cat conftest.err >&5
    12531    echo "$as_me:12531: \$? = $ac_status" >&5
     12537   echo "$as_me:12537: \$? = $ac_status" >&5
    1253212538   if (exit $ac_status) && test -s "$ac_outfile"; then
    1253312539     # The compiler can only warn and ignore the option if not recognized
     
    1262412630   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1262512631   -e 's:$: $lt_compiler_flag:'`
    12626    (eval echo "\"\$as_me:12626: $lt_compile\"" >&5)
     12632   (eval echo "\"\$as_me:12632: $lt_compile\"" >&5)
    1262712633   (eval "$lt_compile" 2>out/conftest.err)
    1262812634   ac_status=$?
    1262912635   cat out/conftest.err >&5
    12630    echo "$as_me:12630: \$? = $ac_status" >&5
     12636   echo "$as_me:12636: \$? = $ac_status" >&5
    1263112637   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1263212638   then
     
    1267612682   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1267712683   -e 's:$: $lt_compiler_flag:'`
    12678    (eval echo "\"\$as_me:12678: $lt_compile\"" >&5)
     12684   (eval echo "\"\$as_me:12684: $lt_compile\"" >&5)
    1267912685   (eval "$lt_compile" 2>out/conftest.err)
    1268012686   ac_status=$?
    1268112687   cat out/conftest.err >&5
    12682    echo "$as_me:12682: \$? = $ac_status" >&5
     12688   echo "$as_me:12688: \$? = $ac_status" >&5
    1268312689   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1268412690   then
     
    1823618242
    1823718243        if test "$no_good" = yes; then
    18238                 as_fn_error $? "cfitsio not properly installed/not found." "$LINENO" 5
     18244                HAVE_CFITSIO=no
    1823918245
    1824018246                LIBS=$OLD_LIBS
     
    1824318249                CFLAGS=$OLD_CFLAGS
    1824418250        else
    18245 
     18251                HAVE_CFITSIO=yes
    1824618252
    1824718253                $as_echo "#define HAVE_PKG_cfitsio 1" >>confdefs.h
     
    1835718363
    1835818364        if test "$no_good" = yes; then
    18359                 as_fn_error $? "CCfits not properly installed/not found." "$LINENO" 5
     18365                HAVE_CCFITS=no
    1836018366
    1836118367                LIBS=$OLD_LIBS
     
    1836418370                CFLAGS=$OLD_CFLAGS
    1836518371        else
    18366 
     18372                HAVE_CCFITS=yes
    1836718373
    1836818374                $as_echo "#define HAVE_PKG_ccfits 1" >>confdefs.h
     
    2160921615
    2161021616                cat > conftest.$ac_ext <<EOF
    21611 #line 21611 "configure"
     21617#line 21617 "configure"
    2161221618#include "confdefs.h"
    2161321619#include <qglobal.h>
     
    2228722293fi
    2228822294
     22295 if test "$HAVE_CFITSIO" = yes; then
     22296  HAS_CFITSIO_TRUE=
     22297  HAS_CFITSIO_FALSE='#'
     22298else
     22299  HAS_CFITSIO_TRUE='#'
     22300  HAS_CFITSIO_FALSE=
     22301fi
     22302
     22303 if test "$HAVE_CCFITS" = yes; then
     22304  HAS_CCFITS_TRUE=
     22305  HAS_CCFITS_FALSE='#'
     22306else
     22307  HAS_CCFITS_TRUE='#'
     22308  HAS_CCFITS_FALSE=
     22309fi
     22310
     22311 if test "$HAVE_CFITSIO" = yes -a "$HAVE_CCFITS" = yes; then
     22312  HAS_FITS_TRUE=
     22313  HAS_FITS_FALSE='#'
     22314else
     22315  HAS_FITS_TRUE='#'
     22316  HAS_FITS_FALSE=
     22317fi
     22318
    2228922319
    2229022320 if test "x" = "y"; then
     
    2230422334fi
    2230522335
     22336
     22337if test "$HAVE_CFITSIO" = yes -a "$HAVE_CCFITS" = yes; then
     22338  $as_echo "#define HAVE_FITS 1" >>confdefs.h
     22339
     22340fi
    2230622341
    2230722342##########################################################################
     
    2260122636if test -z "${HAS_GUI_TRUE}" && test -z "${HAS_GUI_FALSE}"; then
    2260222637  as_fn_error $? "conditional \"HAS_GUI\" was never defined.
     22638Usually this means the macro was only invoked conditionally." "$LINENO" 5
     22639fi
     22640if test -z "${HAS_CFITSIO_TRUE}" && test -z "${HAS_CFITSIO_FALSE}"; then
     22641  as_fn_error $? "conditional \"HAS_CFITSIO\" was never defined.
     22642Usually this means the macro was only invoked conditionally." "$LINENO" 5
     22643fi
     22644if test -z "${HAS_CCFITS_TRUE}" && test -z "${HAS_CCFITS_FALSE}"; then
     22645  as_fn_error $? "conditional \"HAS_CCFITS\" was never defined.
     22646Usually this means the macro was only invoked conditionally." "$LINENO" 5
     22647fi
     22648if test -z "${HAS_FITS_TRUE}" && test -z "${HAS_FITS_FALSE}"; then
     22649  as_fn_error $? "conditional \"HAS_FITS\" was never defined.
    2260322650Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2260422651fi
     
    2499125038{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
    2499225039$as_echo "$as_me: " >&6;}
     25040{ $as_echo "$as_me:${as_lineno-$LINENO}:  cfitsio                / 'fitsio.h'        found: $HAVE_CFITSIO" >&5
     25041$as_echo "$as_me:  cfitsio                / 'fitsio.h'        found: $HAVE_CFITSIO" >&6;}
     25042{ $as_echo "$as_me:${as_lineno-$LINENO}:  CCfits                 / 'CCfits/CCfits'   found: $HAVE_CCFITS" >&5
     25043$as_echo "$as_me:  CCfits                 / 'CCfits/CCfits'   found: $HAVE_CCFITS" >&6;}
     25044if test "$lt_cv_libxp" = "yes"; then
     25045  { $as_echo "$as_me:${as_lineno-$LINENO}:  Motif/lesstif          / 'Xm/Xm.h' 'libXp' found: yes" >&5
     25046$as_echo "$as_me:  Motif/lesstif          / 'Xm/Xm.h' 'libXp' found: yes" >&6;}
     25047else
     25048  { $as_echo "$as_me:${as_lineno-$LINENO}:  Motif/lesstif          / 'Xm/Xm.h' 'libXp' found: no" >&5
     25049$as_echo "$as_me:  Motif/lesstif          / 'Xm/Xm.h' 'libXp' found: no" >&6;}
     25050
     25051fi
     25052
    2499325053if test "$lt_cv_libxp" = "yes"; then
    2499425054  { $as_echo "$as_me:${as_lineno-$LINENO}:  Motif/lesstif          / 'Xm/Xm.h' 'libXp' found: yes" >&5
     
    2514525205
    2514625206fi
     25207if test "$HAVE_CFITSIO" = yes -a "$HAVE_CCFITS" = yes; then
     25208  :
     25209else
     25210  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  FITS support disabled. cfitsio/CCfits missing!" >&5
     25211$as_echo "$as_me: WARNING:  FITS support disabled. cfitsio/CCfits missing!" >&2;}
     25212
     25213fi
    2514725214if test "$ROOTEXEC" != no; then
    2514825215  if test "$HAVE_ROOT_QT" = yes; then
  • trunk/FACT++/configure.ac

    r10681 r10693  
    9797
    9898# Needed to compile FACT++
    99 AC_CHECK_PACKAGE(cfitsio, ffpss, cfitsio, fitsio.h,,
    100    AC_MSG_ERROR([cfitsio not properly installed/not found.]))
     99AC_CHECK_PACKAGE(cfitsio, ffpss, cfitsio, fitsio.h, 
     100                 HAVE_CFITSIO=yes, HAVE_CFITSIO=no)
    101101
    102102#AC_CHECK_HEADERS([fitsio.h],,AC_MSG_ERROR([cfitsio headers not found]))
     
    106106
    107107# Needed to compile FACT++
    108 AC_CHECK_PACKAGE(ccfits, main, CCfits, CCfits/CCfits,,
    109    AC_MSG_ERROR([CCfits not properly installed/not found.]))
     108AC_CHECK_PACKAGE(ccfits, main, CCfits, CCfits/CCfits, 
     109                 HAVE_CCFITS=yes, HAVE_CCFITS=no)
    110110
    111111#AC_CHECK_HEADERS([CCfits/CCfits],,
     
    269269AM_CONDITIONAL(HAS_ROOT_QT,   [test "$HAVE_ROOT_QT" = yes])
    270270AM_CONDITIONAL(HAS_GUI,       [test "$QT4_VERSION" -a "$HAVE_ROOT_QT" = yes])
     271AM_CONDITIONAL(HAS_CFITSIO,   [test "$HAVE_CFITSIO" = yes])
     272AM_CONDITIONAL(HAS_CCFITS,    [test "$HAVE_CCFITS" = yes])
     273AM_CONDITIONAL(HAS_FITS,      [test "$HAVE_CFITSIO" = yes -a "$HAVE_CCFITS" = yes])
    271274
    272275AM_CONDITIONAL(IS_FALSE,      [test "x" = "y"])
    273276AM_CONDITIONAL(IS_TRUE,       [test "x" = "x"])
     277
     278AM_COND_IF(HAS_FITS, [AC_DEFINE(HAVE_FITS)], )
    274279
    275280##########################################################################
     
    319324AC_MSG_NOTICE(--------------------------------------------------------------------)
    320325AC_MSG_NOTICE()
     326AC_MSG_NOTICE([ cfitsio                / 'fitsio.h'        found: $HAVE_CFITSIO])
     327AC_MSG_NOTICE([ CCfits                 / 'CCfits/CCfits'   found: $HAVE_CCFITS])
     328AM_COND_IF(HAS_LIBXP,
     329   AC_MSG_NOTICE([ Motif/lesstif          / 'Xm/Xm.h' 'libXp' found: yes]),
     330   AC_MSG_NOTICE([ Motif/lesstif          / 'Xm/Xm.h' 'libXp' found: no])
     331)
     332
    321333AM_COND_IF(HAS_LIBXP,
    322334   AC_MSG_NOTICE([ Motif/lesstif          / 'Xm/Xm.h' 'libXp' found: yes]),
     
    396408      AC_MSG_WARN([ Motif/lesstif not found. The dim gui did will not be built!])
    397409)
     410AM_COND_IF(HAS_FITS,,
     411      AC_MSG_WARN([ FITS support disabled. cfitsio/CCfits missing!])
     412)
    398413AM_COND_IF(HAS_ROOT, 
    399414   [AM_COND_IF(HAS_ROOT_QT,,
  • trunk/FACT++/src/dataLogger.cc

    r10688 r10693  
    6666#include <sys/stat.h>
    6767
    68 #define HAS_FITS
    6968//#define ONE_RUN_FITS_ONLY
    7069
     
    7978#include <boost/thread.hpp>
    8079
    81 #ifdef HAS_FITS
     80#ifdef HAVE_FITS
    8281#include "Fits.h"
    8382#endif
     
    177176        struct SubscriptionType
    178177        {
    179 #ifdef HAS_FITS
     178#ifdef HAVE_FITS
    180179                ///Nightly FITS output file
    181180                Fits    nightlyFile;
     
    192191                void operator = (const SubscriptionType& other)
    193192                {
    194 #ifdef HAS_FITS
     193#ifdef HAVE_FITS
    195194                        nightlyFile = other.nightlyFile;
    196195                        runFile = other.runFile;
     
    203202                SubscriptionType(const SubscriptionType& other)
    204203                {
    205 #ifdef HAS_FITS
     204#ifdef HAVE_FITS
    206205                        nightlyFile = other.nightlyFile;
    207206                        runFile = other.runFile;
     
    233232                                if (dimInfo)
    234233                                delete dimInfo;
    235 #ifdef HAS_FITS
     234#ifdef HAVE_FITS
    236235                                if (nightlyFile.IsOpen())
    237236                                        nightlyFile.Close();
     
    277276        ///from NightlyOpen to waiting transition
    278277        int NightlyToWaitRunPlease();
    279 #ifdef HAS_FITS
     278#ifdef HAVE_FITS
    280279        ///Open fits files
    281280        void OpenFITSFilesPlease(SubscriptionType& sub);
     
    342341void DataLogger::calculateTotalSizeWritten(DataLoggerStats& statVar, bool& shouldWarn, bool isPrinting)
    343342{
    344 #ifdef HAS_FITS
     343#ifdef HAVE_FITS
    345344        if (isPrinting)
    346345        {
     
    473472                        //update the fits files sizes
    474473                        calculateTotalSizeWritten(statVar, statWarning, false);/*
    475 #ifdef HAS_FITS
     474#ifdef HAVE_FITS
    476475                        SubscriptionsListType::iterator x;
    477476                        std::map<std::string, SubscriptionType>::iterator y;
     
    576575                fRunNumber = -1;
    577576                fPreviousRunNumber = fRunNumber;
    578 #ifdef HAS_FITS
     577#ifdef HAVE_FITS
    579578#ifdef ONE_RUN_FITS_ONLY
    580579                fRunFitsFile = NULL;
     
    869868        delete fNumSubAndFits;
    870869//TODO notify that all files were closed
    871 #ifdef HAS_FITS
     870#ifdef HAVE_FITS
    872871#ifdef ONE_RUN_FITS_ONLY
    873872        if (fRunFitsFile != NULL)
     
    11271126        }
    11281127
    1129 #ifdef HAS_FITS
     1128#ifdef HAVE_FITS
    11301129        if (isItaReport)
    11311130        {
     
    12931292        DataLoggerStats statVar;
    12941293        calculateTotalSizeWritten(statVar, statWarning, false);/*
    1295 #ifdef HAS_FITS
     1294#ifdef HAVE_FITS
    12961295        str.str("");
    12971296        str << "There are " << fNumSubAndFitsData.numOpenFits << " FITS files open:";
     
    16631662}
    16641663
    1665 #ifdef HAS_FITS
     1664#ifdef HAVE_FITS
    16661665// --------------------------------------------------------------------------
    16671666//
     
    19951994        if (fRunReportFile.is_open())
    19961995                fRunReportFile.close();
    1997 #ifdef HAS_FITS
     1996#ifdef HAVE_FITS
    19981997        for (SubscriptionsListType::iterator i = fServiceSubscriptions.begin(); i != fServiceSubscriptions.end(); i++)
    19991998                for (std::map<std::string, SubscriptionType>::iterator j = i->second.begin(); j != i->second.end(); j++)
     
    20392038                fRunReportFile.close();
    20402039               
    2041 #ifdef HAS_FITS
     2040#ifdef HAVE_FITS
    20422041        for (SubscriptionsListType::iterator i = fServiceSubscriptions.begin(); i != fServiceSubscriptions.end(); i++)
    20432042                for (std::map<std::string, SubscriptionType>::iterator j = i->second.begin(); j != i->second.end(); j++)
Note: See TracChangeset for help on using the changeset viewer.