Changeset 10438


Ignore:
Timestamp:
04/20/11 23:24:00 (14 years ago)
Author:
tbretz
Message:
Updated.
Location:
trunk/FACT++
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.in

    r10363 r10438  
    4646        .aux_dir/ltmain.sh .aux_dir/missing AUTHORS COPYING ChangeLog \
    4747        INSTALL NEWS
    48 bin_PROGRAMS = dns$(EXEEXT) did$(EXEEXT) log$(EXEEXT) logtime$(EXEEXT) \
    49         argv$(EXEEXT) time$(EXEEXT) test3$(EXEEXT) dclient5$(EXEEXT) \
    50         dserver2$(EXEEXT) dataLogger$(EXEEXT)
     48bin_PROGRAMS = $(am__EXEEXT_1) dns$(EXEEXT) did$(EXEEXT) log$(EXEEXT) \
     49        logtime$(EXEEXT) time$(EXEEXT) argv$(EXEEXT) test3$(EXEEXT) \
     50        dclient5$(EXEEXT) dserver2$(EXEEXT) dataLogger$(EXEEXT)
    5151@HAS_GROFF_TRUE@am__append_1 = $(dist_man1_MANS:.man=.html)
    5252@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_2 = $(dist_man1_MANS:.man=.pdf)
    … …  
    6464        $(top_srcdir)/.macro_dir/mysql++_devel.m4 \
    6565        $(top_srcdir)/.macro_dir/mysql_devel.m4 \
     66        $(top_srcdir)/.macro_dir/qt4_do_it_all.m4 \
     67        $(top_srcdir)/.macro_dir/root_path.m4 \
    6668        $(top_srcdir)/configure.ac
    6769am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    … …  
    118120am_libStateMachine_la_OBJECTS = src/WindowLog.lo src/Readline.lo \
    119121        src/ReadlineColor.lo src/ReadlineWindow.lo src/Console.lo \
    120         src/Shell.lo src/EventImp.lo src/Event.lo src/Description.lo \
    121         src/MessageImp.lo src/Converter.lo src/StateMachineImp.lo \
    122         src/StateMachine.lo src/MessageDim.lo src/StateMachineDim.lo \
    123         src/ServiceList.lo src/DimErrorRedirecter.lo \
    124         src/DimDescriptionService.lo src/Connection.lo
     122        src/Shell.lo src/EventImp.lo src/Event.lo src/State.lo \
     123        src/Description.lo src/MessageImp.lo src/Converter.lo \
     124        src/StateMachineImp.lo src/StateMachine.lo src/MessageDim.lo \
     125        src/StateMachineDim.lo src/DimServerList.lo \
     126        src/DimServiceInfoList.lo src/DimNetwork.lo src/ServiceList.lo \
     127        src/DimErrorRedirecter.lo src/DimDescriptionService.lo \
     128        src/Connection.lo
    125129libStateMachine_la_OBJECTS = $(am_libStateMachine_la_OBJECTS)
    126130libTime_la_LIBADD =
    … …  
    130134am_libTools_la_OBJECTS = src/tools.lo
    131135libTools_la_OBJECTS = $(am_libTools_la_OBJECTS)
     136@HAS_QT4_TRUE@am__EXEEXT_1 = fact$(EXEEXT)
    132137PROGRAMS = $(bin_PROGRAMS)
    133138am_argv_OBJECTS = src/argv.$(OBJEXT)
    … …  
    135140argv_DEPENDENCIES = libConfiguration.la
    136141am_dataLogger_OBJECTS = src/dataLogger.$(OBJEXT) \
    137         src/LocalControl.$(OBJEXT)
     142        src/LocalControl.$(OBJEXT) src/Fits.$(OBJEXT)
    138143dataLogger_OBJECTS = $(am_dataLogger_OBJECTS)
    139144dataLogger_DEPENDENCIES = libDim.la libDim++.la libTools.la libTime.la \
    … …  
    155160dserver2_DEPENDENCIES = libTime.la libTools.la libStateMachine.la \
    156161        libDim.la libDim++.la
     162am__fact_SOURCES_DIST = gui/design.h gui/design.cc \
     163        gui/HtmlDelegate.moc.cc gui/CheckBoxDelegate.moc.cc \
     164        gui/DockWindow.moc.cc gui/MainWindow.moc.cc \
     165        gui/HtmlDelegate.cc gui/CheckBoxDelegate.cc gui/DockWindow.cc \
     166        gui/MainWindow.cc gui/fact.cc gui/FactGui.cc
     167am__objects_1 =
     168@HAS_QT4_TRUE@am__objects_2 = gui/design.$(OBJEXT)
     169@HAS_QT4_TRUE@am__objects_3 = gui/HtmlDelegate.moc.$(OBJEXT) \
     170@HAS_QT4_TRUE@  gui/CheckBoxDelegate.moc.$(OBJEXT) \
     171@HAS_QT4_TRUE@  gui/DockWindow.moc.$(OBJEXT) \
     172@HAS_QT4_TRUE@  gui/MainWindow.moc.$(OBJEXT)
     173am__objects_4 = $(am__objects_1) $(am__objects_2) $(am__objects_3)
     174@HAS_QT4_TRUE@am__objects_5 = gui/HtmlDelegate.$(OBJEXT) \
     175@HAS_QT4_TRUE@  gui/CheckBoxDelegate.$(OBJEXT) \
     176@HAS_QT4_TRUE@  gui/DockWindow.$(OBJEXT) \
     177@HAS_QT4_TRUE@  gui/MainWindow.$(OBJEXT)
     178am_fact_OBJECTS = $(am__objects_4) $(am__objects_5) gui/fact.$(OBJEXT) \
     179        gui/FactGui.$(OBJEXT)
     180fact_OBJECTS = $(am_fact_OBJECTS)
     181am__DEPENDENCIES_1 =
     182fact_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
     183        $(am__DEPENDENCIES_1) libDim.la libDim++.la libTools.la \
     184        libTime.la libStateMachine.la
    157185am_log_OBJECTS = src/log.$(OBJEXT)
    158186log_OBJECTS = $(am_log_OBJECTS)
    … …  
    217245        $(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
    218246        $(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
    219         $(dns_SOURCES) $(dserver2_SOURCES) $(log_SOURCES) \
    220         $(logtime_SOURCES) $(test3_SOURCES) $(time_SOURCES)
     247        $(dns_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) \
     248        $(log_SOURCES) $(logtime_SOURCES) $(test3_SOURCES) \
     249        $(time_SOURCES)
    221250DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
    222251        $(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
    223252        $(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
    224253        $(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
    225         $(dns_SOURCES) $(dserver2_SOURCES) $(log_SOURCES) \
    226         $(logtime_SOURCES) $(test3_SOURCES) $(time_SOURCES)
     254        $(dns_SOURCES) $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) \
     255        $(log_SOURCES) $(logtime_SOURCES) $(test3_SOURCES) \
     256        $(time_SOURCES)
    227257man1dir = $(mandir)/man1
    228258NROFF = nroff
    … …  
    323353MAKEINFO = @MAKEINFO@
    324354MKDIR_P = @MKDIR_P@
     355MOC4 = @MOC4@
    325356MOTIF_CFLAGS = @MOTIF_CFLAGS@
    326357MOTIF_INCL = @MOTIF_INCL@
    … …  
    344375PACKAGE_VERSION = @PACKAGE_VERSION@
    345376PATH_SEPARATOR = @PATH_SEPARATOR@
     377PKG_CONFIG = @PKG_CONFIG@
     378PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
     379PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
    346380PS2PDF = @PS2PDF@
    347381PTHREAD_CC = @PTHREAD_CC@
    348382PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
    349383PTHREAD_LIBS = @PTHREAD_LIBS@
     384QT4DIR = @QT4DIR@
     385QT4_CORE_CFLAGS = @QT4_CORE_CFLAGS@
     386QT4_CORE_INCLUDES = @QT4_CORE_INCLUDES@
     387QT4_CORE_LDFLAGS = @QT4_CORE_LDFLAGS@
     388QT4_CORE_LIB = @QT4_CORE_LIB@
     389QT4_CORE_LIBS = @QT4_CORE_LIBS@
     390QT4_FRONTEND_CFLAGS = @QT4_FRONTEND_CFLAGS@
     391QT4_FRONTEND_LIBS = @QT4_FRONTEND_LIBS@
     392QT4_INCLUDES = @QT4_INCLUDES@
     393QT4_LDFLAGS = @QT4_LDFLAGS@
     394QT4_LIB = @QT4_LIB@
     395QT4_VERSION = @QT4_VERSION@
    350396RANLIB = @RANLIB@
     397RCC4 = @RCC4@
    351398READLINE_INCLUDES = @READLINE_INCLUDES@
    352399READLINE_LIBS = @READLINE_LIBS@
     400ROOTAUXCFLAGS = @ROOTAUXCFLAGS@
     401ROOTAUXLIBS = @ROOTAUXLIBS@
     402ROOTCFLAGS = @ROOTCFLAGS@
     403ROOTCINT = @ROOTCINT@
     404ROOTCONF = @ROOTCONF@
     405ROOTCPPFLAGS = @ROOTCPPFLAGS@
     406ROOTEXEC = @ROOTEXEC@
     407ROOTGLIBS = @ROOTGLIBS@
     408ROOTINCDIR = @ROOTINCDIR@
     409ROOTLDFLAGS = @ROOTLDFLAGS@
     410ROOTLIBDIR = @ROOTLIBDIR@
     411ROOTLIBS = @ROOTLIBS@
     412ROOTRPATH = @ROOTRPATH@
     413ROOTSOVERSION = @ROOTSOVERSION@
     414ROOTVERSION = @ROOTVERSION@
    353415SED = @SED@
    354416SET_MAKE = @SET_MAKE@
    355417SHELL = @SHELL@
    356418STRIP = @STRIP@
     419UIC4 = @UIC4@
    357420VERSION = @VERSION@
    358421XMKMF = @XMKMF@
    … …  
    444507DIM_FLAGS = -DMIPSEL -DPROTOCOL=1 -Dunix -Dlinux
    445508BOOST_FLAGS = -DBOOST_DISABLE_ASSERTS
    446 AM_CPPFLAGS = \
    447    -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
    448    -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS)
    449 
    450 AM_CXXFLAGS = $(AM_CPPFLAGS) -Woverloaded-virtual -Wshadow -std=c++0x
     509AM_CPPFLAGS = -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
     510   -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2
     511
     512AM_CXXFLAGS = $(AM_CPPFLAGS) $(QT4_INCLUDES) \
     513   -Woverloaded-virtual -Wshadow -std=c++0x
     514
    451515
    452516# -no-undefined
    453517AM_LDFLAGS = -module -avoid-version
     518
     519#$(man3_MANS): doxygen-doc
     520#DX_CLEANFILES = everything to clean.
     521# Add to MOSTLYCLEANFILES.
     522
     523#-------------------------------------------------------------------------
     524@HAS_QT4_TRUE@QT4_EXECUTABLES = fact
     525#       ftmctrl ftm \
     526#       chatclient chatserv \
     527#       fitsgrep test \
    454528#       sched astro test ftm ftmctrl
    455529lib_LTLIBRARIES = libDim.la libDim++.la libTime.la libTools.la \
    … …  
    466540        dim/README_v14.txt dim/README_v17.txt dim/README_v16.txt \
    467541        dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
    468         $(dist_man1_MANS:.man=.html) $(dist_man1_MANS:.man=.pdf)
    469 CLEANFILES = $(dist_man1_MANS:.man=.pdf)  $(dist_man1_MANS:.man=.html)
     542        $(dist_man1_MANS:.man=.html) $(dist_man1_MANS:.man=.pdf) \
     543        $(DIALOGS) $(RESOURCES)
     544CLEANFILES = $(dist_man1_MANS:.man=.pdf) $(dist_man1_MANS:.man=.html) \
     545        $(BUILT_SOURCES)
    470546dns_LDADD = libDim.la
    471547dns_SOURCES = dim/src/dns.c
    … …  
    535611        src/EventImp.h        src/EventImp.cc \
    536612        src/Event.h           src/Event.cc \
     613        src/State.h           src/State.cc \
    537614        src/Description.h     src/Description.cc \
    538615        src/MessageImp.h      src/MessageImp.cc \
    … …  
    542619        \
    543620        src/EventDim.h \
    544         src/MessageDim.h      src/MessageDim.cc \
    545         src/StateMachineDim.h src/StateMachineDim.cc \
    546         src/ServiceList.h     src/ServiceList.cc \
     621        src/MessageDim.h         src/MessageDim.cc \
     622        src/StateMachineDim.h    src/StateMachineDim.cc \
     623        src/DimServerList.h      src/DimServerList.cc \
     624        src/DimServiceInfoList.h src/DimServiceInfoList.cc \
     625        src/DimNetworkList.h     src/DimNetwork.cc \
     626        src/ServiceList.h        src/ServiceList.cc \
    547627        src/DimErrorRedirecter.h  \
    548628        src/DimErrorRedirecter.cc \
    … …  
    559639dserver2_LDADD = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
    560640
    561 #ftm_SOURCES = src/ftm.cc
     641#ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
    562642#ftm_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
    563643log_SOURCES = src/log.cc
    … …  
    565645logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la
    566646logtime_SOURCES = src/logtime.cc
     647
     648#chatserv_LDADD = libStateMachine.la libConfiguration.la libTools.la libTime.la libDim.la libDim++.la
     649#chatserv_SOURCES = src/chatserv.cc src/LocalControl.cc src/LocalControl.h
    567650dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc src/LocalControl.h
    568651dclient5_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
    … …  
    570653
    571654
    572 #ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h
     655#ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc
    573656#ftmctrl_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
    574 #    libConfiguration.la
    575 
    576 #sched_SOURCES = src/sched.cc src/LocalControl.cc src/LocalControl.h
    577 #sched_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
    578657#    libConfiguration.la
    579658argv_SOURCES = src/argv.cc
    … …  
    581660test3_SOURCES = src/test3.cc src/RemoteControl.cc src/RemoteControl.h
    582661test3_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
     662
     663#chatclient_SOURCES = src/chatclient.cc src/ChatClient.cc src/ChatClient.h
     664#chatclient_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
    583665time_SOURCES = src/time.cc
    584666time_LDADD = libTime.la
    … …  
    589671#test_SOURCES = src/test.cc
    590672#test_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
    591 dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h
     673dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h src/Fits.cc
    592674dataLogger_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
    593675    libConfiguration.la
    594676
    595677
     678#fitsgrep_SOURCES = src/fitsgrep.cc
     679#fitsgrep_LDADD   = libConfiguration.la
     680
     681# -----
     682@HAS_QT4_TRUE@DIALOGS = \
     683@HAS_QT4_TRUE@  gui/design.ui
     684
     685@HAS_QT4_TRUE@RESOURCES = \
     686@HAS_QT4_TRUE@  gui/design.qrc
     687
     688@HAS_QT4_TRUE@QT_SOURCES = \
     689@HAS_QT4_TRUE@  gui/HtmlDelegate.cc \
     690@HAS_QT4_TRUE@  gui/CheckBoxDelegate.cc \
     691@HAS_QT4_TRUE@  gui/DockWindow.cc \
     692@HAS_QT4_TRUE@  gui/MainWindow.cc
     693
     694BUILT_SOURCES = $(DIALOGS:.ui=.h) $(RESOURCES:.qrc=.cc) $(QT_SOURCES:.cc=.moc.cc)
     695fact_LDADD = $(ROOTLDFLAGS) $(QT4_LIB) $(QT4_LDFLAGS) \
     696        libDim.la libDim++.la libTools.la libTime.la libStateMachine.la
     697
     698fact_SOURCES = $(BUILT_SOURCES) $(QT_SOURCES) \
     699        gui/fact.cc gui/FactGui.cc
     700
     701
     702#-------------------------------------------------------------------------
     703SUFFIXES = .moc.cc
     704
    596705#-------------------------------------------------------------------------
    597706MAN_TARGETS = $(am__append_1) $(am__append_2) $(am__append_3)
    598 all: all-am
     707all: $(BUILT_SOURCES)
     708        $(MAKE) $(AM_MAKEFLAGS) all-am
    599709
    600710.SUFFIXES:
    601 .SUFFIXES: .c .cc .cxx .html .lo .man .o .obj .pdf
     711.SUFFIXES: .moc.cc .c .cc .cxx .h .html .lo .man .o .obj .pdf .qrc .ui
    602712am--refresh:
    603713        @:
    … …  
    731841src/EventImp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    732842src/Event.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
     843src/State.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    733844src/Description.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    734845src/MessageImp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    … …  
    740851src/StateMachineDim.lo: src/$(am__dirstamp) \
    741852        src/$(DEPDIR)/$(am__dirstamp)
     853src/DimServerList.lo: src/$(am__dirstamp) \
     854        src/$(DEPDIR)/$(am__dirstamp)
     855src/DimServiceInfoList.lo: src/$(am__dirstamp) \
     856        src/$(DEPDIR)/$(am__dirstamp)
     857src/DimNetwork.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    742858src/ServiceList.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    743859src/DimErrorRedirecter.lo: src/$(am__dirstamp) \
    … …  
    821937src/LocalControl.$(OBJEXT): src/$(am__dirstamp) \
    822938        src/$(DEPDIR)/$(am__dirstamp)
     939src/Fits.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    823940dataLogger$(EXEEXT): $(dataLogger_OBJECTS) $(dataLogger_DEPENDENCIES)
    824941        @rm -f dataLogger$(EXEEXT)
    … …  
    852969        @rm -f dserver2$(EXEEXT)
    853970        $(AM_V_CXXLD)$(CXXLINK) $(dserver2_OBJECTS) $(dserver2_LDADD) $(LIBS)
     971gui/$(am__dirstamp):
     972        @$(MKDIR_P) gui
     973        @: > gui/$(am__dirstamp)
     974gui/$(DEPDIR)/$(am__dirstamp):
     975        @$(MKDIR_P) gui/$(DEPDIR)
     976        @: > gui/$(DEPDIR)/$(am__dirstamp)
     977gui/design.$(OBJEXT): gui/$(am__dirstamp) \
     978        gui/$(DEPDIR)/$(am__dirstamp)
     979gui/HtmlDelegate.moc.$(OBJEXT): gui/$(am__dirstamp) \
     980        gui/$(DEPDIR)/$(am__dirstamp)
     981gui/CheckBoxDelegate.moc.$(OBJEXT): gui/$(am__dirstamp) \
     982        gui/$(DEPDIR)/$(am__dirstamp)
     983gui/DockWindow.moc.$(OBJEXT): gui/$(am__dirstamp) \
     984        gui/$(DEPDIR)/$(am__dirstamp)
     985gui/MainWindow.moc.$(OBJEXT): gui/$(am__dirstamp) \
     986        gui/$(DEPDIR)/$(am__dirstamp)
     987gui/HtmlDelegate.$(OBJEXT): gui/$(am__dirstamp) \
     988        gui/$(DEPDIR)/$(am__dirstamp)
     989gui/CheckBoxDelegate.$(OBJEXT): gui/$(am__dirstamp) \
     990        gui/$(DEPDIR)/$(am__dirstamp)
     991gui/DockWindow.$(OBJEXT): gui/$(am__dirstamp) \
     992        gui/$(DEPDIR)/$(am__dirstamp)
     993gui/MainWindow.$(OBJEXT): gui/$(am__dirstamp) \
     994        gui/$(DEPDIR)/$(am__dirstamp)
     995gui/fact.$(OBJEXT): gui/$(am__dirstamp) gui/$(DEPDIR)/$(am__dirstamp)
     996gui/FactGui.$(OBJEXT): gui/$(am__dirstamp) \
     997        gui/$(DEPDIR)/$(am__dirstamp)
     998fact$(EXEEXT): $(fact_OBJECTS) $(fact_DEPENDENCIES)
     999        @rm -f fact$(EXEEXT)
     1000        $(AM_V_CXXLD)$(CXXLINK) $(fact_OBJECTS) $(fact_LDADD) $(LIBS)
    8541001src/log.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    8551002log$(EXEEXT): $(log_OBJECTS) $(log_DEPENDENCIES)
    … …  
    9131060        -rm -f dim/src/utilities.$(OBJEXT)
    9141061        -rm -f dim/src/utilities.lo
     1062        -rm -f gui/CheckBoxDelegate.$(OBJEXT)
     1063        -rm -f gui/CheckBoxDelegate.moc.$(OBJEXT)
     1064        -rm -f gui/DockWindow.$(OBJEXT)
     1065        -rm -f gui/DockWindow.moc.$(OBJEXT)
     1066        -rm -f gui/FactGui.$(OBJEXT)
     1067        -rm -f gui/HtmlDelegate.$(OBJEXT)
     1068        -rm -f gui/HtmlDelegate.moc.$(OBJEXT)
     1069        -rm -f gui/MainWindow.$(OBJEXT)
     1070        -rm -f gui/MainWindow.moc.$(OBJEXT)
     1071        -rm -f gui/design.$(OBJEXT)
     1072        -rm -f gui/fact.$(OBJEXT)
    9151073        -rm -f src/Configuration.$(OBJEXT)
    9161074        -rm -f src/Configuration.lo
    … …  
    9271085        -rm -f src/DimErrorRedirecter.$(OBJEXT)
    9281086        -rm -f src/DimErrorRedirecter.lo
     1087        -rm -f src/DimNetwork.$(OBJEXT)
     1088        -rm -f src/DimNetwork.lo
     1089        -rm -f src/DimServerList.$(OBJEXT)
     1090        -rm -f src/DimServerList.lo
     1091        -rm -f src/DimServiceInfoList.$(OBJEXT)
     1092        -rm -f src/DimServiceInfoList.lo
    9291093        -rm -f src/Event.$(OBJEXT)
    9301094        -rm -f src/Event.lo
    9311095        -rm -f src/EventImp.$(OBJEXT)
    9321096        -rm -f src/EventImp.lo
     1097        -rm -f src/Fits.$(OBJEXT)
    9331098        -rm -f src/LocalControl.$(OBJEXT)
    9341099        -rm -f src/MessageDim.$(OBJEXT)
    … …  
    9471112        -rm -f src/Shell.$(OBJEXT)
    9481113        -rm -f src/Shell.lo
     1114        -rm -f src/State.$(OBJEXT)
     1115        -rm -f src/State.lo
    9491116        -rm -f src/StateMachine.$(OBJEXT)
    9501117        -rm -f src/StateMachine.lo
    … …  
    9921159@AMDEP_TRUE@@am__include@ @am__quote@dim/src/did/$(DEPDIR)/did-did.Po@am__quote@
    9931160@AMDEP_TRUE@@am__include@ @am__quote@dim/src/did/$(DEPDIR)/did-dui_util.Po@am__quote@
     1161@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/CheckBoxDelegate.Po@am__quote@
     1162@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/CheckBoxDelegate.moc.Po@am__quote@
     1163@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/DockWindow.Po@am__quote@
     1164@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/DockWindow.moc.Po@am__quote@
     1165@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/FactGui.Po@am__quote@
     1166@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/HtmlDelegate.Po@am__quote@
     1167@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/HtmlDelegate.moc.Po@am__quote@
     1168@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/MainWindow.Po@am__quote@
     1169@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/MainWindow.moc.Po@am__quote@
     1170@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/design.Po@am__quote@
     1171@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/fact.Po@am__quote@
    9941172@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Configuration.Plo@am__quote@
    9951173@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Connection.Plo@am__quote@
    … …  
    9991177@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimDescriptionService.Plo@am__quote@
    10001178@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimErrorRedirecter.Plo@am__quote@
     1179@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimNetwork.Plo@am__quote@
     1180@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimServerList.Plo@am__quote@
     1181@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimServiceInfoList.Plo@am__quote@
    10011182@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Event.Plo@am__quote@
    10021183@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/EventImp.Plo@am__quote@
     1184@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Fits.Po@am__quote@
    10031185@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/LocalControl.Po@am__quote@
    10041186@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/MessageDim.Plo@am__quote@
    … …  
    10101192@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ServiceList.Plo@am__quote@
    10111193@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Shell.Plo@am__quote@
     1194@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/State.Plo@am__quote@
    10121195@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/StateMachine.Plo@am__quote@
    10131196@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/StateMachineDim.Plo@am__quote@
    … …  
    14361619               exit 1; } >&2
    14371620check-am: all-am
    1438 check: check-am
     1621check: $(BUILT_SOURCES)
     1622        $(MAKE) $(AM_MAKEFLAGS) check-am
    14391623all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) \
    14401624                $(HEADERS)
    … …  
    14451629          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
    14461630        done
    1447 install: install-am
     1631install: $(BUILT_SOURCES)
     1632        $(MAKE) $(AM_MAKEFLAGS) install-am
    14481633install-exec: install-exec-am
    14491634install-data: install-data-am
    … …  
    14711656        -rm -f dim/src/did/$(DEPDIR)/$(am__dirstamp)
    14721657        -rm -f dim/src/did/$(am__dirstamp)
     1658        -rm -f gui/$(DEPDIR)/$(am__dirstamp)
     1659        -rm -f gui/$(am__dirstamp)
    14731660        -rm -f src/$(DEPDIR)/$(am__dirstamp)
    14741661        -rm -f src/$(am__dirstamp)
    … …  
    14771664        @echo "This command is intended for maintainers to use"
    14781665        @echo "it deletes files that may require special tools to rebuild."
     1666        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
    14791667clean: clean-am
    14801668
    … …  
    14841672distclean: distclean-am
    14851673        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    1486         -rm -rf dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) src/$(DEPDIR)
     1674        -rm -rf dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) src/$(DEPDIR)
    14871675        -rm -f Makefile
    14881676distclean-am: clean-am distclean-compile distclean-generic \
    … …  
    15331721        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    15341722        -rm -rf $(top_srcdir)/autom4te.cache
    1535         -rm -rf dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) src/$(DEPDIR)
     1723        -rm -rf dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) src/$(DEPDIR)
    15361724        -rm -f Makefile
    15371725maintainer-clean-am: distclean-am maintainer-clean-generic
    … …  
    15561744uninstall-man: uninstall-man1
    15571745
    1558 .MAKE: install-am install-strip
     1746.MAKE: all check install install-am install-strip
    15591747
    15601748.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
    … …  
    16191807@DX_COND_doc_TRUE@      $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
    16201808
     1809.ui.h: $<
     1810        $(AM_V_GEN)$(UIC4) $< -o $@
     1811
     1812.h.moc.cc: $<
     1813        $(AM_V_GEN)$(MOC4) $(EXTRA_CPPFLAGS) $< -o $@
     1814
     1815.qrc.cc: $<
     1816        $(AM_V_GEN)$(RCC4) -name `echo "$<" | sed 's|^.*/\(.*\)\.qrc$$|\1|'` $< -o $@
     1817
    16211818@HAS_GROFF_TRUE@.man.html: $<
    1622 @HAS_GROFF_TRUE@        $(AM_V_GEN)groff -mandoc `man -w ./$<` -T html > $@
     1819@HAS_GROFF_TRUE@        $(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@
    16231820
    16241821@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@.man.pdf: $<
    1625 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@       $(AM_V_GEN)groff -mandoc `man -w ./$<` | ps2pdf - $@
     1822@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@       $(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@
    16261823
    16271824@HAS_HELP2MAN_TRUE@$(dist_man1_MANS): $(dist_man1_MANS:.man=)
    … …  
    16331830diff:
    16341831        @svn diff | $(COLORDIFF)
     1832
     1833#-------------------------------------------------------------------------
    16351834
    16361835# Overwrite rules for silent or other verbosity levels
    … …  
    16491848#        done
    16501849
     1850#CLEANFILES = *~ *.rej *.orig
     1851#MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \
     1852#        stamp-h.in stamp-h[0-9].in
     1853#DISTCLEANFILES = config.cache config.log
     1854
    16511855# Tell versions [3.59,3.63) of GNU make to not export all variables.
    16521856# Otherwise a system limit (for SysV at least) may be exceeded.

  • trunk/FACT++/configure

    r10403 r10438  
    747747LTLIBOBJS
    748748LIBOBJS
     749HAS_GUI_FALSE
     750HAS_GUI_TRUE
     751HAS_ROOT_QT_FALSE
     752HAS_ROOT_QT_TRUE
     753HAS_ROOT_FALSE
     754HAS_ROOT_TRUE
    749755HAS_QT4_FALSE
    750756HAS_QT4_TRUE
    … …  
    767773GROFF
    768774COLORDIFF
     775ROOTLDFLAGS
     776ROOTCPPFLAGS
     777ROOTSOVERSION
     778ROOTVERSION
     779ROOTRPATH
     780ROOTAUXCFLAGS
     781ROOTAUXLIBS
     782ROOTGLIBS
     783ROOTLIBS
     784ROOTCFLAGS
     785ROOTINCDIR
     786ROOTLIBDIR
     787ROOTCINT
     788ROOTEXEC
     789ROOTCONF
    769790RCC4
    770791UIC4
    … …  
    10231044with_qt4_includes
    10241045with_qt4_libraries
     1046with_root
     1047with_rootsys
    10251048'
    10261049      ac_precious_vars='build_alias
    … …  
    17561779  --with-qt4-includes     where the Qt 4 includes are
    17571780  --with-qt4-libraries    where the Qt 4 library is installed
     1781  --without-root          Disable root, i.e. disable gui support.
     1782  --with-rootsys          top of the ROOT installation directory
    17581783
    17591784Some influential environment variables:
    … …  
    44204445  lt_cv_nm_interface="BSD nm"
    44214446  echo "int some_variable = 0;" > conftest.$ac_ext
    4422   (eval echo "\"\$as_me:4422: $ac_compile\"" >&5)
     4447  (eval echo "\"\$as_me:4447: $ac_compile\"" >&5)
    44234448  (eval "$ac_compile" 2>conftest.err)
    44244449  cat conftest.err >&5
    4425   (eval echo "\"\$as_me:4425: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
     4450  (eval echo "\"\$as_me:4450: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    44264451  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    44274452  cat conftest.err >&5
    4428   (eval echo "\"\$as_me:4428: output\"" >&5)
     4453  (eval echo "\"\$as_me:4453: output\"" >&5)
    44294454  cat conftest.out >&5
    44304455  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    … …  
    56325657*-*-irix6*)
    56335658  # Find out which ABI we are using.
    5634   echo '#line 5634 "configure"' > conftest.$ac_ext
     5659  echo '#line 5659 "configure"' > conftest.$ac_ext
    56355660  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    56365661  (eval $ac_compile) 2>&5
    … …  
    75607585   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    75617586   -e 's:$: $lt_compiler_flag:'`
    7562    (eval echo "\"\$as_me:7562: $lt_compile\"" >&5)
     7587   (eval echo "\"\$as_me:7587: $lt_compile\"" >&5)
    75637588   (eval "$lt_compile" 2>conftest.err)
    75647589   ac_status=$?
    75657590   cat conftest.err >&5
    7566    echo "$as_me:7566: \$? = $ac_status" >&5
     7591   echo "$as_me:7591: \$? = $ac_status" >&5
    75677592   if (exit $ac_status) && test -s "$ac_outfile"; then
    75687593     # The compiler can only warn and ignore the option if not recognized
    … …  
    78997924   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79007925   -e 's:$: $lt_compiler_flag:'`
    7901    (eval echo "\"\$as_me:7901: $lt_compile\"" >&5)
     7926   (eval echo "\"\$as_me:7926: $lt_compile\"" >&5)
    79027927   (eval "$lt_compile" 2>conftest.err)
    79037928   ac_status=$?
    79047929   cat conftest.err >&5
    7905    echo "$as_me:7905: \$? = $ac_status" >&5
     7930   echo "$as_me:7930: \$? = $ac_status" >&5
    79067931   if (exit $ac_status) && test -s "$ac_outfile"; then
    79077932     # The compiler can only warn and ignore the option if not recognized
    … …  
    80048029   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80058030   -e 's:$: $lt_compiler_flag:'`
    8006    (eval echo "\"\$as_me:8006: $lt_compile\"" >&5)
     8031   (eval echo "\"\$as_me:8031: $lt_compile\"" >&5)
    80078032   (eval "$lt_compile" 2>out/conftest.err)
    80088033   ac_status=$?
    80098034   cat out/conftest.err >&5
    8010    echo "$as_me:8010: \$? = $ac_status" >&5
     8035   echo "$as_me:8035: \$? = $ac_status" >&5
    80118036   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    80128037   then
    … …  
    80598084   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80608085   -e 's:$: $lt_compiler_flag:'`
    8061    (eval echo "\"\$as_me:8061: $lt_compile\"" >&5)
     8086   (eval echo "\"\$as_me:8086: $lt_compile\"" >&5)
    80628087   (eval "$lt_compile" 2>out/conftest.err)
    80638088   ac_status=$?
    80648089   cat out/conftest.err >&5
    8065    echo "$as_me:8065: \$? = $ac_status" >&5
     8090   echo "$as_me:8090: \$? = $ac_status" >&5
    80668091   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    80678092   then
    … …  
    1044310468  lt_status=$lt_dlunknown
    1044410469  cat > conftest.$ac_ext <<_LT_EOF
    10445 #line 10445 "configure"
     10470#line 10470 "configure"
    1044610471#include "confdefs.h"
    1044710472
    … …  
    1053910564  lt_status=$lt_dlunknown
    1054010565  cat > conftest.$ac_ext <<_LT_EOF
    10541 #line 10541 "configure"
     10566#line 10566 "configure"
    1054210567#include "confdefs.h"
    1054310568
    … …  
    1249512520   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1249612521   -e 's:$: $lt_compiler_flag:'`
    12497    (eval echo "\"\$as_me:12497: $lt_compile\"" >&5)
     12522   (eval echo "\"\$as_me:12522: $lt_compile\"" >&5)
    1249812523   (eval "$lt_compile" 2>conftest.err)
    1249912524   ac_status=$?
    1250012525   cat conftest.err >&5
    12501    echo "$as_me:12501: \$? = $ac_status" >&5
     12526   echo "$as_me:12526: \$? = $ac_status" >&5
    1250212527   if (exit $ac_status) && test -s "$ac_outfile"; then
    1250312528     # The compiler can only warn and ignore the option if not recognized
    … …  
    1259412619   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1259512620   -e 's:$: $lt_compiler_flag:'`
    12596    (eval echo "\"\$as_me:12596: $lt_compile\"" >&5)
     12621   (eval echo "\"\$as_me:12621: $lt_compile\"" >&5)
    1259712622   (eval "$lt_compile" 2>out/conftest.err)
    1259812623   ac_status=$?
    1259912624   cat out/conftest.err >&5
    12600    echo "$as_me:12600: \$? = $ac_status" >&5
     12625   echo "$as_me:12625: \$? = $ac_status" >&5
    1260112626   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1260212627   then
    … …  
    1264612671   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1264712672   -e 's:$: $lt_compiler_flag:'`
    12648    (eval echo "\"\$as_me:12648: $lt_compile\"" >&5)
     12673   (eval echo "\"\$as_me:12673: $lt_compile\"" >&5)
    1264912674   (eval "$lt_compile" 2>out/conftest.err)
    1265012675   ac_status=$?
    1265112676   cat out/conftest.err >&5
    12652    echo "$as_me:12652: \$? = $ac_status" >&5
     12677   echo "$as_me:12677: \$? = $ac_status" >&5
    1265312678   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1265412679   then
    … …  
    2153121556
    2153221557                cat > conftest.$ac_ext <<EOF
    21533 #line 21533 "configure"
     21558#line 21558 "configure"
    2153421559#include "confdefs.h"
    2153521560#include <qglobal.h>
    … …  
    2169421719
    2169521720
    21696 #AC_CHECK_PROG(QT4_MOC, moc, moc,
    21697 #   AC_MSG_ERROR([QT4 executable 'moc' not found in path.]))
    21698 #AC_CHECK_PROG(QT4_UIC, uic, uic,
    21699 #   AC_MSG_ERROR([QT4 executable 'moc' not found in path.]))
    21700 
    2170121721######################################################################
    2170221722# ROOT SUPPORT
    2170321723######################################################################
    2170421724
    21705 # ROOT_PATH([5.12/00, [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]]])
    21706 # ROOT_PATH([5.12/00])
    21707 # ROOT_PATH(3.03/05, , AC_MSG_ERROR(Your ROOT version is too old))
    21708 # ROOT_PATH(, AC_DEFINE([HAVE_ROOT]))
    21709 
    21710 # ROOTCONF           full path to root-config
    21711 # ROOTEXEC           full path to root
    21712 # ROOTCINT           full path to rootcint
    21713 # ROOTLIBDIR         Where the ROOT libraries are
    21714 # ROOTINCDIR         Where the ROOT headers are
    21715 # ROOTETCDIR         Where the ROOT configuration is
    21716 # ROOTCFLAGS         Extra compiler flags
    21717 # ROOTLIBS           ROOT basic libraries
    21718 # ROOTGLIBS          ROOT basic + GUI libraries
    21719 # ROOTAUXLIBS        Auxilary libraries and linker flags for ROOT
    21720 # ROOTAUXCFLAGS      Auxilary compiler flags
    21721 # ROOTRPATH          Same as ROOTLIBDIR
    21722 
     21725
     21726# Check whether --with-root was given.
     21727if test "${with_root+set}" = set; then :
     21728  withval=$with_root;
     21729else
     21730
     21731
     21732# Check whether --with-rootsys was given.
     21733if test "${with_rootsys+set}" = set; then :
     21734  withval=$with_rootsys; user_rootsys=$withval
     21735else
     21736  user_rootsys="none"
     21737fi
     21738
     21739  if test ! x"$user_rootsys" = xnone; then
     21740    rootbin="$user_rootsys"
     21741  elif test ! x"$ROOTSYS" = x ; then
     21742    rootbin="$ROOTSYS/bin"
     21743  else
     21744   rootbin=$PATH
     21745  fi
     21746
     21747  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for root in" >&5
     21748$as_echo_n "checking for root in... " >&6; }
     21749  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $rootbin" >&5
     21750$as_echo "$rootbin" >&6; }
     21751
     21752  # Extract the first word of "root-config ", so it can be a program name with args.
     21753set dummy root-config ; ac_word=$2
     21754{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     21755$as_echo_n "checking for $ac_word... " >&6; }
     21756if test "${ac_cv_path_ROOTCONF+set}" = set; then :
     21757  $as_echo_n "(cached) " >&6
     21758else
     21759  case $ROOTCONF in
     21760  [\\/]* | ?:[\\/]*)
     21761  ac_cv_path_ROOTCONF="$ROOTCONF" # Let the user override the test with a path.
     21762  ;;
     21763  *)
     21764  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     21765for as_dir in $rootbin
     21766do
     21767  IFS=$as_save_IFS
     21768  test -z "$as_dir" && as_dir=.
     21769    for ac_exec_ext in '' $ac_executable_extensions; do
     21770  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     21771    ac_cv_path_ROOTCONF="$as_dir/$ac_word$ac_exec_ext"
     21772    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     21773    break 2
     21774  fi
     21775done
     21776  done
     21777IFS=$as_save_IFS
     21778
     21779  test -z "$ac_cv_path_ROOTCONF" && ac_cv_path_ROOTCONF="no"
     21780  ;;
     21781esac
     21782fi
     21783ROOTCONF=$ac_cv_path_ROOTCONF
     21784if test -n "$ROOTCONF"; then
     21785  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ROOTCONF" >&5
     21786$as_echo "$ROOTCONF" >&6; }
     21787else
     21788  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     21789$as_echo "no" >&6; }
     21790fi
     21791
     21792
     21793  # Extract the first word of "root ", so it can be a program name with args.
     21794set dummy root ; ac_word=$2
     21795{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     21796$as_echo_n "checking for $ac_word... " >&6; }
     21797if test "${ac_cv_path_ROOTEXEC+set}" = set; then :
     21798  $as_echo_n "(cached) " >&6
     21799else
     21800  case $ROOTEXEC in
     21801  [\\/]* | ?:[\\/]*)
     21802  ac_cv_path_ROOTEXEC="$ROOTEXEC" # Let the user override the test with a path.
     21803  ;;
     21804  *)
     21805  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     21806for as_dir in $rootbin
     21807do
     21808  IFS=$as_save_IFS
     21809  test -z "$as_dir" && as_dir=.
     21810    for ac_exec_ext in '' $ac_executable_extensions; do
     21811  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     21812    ac_cv_path_ROOTEXEC="$as_dir/$ac_word$ac_exec_ext"
     21813    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     21814    break 2
     21815  fi
     21816done
     21817  done
     21818IFS=$as_save_IFS
     21819
     21820  test -z "$ac_cv_path_ROOTEXEC" && ac_cv_path_ROOTEXEC="no"
     21821  ;;
     21822esac
     21823fi
     21824ROOTEXEC=$ac_cv_path_ROOTEXEC
     21825if test -n "$ROOTEXEC"; then
     21826  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ROOTEXEC" >&5
     21827$as_echo "$ROOTEXEC" >&6; }
     21828else
     21829  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     21830$as_echo "no" >&6; }
     21831fi
     21832
     21833
     21834  # Extract the first word of "rootcint ", so it can be a program name with args.
     21835set dummy rootcint ; ac_word=$2
     21836{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     21837$as_echo_n "checking for $ac_word... " >&6; }
     21838if test "${ac_cv_path_ROOTCINT+set}" = set; then :
     21839  $as_echo_n "(cached) " >&6
     21840else
     21841  case $ROOTCINT in
     21842  [\\/]* | ?:[\\/]*)
     21843  ac_cv_path_ROOTCINT="$ROOTCINT" # Let the user override the test with a path.
     21844  ;;
     21845  *)
     21846  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     21847for as_dir in $rootbin
     21848do
     21849  IFS=$as_save_IFS
     21850  test -z "$as_dir" && as_dir=.
     21851    for ac_exec_ext in '' $ac_executable_extensions; do
     21852  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     21853    ac_cv_path_ROOTCINT="$as_dir/$ac_word$ac_exec_ext"
     21854    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     21855    break 2
     21856  fi
     21857done
     21858  done
     21859IFS=$as_save_IFS
     21860
     21861  test -z "$ac_cv_path_ROOTCINT" && ac_cv_path_ROOTCINT="no"
     21862  ;;
     21863esac
     21864fi
     21865ROOTCINT=$ac_cv_path_ROOTCINT
     21866if test -n "$ROOTCINT"; then
     21867  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ROOTCINT" >&5
     21868$as_echo "$ROOTCINT" >&6; }
     21869else
     21870  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     21871$as_echo "no" >&6; }
     21872fi
     21873
     21874
     21875
     21876  if test ! x"$ROOTCONF" = "xno" && \
     21877     test ! x"$ROOTCINT" = "xno" ; then
     21878
     21879    # define some variables
     21880    ROOTLIBDIR=`$ROOTCONF --libdir`
     21881    ROOTINCDIR=`$ROOTCONF --incdir`
     21882#    ROOTETCDIR=`$ROOTCONF --etcdir`
     21883    ROOTCFLAGS=`$ROOTCONF --noauxcflags --cflags`
     21884    ROOTLIBS=`$ROOTCONF --noauxlibs --noldflags --libs`
     21885    ROOTGLIBS=`$ROOTCONF --noauxlibs --noldflags --glibs`
     21886    ROOTAUXCFLAGS=`$ROOTCONF --auxcflags`
     21887    ROOTAUXLIBS=`$ROOTCONF --auxlibs`
     21888    ROOTRPATH=$ROOTLIBDIR
     21889    ROOTVERSION=`$ROOTCONF --version`
     21890    ROOTSOVERSION=`dirname $ROOTVERSION`
     21891
     21892    if test 5.12/00 ; then
     21893      { $as_echo "$as_me:${as_lineno-$LINENO}: checking wether ROOT version >= 5.12/00" >&5
     21894$as_echo_n "checking wether ROOT version >= 5.12/00... " >&6; }
     21895      vers=`$ROOTCONF --version | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
     21896      requ=`echo 5.12/00 | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
     21897      if test $vers -lt $requ ; then
     21898        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     21899$as_echo "no" >&6; }
     21900        no_root="yes"
     21901      else
     21902        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     21903$as_echo "yes" >&6; }
     21904      fi
     21905    fi
     21906  else
     21907    # otherwise, we say no_root
     21908    no_root="yes"
     21909  fi
     21910
     21911
     21912
     21913#  AC_SUBST(ROOTETCDIR)
     21914
     21915
     21916
     21917
     21918
     21919
     21920
     21921
     21922
     21923  if test "x$no_root" = "x" ; then
     21924    :
     21925  else
     21926    :
     21927  fi
     21928
     21929
     21930fi
     21931
     21932
     21933HAVE_ROOT_QT=no
     21934
     21935if test "$ROOTEXEC" != no ;
     21936then
     21937
     21938   ROOTCPPFLAGS=$ROOTCFLAGS" "$ROOTAUXCFLAGS
     21939   ROOTLDFLAGS="-L"$ROOTLIBDIR" -lGQt "
     21940
     21941
     21942
     21943  feat=qt
     21944  res=`$ROOTCONF --has-$feat`
     21945  if test "x$res" = "xyes" ; then
     21946    HAVE_ROOT_QT=yes
     21947  else
     21948    :
     21949  fi
     21950
     21951  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether root was built with --with-qt" >&5
     21952$as_echo_n "checking whether root was built with --with-qt... " >&6; }
     21953  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $res" >&5
     21954$as_echo "$res" >&6; }
     21955
     21956
     21957
     21958
     21959
     21960fi
    2172321961
    2172421962######################################################################
    … …  
    2196722205  HAS_QT4_TRUE='#'
    2196822206  HAS_QT4_FALSE=
     22207fi
     22208
     22209 if test "$ROOTEXEC" != no; then
     22210  HAS_ROOT_TRUE=
     22211  HAS_ROOT_FALSE='#'
     22212else
     22213  HAS_ROOT_TRUE='#'
     22214  HAS_ROOT_FALSE=
     22215fi
     22216
     22217 if test "$HAVE_ROOT_QT" = yes; then
     22218  HAS_ROOT_QT_TRUE=
     22219  HAS_ROOT_QT_FALSE='#'
     22220else
     22221  HAS_ROOT_QT_TRUE='#'
     22222  HAS_ROOT_QT_FALSE=
     22223fi
     22224
     22225 if test "$QT4_VERSION" -a "$HAVE_ROOT_QT" = yes; then
     22226  HAS_GUI_TRUE=
     22227  HAS_GUI_FALSE='#'
     22228else
     22229  HAS_GUI_TRUE='#'
     22230  HAS_GUI_FALSE=
    2196922231fi
    2197022232
    … …  
    2225422516if test -z "${HAS_QT4_TRUE}" && test -z "${HAS_QT4_FALSE}"; then
    2225522517  as_fn_error $? "conditional \"HAS_QT4\" was never defined.
     22518Usually this means the macro was only invoked conditionally." "$LINENO" 5
     22519fi
     22520if test -z "${HAS_ROOT_TRUE}" && test -z "${HAS_ROOT_FALSE}"; then
     22521  as_fn_error $? "conditional \"HAS_ROOT\" was never defined.
     22522Usually this means the macro was only invoked conditionally." "$LINENO" 5
     22523fi
     22524if test -z "${HAS_ROOT_QT_TRUE}" && test -z "${HAS_ROOT_QT_FALSE}"; then
     22525  as_fn_error $? "conditional \"HAS_ROOT_QT\" was never defined.
     22526Usually this means the macro was only invoked conditionally." "$LINENO" 5
     22527fi
     22528if test -z "${HAS_GUI_TRUE}" && test -z "${HAS_GUI_FALSE}"; then
     22529  as_fn_error $? "conditional \"HAS_GUI\" was never defined.
    2225622530Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2225722531fi
    … …  
    2461024884fi
    2461124885if test -n "$QT4_VERSION"; then
    24612   { $as_echo "$as_me:${as_lineno-$LINENO}:  GUI support enabled    / QT4 toolkit      found: yes" >&5
    24613 $as_echo "$as_me:  GUI support enabled    / QT4 toolkit      found: yes" >&6;}
    24614 else
    24615   { $as_echo "$as_me:${as_lineno-$LINENO}:  GUI support enabled    / QT4 toolkit      found: no" >&5
    24616 $as_echo "$as_me:  GUI support enabled    / QT4 toolkit      found: no" >&6;}
    24617 
    24618 fi
     24886  { $as_echo "$as_me:${as_lineno-$LINENO}:  QT4 support enabled    /  QT4 toolkit     found: yes" >&5
     24887$as_echo "$as_me:  QT4 support enabled    /  QT4 toolkit     found: yes" >&6;}
     24888else
     24889  { $as_echo "$as_me:${as_lineno-$LINENO}:  QT4 support enabled    /  QT4 toolkit     found: no" >&5
     24890$as_echo "$as_me:  QT4 support enabled    /  QT4 toolkit     found: no" >&6;}
     24891
     24892fi
     24893{ $as_echo "$as_me:${as_lineno-$LINENO}:  ROOT support enabled   /  root >= 5.12/00 found: $ROOTEXEC" >&5
     24894$as_echo "$as_me:  ROOT support enabled   /  root >= 5.12/00 found: $ROOTEXEC" >&6;}
     24895{ $as_echo "$as_me:${as_lineno-$LINENO}:  ROOT built with --with-qt                 found: $HAVE_ROOT_QT" >&5
     24896$as_echo "$as_me:  ROOT built with --with-qt                 found: $HAVE_ROOT_QT" >&6;}
    2461924897if test -n "$QT4_VERSION"; then
    2462024898
    … …  
    2464524923
    2464624924fi
     24925if test -n "$QT4_VERSION"; then
     24926
     24927   { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
     24928$as_echo "$as_me: " >&6;}
     24929   { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------------------------" >&5
     24930$as_echo "$as_me: --------------------------------------------------------------------" >&6;}
     24931   { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
     24932$as_echo "$as_me: " >&6;}
     24933   { $as_echo "$as_me:${as_lineno-$LINENO}:  ROOTVERSION   = $ROOTVERSION" >&5
     24934$as_echo "$as_me:  ROOTVERSION   = $ROOTVERSION" >&6;}
     24935   { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
     24936$as_echo "$as_me: " >&6;}
     24937   { $as_echo "$as_me:${as_lineno-$LINENO}:  ROOTEXEC      = $ROOTEXEC" >&5
     24938$as_echo "$as_me:  ROOTEXEC      = $ROOTEXEC" >&6;}
     24939   { $as_echo "$as_me:${as_lineno-$LINENO}:  ROOTCONF      = $ROOTCONF" >&5
     24940$as_echo "$as_me:  ROOTCONF      = $ROOTCONF" >&6;}
     24941   { $as_echo "$as_me:${as_lineno-$LINENO}:  ROOTCINT      = $ROOTCINT" >&5
     24942$as_echo "$as_me:  ROOTCINT      = $ROOTCINT" >&6;}
     24943   { $as_echo "$as_me:${as_lineno-$LINENO}:  ROOTCPPFLAGS  = $ROOTCPPFLAGS" >&5
     24944$as_echo "$as_me:  ROOTCPPFLAGS  = $ROOTCPPFLAGS" >&6;}
     24945   { $as_echo "$as_me:${as_lineno-$LINENO}:  ROOTLDFLAGS   = $ROOTLDFLAGS" >&5
     24946$as_echo "$as_me:  ROOTLDFLAGS   = $ROOTLDFLAGS" >&6;}
     24947
     24948fi
    2464724949{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
    2464824950$as_echo "$as_me: " >&6;}
    … …  
    2471025012{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
    2471125013$as_echo "$as_me: " >&6;}
    24712 
    24713 #[AC_]PACKAGE_NAME
    24714 #[AC_]PACKAGE_TARNAME
    24715 #[AC_]PACKAGE_VERSION
    24716 #[AC_]PACKAGE_STRING
    24717 #[AC_]PACKAGE_BUGREPORT
     25014{ $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------------------------" >&5
     25015$as_echo "$as_me: --------------------------------------------------------------------" >&6;}
     25016{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
     25017$as_echo "$as_me: " >&6;}
     25018if test "$ROOTEXEC" != no; then
     25019  if test "$HAVE_ROOT_QT" = yes; then
     25020  :
     25021else
     25022  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  root found but it was built without the --with-qt option" >&5
     25023$as_echo "$as_me: WARNING:  root found but it was built without the --with-qt option" >&2;}
     25024
     25025fi
     25026
     25027fi
     25028if test "$QT4_VERSION" -a "$HAVE_ROOT_QT" = yes; then
     25029  :
     25030else
     25031  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Either QT4 or qt-root is missing: GUI disabled!" >&5
     25032$as_echo "$as_me: WARNING:  Either QT4 or qt-root is missing: GUI disabled!" >&2;}
     25033
     25034fi
     25035{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
     25036$as_echo "$as_me: " >&6;}
Note: See TracChangeset for help on using the changeset viewer.