Changeset 10693
- Timestamp:
- 05/13/11 11:24:35 (14 years ago)
- Location:
- trunk/FACT++
- Files:
-
- 5 edited
-
Makefile.am (modified) (1 diff)
-
Makefile.in (modified) (8 diffs)
-
configure (modified) (22 diffs)
-
configure.ac (modified) (5 diffs)
-
src/dataLogger.cc (modified) (16 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/Makefile.am
r10671 r10693 234 234 test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la 235 235 236 dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h src/Fits.cc 236 dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h 237 if HAS_FITS 238 dataLogger_SOURCES += src/Fits.cc 239 endif 237 240 dataLogger_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \ 238 241 libConfiguration.la -
trunk/FACT++/Makefile.in
r10673 r10693 60 60 @IS_FALSE@ sched astro fadctrl 61 61 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) 65 65 @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) 67 67 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_8 = $(dist_man1_MANS:.man=.pdf) 68 68 @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) 69 70 subdir = . 70 71 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 … … 170 171 chatserv_DEPENDENCIES = libTools.la libStateMachine.la \ 171 172 libConfiguration.la libTime.la libDim.la libDim++.la 173 am__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) 172 176 am_dataLogger_OBJECTS = src/dataLogger.$(OBJEXT) \ 173 src/LocalControl.$(OBJEXT) src/Fits.$(OBJEXT)177 src/LocalControl.$(OBJEXT) $(am__objects_1) 174 178 dataLogger_OBJECTS = $(am_dataLogger_OBJECTS) 175 179 dataLogger_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \ … … 195 199 gui/MainWindow.cc gui/CheckBoxDelegate.cc gui/HtmlDelegate.cc \ 196 200 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) \201 am__objects_2 = 202 @HAS_GUI_TRUE@am__objects_3 = gui/design.$(OBJEXT) 203 @HAS_GUI_TRUE@am__objects_4 = gui/DockWindow.moc.$(OBJEXT) \ 200 204 @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) \205 am__objects_5 = $(am__objects_2) $(am__objects_3) $(am__objects_4) 206 @HAS_GUI_TRUE@am__objects_6 = gui/DockWindow.$(OBJEXT) \ 203 207 @HAS_GUI_TRUE@ gui/MainWindow.$(OBJEXT) 204 am_fact_OBJECTS = $(am__objects_ 4) $(am__objects_5) \208 am_fact_OBJECTS = $(am__objects_5) $(am__objects_6) \ 205 209 gui/CheckBoxDelegate.$(OBJEXT) gui/HtmlDelegate.$(OBJEXT) \ 206 210 gui/fact.$(OBJEXT) gui/FactGui.$(OBJEXT) \ … … 317 321 $(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \ 318 322 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) 325 330 man1dir = $(mandir)/man1 326 331 NROFF = nroff … … 601 606 602 607 #------------------------------------------------------------------------- 603 CLEANFILES = $(BUILT_SOURCES) $(am__append_ 6) $(am__append_9)608 CLEANFILES = $(BUILT_SOURCES) $(am__append_7) $(am__append_10) 604 609 dist_noinst_SCRIPTS = autogen.sh 605 610 EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \ … … 608 613 dim/README_v14.txt dim/README_v17.txt dim/README_v16.txt \ 609 614 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) 611 616 dns_LDADD = libDim.la 612 617 dns_SOURCES = dim/src/dns.c … … 741 746 test_SOURCES = src/test.cc 742 747 test_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 748 dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc \ 749 src/LocalControl.h $(am__append_3) 744 750 dataLogger_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \ 745 751 libConfiguration.la … … 778 784 779 785 #------------------------------------------------------------------------- 780 MAN_TARGETS = $(am__append_ 3) $(am__append_4) $(am__append_7)786 MAN_TARGETS = $(am__append_4) $(am__append_5) $(am__append_8) 781 787 all: $(BUILT_SOURCES) 782 788 $(MAKE) $(AM_MAKEFLAGS) all-am -
trunk/FACT++/configure
r10682 r10693 751 751 IS_FALSE_FALSE 752 752 IS_FALSE_TRUE 753 HAS_FITS_FALSE 754 HAS_FITS_TRUE 755 HAS_CCFITS_FALSE 756 HAS_CCFITS_TRUE 757 HAS_CFITSIO_FALSE 758 HAS_CFITSIO_TRUE 753 759 HAS_GUI_FALSE 754 760 HAS_GUI_TRUE … … 4450 4456 lt_cv_nm_interface="BSD nm" 4451 4457 echo "int some_variable = 0;" > conftest.$ac_ext 4452 (eval echo "\"\$as_me:445 2: $ac_compile\"" >&5)4458 (eval echo "\"\$as_me:4458: $ac_compile\"" >&5) 4453 4459 (eval "$ac_compile" 2>conftest.err) 4454 4460 cat conftest.err >&5 4455 (eval echo "\"\$as_me:44 55: $NM \\\"conftest.$ac_objext\\\"\"" >&5)4461 (eval echo "\"\$as_me:4461: $NM \\\"conftest.$ac_objext\\\"\"" >&5) 4456 4462 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) 4457 4463 cat conftest.err >&5 4458 (eval echo "\"\$as_me:44 58: output\"" >&5)4464 (eval echo "\"\$as_me:4464: output\"" >&5) 4459 4465 cat conftest.out >&5 4460 4466 if $GREP 'External.*some_variable' conftest.out > /dev/null; then … … 5662 5668 *-*-irix6*) 5663 5669 # Find out which ABI we are using. 5664 echo '#line 56 64"configure"' > conftest.$ac_ext5670 echo '#line 5670 "configure"' > conftest.$ac_ext 5665 5671 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 5666 5672 (eval $ac_compile) 2>&5 … … 7590 7596 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7591 7597 -e 's:$: $lt_compiler_flag:'` 7592 (eval echo "\"\$as_me:759 2: $lt_compile\"" >&5)7598 (eval echo "\"\$as_me:7598: $lt_compile\"" >&5) 7593 7599 (eval "$lt_compile" 2>conftest.err) 7594 7600 ac_status=$? 7595 7601 cat conftest.err >&5 7596 echo "$as_me:7 596: \$? = $ac_status" >&57602 echo "$as_me:7602: \$? = $ac_status" >&5 7597 7603 if (exit $ac_status) && test -s "$ac_outfile"; then 7598 7604 # The compiler can only warn and ignore the option if not recognized … … 7929 7935 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7930 7936 -e 's:$: $lt_compiler_flag:'` 7931 (eval echo "\"\$as_me:793 1: $lt_compile\"" >&5)7937 (eval echo "\"\$as_me:7937: $lt_compile\"" >&5) 7932 7938 (eval "$lt_compile" 2>conftest.err) 7933 7939 ac_status=$? 7934 7940 cat conftest.err >&5 7935 echo "$as_me:79 35: \$? = $ac_status" >&57941 echo "$as_me:7941: \$? = $ac_status" >&5 7936 7942 if (exit $ac_status) && test -s "$ac_outfile"; then 7937 7943 # The compiler can only warn and ignore the option if not recognized … … 8034 8040 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8035 8041 -e 's:$: $lt_compiler_flag:'` 8036 (eval echo "\"\$as_me:80 36: $lt_compile\"" >&5)8042 (eval echo "\"\$as_me:8042: $lt_compile\"" >&5) 8037 8043 (eval "$lt_compile" 2>out/conftest.err) 8038 8044 ac_status=$? 8039 8045 cat out/conftest.err >&5 8040 echo "$as_me:804 0: \$? = $ac_status" >&58046 echo "$as_me:8046: \$? = $ac_status" >&5 8041 8047 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8042 8048 then … … 8089 8095 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8090 8096 -e 's:$: $lt_compiler_flag:'` 8091 (eval echo "\"\$as_me:809 1: $lt_compile\"" >&5)8097 (eval echo "\"\$as_me:8097: $lt_compile\"" >&5) 8092 8098 (eval "$lt_compile" 2>out/conftest.err) 8093 8099 ac_status=$? 8094 8100 cat out/conftest.err >&5 8095 echo "$as_me:8 095: \$? = $ac_status" >&58101 echo "$as_me:8101: \$? = $ac_status" >&5 8096 8102 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8097 8103 then … … 10473 10479 lt_status=$lt_dlunknown 10474 10480 cat > conftest.$ac_ext <<_LT_EOF 10475 #line 104 75"configure"10481 #line 10481 "configure" 10476 10482 #include "confdefs.h" 10477 10483 … … 10569 10575 lt_status=$lt_dlunknown 10570 10576 cat > conftest.$ac_ext <<_LT_EOF 10571 #line 1057 1"configure"10577 #line 10577 "configure" 10572 10578 #include "confdefs.h" 10573 10579 … … 12525 12531 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 12526 12532 -e 's:$: $lt_compiler_flag:'` 12527 (eval echo "\"\$as_me:125 27: $lt_compile\"" >&5)12533 (eval echo "\"\$as_me:12533: $lt_compile\"" >&5) 12528 12534 (eval "$lt_compile" 2>conftest.err) 12529 12535 ac_status=$? 12530 12536 cat conftest.err >&5 12531 echo "$as_me:1253 1: \$? = $ac_status" >&512537 echo "$as_me:12537: \$? = $ac_status" >&5 12532 12538 if (exit $ac_status) && test -s "$ac_outfile"; then 12533 12539 # The compiler can only warn and ignore the option if not recognized … … 12624 12630 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 12625 12631 -e 's:$: $lt_compiler_flag:'` 12626 (eval echo "\"\$as_me:126 26: $lt_compile\"" >&5)12632 (eval echo "\"\$as_me:12632: $lt_compile\"" >&5) 12627 12633 (eval "$lt_compile" 2>out/conftest.err) 12628 12634 ac_status=$? 12629 12635 cat out/conftest.err >&5 12630 echo "$as_me:1263 0: \$? = $ac_status" >&512636 echo "$as_me:12636: \$? = $ac_status" >&5 12631 12637 if (exit $ac_status) && test -s out/conftest2.$ac_objext 12632 12638 then … … 12676 12682 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 12677 12683 -e 's:$: $lt_compiler_flag:'` 12678 (eval echo "\"\$as_me:126 78: $lt_compile\"" >&5)12684 (eval echo "\"\$as_me:12684: $lt_compile\"" >&5) 12679 12685 (eval "$lt_compile" 2>out/conftest.err) 12680 12686 ac_status=$? 12681 12687 cat out/conftest.err >&5 12682 echo "$as_me:1268 2: \$? = $ac_status" >&512688 echo "$as_me:12688: \$? = $ac_status" >&5 12683 12689 if (exit $ac_status) && test -s out/conftest2.$ac_objext 12684 12690 then … … 18236 18242 18237 18243 if test "$no_good" = yes; then 18238 as_fn_error $? "cfitsio not properly installed/not found." "$LINENO" 518244 HAVE_CFITSIO=no 18239 18245 18240 18246 LIBS=$OLD_LIBS … … 18243 18249 CFLAGS=$OLD_CFLAGS 18244 18250 else 18245 18251 HAVE_CFITSIO=yes 18246 18252 18247 18253 $as_echo "#define HAVE_PKG_cfitsio 1" >>confdefs.h … … 18357 18363 18358 18364 if test "$no_good" = yes; then 18359 as_fn_error $? "CCfits not properly installed/not found." "$LINENO" 518365 HAVE_CCFITS=no 18360 18366 18361 18367 LIBS=$OLD_LIBS … … 18364 18370 CFLAGS=$OLD_CFLAGS 18365 18371 else 18366 18372 HAVE_CCFITS=yes 18367 18373 18368 18374 $as_echo "#define HAVE_PKG_ccfits 1" >>confdefs.h … … 21609 21615 21610 21616 cat > conftest.$ac_ext <<EOF 21611 #line 2161 1"configure"21617 #line 21617 "configure" 21612 21618 #include "confdefs.h" 21613 21619 #include <qglobal.h> … … 22287 22293 fi 22288 22294 22295 if test "$HAVE_CFITSIO" = yes; then 22296 HAS_CFITSIO_TRUE= 22297 HAS_CFITSIO_FALSE='#' 22298 else 22299 HAS_CFITSIO_TRUE='#' 22300 HAS_CFITSIO_FALSE= 22301 fi 22302 22303 if test "$HAVE_CCFITS" = yes; then 22304 HAS_CCFITS_TRUE= 22305 HAS_CCFITS_FALSE='#' 22306 else 22307 HAS_CCFITS_TRUE='#' 22308 HAS_CCFITS_FALSE= 22309 fi 22310 22311 if test "$HAVE_CFITSIO" = yes -a "$HAVE_CCFITS" = yes; then 22312 HAS_FITS_TRUE= 22313 HAS_FITS_FALSE='#' 22314 else 22315 HAS_FITS_TRUE='#' 22316 HAS_FITS_FALSE= 22317 fi 22318 22289 22319 22290 22320 if test "x" = "y"; then … … 22304 22334 fi 22305 22335 22336 22337 if test "$HAVE_CFITSIO" = yes -a "$HAVE_CCFITS" = yes; then 22338 $as_echo "#define HAVE_FITS 1" >>confdefs.h 22339 22340 fi 22306 22341 22307 22342 ########################################################################## … … 22601 22636 if test -z "${HAS_GUI_TRUE}" && test -z "${HAS_GUI_FALSE}"; then 22602 22637 as_fn_error $? "conditional \"HAS_GUI\" was never defined. 22638 Usually this means the macro was only invoked conditionally." "$LINENO" 5 22639 fi 22640 if test -z "${HAS_CFITSIO_TRUE}" && test -z "${HAS_CFITSIO_FALSE}"; then 22641 as_fn_error $? "conditional \"HAS_CFITSIO\" was never defined. 22642 Usually this means the macro was only invoked conditionally." "$LINENO" 5 22643 fi 22644 if test -z "${HAS_CCFITS_TRUE}" && test -z "${HAS_CCFITS_FALSE}"; then 22645 as_fn_error $? "conditional \"HAS_CCFITS\" was never defined. 22646 Usually this means the macro was only invoked conditionally." "$LINENO" 5 22647 fi 22648 if test -z "${HAS_FITS_TRUE}" && test -z "${HAS_FITS_FALSE}"; then 22649 as_fn_error $? "conditional \"HAS_FITS\" was never defined. 22603 22650 Usually this means the macro was only invoked conditionally." "$LINENO" 5 22604 22651 fi … … 24991 25038 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 24992 25039 $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;} 25044 if 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;} 25047 else 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 25051 fi 25052 24993 25053 if test "$lt_cv_libxp" = "yes"; then 24994 25054 { $as_echo "$as_me:${as_lineno-$LINENO}: Motif/lesstif / 'Xm/Xm.h' 'libXp' found: yes" >&5 … … 25145 25205 25146 25206 fi 25207 if test "$HAVE_CFITSIO" = yes -a "$HAVE_CCFITS" = yes; then 25208 : 25209 else 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 25213 fi 25147 25214 if test "$ROOTEXEC" != no; then 25148 25215 if test "$HAVE_ROOT_QT" = yes; then -
trunk/FACT++/configure.ac
r10681 r10693 97 97 98 98 # Needed to compile FACT++ 99 AC_CHECK_PACKAGE(cfitsio, ffpss, cfitsio, fitsio.h, ,100 AC_MSG_ERROR([cfitsio not properly installed/not found.]))99 AC_CHECK_PACKAGE(cfitsio, ffpss, cfitsio, fitsio.h, 100 HAVE_CFITSIO=yes, HAVE_CFITSIO=no) 101 101 102 102 #AC_CHECK_HEADERS([fitsio.h],,AC_MSG_ERROR([cfitsio headers not found])) … … 106 106 107 107 # Needed to compile FACT++ 108 AC_CHECK_PACKAGE(ccfits, main, CCfits, CCfits/CCfits, ,109 AC_MSG_ERROR([CCfits not properly installed/not found.]))108 AC_CHECK_PACKAGE(ccfits, main, CCfits, CCfits/CCfits, 109 HAVE_CCFITS=yes, HAVE_CCFITS=no) 110 110 111 111 #AC_CHECK_HEADERS([CCfits/CCfits],, … … 269 269 AM_CONDITIONAL(HAS_ROOT_QT, [test "$HAVE_ROOT_QT" = yes]) 270 270 AM_CONDITIONAL(HAS_GUI, [test "$QT4_VERSION" -a "$HAVE_ROOT_QT" = yes]) 271 AM_CONDITIONAL(HAS_CFITSIO, [test "$HAVE_CFITSIO" = yes]) 272 AM_CONDITIONAL(HAS_CCFITS, [test "$HAVE_CCFITS" = yes]) 273 AM_CONDITIONAL(HAS_FITS, [test "$HAVE_CFITSIO" = yes -a "$HAVE_CCFITS" = yes]) 271 274 272 275 AM_CONDITIONAL(IS_FALSE, [test "x" = "y"]) 273 276 AM_CONDITIONAL(IS_TRUE, [test "x" = "x"]) 277 278 AM_COND_IF(HAS_FITS, [AC_DEFINE(HAVE_FITS)], ) 274 279 275 280 ########################################################################## … … 319 324 AC_MSG_NOTICE(--------------------------------------------------------------------) 320 325 AC_MSG_NOTICE() 326 AC_MSG_NOTICE([ cfitsio / 'fitsio.h' found: $HAVE_CFITSIO]) 327 AC_MSG_NOTICE([ CCfits / 'CCfits/CCfits' found: $HAVE_CCFITS]) 328 AM_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 321 333 AM_COND_IF(HAS_LIBXP, 322 334 AC_MSG_NOTICE([ Motif/lesstif / 'Xm/Xm.h' 'libXp' found: yes]), … … 396 408 AC_MSG_WARN([ Motif/lesstif not found. The dim gui did will not be built!]) 397 409 ) 410 AM_COND_IF(HAS_FITS,, 411 AC_MSG_WARN([ FITS support disabled. cfitsio/CCfits missing!]) 412 ) 398 413 AM_COND_IF(HAS_ROOT, 399 414 [AM_COND_IF(HAS_ROOT_QT,, -
trunk/FACT++/src/dataLogger.cc
r10688 r10693 66 66 #include <sys/stat.h> 67 67 68 #define HAS_FITS69 68 //#define ONE_RUN_FITS_ONLY 70 69 … … 79 78 #include <boost/thread.hpp> 80 79 81 #ifdef HA S_FITS80 #ifdef HAVE_FITS 82 81 #include "Fits.h" 83 82 #endif … … 177 176 struct SubscriptionType 178 177 { 179 #ifdef HA S_FITS178 #ifdef HAVE_FITS 180 179 ///Nightly FITS output file 181 180 Fits nightlyFile; … … 192 191 void operator = (const SubscriptionType& other) 193 192 { 194 #ifdef HA S_FITS193 #ifdef HAVE_FITS 195 194 nightlyFile = other.nightlyFile; 196 195 runFile = other.runFile; … … 203 202 SubscriptionType(const SubscriptionType& other) 204 203 { 205 #ifdef HA S_FITS204 #ifdef HAVE_FITS 206 205 nightlyFile = other.nightlyFile; 207 206 runFile = other.runFile; … … 233 232 if (dimInfo) 234 233 delete dimInfo; 235 #ifdef HA S_FITS234 #ifdef HAVE_FITS 236 235 if (nightlyFile.IsOpen()) 237 236 nightlyFile.Close(); … … 277 276 ///from NightlyOpen to waiting transition 278 277 int NightlyToWaitRunPlease(); 279 #ifdef HA S_FITS278 #ifdef HAVE_FITS 280 279 ///Open fits files 281 280 void OpenFITSFilesPlease(SubscriptionType& sub); … … 342 341 void DataLogger::calculateTotalSizeWritten(DataLoggerStats& statVar, bool& shouldWarn, bool isPrinting) 343 342 { 344 #ifdef HA S_FITS343 #ifdef HAVE_FITS 345 344 if (isPrinting) 346 345 { … … 473 472 //update the fits files sizes 474 473 calculateTotalSizeWritten(statVar, statWarning, false);/* 475 #ifdef HA S_FITS474 #ifdef HAVE_FITS 476 475 SubscriptionsListType::iterator x; 477 476 std::map<std::string, SubscriptionType>::iterator y; … … 576 575 fRunNumber = -1; 577 576 fPreviousRunNumber = fRunNumber; 578 #ifdef HA S_FITS577 #ifdef HAVE_FITS 579 578 #ifdef ONE_RUN_FITS_ONLY 580 579 fRunFitsFile = NULL; … … 869 868 delete fNumSubAndFits; 870 869 //TODO notify that all files were closed 871 #ifdef HA S_FITS870 #ifdef HAVE_FITS 872 871 #ifdef ONE_RUN_FITS_ONLY 873 872 if (fRunFitsFile != NULL) … … 1127 1126 } 1128 1127 1129 #ifdef HA S_FITS1128 #ifdef HAVE_FITS 1130 1129 if (isItaReport) 1131 1130 { … … 1293 1292 DataLoggerStats statVar; 1294 1293 calculateTotalSizeWritten(statVar, statWarning, false);/* 1295 #ifdef HA S_FITS1294 #ifdef HAVE_FITS 1296 1295 str.str(""); 1297 1296 str << "There are " << fNumSubAndFitsData.numOpenFits << " FITS files open:"; … … 1663 1662 } 1664 1663 1665 #ifdef HA S_FITS1664 #ifdef HAVE_FITS 1666 1665 // -------------------------------------------------------------------------- 1667 1666 // … … 1995 1994 if (fRunReportFile.is_open()) 1996 1995 fRunReportFile.close(); 1997 #ifdef HA S_FITS1996 #ifdef HAVE_FITS 1998 1997 for (SubscriptionsListType::iterator i = fServiceSubscriptions.begin(); i != fServiceSubscriptions.end(); i++) 1999 1998 for (std::map<std::string, SubscriptionType>::iterator j = i->second.begin(); j != i->second.end(); j++) … … 2039 2038 fRunReportFile.close(); 2040 2039 2041 #ifdef HA S_FITS2040 #ifdef HAVE_FITS 2042 2041 for (SubscriptionsListType::iterator i = fServiceSubscriptions.begin(); i != fServiceSubscriptions.end(); i++) 2043 2042 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.
