Changeset 11618
- Timestamp:
- 07/26/11 15:27:39 (13 years ago)
- Location:
- trunk/FACT++
- Files:
-
- 4 edited
-
Makefile.am (modified) (3 diffs)
-
Makefile.in (modified) (19 diffs)
-
configure (modified) (20 diffs)
-
configure.ac (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/Makefile.am
r11585 r11618 43 43 if HAS_GUI 44 44 bin_PROGRAMS += fact 45 if HAS_VIEWER 46 bin_PROGRAMS += viewer 47 endif 45 48 endif 46 49 … … 311 314 312 315 if HAS_GUI 313 DIALOGS = \ 316 317 # 318 319 fact_DIALOGS = \ 314 320 gui/design.ui 315 321 316 RESOURCES = \322 fact_RESOURCES = \ 317 323 gui/design.qrc 318 324 319 QT_SOURCES = \325 fact_QT_SOURCES = \ 320 326 gui/DockWindow.cc \ 321 327 gui/MainWindow.cc 322 endif 323 324 BUILT_SOURCES = $(DIALOGS:.ui=.h) $(RESOURCES:.qrc=.cc) $(QT_SOURCES:.cc=.moc.cc) 325 328 329 fact_SRCADD = $(fact_DIALOGS:.ui=.h) $(fact_RESOURCES:.qrc=.cc) $(fact_QT_SOURCES:.cc=.moc.cc) 330 331 # 332 333 if HAS_VIEWER 334 335 viewer_DIALOGS = \ 336 gui/RawEventsViewer/viewer.ui 337 338 viewer_QT_SOURCES = \ 339 gui/RawEventsViewer/RawEventsViewer.cc 340 341 viewer_SRCADD = $(viewer_DIALOGS:.ui=.h) $(viewer_RESOURCES:.qrc=.cc) $(viewer_QT_SOURCES:.cc=.moc.cc) 342 343 endif 344 345 endif 346 347 348 349 BUILT_SOURCES = $(fact_SRCADD) $(viewer_SRCADD) 350 326 351 CLEANFILES += $(BUILT_SOURCES) 327 352 … … 333 358 libConfiguration.la 334 359 335 fact_SOURCES = $( BUILT_SOURCES) $(QT_SOURCES) \360 fact_SOURCES = $(fact_SRCADD) $(fact_QT_SOURCES) \ 336 361 gui/CheckBoxDelegate.cc gui/HtmlDelegate.cc \ 337 362 gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc 363 364 viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU 365 366 viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES) 367 368 338 369 339 370 #------------------------------------------------------------------------- -
trunk/FACT++/Makefile.in
r11585 r11618 53 53 chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \ 54 54 mcp$(EXEEXT) fitsdump$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \ 55 $(am__EXEEXT_3) 55 $(am__EXEEXT_3) $(am__EXEEXT_4) 56 56 @HAS_GUI_TRUE@am__append_1 = fact 57 @HAS_LIBXP_TRUE@am__append_2 = did 57 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__append_2 = viewer 58 @HAS_LIBXP_TRUE@am__append_3 = did 58 59 59 60 # This is a trick to be able to build them but not having them in 'all' 60 @IS_FALSE@am__append_ 3= \61 @IS_FALSE@am__append_4 = \ 61 62 @IS_FALSE@ test \ 62 63 @IS_FALSE@ dclient5 dserver2 \ … … 65 66 @IS_FALSE@ readfits 66 67 67 @HAS_FITS_TRUE@am__append_4 = src/Fits.cc 68 @HAS_GROFF_TRUE@am__append_5 = $(dist_man1_MANS:.man=.html) 69 @HAS_GROFF_TRUE@am__append_6 = $(dist_man1_MANS:.man=.html) 68 @HAS_FITS_TRUE@am__append_5 = src/Fits.cc 69 @HAS_GROFF_TRUE@am__append_6 = $(dist_man1_MANS:.man=.html) 70 70 @HAS_GROFF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.html) 71 @HAS_GROFF_TRUE@ @HAS_PS2PDF_TRUE@am__append_8 = $(dist_man1_MANS:.man=.pdf)71 @HAS_GROFF_TRUE@am__append_8 = $(dist_man1_MANS:.man=.html) 72 72 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_9 = $(dist_man1_MANS:.man=.pdf) 73 73 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_10 = $(dist_man1_MANS:.man=.pdf) 74 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.pdf) 74 75 subdir = . 75 76 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 … … 159 160 libTools_la_OBJECTS = $(am_libTools_la_OBJECTS) 160 161 @HAS_GUI_TRUE@am__EXEEXT_1 = fact$(EXEEXT) 161 @HAS_LIBXP_TRUE@am__EXEEXT_2 = did$(EXEEXT) 162 @IS_FALSE@am__EXEEXT_3 = test$(EXEEXT) dclient5$(EXEEXT) \ 162 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__EXEEXT_2 = viewer$(EXEEXT) 163 @HAS_LIBXP_TRUE@am__EXEEXT_3 = did$(EXEEXT) 164 @IS_FALSE@am__EXEEXT_4 = test$(EXEEXT) dclient5$(EXEEXT) \ 163 165 @IS_FALSE@ dserver2$(EXEEXT) fitsloader$(EXEEXT) \ 164 166 @IS_FALSE@ fitsgrep$(EXEEXT) sched$(EXEEXT) astro$(EXEEXT) \ … … 222 224 @HAS_GUI_TRUE@am__objects_4 = gui/DockWindow.moc.$(OBJEXT) \ 223 225 @HAS_GUI_TRUE@ gui/MainWindow.moc.$(OBJEXT) 224 am__objects_5 = $(am__objects_2) $(am__objects_3) $(am__objects_4) 226 @HAS_GUI_TRUE@am__objects_5 = $(am__objects_2) $(am__objects_3) \ 227 @HAS_GUI_TRUE@ $(am__objects_4) 225 228 @HAS_GUI_TRUE@am__objects_6 = gui/DockWindow.$(OBJEXT) \ 226 229 @HAS_GUI_TRUE@ gui/MainWindow.$(OBJEXT) … … 303 306 triggerschedule_DEPENDENCIES = libDim.la libDim++.la \ 304 307 libDimExtension.la libConfiguration.la 308 am__viewer_SOURCES_DIST = gui/RawEventsViewer/viewer.h \ 309 gui/RawEventsViewer/RawEventsViewer.moc.cc \ 310 gui/RawEventsViewer/RawEventsViewer.cc 311 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_7 = gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT) 312 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_8 = $(am__objects_2) \ 313 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@ $(am__objects_7) 314 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_9 = gui/RawEventsViewer/RawEventsViewer.$(OBJEXT) 315 am_viewer_OBJECTS = $(am__objects_8) $(am__objects_9) 316 viewer_OBJECTS = $(am_viewer_OBJECTS) 317 viewer_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) 305 318 SCRIPTS = $(dist_noinst_SCRIPTS) 306 319 DEFAULT_INCLUDES = -I.@am__isrc@ … … 359 372 $(logtime_SOURCES) $(mcp_SOURCES) $(readfits_SOURCES) sched.c \ 360 373 $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \ 361 $(triggerschedule_SOURCES) 374 $(triggerschedule_SOURCES) $(viewer_SOURCES) 362 375 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \ 363 376 $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \ … … 374 387 $(mcp_SOURCES) $(readfits_SOURCES) sched.c \ 375 388 $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \ 376 $(triggerschedule_SOURCES) 389 $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST) 377 390 man1dir = $(mandir)/man1 378 391 NROFF = nroff … … 648 661 649 662 #------------------------------------------------------------------------- 650 CLEANFILES = $(BUILT_SOURCES) $(am__append_ 7) $(am__append_10)663 CLEANFILES = $(BUILT_SOURCES) $(am__append_8) $(am__append_11) 651 664 dist_noinst_SCRIPTS = autogen.sh 652 665 EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \ … … 655 668 dim/README_v14.txt dim/README_v17.txt dim/README_v16.txt \ 656 669 dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \ 657 $(DIALOGS) $(RESOURCES) $(am__append_ 6) $(am__append_9)670 $(DIALOGS) $(RESOURCES) $(am__append_7) $(am__append_10) 658 671 dns_LDADD = libDim.la libDimExtension.la 659 672 dns_SOURCES = src/dns.c … … 828 841 test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la 829 842 datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \ 830 $(am__append_ 4)843 $(am__append_5) 831 844 datalogger_LDADD = libDim.la libDim++.la libDimExtension.la \ 832 845 libTime.la libTools.la libStateMachine.la \ … … 850 863 851 864 # ----- 852 @HAS_GUI_TRUE@DIALOGS = \ 865 866 # 867 @HAS_GUI_TRUE@fact_DIALOGS = \ 853 868 @HAS_GUI_TRUE@ gui/design.ui 854 869 855 @HAS_GUI_TRUE@ RESOURCES = \870 @HAS_GUI_TRUE@fact_RESOURCES = \ 856 871 @HAS_GUI_TRUE@ gui/design.qrc 857 872 858 @HAS_GUI_TRUE@ QT_SOURCES = \873 @HAS_GUI_TRUE@fact_QT_SOURCES = \ 859 874 @HAS_GUI_TRUE@ gui/DockWindow.cc \ 860 875 @HAS_GUI_TRUE@ gui/MainWindow.cc 861 876 862 BUILT_SOURCES = $(DIALOGS:.ui=.h) $(RESOURCES:.qrc=.cc) $(QT_SOURCES:.cc=.moc.cc) 877 @HAS_GUI_TRUE@fact_SRCADD = $(fact_DIALOGS:.ui=.h) $(fact_RESOURCES:.qrc=.cc) $(fact_QT_SOURCES:.cc=.moc.cc) 878 879 # 880 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@viewer_DIALOGS = \ 881 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@ gui/RawEventsViewer/viewer.ui 882 883 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@viewer_QT_SOURCES = \ 884 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@ gui/RawEventsViewer/RawEventsViewer.cc 885 886 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@viewer_SRCADD = $(viewer_DIALOGS:.ui=.h) $(viewer_RESOURCES:.qrc=.cc) $(viewer_QT_SOURCES:.cc=.moc.cc) 887 BUILT_SOURCES = $(fact_SRCADD) $(viewer_SRCADD) 863 888 fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) $(QT4_LIB) $(QT4_LDFLAGS) -L. \ 864 889 libDim.la libDim++.la libDimExtension.la \ … … 866 891 libConfiguration.la 867 892 868 fact_SOURCES = $( BUILT_SOURCES) $(QT_SOURCES) \893 fact_SOURCES = $(fact_SRCADD) $(fact_QT_SOURCES) \ 869 894 gui/CheckBoxDelegate.cc gui/HtmlDelegate.cc \ 870 895 gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc 871 896 897 viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU 898 viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES) 872 899 873 900 #------------------------------------------------------------------------- … … 875 902 876 903 #------------------------------------------------------------------------- 877 MAN_TARGETS = $(dist_man1_MANS) $(am__append_ 5) $(am__append_8)904 MAN_TARGETS = $(dist_man1_MANS) $(am__append_6) $(am__append_9) 878 905 all: $(BUILT_SOURCES) 879 906 $(MAKE) $(AM_MAKEFLAGS) all-am … … 1286 1313 @rm -f triggerschedule$(EXEEXT) 1287 1314 $(AM_V_CXXLD)$(CXXLINK) $(triggerschedule_OBJECTS) $(triggerschedule_LDADD) $(LIBS) 1315 gui/RawEventsViewer/$(am__dirstamp): 1316 @$(MKDIR_P) gui/RawEventsViewer 1317 @: > gui/RawEventsViewer/$(am__dirstamp) 1318 gui/RawEventsViewer/$(DEPDIR)/$(am__dirstamp): 1319 @$(MKDIR_P) gui/RawEventsViewer/$(DEPDIR) 1320 @: > gui/RawEventsViewer/$(DEPDIR)/$(am__dirstamp) 1321 gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT): \ 1322 gui/RawEventsViewer/$(am__dirstamp) \ 1323 gui/RawEventsViewer/$(DEPDIR)/$(am__dirstamp) 1324 gui/RawEventsViewer/RawEventsViewer.$(OBJEXT): \ 1325 gui/RawEventsViewer/$(am__dirstamp) \ 1326 gui/RawEventsViewer/$(DEPDIR)/$(am__dirstamp) 1327 viewer$(EXEEXT): $(viewer_OBJECTS) $(viewer_DEPENDENCIES) 1328 @rm -f viewer$(EXEEXT) 1329 $(AM_V_CXXLD)$(CXXLINK) $(viewer_OBJECTS) $(viewer_LDADD) $(LIBS) 1288 1330 1289 1331 mostlyclean-compile: … … 1334 1376 -rm -f gui/MainWindow.$(OBJEXT) 1335 1377 -rm -f gui/MainWindow.moc.$(OBJEXT) 1378 -rm -f gui/RawEventsViewer/RawEventsViewer.$(OBJEXT) 1379 -rm -f gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT) 1336 1380 -rm -f gui/design.$(OBJEXT) 1337 1381 -rm -f gui/fact.$(OBJEXT) … … 1463 1507 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/design.Po@am__quote@ 1464 1508 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/fact.Po@am__quote@ 1509 @AMDEP_TRUE@@am__include@ @am__quote@gui/RawEventsViewer/$(DEPDIR)/RawEventsViewer.Po@am__quote@ 1510 @AMDEP_TRUE@@am__include@ @am__quote@gui/RawEventsViewer/$(DEPDIR)/RawEventsViewer.moc.Po@am__quote@ 1465 1511 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Configuration.Plo@am__quote@ 1466 1512 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Connection.Plo@am__quote@ … … 1975 2021 -rm -f gui/$(DEPDIR)/$(am__dirstamp) 1976 2022 -rm -f gui/$(am__dirstamp) 2023 -rm -f gui/RawEventsViewer/$(DEPDIR)/$(am__dirstamp) 2024 -rm -f gui/RawEventsViewer/$(am__dirstamp) 1977 2025 -rm -f src/$(DEPDIR)/$(am__dirstamp) 1978 2026 -rm -f src/$(am__dirstamp) … … 1989 2037 distclean: distclean-am 1990 2038 -rm -f $(am__CONFIG_DISTCLEAN_FILES) 1991 -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) src/$(DEPDIR)2039 -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) src/$(DEPDIR) 1992 2040 -rm -f Makefile 1993 2041 distclean-am: clean-am distclean-compile distclean-generic \ … … 2038 2086 -rm -f $(am__CONFIG_DISTCLEAN_FILES) 2039 2087 -rm -rf $(top_srcdir)/autom4te.cache 2040 -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) src/$(DEPDIR)2088 -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) src/$(DEPDIR) 2041 2089 -rm -f Makefile 2042 2090 maintainer-clean-am: distclean-am maintainer-clean-generic -
trunk/FACT++/configure
r11615 r11618 751 751 IS_FALSE_FALSE 752 752 IS_FALSE_TRUE 753 HAS_VIEWER_FALSE 754 HAS_VIEWER_TRUE 755 HAS_FITS_H_FALSE 756 HAS_FITS_H_TRUE 757 HAS_IZSTREAM_H_FALSE 758 HAS_IZSTREAM_H_TRUE 753 759 HAS_ZLIB_FALSE 754 760 HAS_ZLIB_TRUE … … 4804 4810 lt_cv_nm_interface="BSD nm" 4805 4811 echo "int some_variable = 0;" > conftest.$ac_ext 4806 (eval echo "\"\$as_me:48 06: $ac_compile\"" >&5)4812 (eval echo "\"\$as_me:4812: $ac_compile\"" >&5) 4807 4813 (eval "$ac_compile" 2>conftest.err) 4808 4814 cat conftest.err >&5 4809 (eval echo "\"\$as_me:48 09: $NM \\\"conftest.$ac_objext\\\"\"" >&5)4815 (eval echo "\"\$as_me:4815: $NM \\\"conftest.$ac_objext\\\"\"" >&5) 4810 4816 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) 4811 4817 cat conftest.err >&5 4812 (eval echo "\"\$as_me:481 2: output\"" >&5)4818 (eval echo "\"\$as_me:4818: output\"" >&5) 4813 4819 cat conftest.out >&5 4814 4820 if $GREP 'External.*some_variable' conftest.out > /dev/null; then … … 6015 6021 *-*-irix6*) 6016 6022 # Find out which ABI we are using. 6017 echo '#line 60 17"configure"' > conftest.$ac_ext6023 echo '#line 6023 "configure"' > conftest.$ac_ext 6018 6024 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 6019 6025 (eval $ac_compile) 2>&5 … … 7676 7682 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7677 7683 -e 's:$: $lt_compiler_flag:'` 7678 (eval echo "\"\$as_me:76 78: $lt_compile\"" >&5)7684 (eval echo "\"\$as_me:7684: $lt_compile\"" >&5) 7679 7685 (eval "$lt_compile" 2>conftest.err) 7680 7686 ac_status=$? 7681 7687 cat conftest.err >&5 7682 echo "$as_me:768 2: \$? = $ac_status" >&57688 echo "$as_me:7688: \$? = $ac_status" >&5 7683 7689 if (exit $ac_status) && test -s "$ac_outfile"; then 7684 7690 # The compiler can only warn and ignore the option if not recognized … … 8015 8021 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8016 8022 -e 's:$: $lt_compiler_flag:'` 8017 (eval echo "\"\$as_me:80 17: $lt_compile\"" >&5)8023 (eval echo "\"\$as_me:8023: $lt_compile\"" >&5) 8018 8024 (eval "$lt_compile" 2>conftest.err) 8019 8025 ac_status=$? 8020 8026 cat conftest.err >&5 8021 echo "$as_me:802 1: \$? = $ac_status" >&58027 echo "$as_me:8027: \$? = $ac_status" >&5 8022 8028 if (exit $ac_status) && test -s "$ac_outfile"; then 8023 8029 # The compiler can only warn and ignore the option if not recognized … … 8120 8126 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8121 8127 -e 's:$: $lt_compiler_flag:'` 8122 (eval echo "\"\$as_me:812 2: $lt_compile\"" >&5)8128 (eval echo "\"\$as_me:8128: $lt_compile\"" >&5) 8123 8129 (eval "$lt_compile" 2>out/conftest.err) 8124 8130 ac_status=$? 8125 8131 cat out/conftest.err >&5 8126 echo "$as_me:81 26: \$? = $ac_status" >&58132 echo "$as_me:8132: \$? = $ac_status" >&5 8127 8133 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8128 8134 then … … 8175 8181 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8176 8182 -e 's:$: $lt_compiler_flag:'` 8177 (eval echo "\"\$as_me:81 77: $lt_compile\"" >&5)8183 (eval echo "\"\$as_me:8183: $lt_compile\"" >&5) 8178 8184 (eval "$lt_compile" 2>out/conftest.err) 8179 8185 ac_status=$? 8180 8186 cat out/conftest.err >&5 8181 echo "$as_me:818 1: \$? = $ac_status" >&58187 echo "$as_me:8187: \$? = $ac_status" >&5 8182 8188 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8183 8189 then … … 10559 10565 lt_status=$lt_dlunknown 10560 10566 cat > conftest.$ac_ext <<_LT_EOF 10561 #line 1056 1"configure"10567 #line 10567 "configure" 10562 10568 #include "confdefs.h" 10563 10569 … … 10655 10661 lt_status=$lt_dlunknown 10656 10662 cat > conftest.$ac_ext <<_LT_EOF 10657 #line 106 57"configure"10663 #line 10663 "configure" 10658 10664 #include "confdefs.h" 10659 10665 … … 12611 12617 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 12612 12618 -e 's:$: $lt_compiler_flag:'` 12613 (eval echo "\"\$as_me:1261 3: $lt_compile\"" >&5)12619 (eval echo "\"\$as_me:12619: $lt_compile\"" >&5) 12614 12620 (eval "$lt_compile" 2>conftest.err) 12615 12621 ac_status=$? 12616 12622 cat conftest.err >&5 12617 echo "$as_me:126 17: \$? = $ac_status" >&512623 echo "$as_me:12623: \$? = $ac_status" >&5 12618 12624 if (exit $ac_status) && test -s "$ac_outfile"; then 12619 12625 # The compiler can only warn and ignore the option if not recognized … … 12710 12716 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 12711 12717 -e 's:$: $lt_compiler_flag:'` 12712 (eval echo "\"\$as_me:1271 2: $lt_compile\"" >&5)12718 (eval echo "\"\$as_me:12718: $lt_compile\"" >&5) 12713 12719 (eval "$lt_compile" 2>out/conftest.err) 12714 12720 ac_status=$? 12715 12721 cat out/conftest.err >&5 12716 echo "$as_me:127 16: \$? = $ac_status" >&512722 echo "$as_me:12722: \$? = $ac_status" >&5 12717 12723 if (exit $ac_status) && test -s out/conftest2.$ac_objext 12718 12724 then … … 12762 12768 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 12763 12769 -e 's:$: $lt_compiler_flag:'` 12764 (eval echo "\"\$as_me:127 64: $lt_compile\"" >&5)12770 (eval echo "\"\$as_me:12770: $lt_compile\"" >&5) 12765 12771 (eval "$lt_compile" 2>out/conftest.err) 12766 12772 ac_status=$? 12767 12773 cat out/conftest.err >&5 12768 echo "$as_me:127 68: \$? = $ac_status" >&512774 echo "$as_me:12774: \$? = $ac_status" >&5 12769 12775 if (exit $ac_status) && test -s out/conftest2.$ac_objext 12770 12776 then … … 18339 18345 18340 18346 18341 #AC_CHECK_FILE(gui/RawEventsViewer(izstream.h, [action.if-yes], [action-if-no]) 18342 #AC_CHECK_FILE(gui/RawEventsViewer(fits.h , [action.if-yes], [action-if-no]) 18347 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gui/RawEventsViewer/izstream.h" >&5 18348 $as_echo_n "checking for gui/RawEventsViewer/izstream.h... " >&6; } 18349 if test "${ac_cv_file_gui_RawEventsViewer_izstream_h+set}" = set; then : 18350 $as_echo_n "(cached) " >&6 18351 else 18352 test "$cross_compiling" = yes && 18353 as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 18354 if test -r "gui/RawEventsViewer/izstream.h"; then 18355 ac_cv_file_gui_RawEventsViewer_izstream_h=yes 18356 else 18357 ac_cv_file_gui_RawEventsViewer_izstream_h=no 18358 fi 18359 fi 18360 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file_gui_RawEventsViewer_izstream_h" >&5 18361 $as_echo "$ac_cv_file_gui_RawEventsViewer_izstream_h" >&6; } 18362 if test "x$ac_cv_file_gui_RawEventsViewer_izstream_h" = x""yes; then : 18363 HAVE_IZSTREAM_H=yes 18364 else 18365 HAVE_IZSTREAM_H=no 18366 fi 18367 18368 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gui/RawEventsViewer/fits.h" >&5 18369 $as_echo_n "checking for gui/RawEventsViewer/fits.h... " >&6; } 18370 if test "${ac_cv_file_gui_RawEventsViewer_fits_h+set}" = set; then : 18371 $as_echo_n "(cached) " >&6 18372 else 18373 test "$cross_compiling" = yes && 18374 as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 18375 if test -r "gui/RawEventsViewer/fits.h"; then 18376 ac_cv_file_gui_RawEventsViewer_fits_h=yes 18377 else 18378 ac_cv_file_gui_RawEventsViewer_fits_h=no 18379 fi 18380 fi 18381 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file_gui_RawEventsViewer_fits_h" >&5 18382 $as_echo "$ac_cv_file_gui_RawEventsViewer_fits_h" >&6; } 18383 if test "x$ac_cv_file_gui_RawEventsViewer_fits_h" = x""yes; then : 18384 HAVE_FITS_H=yes 18385 else 18386 HAVE_FITS_H=no 18387 fi 18388 18343 18389 18344 18390 # Needed to compile FACT++ … … 21814 21860 21815 21861 cat > conftest.$ac_ext <<EOF 21816 #line 218 16"configure"21862 #line 21862 "configure" 21817 21863 #include "confdefs.h" 21818 21864 #include <qglobal.h> … … 22523 22569 fi 22524 22570 22571 if test "$HAVE_IZSTREAM_H" = yes; then 22572 HAS_IZSTREAM_H_TRUE= 22573 HAS_IZSTREAM_H_FALSE='#' 22574 else 22575 HAS_IZSTREAM_H_TRUE='#' 22576 HAS_IZSTREAM_H_FALSE= 22577 fi 22578 22579 if test "$HAVE_FITS_H" = yes; then 22580 HAS_FITS_H_TRUE= 22581 HAS_FITS_H_FALSE='#' 22582 else 22583 HAS_FITS_H_TRUE='#' 22584 HAS_FITS_H_FALSE= 22585 fi 22586 22587 22588 if test "$HAVE_FITS_H" = yes; then 22589 HAS_VIEWER_TRUE= 22590 HAS_VIEWER_FALSE='#' 22591 else 22592 HAS_VIEWER_TRUE='#' 22593 HAS_VIEWER_FALSE= 22594 fi 22595 22525 22596 22526 22597 if test "x" = "y"; then … … 22549 22620 22550 22621 fi 22551 if test "$HAVE_ZLIB" = yes; then 22622 22623 if test "$HAVE_FITS_H" = yes; then 22624 22625 if test "$HAVE_IZSTREAM_H" = yes; then 22626 22627 if test "$HAVE_ZLIB" = yes; then 22552 22628 $as_echo "#define HAVE_ZLIB 1" >>confdefs.h 22553 22629 22554 22630 fi 22631 22632 fi 22633 22634 fi 22635 22555 22636 22556 22637 ########################################################################## … … 22866 22947 if test -z "${HAS_ZLIB_TRUE}" && test -z "${HAS_ZLIB_FALSE}"; then 22867 22948 as_fn_error $? "conditional \"HAS_ZLIB\" was never defined. 22949 Usually this means the macro was only invoked conditionally." "$LINENO" 5 22950 fi 22951 if test -z "${HAS_IZSTREAM_H_TRUE}" && test -z "${HAS_IZSTREAM_H_FALSE}"; then 22952 as_fn_error $? "conditional \"HAS_IZSTREAM_H\" was never defined. 22953 Usually this means the macro was only invoked conditionally." "$LINENO" 5 22954 fi 22955 if test -z "${HAS_FITS_H_TRUE}" && test -z "${HAS_FITS_H_FALSE}"; then 22956 as_fn_error $? "conditional \"HAS_FITS_H\" was never defined. 22957 Usually this means the macro was only invoked conditionally." "$LINENO" 5 22958 fi 22959 if test -z "${HAS_VIEWER_TRUE}" && test -z "${HAS_VIEWER_FALSE}"; then 22960 as_fn_error $? "conditional \"HAS_VIEWER\" was never defined. 22868 22961 Usually this means the macro was only invoked conditionally." "$LINENO" 5 22869 22962 fi … … 25258 25351 { $as_echo "$as_me:${as_lineno-$LINENO}: zlib / 'zlib.h' found: $HAVE_ZLIB" >&5 25259 25352 $as_echo "$as_me: zlib / 'zlib.h' found: $HAVE_ZLIB" >&6;} 25353 { $as_echo "$as_me:${as_lineno-$LINENO}: gui/RawEventsViewer/izstream.h found: $HAVE_IZSTREAM_H" >&5 25354 $as_echo "$as_me: gui/RawEventsViewer/izstream.h found: $HAVE_IZSTREAM_H" >&6;} 25355 { $as_echo "$as_me:${as_lineno-$LINENO}: gui/RawEventsViewer/fits.h found: $HAVE_FITS_H" >&5 25356 $as_echo "$as_me: gui/RawEventsViewer/fits.h found: $HAVE_FITS_H" >&6;} 25260 25357 { $as_echo "$as_me:${as_lineno-$LINENO}: cfitsio / 'fitsio.h' found: $HAVE_CFITSIO" >&5 25261 25358 $as_echo "$as_me: cfitsio / 'fitsio.h' found: $HAVE_CFITSIO" >&6;} … … 25421 25518 : 25422 25519 else 25423 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: zlib not found. Support for reading zipped files disabled!" >&5 25424 $as_echo "$as_me: WARNING: zlib not found. Support for reading zipped files disabled!" >&2;} 25520 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: zlib not found. Support for reading zipped files viewer disabled!" >&5 25521 $as_echo "$as_me: WARNING: zlib not found. Support for reading zipped files viewer disabled!" >&2;} 25522 25523 fi 25524 if test "$HAVE_IZSTREAM_H" = yes; then 25525 : 25526 else 25527 { $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 25528 $as_echo "$as_me: WARNING: Mars izstream.h not found in gui/RawEventsViwer. Support for reading zipped files in viewer disabled!" >&2;} 25529 25530 fi 25531 if test "$HAVE_FITS_H" = yes; then 25532 : 25533 else 25534 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Mars fits.h not found in gui/RawEventsViwer. Support for viewer disabled!" >&5 25535 $as_echo "$as_me: WARNING: Mars fits.h not found in gui/RawEventsViwer. Support for viewer disabled!" >&2;} 25425 25536 25426 25537 fi … … 25452 25563 : 25453 25564 else 25454 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Either QT4 or qt-root is missing: GUI disabled!" >&525455 $as_echo "$as_me: WARNING: Either QT4 or qt-root is missing: GUI disabled!" >&2;}25565 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Either QT4 or qt-root is missing: GUIs disabled!" >&5 25566 $as_echo "$as_me: WARNING: Either QT4 or qt-root is missing: GUIs disabled!" >&2;} 25456 25567 25457 25568 fi -
trunk/FACT++/configure.ac
r11615 r11618 111 111 HAVE_ZLIB=yes, HAVE_ZLIB=no) 112 112 113 #AC_CHECK_FILE(gui/RawEventsViewer(izstream.h, [action.if-yes], [action-if-no]) 114 #AC_CHECK_FILE(gui/RawEventsViewer(fits.h , [action.if-yes], [action-if-no]) 113 AC_CHECK_FILE(gui/RawEventsViewer/izstream.h, 114 HAVE_IZSTREAM_H=yes, HAVE_IZSTREAM_H=no) 115 AC_CHECK_FILE(gui/RawEventsViewer/fits.h, 116 HAVE_FITS_H=yes, HAVE_FITS_H=no) 115 117 116 118 # Needed to compile FACT++ … … 290 292 AM_CONDITIONAL(HAS_FITS, [test "$HAVE_CFITSIO" = yes -a "$HAVE_CCFITS" = yes]) 291 293 AM_CONDITIONAL(HAS_ZLIB, [test "$HAVE_ZLIB" = yes]) 294 AM_CONDITIONAL(HAS_IZSTREAM_H,[test "$HAVE_IZSTREAM_H" = yes]) 295 AM_CONDITIONAL(HAS_FITS_H, [test "$HAVE_FITS_H" = yes]) 296 297 AM_CONDITIONAL(HAS_VIEWER, [test "$HAVE_FITS_H" = yes]) 292 298 293 299 AM_CONDITIONAL(IS_FALSE, [test "x" = "y"]) … … 296 302 AM_COND_IF(HAS_FITS, [AC_DEFINE(HAVE_FITS)], ) 297 303 AM_COND_IF(HAS_ROOT, [AC_DEFINE(HAVE_ROOT)], ) 298 AM_COND_IF(HAS_ZLIB, [AC_DEFINE(HAVE_ZLIB)], ) 304 305 AM_COND_IF(HAS_FITS_H, [ 306 AM_COND_IF(HAS_IZSTREAM_H, [ 307 AM_COND_IF(HAS_ZLIB, [AC_DEFINE(HAVE_ZLIB)], ) 308 ]) 309 ],) 310 299 311 300 312 ########################################################################## … … 345 357 AC_MSG_NOTICE() 346 358 AC_MSG_NOTICE([ zlib / 'zlib.h' found: $HAVE_ZLIB]) 359 AC_MSG_NOTICE([ gui/RawEventsViewer/izstream.h found: $HAVE_IZSTREAM_H]) 360 AC_MSG_NOTICE([ gui/RawEventsViewer/fits.h found: $HAVE_FITS_H]) 347 361 AC_MSG_NOTICE([ cfitsio / 'fitsio.h' found: $HAVE_CFITSIO]) 348 362 AC_MSG_NOTICE([ CCfits / 'CCfits/CCfits' found: $HAVE_CCFITS]) … … 427 441 AC_MSG_NOTICE() 428 442 AM_COND_IF(HAS_ZLIB,, 429 AC_MSG_WARN([ zlib not found. Support for reading zipped files disabled!]) 443 AC_MSG_WARN([ zlib not found. Support for reading zipped files viewer disabled!]) 444 ) 445 AM_COND_IF(HAS_IZSTREAM_H,, 446 AC_MSG_WARN([ Mars izstream.h not found in gui/RawEventsViwer. Support for reading zipped files in viewer disabled!]) 447 ) 448 AM_COND_IF(HAS_FITS_H,, 449 AC_MSG_WARN([ Mars fits.h not found in gui/RawEventsViwer. Support for viewer disabled!]) 430 450 ) 431 451 AM_COND_IF(HAS_LIBXP,, … … 441 461 ) 442 462 AM_COND_IF(HAS_GUI, [], 443 AC_MSG_WARN([ Either QT4 or qt-root is missing: GUI disabled!])444 ) 445 AC_MSG_NOTICE() 463 AC_MSG_WARN([ Either QT4 or qt-root is missing: GUIs disabled!]) 464 ) 465 AC_MSG_NOTICE()
Note:
See TracChangeset
for help on using the changeset viewer.
