Changeset 10459 for trunk


Ignore:
Timestamp:
04/26/11 11:34:27 (14 years ago)
Author:
tbretz
Message:
Upadted.
Location:
trunk/FACT++
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.in

    r10446 r10459  
    4646        .aux_dir/ltmain.sh .aux_dir/missing AUTHORS COPYING ChangeLog \
    4747        INSTALL NEWS
    48 bin_PROGRAMS = $(am__EXEEXT_1) dns$(EXEEXT) did$(EXEEXT) log$(EXEEXT) \
     48bin_PROGRAMS = $(am__EXEEXT_1) dns$(EXEEXT) log$(EXEEXT) \
    4949        logtime$(EXEEXT) time$(EXEEXT) argv$(EXEEXT) test3$(EXEEXT) \
    5050        dclient5$(EXEEXT) dserver2$(EXEEXT) dataLogger$(EXEEXT) \
    51         ftmctrl$(EXEEXT) ftm$(EXEEXT) chatclient$(EXEEXT) \
    52         chatserv$(EXEEXT) fitsgrep$(EXEEXT) test$(EXEEXT)
    53 @HAS_GROFF_TRUE@am__append_1 = $(dist_man1_MANS:.man=.html)
    54 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_2 = $(dist_man1_MANS:.man=.pdf)
    55 @HAS_HELP2MAN_TRUE@am__append_3 = $(dist_man1_MANS)
     51        $(am__EXEEXT_2) $(am__EXEEXT_3)
     52@HAS_LIBXP_TRUE@am__append_1 = did
     53
     54# This is a trick to be able to build them but not having them in 'all'
     55@IS_FALSE@am__append_2 = \
     56@IS_FALSE@      test \
     57@IS_FALSE@      ftmctrl ftm \
     58@IS_FALSE@      chatclient chatserv \
     59@IS_FALSE@      fitsgrep test \
     60@IS_FALSE@      sched astro
     61
     62@HAS_GROFF_TRUE@am__append_3 = $(dist_man1_MANS:.man=.html)
     63@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_4 = $(dist_man1_MANS:.man=.pdf)
     64@HAS_HELP2MAN_TRUE@am__append_5 = $(dist_man1_MANS)
    5665subdir = .
    5766ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    137146libTools_la_OBJECTS = $(am_libTools_la_OBJECTS)
    138147@HAS_GUI_TRUE@am__EXEEXT_1 = fact$(EXEEXT)
     148@HAS_LIBXP_TRUE@am__EXEEXT_2 = did$(EXEEXT)
     149@IS_FALSE@am__EXEEXT_3 = test$(EXEEXT) ftmctrl$(EXEEXT) ftm$(EXEEXT) \
     150@IS_FALSE@      chatclient$(EXEEXT) chatserv$(EXEEXT) \
     151@IS_FALSE@      fitsgrep$(EXEEXT) test$(EXEEXT) sched$(EXEEXT) \
     152@IS_FALSE@      astro$(EXEEXT)
    139153PROGRAMS = $(bin_PROGRAMS)
    140154am_argv_OBJECTS = src/argv.$(OBJEXT)
    141155argv_OBJECTS = $(am_argv_OBJECTS)
    142156argv_DEPENDENCIES = libConfiguration.la
    143 am_chatclient_OBJECTS = src/chatclient.$(OBJEXT) \
    144         src/ChatClient.$(OBJEXT)
    145 chatclient_OBJECTS = $(am_chatclient_OBJECTS)
    146 chatclient_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
    147         libDim.la libDim++.la libConfiguration.la
    148 am_chatserv_OBJECTS = src/chatserv.$(OBJEXT) \
    149         src/LocalControl.$(OBJEXT)
    150 chatserv_OBJECTS = $(am_chatserv_OBJECTS)
    151 chatserv_DEPENDENCIES = libStateMachine.la libConfiguration.la \
    152         libTools.la libTime.la libDim.la libDim++.la
     157astro_SOURCES = astro.c
     158astro_OBJECTS = astro.$(OBJEXT)
     159astro_LDADD = $(LDADD)
     160chatclient_SOURCES = chatclient.c
     161chatclient_OBJECTS = chatclient.$(OBJEXT)
     162chatclient_LDADD = $(LDADD)
     163chatserv_SOURCES = chatserv.c
     164chatserv_OBJECTS = chatserv.$(OBJEXT)
     165chatserv_LDADD = $(LDADD)
    153166am_dataLogger_OBJECTS = src/dataLogger.$(OBJEXT) \
    154167        src/LocalControl.$(OBJEXT) src/Fits.$(OBJEXT)
    … …  
    195208        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libDim.la \
    196209        libDim++.la libTools.la libTime.la libStateMachine.la
    197 am_fitsgrep_OBJECTS = src/fitsgrep.$(OBJEXT)
    198 fitsgrep_OBJECTS = $(am_fitsgrep_OBJECTS)
    199 fitsgrep_DEPENDENCIES = libConfiguration.la
     210fitsgrep_SOURCES = fitsgrep.c
     211fitsgrep_OBJECTS = fitsgrep.$(OBJEXT)
     212fitsgrep_LDADD = $(LDADD)
    200213am_ftm_OBJECTS = src/ftm.$(OBJEXT) src/HeadersFTM.$(OBJEXT)
    201214ftm_OBJECTS = $(am_ftm_OBJECTS)
    … …  
    215228logtime_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
    216229        libDim.la libDim++.la
     230sched_SOURCES = sched.c
     231sched_OBJECTS = sched.$(OBJEXT)
     232sched_LDADD = $(LDADD)
    217233am_test_OBJECTS = src/test.$(OBJEXT)
    218234test_OBJECTS = $(am_test_OBJECTS)
    … …  
    272288        $(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
    273289        $(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
    274         $(chatclient_SOURCES) $(chatserv_SOURCES) \
    275         $(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
    276         $(dns_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) \
    277         $(fitsgrep_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
    278         $(log_SOURCES) $(logtime_SOURCES) $(test_SOURCES) \
    279         $(test3_SOURCES) $(time_SOURCES)
     290        astro.c chatclient.c chatserv.c $(dataLogger_SOURCES) \
     291        $(dclient5_SOURCES) $(did_SOURCES) $(dns_SOURCES) \
     292        $(dserver2_SOURCES) $(fact_SOURCES) fitsgrep.c $(ftm_SOURCES) \
     293        $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) sched.c \
     294        $(test_SOURCES) $(test3_SOURCES) $(time_SOURCES)
    280295DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
    281296        $(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
    282297        $(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
    283         $(chatclient_SOURCES) $(chatserv_SOURCES) \
    284         $(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
    285         $(dns_SOURCES) $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) \
    286         $(fitsgrep_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
    287         $(log_SOURCES) $(logtime_SOURCES) $(test_SOURCES) \
    288         $(test3_SOURCES) $(time_SOURCES)
     298        astro.c chatclient.c chatserv.c $(dataLogger_SOURCES) \
     299        $(dclient5_SOURCES) $(did_SOURCES) $(dns_SOURCES) \
     300        $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) fitsgrep.c \
     301        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
     302        $(logtime_SOURCES) sched.c $(test_SOURCES) $(test3_SOURCES) \
     303        $(time_SOURCES)
    289304man1dir = $(mandir)/man1
    290305NROFF = nroff
    … …  
    555570#-------------------------------------------------------------------------
    556571@HAS_GUI_TRUE@QT4_EXECUTABLES = fact
    557 #       sched astro
    558572lib_LTLIBRARIES = libDim.la libDim++.la libTime.la libTools.la \
    559573                  libConfiguration.la libStateMachine.la
    … …  
    673687logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la
    674688logtime_SOURCES = src/logtime.cc
    675 chatserv_LDADD = libStateMachine.la libConfiguration.la libTools.la libTime.la libDim.la libDim++.la
    676 chatserv_SOURCES = src/chatserv.cc src/LocalControl.cc src/LocalControl.h
     689
     690#chatserv_LDADD = libStateMachine.la libConfiguration.la libTools.la libTime.la libDim.la libDim++.la
     691#chatserv_SOURCES = src/chatserv.cc src/LocalControl.cc src/LocalControl.h
    677692dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc src/LocalControl.h
    678693dclient5_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
    … …  
    687702test3_SOURCES = src/test3.cc src/RemoteControl.cc src/RemoteControl.h
    688703test3_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
    689 chatclient_SOURCES = src/chatclient.cc src/ChatClient.cc src/ChatClient.h
    690 chatclient_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
     704
     705#chatclient_SOURCES = src/chatclient.cc src/ChatClient.cc src/ChatClient.h
     706#chatclient_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
    691707time_SOURCES = src/time.cc
    692708time_LDADD = libTime.la
    … …  
    700716    libConfiguration.la
    701717
    702 fitsgrep_SOURCES = src/fitsgrep.cc
    703 fitsgrep_LDADD = libConfiguration.la
     718
     719#fitsgrep_SOURCES = src/fitsgrep.cc
     720#fitsgrep_LDADD   = libConfiguration.la
    704721
    705722# -----
    … …  
    728745
    729746#-------------------------------------------------------------------------
    730 MAN_TARGETS = $(am__append_1) $(am__append_2) $(am__append_3)
     747MAN_TARGETS = $(am__append_3) $(am__append_4) $(am__append_5)
    731748all: $(BUILT_SOURCES)
    732749        $(MAKE) $(AM_MAKEFLAGS) all-am
    … …  
    957974        @rm -f argv$(EXEEXT)
    958975        $(AM_V_CXXLD)$(CXXLINK) $(argv_OBJECTS) $(argv_LDADD) $(LIBS)
    959 src/chatclient.$(OBJEXT): src/$(am__dirstamp) \
    960         src/$(DEPDIR)/$(am__dirstamp)
    961 src/ChatClient.$(OBJEXT): src/$(am__dirstamp) \
    962         src/$(DEPDIR)/$(am__dirstamp)
     976astro$(EXEEXT): $(astro_OBJECTS) $(astro_DEPENDENCIES)
     977        @rm -f astro$(EXEEXT)
     978        $(AM_V_CCLD)$(LINK) $(astro_OBJECTS) $(astro_LDADD) $(LIBS)
    963979chatclient$(EXEEXT): $(chatclient_OBJECTS) $(chatclient_DEPENDENCIES)
    964980        @rm -f chatclient$(EXEEXT)
    965         $(AM_V_CXXLD)$(CXXLINK) $(chatclient_OBJECTS) $(chatclient_LDADD) $(LIBS)
    966 src/chatserv.$(OBJEXT): src/$(am__dirstamp) \
     981        $(AM_V_CCLD)$(LINK) $(chatclient_OBJECTS) $(chatclient_LDADD) $(LIBS)
     982chatserv$(EXEEXT): $(chatserv_OBJECTS) $(chatserv_DEPENDENCIES)
     983        @rm -f chatserv$(EXEEXT)
     984        $(AM_V_CCLD)$(LINK) $(chatserv_OBJECTS) $(chatserv_LDADD) $(LIBS)
     985src/dataLogger.$(OBJEXT): src/$(am__dirstamp) \
    967986        src/$(DEPDIR)/$(am__dirstamp)
    968987src/LocalControl.$(OBJEXT): src/$(am__dirstamp) \
    969         src/$(DEPDIR)/$(am__dirstamp)
    970 chatserv$(EXEEXT): $(chatserv_OBJECTS) $(chatserv_DEPENDENCIES)
    971         @rm -f chatserv$(EXEEXT)
    972         $(AM_V_CXXLD)$(CXXLINK) $(chatserv_OBJECTS) $(chatserv_LDADD) $(LIBS)
    973 src/dataLogger.$(OBJEXT): src/$(am__dirstamp) \
    974988        src/$(DEPDIR)/$(am__dirstamp)
    975989src/Fits.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    … …  
    10351049        @rm -f fact$(EXEEXT)
    10361050        $(AM_V_CXXLD)$(CXXLINK) $(fact_OBJECTS) $(fact_LDADD) $(LIBS)
    1037 src/fitsgrep.$(OBJEXT): src/$(am__dirstamp) \
    1038         src/$(DEPDIR)/$(am__dirstamp)
    10391051fitsgrep$(EXEEXT): $(fitsgrep_OBJECTS) $(fitsgrep_DEPENDENCIES)
    10401052        @rm -f fitsgrep$(EXEEXT)
    1041         $(AM_V_CXXLD)$(CXXLINK) $(fitsgrep_OBJECTS) $(fitsgrep_LDADD) $(LIBS)
     1053        $(AM_V_CCLD)$(LINK) $(fitsgrep_OBJECTS) $(fitsgrep_LDADD) $(LIBS)
    10421054src/ftm.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    10431055src/HeadersFTM.$(OBJEXT): src/$(am__dirstamp) \
    … …  
    10601072        @rm -f logtime$(EXEEXT)
    10611073        $(AM_V_CXXLD)$(CXXLINK) $(logtime_OBJECTS) $(logtime_LDADD) $(LIBS)
     1074sched$(EXEEXT): $(sched_OBJECTS) $(sched_DEPENDENCIES)
     1075        @rm -f sched$(EXEEXT)
     1076        $(AM_V_CCLD)$(LINK) $(sched_OBJECTS) $(sched_LDADD) $(LIBS)
    10621077src/test.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    10631078test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES)
    … …  
    11271142        -rm -f gui/design.$(OBJEXT)
    11281143        -rm -f gui/fact.$(OBJEXT)
    1129         -rm -f src/ChatClient.$(OBJEXT)
    11301144        -rm -f src/Configuration.$(OBJEXT)
    11311145        -rm -f src/Configuration.lo
    … …  
    11831197        -rm -f src/WindowLog.lo
    11841198        -rm -f src/argv.$(OBJEXT)
    1185         -rm -f src/chatclient.$(OBJEXT)
    1186         -rm -f src/chatserv.$(OBJEXT)
    11871199        -rm -f src/dataLogger.$(OBJEXT)
    11881200        -rm -f src/dclient5.$(OBJEXT)
    11891201        -rm -f src/dserver2.$(OBJEXT)
    1190         -rm -f src/fitsgrep.$(OBJEXT)
    11911202        -rm -f src/ftm.$(OBJEXT)
    11921203        -rm -f src/ftmctrl.$(OBJEXT)
    … …  
    12021213        -rm -f *.tab.c
    12031214
     1215@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/astro.Po@am__quote@
     1216@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chatclient.Po@am__quote@
     1217@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chatserv.Po@am__quote@
     1218@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fitsgrep.Po@am__quote@
     1219@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sched.Po@am__quote@
    12041220@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/conn_handler.Plo@am__quote@
    12051221@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/copy_swap.Plo@am__quote@
    … …  
    12341250@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/design.Po@am__quote@
    12351251@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/fact.Po@am__quote@
    1236 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ChatClient.Po@am__quote@
    12371252@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Configuration.Plo@am__quote@
    12381253@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Connection.Plo@am__quote@
    … …  
    12651280@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/WindowLog.Plo@am__quote@
    12661281@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/argv.Po@am__quote@
    1267 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatclient.Po@am__quote@
    1268 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatserv.Po@am__quote@
    12691282@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dataLogger.Po@am__quote@
    12701283@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dclient5.Po@am__quote@
    12711284@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dserver2.Po@am__quote@
    1272 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsgrep.Po@am__quote@
    12731285@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftm.Po@am__quote@
    12741286@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftmctrl.Po@am__quote@
    … …  
    17441756distclean: distclean-am
    17451757        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    1746         -rm -rf dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) src/$(DEPDIR)
     1758        -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) src/$(DEPDIR)
    17471759        -rm -f Makefile
    17481760distclean-am: clean-am distclean-compile distclean-generic \
    … …  
    17931805        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    17941806        -rm -rf $(top_srcdir)/autom4te.cache
    1795         -rm -rf dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) src/$(DEPDIR)
     1807        -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) src/$(DEPDIR)
    17961808        -rm -f Makefile
    17971809maintainer-clean-am: distclean-am maintainer-clean-generic

  • trunk/FACT++/configure

    r10446 r10459  
    747747LTLIBOBJS
    748748LIBOBJS
     749IS_TRUE_FALSE
     750IS_TRUE_TRUE
     751IS_FALSE_FALSE
     752IS_FALSE_TRUE
    749753HAS_GUI_FALSE
    750754HAS_GUI_TRUE
    … …  
    823827MOTIF_LDFLAGS
    824828LT_HAVE_XP
    825 Have_Libxp_FALSE
    826 Have_Libxp_TRUE
     829HAS_LIBXP_FALSE
     830HAS_LIBXP_TRUE
    827831X_EXTRA_LIBS
    828832X_LIBS
    … …  
    44464450  lt_cv_nm_interface="BSD nm"
    44474451  echo "int some_variable = 0;" > conftest.$ac_ext
    4448   (eval echo "\"\$as_me:4448: $ac_compile\"" >&5)
     4452  (eval echo "\"\$as_me:4452: $ac_compile\"" >&5)
    44494453  (eval "$ac_compile" 2>conftest.err)
    44504454  cat conftest.err >&5
    4451   (eval echo "\"\$as_me:4451: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
     4455  (eval echo "\"\$as_me:4455: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    44524456  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    44534457  cat conftest.err >&5
    4454   (eval echo "\"\$as_me:4454: output\"" >&5)
     4458  (eval echo "\"\$as_me:4458: output\"" >&5)
    44554459  cat conftest.out >&5
    44564460  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    … …  
    56585662*-*-irix6*)
    56595663  # Find out which ABI we are using.
    5660   echo '#line 5660 "configure"' > conftest.$ac_ext
     5664  echo '#line 5664 "configure"' > conftest.$ac_ext
    56615665  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    56625666  (eval $ac_compile) 2>&5
    … …  
    75867590   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    75877591   -e 's:$: $lt_compiler_flag:'`
    7588    (eval echo "\"\$as_me:7588: $lt_compile\"" >&5)
     7592   (eval echo "\"\$as_me:7592: $lt_compile\"" >&5)
    75897593   (eval "$lt_compile" 2>conftest.err)
    75907594   ac_status=$?
    75917595   cat conftest.err >&5
    7592    echo "$as_me:7592: \$? = $ac_status" >&5
     7596   echo "$as_me:7596: \$? = $ac_status" >&5
    75937597   if (exit $ac_status) && test -s "$ac_outfile"; then
    75947598     # The compiler can only warn and ignore the option if not recognized
    … …  
    79257929   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79267930   -e 's:$: $lt_compiler_flag:'`
    7927    (eval echo "\"\$as_me:7927: $lt_compile\"" >&5)
     7931   (eval echo "\"\$as_me:7931: $lt_compile\"" >&5)
    79287932   (eval "$lt_compile" 2>conftest.err)
    79297933   ac_status=$?
    79307934   cat conftest.err >&5
    7931    echo "$as_me:7931: \$? = $ac_status" >&5
     7935   echo "$as_me:7935: \$? = $ac_status" >&5
    79327936   if (exit $ac_status) && test -s "$ac_outfile"; then
    79337937     # The compiler can only warn and ignore the option if not recognized
    … …  
    80308034   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80318035   -e 's:$: $lt_compiler_flag:'`
    8032    (eval echo "\"\$as_me:8032: $lt_compile\"" >&5)
     8036   (eval echo "\"\$as_me:8036: $lt_compile\"" >&5)
    80338037   (eval "$lt_compile" 2>out/conftest.err)
    80348038   ac_status=$?
    80358039   cat out/conftest.err >&5
    8036    echo "$as_me:8036: \$? = $ac_status" >&5
     8040   echo "$as_me:8040: \$? = $ac_status" >&5
    80378041   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    80388042   then
    … …  
    80858089   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80868090   -e 's:$: $lt_compiler_flag:'`
    8087    (eval echo "\"\$as_me:8087: $lt_compile\"" >&5)
     8091   (eval echo "\"\$as_me:8091: $lt_compile\"" >&5)
    80888092   (eval "$lt_compile" 2>out/conftest.err)
    80898093   ac_status=$?
    80908094   cat out/conftest.err >&5
    8091    echo "$as_me:8091: \$? = $ac_status" >&5
     8095   echo "$as_me:8095: \$? = $ac_status" >&5
    80928096   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    80938097   then
    … …  
    1046910473  lt_status=$lt_dlunknown
    1047010474  cat > conftest.$ac_ext <<_LT_EOF
    10471 #line 10471 "configure"
     10475#line 10475 "configure"
    1047210476#include "confdefs.h"
    1047310477
    … …  
    1056510569  lt_status=$lt_dlunknown
    1056610570  cat > conftest.$ac_ext <<_LT_EOF
    10567 #line 10567 "configure"
     10571#line 10571 "configure"
    1056810572#include "confdefs.h"
    1056910573
    … …  
    1252112525   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1252212526   -e 's:$: $lt_compiler_flag:'`
    12523    (eval echo "\"\$as_me:12523: $lt_compile\"" >&5)
     12527   (eval echo "\"\$as_me:12527: $lt_compile\"" >&5)
    1252412528   (eval "$lt_compile" 2>conftest.err)
    1252512529   ac_status=$?
    1252612530   cat conftest.err >&5
    12527    echo "$as_me:12527: \$? = $ac_status" >&5
     12531   echo "$as_me:12531: \$? = $ac_status" >&5
    1252812532   if (exit $ac_status) && test -s "$ac_outfile"; then
    1252912533     # The compiler can only warn and ignore the option if not recognized
    … …  
    1262012624   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1262112625   -e 's:$: $lt_compiler_flag:'`
    12622    (eval echo "\"\$as_me:12622: $lt_compile\"" >&5)
     12626   (eval echo "\"\$as_me:12626: $lt_compile\"" >&5)
    1262312627   (eval "$lt_compile" 2>out/conftest.err)
    1262412628   ac_status=$?
    1262512629   cat out/conftest.err >&5
    12626    echo "$as_me:12626: \$? = $ac_status" >&5
     12630   echo "$as_me:12630: \$? = $ac_status" >&5
    1262712631   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1262812632   then
    … …  
    1267212676   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1267312677   -e 's:$: $lt_compiler_flag:'`
    12674    (eval echo "\"\$as_me:12674: $lt_compile\"" >&5)
     12678   (eval echo "\"\$as_me:12678: $lt_compile\"" >&5)
    1267512679   (eval "$lt_compile" 2>out/conftest.err)
    1267612680   ac_status=$?
    1267712681   cat out/conftest.err >&5
    12678    echo "$as_me:12678: \$? = $ac_status" >&5
     12682   echo "$as_me:12682: \$? = $ac_status" >&5
    1267912683   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1268012684   then
    … …  
    1807318077fi
    1807418078 if test "$lt_cv_libxp" = "yes"; then
    18075   Have_Libxp_TRUE=
    18076   Have_Libxp_FALSE='#'
    18077 else
    18078   Have_Libxp_TRUE='#'
    18079   Have_Libxp_FALSE=
     18079  HAS_LIBXP_TRUE=
     18080  HAS_LIBXP_FALSE='#'
     18081else
     18082  HAS_LIBXP_TRUE='#'
     18083  HAS_LIBXP_FALSE=
    1808018084fi
    1808118085
    … …  
    1832518329fi
    1832618330 if test "$lt_cv_libxp" = "yes"; then
    18327   Have_Libxp_TRUE=
    18328   Have_Libxp_FALSE='#'
    18329 else
    18330   Have_Libxp_TRUE='#'
    18331   Have_Libxp_FALSE=
     18331  HAS_LIBXP_TRUE=
     18332  HAS_LIBXP_FALSE='#'
     18333else
     18334  HAS_LIBXP_TRUE='#'
     18335  HAS_LIBXP_FALSE=
    1833218336fi
    1833318337
    … …  
    1838218386LDFLAGS+=" "$MOTIF_LDFLAGS" "
    1838318387
    18384 #AC_CHECK_HEADERS([Mrm/MrmAppl.h], [],
    18385 #   [
    18386 #      echo "Error! Mrm/MrmAppl.h not properly installed, needed to compile did (you need most probably lesstif2-dev)."
    18387 #      exit -1
    18388 #   ]
    18389 #)
     18388if test "$lt_cv_libxp" = "yes"; then
     18389  :
     18390else
     18391  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Motif/lesstif not found!" >&5
     18392$as_echo "$as_me: WARNING:  Motif/lesstif not found!" >&2;}
     18393
     18394fi
    1839018395
    1839118396######################################################################
    … …  
    2160721612
    2160821613                cat > conftest.$ac_ext <<EOF
    21609 #line 21609 "configure"
     21614#line 21614 "configure"
    2161021615#include "confdefs.h"
    2161121616#include <qglobal.h>
    … …  
    2228322288  HAS_GUI_TRUE='#'
    2228422289  HAS_GUI_FALSE=
     22290fi
     22291
     22292
     22293 if test "x" = "y"; then
     22294  IS_FALSE_TRUE=
     22295  IS_FALSE_FALSE='#'
     22296else
     22297  IS_FALSE_TRUE='#'
     22298  IS_FALSE_FALSE=
     22299fi
     22300
     22301 if test "x" = "x"; then
     22302  IS_TRUE_TRUE=
     22303  IS_TRUE_FALSE='#'
     22304else
     22305  IS_TRUE_TRUE='#'
     22306  IS_TRUE_FALSE=
    2228522307fi
    2228622308
    … …  
    2253222554Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2253322555fi
    22534 if test -z "${Have_Libxp_TRUE}" && test -z "${Have_Libxp_FALSE}"; then
    22535   as_fn_error $? "conditional \"Have_Libxp\" was never defined.
     22556if test -z "${HAS_LIBXP_TRUE}" && test -z "${HAS_LIBXP_FALSE}"; then
     22557  as_fn_error $? "conditional \"HAS_LIBXP\" was never defined.
    2253622558Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2253722559fi
    22538 if test -z "${Have_Libxp_TRUE}" && test -z "${Have_Libxp_FALSE}"; then
    22539   as_fn_error $? "conditional \"Have_Libxp\" was never defined.
     22560if test -z "${HAS_LIBXP_TRUE}" && test -z "${HAS_LIBXP_FALSE}"; then
     22561  as_fn_error $? "conditional \"HAS_LIBXP\" was never defined.
    2254022562Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2254122563fi
    … …  
    2258222604if test -z "${HAS_GUI_TRUE}" && test -z "${HAS_GUI_FALSE}"; then
    2258322605  as_fn_error $? "conditional \"HAS_GUI\" was never defined.
     22606Usually this means the macro was only invoked conditionally." "$LINENO" 5
     22607fi
     22608if test -z "${IS_FALSE_TRUE}" && test -z "${IS_FALSE_FALSE}"; then
     22609  as_fn_error $? "conditional \"IS_FALSE\" was never defined.
     22610Usually this means the macro was only invoked conditionally." "$LINENO" 5
     22611fi
     22612if test -z "${IS_TRUE_TRUE}" && test -z "${IS_TRUE_FALSE}"; then
     22613  as_fn_error $? "conditional \"IS_TRUE\" was never defined.
    2258422614Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2258522615fi
    … …  
    2490624936{ $as_echo "$as_me:${as_lineno-$LINENO}:  BOOST_LDFLAGS  = $BOOST_LDFLAGS" >&5
    2490724937$as_echo "$as_me:  BOOST_LDFLAGS  = $BOOST_LDFLAGS" >&6;}
    24908    { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
     24938{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
    2490924939$as_echo "$as_me: " >&6;}
    2491024940if test -n "$QT4_VERSION"; then
    … …  
    2495624986   { $as_echo "$as_me:${as_lineno-$LINENO}:  ROOTLDFLAGS   = $ROOTLDFLAGS" >&5
    2495724987$as_echo "$as_me:  ROOTLDFLAGS   = $ROOTLDFLAGS" >&6;}
    24958 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
     24988   { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
    2495924989$as_echo "$as_me: " >&6;}
    2496024990
    … …  
    2496424994{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
    2496524995$as_echo "$as_me: " >&6;}
    24966 
     24996if test "$lt_cv_libxp" = "yes"; then
     24997  { $as_echo "$as_me:${as_lineno-$LINENO}:  Motif/lesstif          / 'Xm/Xm.h' 'libXp' found: yes" >&5
     24998$as_echo "$as_me:  Motif/lesstif          / 'Xm/Xm.h' 'libXp' found: yes" >&6;}
     24999else
     25000  { $as_echo "$as_me:${as_lineno-$LINENO}:  Motif/lesstif          / 'Xm/Xm.h' 'libXp' found: no" >&5
     25001$as_echo "$as_me:  Motif/lesstif          / 'Xm/Xm.h' 'libXp' found: no" >&6;}
     25002
     25003fi
    2496725004if test "$COLORDIFF" = colordiff; then
    24968   { $as_echo "$as_me:${as_lineno-$LINENO}:  colored svn diff       / 'colordiff'      found: yes" >&5
    24969 $as_echo "$as_me:  colored svn diff       / 'colordiff'      found: yes" >&6;}
    24970 else
    24971   { $as_echo "$as_me:${as_lineno-$LINENO}:  colored svn diff       / 'colordiff'      found: no" >&5
    24972 $as_echo "$as_me:  colored svn diff       / 'colordiff'      found: no" >&6;}
     25005  { $as_echo "$as_me:${as_lineno-$LINENO}:  colored svn diff       / 'colordiff'       found: yes" >&5
     25006$as_echo "$as_me:  colored svn diff       / 'colordiff'       found: yes" >&6;}
     25007else
     25008  { $as_echo "$as_me:${as_lineno-$LINENO}:  colored svn diff       / 'colordiff'       found: no" >&5
     25009$as_echo "$as_me:  colored svn diff       / 'colordiff'       found: no" >&6;}
    2497325010
    2497425011fi
    2497525012if test "$HELP2MAN" = yes; then
    2497625013
    24977    { $as_echo "$as_me:${as_lineno-$LINENO}:  man-pages enabled      / 'help2man'       found: $HELP2MAN" >&5
    24978 $as_echo "$as_me:  man-pages enabled      / 'help2man'       found: $HELP2MAN" >&6;}
     25014   { $as_echo "$as_me:${as_lineno-$LINENO}:  man-pages enabled      / 'help2man'        found: $HELP2MAN" >&5
     25015$as_echo "$as_me:  man-pages enabled      / 'help2man'        found: $HELP2MAN" >&6;}
    2497925016   if test "$GROFF" = yes; then
    24980   { $as_echo "$as_me:${as_lineno-$LINENO}:  build of html enabled  / 'groff'          found: yes" >&5
    24981 $as_echo "$as_me:  build of html enabled  / 'groff'          found: yes" >&6;}
    24982       { $as_echo "$as_me:${as_lineno-$LINENO}:  build of pdf  enabled  / 'ps2pdf'         found: $PS2PDF" >&5
    24983 $as_echo "$as_me:  build of pdf  enabled  / 'ps2pdf'         found: $PS2PDF" >&6;}
    24984 else
    24985   { $as_echo "$as_me:${as_lineno-$LINENO}:  build of html and pdf  / 'groff'          found: no" >&5
    24986 $as_echo "$as_me:  build of html and pdf  / 'groff'          found: no" >&6;}
    24987 
    24988 fi
    24989 
    24990 else
    24991 
    24992    { $as_echo "$as_me:${as_lineno-$LINENO}:  man, html, pdf enabled / 'help2man'       found: no" >&5
    24993 $as_echo "$as_me:  man, html, pdf enabled / 'help2man'       found: no" >&6;}
     25017  { $as_echo "$as_me:${as_lineno-$LINENO}:  build of html enabled  / 'groff'           found: yes" >&5
     25018$as_echo "$as_me:  build of html enabled  / 'groff'           found: yes" >&6;}
     25019      { $as_echo "$as_me:${as_lineno-$LINENO}:  build of pdf  enabled  / 'ps2pdf'          found: $PS2PDF" >&5
     25020$as_echo "$as_me:  build of pdf  enabled  / 'ps2pdf'          found: $PS2PDF" >&6;}
     25021else
     25022  { $as_echo "$as_me:${as_lineno-$LINENO}:  build of html and pdf  / 'groff'           found: no" >&5
     25023$as_echo "$as_me:  build of html and pdf  / 'groff'           found: no" >&6;}
     25024
     25025fi
     25026
     25027else
     25028
     25029   { $as_echo "$as_me:${as_lineno-$LINENO}:  man, html, pdf enabled / 'help2man'        found: no" >&5
     25030$as_echo "$as_me:  man, html, pdf enabled / 'help2man'        found: no" >&6;}
    2499425031
    2499525032fi
    2499625033
    2499725034if test -n "$DX_DOXYGEN"; then
    24998   { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen docu enabled   / 'doxygen'        found: $DX_DOXYGEN" >&5
    24999 $as_echo "$as_me:  doxygen docu enabled   / 'doxygen'        found: $DX_DOXYGEN" >&6;}
    25000 else
    25001   { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen docu enabled   / 'doxygen'        found: no" >&5
    25002 $as_echo "$as_me:  doxygen docu enabled   / 'doxygen'        found: no" >&6;}
     25035  { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen docu enabled   / 'doxygen'         found: $DX_DOXYGEN" >&5
     25036$as_echo "$as_me:  doxygen docu enabled   / 'doxygen'         found: $DX_DOXYGEN" >&6;}
     25037else
     25038  { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen docu enabled   / 'doxygen'         found: no" >&5
     25039$as_echo "$as_me:  doxygen docu enabled   / 'doxygen'         found: no" >&6;}
    2500325040
    2500425041fi
    2500525042if test -n "$DX_DOT"; then
    25006   { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen graphs enabled / 'dot' (graphviz) found: $DX_DOT" >&5
    25007 $as_echo "$as_me:  doxygen graphs enabled / 'dot' (graphviz) found: $DX_DOT" >&6;}
    25008 else
    25009   { $as_echo "$as_me:${as_lineno-$LINENO}:  doxagen graphs enabled / 'dot' (graphviz) found: no" >&5
    25010 $as_echo "$as_me:  doxagen graphs enabled / 'dot' (graphviz) found: no" >&6;}
     25043  { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen graphs enabled / 'dot' (graphviz)  found: $DX_DOT" >&5
     25044$as_echo "$as_me:  doxygen graphs enabled / 'dot' (graphviz)  found: $DX_DOT" >&6;}
     25045else
     25046  { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen graphs enabled / 'dot' (graphviz) found: no" >&5
     25047$as_echo "$as_me:  doxygen graphs enabled / 'dot' (graphviz) found: no" >&6;}
    2501125048
    2501225049fi
    2501325050if test -n "$QT4_VERSION"; then
    25014   { $as_echo "$as_me:${as_lineno-$LINENO}:  QT4 support enabled    /  QT4 toolkit     found: yes" >&5
    25015 $as_echo "$as_me:  QT4 support enabled    /  QT4 toolkit     found: yes" >&6;}
    25016 else
    25017   { $as_echo "$as_me:${as_lineno-$LINENO}:  QT4 support enabled    /  QT4 toolkit     found: no" >&5
    25018 $as_echo "$as_me:  QT4 support enabled    /  QT4 toolkit     found: no" >&6;}
    25019 
    25020 fi
    25021 { $as_echo "$as_me:${as_lineno-$LINENO}:  ROOT support enabled   /  root >= 5.12/00 found: $ROOTEXEC" >&5
    25022 $as_echo "$as_me:  ROOT support enabled   /  root >= 5.12/00 found: $ROOTEXEC" >&6;}
    25023 { $as_echo "$as_me:${as_lineno-$LINENO}:  ROOT built with --with-qt                 found: $HAVE_ROOT_QT" >&5
    25024 $as_echo "$as_me:  ROOT built with --with-qt                 found: $HAVE_ROOT_QT" >&6;}
     25051  { $as_echo "$as_me:${as_lineno-$LINENO}:  QT4 support enabled    /  QT4 toolkit      found: yes" >&5
     25052$as_echo "$as_me:  QT4 support enabled    /  QT4 toolkit      found: yes" >&6;}
     25053else
     25054  { $as_echo "$as_me:${as_lineno-$LINENO}:  QT4 support enabled    /  QT4 toolkit      found: no" >&5
     25055$as_echo "$as_me:  QT4 support enabled    /  QT4 toolkit      found: no" >&6;}
     25056
     25057fi
     25058{ $as_echo "$as_me:${as_lineno-$LINENO}:  ROOT support enabled   /  root >= 5.12/00  found: $ROOTEXEC" >&5
     25059$as_echo "$as_me:  ROOT support enabled   /  root >= 5.12/00  found: $ROOTEXEC" >&6;}
     25060{ $as_echo "$as_me:${as_lineno-$LINENO}:  ROOT built with --with-qt                  found: $HAVE_ROOT_QT" >&5
     25061$as_echo "$as_me:  ROOT built with --with-qt                  found: $HAVE_ROOT_QT" >&6;}
    2502525062{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
    2502625063$as_echo "$as_me: " >&6;}
    … …  
    2503325070{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
    2503425071$as_echo "$as_me: " >&6;}
    25035 { $as_echo "$as_me:${as_lineno-$LINENO}:   - Add 'V=1' to you make-call to switch on verbose output." >&5
    25036 $as_echo "$as_me:   - Add 'V=1' to you make-call to switch on verbose output." >&6;}
    25037 { $as_echo "$as_me:${as_lineno-$LINENO}:   - Do not try to create man-pages with doxygen," >&5
    25038 $as_echo "$as_me:   - Do not try to create man-pages with doxygen," >&6;}
    25039 { $as_echo "$as_me:${as_lineno-$LINENO}:     it does most probably not work." >&5
    25040 $as_echo "$as_me:     it does most probably not work." >&6;}
     25072{ $as_echo "$as_me:${as_lineno-$LINENO}:  - Add 'V=1' to you make-call to switch on verbose output." >&5
     25073$as_echo "$as_me:  - Add 'V=1' to you make-call to switch on verbose output." >&6;}
     25074{ $as_echo "$as_me:${as_lineno-$LINENO}:  - Do not try to create man-pages with doxygen," >&5
     25075$as_echo "$as_me:  - Do not try to create man-pages with doxygen," >&6;}
     25076{ $as_echo "$as_me:${as_lineno-$LINENO}:    it does most probably not work." >&5
     25077$as_echo "$as_me:    it does most probably not work." >&6;}
    2504125078if test "$GCC" = colorgcc; then
    2504225079  :
    2504325080else
    25044   { $as_echo "$as_me:${as_lineno-$LINENO}:   - Install colorgcc to get colored compiler output." >&5
    25045 $as_echo "$as_me:   - Install colorgcc to get colored compiler output." >&6;}
    25046 
    25047 fi
    25048 { $as_echo "$as_me:${as_lineno-$LINENO}:   - If you send me a bug report about:" >&5
    25049 $as_echo "$as_me:   - If you send me a bug report about:" >&6;}
    25050 { $as_echo "$as_me:${as_lineno-$LINENO}:     + configure please attach the file config.log" >&5
    25051 $as_echo "$as_me:     + configure please attach the file config.log" >&6;}
    25052 { $as_echo "$as_me:${as_lineno-$LINENO}:     + make please send me the output of 'make V=1'" >&5
    25053 $as_echo "$as_me:     + make please send me the output of 'make V=1'" >&6;}
     25081  { $as_echo "$as_me:${as_lineno-$LINENO}:  - Install colorgcc to get colored compiler output." >&5
     25082$as_echo "$as_me:  - Install colorgcc to get colored compiler output." >&6;}
     25083
     25084fi
     25085{ $as_echo "$as_me:${as_lineno-$LINENO}:  - If you send me a bug report about:" >&5
     25086$as_echo "$as_me:  - If you send me a bug report about:" >&6;}
     25087{ $as_echo "$as_me:${as_lineno-$LINENO}:    + configure: please attach the file config.log" >&5
     25088$as_echo "$as_me:    + configure: please attach the file config.log" >&6;}
     25089{ $as_echo "$as_me:${as_lineno-$LINENO}:    + make: please send me the output of 'make V=1'" >&5
     25090$as_echo "$as_me:    + make: please send me the output of 'make V=1'" >&6;}
    2505425091{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
    2505525092$as_echo "$as_me: " >&6;}
    … …  
    2509825135{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
    2509925136$as_echo "$as_me: " >&6;}
     25137if test "$lt_cv_libxp" = "yes"; then
     25138  :
     25139else
     25140  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Motif/lesstif not found. The dim gui did will not be built!" >&5
     25141$as_echo "$as_me: WARNING:  Motif/lesstif not found. The dim gui did will not be built!" >&2;}
     25142
     25143fi
    2510025144if test "$ROOTEXEC" != no; then
    2510125145  if test "$HAVE_ROOT_QT" = yes; then
Note: See TracChangeset for help on using the changeset viewer.