Changeset 11822
- Timestamp:
- 08/06/11 17:16:58 (13 years ago)
- Location:
- trunk/FACT++
- Files:
-
- 4 edited
-
Makefile.am (modified) (5 diffs)
-
Makefile.in (modified) (6 diffs)
-
configure (modified) (10 diffs)
-
configure.ac (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/Makefile.am
r11821 r11822 43 43 if HAS_GUI 44 44 bin_PROGRAMS += fact 45 endif 46 45 47 if HAS_VIEWER 46 48 bin_PROGRAMS += viewer 47 endif48 49 endif 49 50 … … 323 324 if HAS_GUI 324 325 325 #326 327 326 fact_DIALOGS = \ 328 327 gui/design.ui … … 339 338 fact_SRCADD = $(fact_DIALOGS:.ui=.h) $(fact_RESOURCES:.qrc=.cc) $(fact_QT_SOURCES:.cc=.moc.cc) 340 339 341 # 340 endif 341 342 # ----- 342 343 343 344 if HAS_VIEWER … … 350 351 351 352 viewer_SRCADD = $(viewer_DIALOGS:.ui=.h) $(viewer_RESOURCES:.qrc=.cc) $(viewer_QT_SOURCES:.cc=.moc.cc) 352 353 endif354 353 355 354 endif … … 361 360 CLEANFILES += $(BUILT_SOURCES) 362 361 363 EXTRA_DIST += $(DIALOGS) $(RESOURCES) 362 EXTRA_DIST += \ 363 $(fact_DIALOGS) $(fact_RESOURCES) \ 364 $(viewer_DIALOGS) $(viewer_RESOURCES) 364 365 365 366 fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) $(QT4_LIB) $(QT4_LDFLAGS) -L. \ -
trunk/FACT++/Makefile.in
r11821 r11822 55 55 $(am__EXEEXT_3) $(am__EXEEXT_4) 56 56 @HAS_GUI_TRUE@am__append_1 = fact 57 @HAS_ GUI_TRUE@@HAS_VIEWER_TRUE@am__append_2 = viewer57 @HAS_VIEWER_TRUE@am__append_2 = viewer 58 58 @HAS_LIBXP_TRUE@am__append_3 = did 59 59 … … 165 165 libTools_la_OBJECTS = $(am_libTools_la_OBJECTS) 166 166 @HAS_GUI_TRUE@am__EXEEXT_1 = fact$(EXEEXT) 167 @HAS_ GUI_TRUE@@HAS_VIEWER_TRUE@am__EXEEXT_2 = viewer$(EXEEXT)167 @HAS_VIEWER_TRUE@am__EXEEXT_2 = viewer$(EXEEXT) 168 168 @HAS_LIBXP_TRUE@am__EXEEXT_3 = did$(EXEEXT) 169 169 @IS_FALSE@am__EXEEXT_4 = test$(EXEEXT) dclient5$(EXEEXT) \ … … 332 332 gui/RawEventsViewer/RawEventsViewer.moc.cc \ 333 333 gui/RawEventsViewer/RawEventsViewer.cc 334 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_8 = gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT) 335 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_9 = $(am__objects_2) \ 336 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@ $(am__objects_8) 337 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_10 = gui/RawEventsViewer/RawEventsViewer.$(OBJEXT) 334 @HAS_VIEWER_TRUE@am__objects_8 = gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT) 335 @HAS_VIEWER_TRUE@am__objects_9 = $(am__objects_2) $(am__objects_8) 336 @HAS_VIEWER_TRUE@am__objects_10 = gui/RawEventsViewer/RawEventsViewer.$(OBJEXT) 338 337 am_viewer_OBJECTS = $(am__objects_9) $(am__objects_10) 339 338 viewer_OBJECTS = $(am_viewer_OBJECTS) … … 692 691 dim/README_v14.txt dim/README_v17.txt dim/README_v16.txt \ 693 692 dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \ 694 $(DIALOGS) $(RESOURCES) $(am__append_8) $(am__append_11) 693 $(fact_DIALOGS) $(fact_RESOURCES) $(viewer_DIALOGS) \ 694 $(viewer_RESOURCES) $(am__append_8) $(am__append_11) 695 695 dns_LDADD = libDim.la libDimExtension.la 696 696 dns_SOURCES = src/dns.c … … 889 889 890 890 # ----- 891 892 #893 891 @HAS_GUI_TRUE@fact_DIALOGS = \ 894 892 @HAS_GUI_TRUE@ gui/design.ui … … 905 903 @HAS_GUI_TRUE@fact_SRCADD = $(fact_DIALOGS:.ui=.h) $(fact_RESOURCES:.qrc=.cc) $(fact_QT_SOURCES:.cc=.moc.cc) 906 904 907 # 908 @HAS_ GUI_TRUE@@HAS_VIEWER_TRUE@viewer_DIALOGS = \909 @HAS_ GUI_TRUE@@HAS_VIEWER_TRUE@ gui/RawEventsViewer/viewer.ui910 911 @HAS_ GUI_TRUE@@HAS_VIEWER_TRUE@viewer_QT_SOURCES = \912 @HAS_ GUI_TRUE@@HAS_VIEWER_TRUE@ gui/RawEventsViewer/RawEventsViewer.cc913 914 @HAS_ GUI_TRUE@@HAS_VIEWER_TRUE@viewer_SRCADD = $(viewer_DIALOGS:.ui=.h) $(viewer_RESOURCES:.qrc=.cc) $(viewer_QT_SOURCES:.cc=.moc.cc)905 # ----- 906 @HAS_VIEWER_TRUE@viewer_DIALOGS = \ 907 @HAS_VIEWER_TRUE@ gui/RawEventsViewer/viewer.ui 908 909 @HAS_VIEWER_TRUE@viewer_QT_SOURCES = \ 910 @HAS_VIEWER_TRUE@ gui/RawEventsViewer/RawEventsViewer.cc 911 912 @HAS_VIEWER_TRUE@viewer_SRCADD = $(viewer_DIALOGS:.ui=.h) $(viewer_RESOURCES:.qrc=.cc) $(viewer_QT_SOURCES:.cc=.moc.cc) 915 913 BUILT_SOURCES = $(fact_SRCADD) $(viewer_SRCADD) 916 914 fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) $(QT4_LIB) $(QT4_LDFLAGS) -L. \ -
trunk/FACT++/configure
r11808 r11822 753 753 HAS_VIEWER_FALSE 754 754 HAS_VIEWER_TRUE 755 HAS_GUI_FALSE 756 HAS_GUI_TRUE 755 757 HAS_QWT_FALSE 756 758 HAS_QWT_TRUE … … 769 771 HAS_CFITSIO_FALSE 770 772 HAS_CFITSIO_TRUE 771 HAS_GUI_FALSE772 HAS_GUI_TRUE773 773 HAS_ROOT_QT_FALSE 774 774 HAS_ROOT_QT_TRUE … … 23028 23028 fi 23029 23029 23030 if test "$QT4_VERSION" -a "$HAVE_ROOT_QT" = yes; then23031 HAS_GUI_TRUE=23032 HAS_GUI_FALSE='#'23033 else23034 HAS_GUI_TRUE='#'23035 HAS_GUI_FALSE=23036 fi23037 23038 23030 if test "$HAVE_CFITSIO" = yes; then 23039 23031 HAS_CFITSIO_TRUE= … … 23102 23094 fi 23103 23095 23096 23097 if test "$QT4_VERSION" -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes -a "$HAVE_QGL" = yes -a "$HAVE_ROOT_QT" = yes ; then 23098 HAS_GUI_TRUE= 23099 HAS_GUI_FALSE='#' 23100 else 23101 HAS_GUI_TRUE='#' 23102 HAS_GUI_FALSE= 23103 fi 23104 23104 23105 23105 if test "$QT4_VERSION" -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes -a "$HAVE_QGL" = yes -a "$HAVE_QWT" = yes; then … … 23442 23442 Usually this means the macro was only invoked conditionally." "$LINENO" 5 23443 23443 fi 23444 if test -z "${HAS_GUI_TRUE}" && test -z "${HAS_GUI_FALSE}"; then23445 as_fn_error $? "conditional \"HAS_GUI\" was never defined.23446 Usually this means the macro was only invoked conditionally." "$LINENO" 523447 fi23448 23444 if test -z "${HAS_CFITSIO_TRUE}" && test -z "${HAS_CFITSIO_FALSE}"; then 23449 23445 as_fn_error $? "conditional \"HAS_CFITSIO\" was never defined. … … 23476 23472 if test -z "${HAS_QWT_TRUE}" && test -z "${HAS_QWT_FALSE}"; then 23477 23473 as_fn_error $? "conditional \"HAS_QWT\" was never defined. 23474 Usually this means the macro was only invoked conditionally." "$LINENO" 5 23475 fi 23476 if test -z "${HAS_GUI_TRUE}" && test -z "${HAS_GUI_FALSE}"; then 23477 as_fn_error $? "conditional \"HAS_GUI\" was never defined. 23478 23478 Usually this means the macro was only invoked conditionally." "$LINENO" 5 23479 23479 fi … … 26042 26042 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 26043 26043 $as_echo "$as_me: " >&6;} 26044 #AM_COND_IF(HAS_FITS_H, [ 26045 if test "$HAVE_ZLIB" = yes; then 26044 if test "$HAVE_ZLIB" = yes; then 26046 26045 : 26047 26046 else … … 26050 26049 26051 26050 fi 26052 # AM_COND_IF(HAS_IZSTREAM_H,,26053 # AC_MSG_WARN([ Mars izstream.h not found in gui/RawEventsViewer. Support for .fits.gz disabled.])26054 # )26055 #],26056 # AC_MSG_WARN([ Mars fits.h not found in gui/RawEventsViewer. Target 'viewer' disabled.])26057 #)26058 26051 if test "$lt_cv_libxp" = "yes"; then 26059 26052 : … … 26080 26073 26081 26074 fi 26075 if test -n "$QT4_VERSION"; then 26076 : 26077 else 26078 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: QT4 missing - GUIs disabled!" >&5 26079 $as_echo "$as_me: WARNING: QT4 missing - GUIs disabled!" >&2;} 26080 fi 26082 26081 if test "$HAVE_GL" = yes; then 26083 26082 : 26084 26083 else 26085 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GL not found - viewerwill be disabled." >&526086 $as_echo "$as_me: WARNING: GL not found - viewerwill be disabled." >&2;}26084 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GL not found - GUIs will be disabled." >&5 26085 $as_echo "$as_me: WARNING: GL not found - GUIs will be disabled." >&2;} 26087 26086 fi 26088 26087 if test "$HAVE_GLU" = yes; then 26089 26088 : 26090 26089 else 26091 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GLU not found - viewer will be disabled." >&5 26092 $as_echo "$as_me: WARNING: GLU not found - viewer will be disabled." >&2;} 26090 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GLU not found - GUIs will be disabled." >&5 26091 $as_echo "$as_me: WARNING: GLU not found - GUIs will be disabled." >&2;} 26092 fi 26093 if test "$HAVE_QGL" = yes; then 26094 : 26095 else 26096 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: QtOpenGl not found - GUIs will be disabled." >&5 26097 $as_echo "$as_me: WARNING: QtOpenGl not found - GUIs will be disabled." >&2;} 26093 26098 fi 26094 26099 if test "$HAVE_QWT" = yes; then … … 26098 26103 $as_echo "$as_me: WARNING: Qwt not found - viewer will be disabled." >&2;} 26099 26104 fi 26100 26101 if test -n "$QT4_VERSION"; then 26105 if test "$QT4_VERSION" -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes -a "$HAVE_QGL" = yes -a "$HAVE_ROOT_QT" = yes ; then 26102 26106 : 26103 26107 else 26104 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: QT4 missing: fact and viewerGUI disabled!" >&526105 $as_echo "$as_me: WARNING: QT4 missing: fact and viewerGUI disabled!" >&2;}26106 26107 fi 26108 if test "$QT4_VERSION" -a "$HAVE_ ROOT_QT" = yes; then26108 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Either of the necessary packages not found - fact GUI disabled!" >&5 26109 $as_echo "$as_me: WARNING: Either of the necessary packages not found - fact GUI disabled!" >&2;} 26110 26111 fi 26112 if test "$QT4_VERSION" -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes -a "$HAVE_QGL" = yes -a "$HAVE_QWT" = yes; then 26109 26113 : 26110 26114 else 26111 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Either QT4 or qt-root is missing: factGUI disabled!" >&526112 $as_echo "$as_me: WARNING: Either QT4 or qt-root is missing: factGUI disabled!" >&2;}26115 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Either of the necessary packages not found - viewer GUI disabled!" >&5 26116 $as_echo "$as_me: WARNING: Either of the necessary packages not found - viewer GUI disabled!" >&2;} 26113 26117 26114 26118 fi -
trunk/FACT++/configure.ac
r11808 r11822 304 304 AM_CONDITIONAL(HAS_ROOT, [test "$ROOTEXEC" != no]) 305 305 AM_CONDITIONAL(HAS_ROOT_QT, [test "$HAVE_ROOT_QT" = yes]) 306 AM_CONDITIONAL(HAS_GUI, [test "$QT4_VERSION" -a "$HAVE_ROOT_QT" = yes])307 306 AM_CONDITIONAL(HAS_CFITSIO, [test "$HAVE_CFITSIO" = yes]) 308 307 AM_CONDITIONAL(HAS_CCFITS, [test "$HAVE_CCFITS" = yes]) … … 316 315 AM_CONDITIONAL(HAS_QWT, [test "$HAVE_QWT" = yes]) 317 316 317 AM_CONDITIONAL(HAS_GUI, [test "$QT4_VERSION" -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes -a "$HAVE_QGL" = yes -a "$HAVE_ROOT_QT" = yes ]) 318 318 AM_CONDITIONAL(HAS_VIEWER, [test "$QT4_VERSION" -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes -a "$HAVE_QGL" = yes -a "$HAVE_QWT" = yes]) 319 319 … … 465 465 AC_MSG_NOTICE(--------------------------------------------------------------------) 466 466 AC_MSG_NOTICE() 467 #AM_COND_IF(HAS_FITS_H, [ 468 AM_COND_IF(HAS_ZLIB,, 469 AC_MSG_WARN([ zlib not found. Support for reading .fits.gz disabled.]) 470 ) 471 # AM_COND_IF(HAS_IZSTREAM_H,, 472 # AC_MSG_WARN([ Mars izstream.h not found in gui/RawEventsViewer. Support for .fits.gz disabled.]) 473 # ) 474 #], 475 # AC_MSG_WARN([ Mars fits.h not found in gui/RawEventsViewer. Target 'viewer' disabled.]) 476 #) 467 AM_COND_IF(HAS_ZLIB,, 468 AC_MSG_WARN([ zlib not found. Support for reading .fits.gz disabled.]) 469 ) 477 470 AM_COND_IF(HAS_LIBXP,, 478 471 AC_MSG_WARN([ Motif/lesstif not found. The dim gui did will not be built!]) … … 486 479 )] 487 480 ) 488 AM_COND_IF(HAS_GL,, AC_MSG_WARN([ GL not found - viewer will be disabled.])) 489 AM_COND_IF(HAS_GLU,, AC_MSG_WARN([ GLU not found - viewer will be disabled.])) 481 AM_COND_IF(HAS_QT4,, AC_MSG_WARN([ QT4 missing - GUIs disabled!])) 482 AM_COND_IF(HAS_GL,, AC_MSG_WARN([ GL not found - GUIs will be disabled.])) 483 AM_COND_IF(HAS_GLU,, AC_MSG_WARN([ GLU not found - GUIs will be disabled.])) 484 AM_COND_IF(HAS_QGL,, AC_MSG_WARN([ QtOpenGl not found - GUIs will be disabled.])) 490 485 AM_COND_IF(HAS_QWT,, AC_MSG_WARN([ Qwt not found - viewer will be disabled.])) 491 492 AM_COND_IF(HAS_QT4, [],493 AC_MSG_WARN([ QT4 missing: fact and viewer GUI disabled!])494 )495 486 AM_COND_IF(HAS_GUI, [], 496 AC_MSG_WARN([ Either QT4 or qt-root is missing: fact GUI disabled!]) 497 ) 498 AC_MSG_NOTICE() 487 AC_MSG_WARN([ Either of the necessary packages not found - fact GUI disabled!]) 488 ) 489 AM_COND_IF(HAS_VIEWER, [], 490 AC_MSG_WARN([ Either of the necessary packages not found - viewer GUI disabled!]) 491 ) 492 AC_MSG_NOTICE()
Note:
See TracChangeset
for help on using the changeset viewer.
