Index: /trunk/FACT++/Makefile.in =================================================================== --- /trunk/FACT++/Makefile.in (revision 10458) +++ /trunk/FACT++/Makefile.in (revision 10459) @@ -46,12 +46,21 @@ .aux_dir/ltmain.sh .aux_dir/missing AUTHORS COPYING ChangeLog \ INSTALL NEWS -bin_PROGRAMS = $(am__EXEEXT_1) dns$(EXEEXT) did$(EXEEXT) log$(EXEEXT) \ +bin_PROGRAMS = $(am__EXEEXT_1) dns$(EXEEXT) log$(EXEEXT) \ logtime$(EXEEXT) time$(EXEEXT) argv$(EXEEXT) test3$(EXEEXT) \ dclient5$(EXEEXT) dserver2$(EXEEXT) dataLogger$(EXEEXT) \ - ftmctrl$(EXEEXT) ftm$(EXEEXT) chatclient$(EXEEXT) \ - chatserv$(EXEEXT) fitsgrep$(EXEEXT) test$(EXEEXT) -@HAS_GROFF_TRUE@am__append_1 = $(dist_man1_MANS:.man=.html) -@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_2 = $(dist_man1_MANS:.man=.pdf) -@HAS_HELP2MAN_TRUE@am__append_3 = $(dist_man1_MANS) + $(am__EXEEXT_2) $(am__EXEEXT_3) +@HAS_LIBXP_TRUE@am__append_1 = did + +# This is a trick to be able to build them but not having them in 'all' +@IS_FALSE@am__append_2 = \ +@IS_FALSE@ test \ +@IS_FALSE@ ftmctrl ftm \ +@IS_FALSE@ chatclient chatserv \ +@IS_FALSE@ fitsgrep test \ +@IS_FALSE@ sched astro + +@HAS_GROFF_TRUE@am__append_3 = $(dist_man1_MANS:.man=.html) +@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_4 = $(dist_man1_MANS:.man=.pdf) +@HAS_HELP2MAN_TRUE@am__append_5 = $(dist_man1_MANS) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -137,18 +146,22 @@ libTools_la_OBJECTS = $(am_libTools_la_OBJECTS) @HAS_GUI_TRUE@am__EXEEXT_1 = fact$(EXEEXT) +@HAS_LIBXP_TRUE@am__EXEEXT_2 = did$(EXEEXT) +@IS_FALSE@am__EXEEXT_3 = test$(EXEEXT) ftmctrl$(EXEEXT) ftm$(EXEEXT) \ +@IS_FALSE@ chatclient$(EXEEXT) chatserv$(EXEEXT) \ +@IS_FALSE@ fitsgrep$(EXEEXT) test$(EXEEXT) sched$(EXEEXT) \ +@IS_FALSE@ astro$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) am_argv_OBJECTS = src/argv.$(OBJEXT) argv_OBJECTS = $(am_argv_OBJECTS) argv_DEPENDENCIES = libConfiguration.la -am_chatclient_OBJECTS = src/chatclient.$(OBJEXT) \ - src/ChatClient.$(OBJEXT) -chatclient_OBJECTS = $(am_chatclient_OBJECTS) -chatclient_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \ - libDim.la libDim++.la libConfiguration.la -am_chatserv_OBJECTS = src/chatserv.$(OBJEXT) \ - src/LocalControl.$(OBJEXT) -chatserv_OBJECTS = $(am_chatserv_OBJECTS) -chatserv_DEPENDENCIES = libStateMachine.la libConfiguration.la \ - libTools.la libTime.la libDim.la libDim++.la +astro_SOURCES = astro.c +astro_OBJECTS = astro.$(OBJEXT) +astro_LDADD = $(LDADD) +chatclient_SOURCES = chatclient.c +chatclient_OBJECTS = chatclient.$(OBJEXT) +chatclient_LDADD = $(LDADD) +chatserv_SOURCES = chatserv.c +chatserv_OBJECTS = chatserv.$(OBJEXT) +chatserv_LDADD = $(LDADD) am_dataLogger_OBJECTS = src/dataLogger.$(OBJEXT) \ src/LocalControl.$(OBJEXT) src/Fits.$(OBJEXT) @@ -195,7 +208,7 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libDim.la \ libDim++.la libTools.la libTime.la libStateMachine.la -am_fitsgrep_OBJECTS = src/fitsgrep.$(OBJEXT) -fitsgrep_OBJECTS = $(am_fitsgrep_OBJECTS) -fitsgrep_DEPENDENCIES = libConfiguration.la +fitsgrep_SOURCES = fitsgrep.c +fitsgrep_OBJECTS = fitsgrep.$(OBJEXT) +fitsgrep_LDADD = $(LDADD) am_ftm_OBJECTS = src/ftm.$(OBJEXT) src/HeadersFTM.$(OBJEXT) ftm_OBJECTS = $(am_ftm_OBJECTS) @@ -215,4 +228,7 @@ logtime_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \ libDim.la libDim++.la +sched_SOURCES = sched.c +sched_OBJECTS = sched.$(OBJEXT) +sched_LDADD = $(LDADD) am_test_OBJECTS = src/test.$(OBJEXT) test_OBJECTS = $(am_test_OBJECTS) @@ -272,19 +288,18 @@ $(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \ $(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \ - $(chatclient_SOURCES) $(chatserv_SOURCES) \ - $(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \ - $(dns_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) \ - $(fitsgrep_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \ - $(log_SOURCES) $(logtime_SOURCES) $(test_SOURCES) \ - $(test3_SOURCES) $(time_SOURCES) + astro.c chatclient.c chatserv.c $(dataLogger_SOURCES) \ + $(dclient5_SOURCES) $(did_SOURCES) $(dns_SOURCES) \ + $(dserver2_SOURCES) $(fact_SOURCES) fitsgrep.c $(ftm_SOURCES) \ + $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) sched.c \ + $(test_SOURCES) $(test3_SOURCES) $(time_SOURCES) DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \ $(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \ $(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \ - $(chatclient_SOURCES) $(chatserv_SOURCES) \ - $(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \ - $(dns_SOURCES) $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) \ - $(fitsgrep_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \ - $(log_SOURCES) $(logtime_SOURCES) $(test_SOURCES) \ - $(test3_SOURCES) $(time_SOURCES) + astro.c chatclient.c chatserv.c $(dataLogger_SOURCES) \ + $(dclient5_SOURCES) $(did_SOURCES) $(dns_SOURCES) \ + $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) fitsgrep.c \ + $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \ + $(logtime_SOURCES) sched.c $(test_SOURCES) $(test3_SOURCES) \ + $(time_SOURCES) man1dir = $(mandir)/man1 NROFF = nroff @@ -555,5 +570,4 @@ #------------------------------------------------------------------------- @HAS_GUI_TRUE@QT4_EXECUTABLES = fact -# sched astro lib_LTLIBRARIES = libDim.la libDim++.la libTime.la libTools.la \ libConfiguration.la libStateMachine.la @@ -673,6 +687,7 @@ logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la logtime_SOURCES = src/logtime.cc -chatserv_LDADD = libStateMachine.la libConfiguration.la libTools.la libTime.la libDim.la libDim++.la -chatserv_SOURCES = src/chatserv.cc src/LocalControl.cc src/LocalControl.h + +#chatserv_LDADD = libStateMachine.la libConfiguration.la libTools.la libTime.la libDim.la libDim++.la +#chatserv_SOURCES = src/chatserv.cc src/LocalControl.cc src/LocalControl.h dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc src/LocalControl.h dclient5_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \ @@ -687,6 +702,7 @@ test3_SOURCES = src/test3.cc src/RemoteControl.cc src/RemoteControl.h test3_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la -chatclient_SOURCES = src/chatclient.cc src/ChatClient.cc src/ChatClient.h -chatclient_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la + +#chatclient_SOURCES = src/chatclient.cc src/ChatClient.cc src/ChatClient.h +#chatclient_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la time_SOURCES = src/time.cc time_LDADD = libTime.la @@ -700,6 +716,7 @@ libConfiguration.la -fitsgrep_SOURCES = src/fitsgrep.cc -fitsgrep_LDADD = libConfiguration.la + +#fitsgrep_SOURCES = src/fitsgrep.cc +#fitsgrep_LDADD = libConfiguration.la # ----- @@ -728,5 +745,5 @@ #------------------------------------------------------------------------- -MAN_TARGETS = $(am__append_1) $(am__append_2) $(am__append_3) +MAN_TARGETS = $(am__append_3) $(am__append_4) $(am__append_5) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -957,19 +974,16 @@ @rm -f argv$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(argv_OBJECTS) $(argv_LDADD) $(LIBS) -src/chatclient.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) -src/ChatClient.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) +astro$(EXEEXT): $(astro_OBJECTS) $(astro_DEPENDENCIES) + @rm -f astro$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(astro_OBJECTS) $(astro_LDADD) $(LIBS) chatclient$(EXEEXT): $(chatclient_OBJECTS) $(chatclient_DEPENDENCIES) @rm -f chatclient$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(chatclient_OBJECTS) $(chatclient_LDADD) $(LIBS) -src/chatserv.$(OBJEXT): src/$(am__dirstamp) \ + $(AM_V_CCLD)$(LINK) $(chatclient_OBJECTS) $(chatclient_LDADD) $(LIBS) +chatserv$(EXEEXT): $(chatserv_OBJECTS) $(chatserv_DEPENDENCIES) + @rm -f chatserv$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(chatserv_OBJECTS) $(chatserv_LDADD) $(LIBS) +src/dataLogger.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/LocalControl.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) -chatserv$(EXEEXT): $(chatserv_OBJECTS) $(chatserv_DEPENDENCIES) - @rm -f chatserv$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(chatserv_OBJECTS) $(chatserv_LDADD) $(LIBS) -src/dataLogger.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/Fits.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) @@ -1035,9 +1049,7 @@ @rm -f fact$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(fact_OBJECTS) $(fact_LDADD) $(LIBS) -src/fitsgrep.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) fitsgrep$(EXEEXT): $(fitsgrep_OBJECTS) $(fitsgrep_DEPENDENCIES) @rm -f fitsgrep$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(fitsgrep_OBJECTS) $(fitsgrep_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(fitsgrep_OBJECTS) $(fitsgrep_LDADD) $(LIBS) src/ftm.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/HeadersFTM.$(OBJEXT): src/$(am__dirstamp) \ @@ -1060,4 +1072,7 @@ @rm -f logtime$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(logtime_OBJECTS) $(logtime_LDADD) $(LIBS) +sched$(EXEEXT): $(sched_OBJECTS) $(sched_DEPENDENCIES) + @rm -f sched$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(sched_OBJECTS) $(sched_LDADD) $(LIBS) src/test.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) @@ -1127,5 +1142,4 @@ -rm -f gui/design.$(OBJEXT) -rm -f gui/fact.$(OBJEXT) - -rm -f src/ChatClient.$(OBJEXT) -rm -f src/Configuration.$(OBJEXT) -rm -f src/Configuration.lo @@ -1183,10 +1197,7 @@ -rm -f src/WindowLog.lo -rm -f src/argv.$(OBJEXT) - -rm -f src/chatclient.$(OBJEXT) - -rm -f src/chatserv.$(OBJEXT) -rm -f src/dataLogger.$(OBJEXT) -rm -f src/dclient5.$(OBJEXT) -rm -f src/dserver2.$(OBJEXT) - -rm -f src/fitsgrep.$(OBJEXT) -rm -f src/ftm.$(OBJEXT) -rm -f src/ftmctrl.$(OBJEXT) @@ -1202,4 +1213,9 @@ -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/astro.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chatclient.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chatserv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fitsgrep.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sched.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/conn_handler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/copy_swap.Plo@am__quote@ @@ -1234,5 +1250,4 @@ @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/design.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/fact.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ChatClient.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Configuration.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Connection.Plo@am__quote@ @@ -1265,10 +1280,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/WindowLog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/argv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatclient.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatserv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dataLogger.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dclient5.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dserver2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsgrep.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftmctrl.Po@am__quote@ @@ -1744,5 +1756,5 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) src/$(DEPDIR) + -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) src/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -1793,5 +1805,5 @@ -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) src/$(DEPDIR) + -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) src/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic Index: /trunk/FACT++/configure =================================================================== --- /trunk/FACT++/configure (revision 10458) +++ /trunk/FACT++/configure (revision 10459) @@ -747,4 +747,8 @@ LTLIBOBJS LIBOBJS +IS_TRUE_FALSE +IS_TRUE_TRUE +IS_FALSE_FALSE +IS_FALSE_TRUE HAS_GUI_FALSE HAS_GUI_TRUE @@ -823,6 +827,6 @@ MOTIF_LDFLAGS LT_HAVE_XP -Have_Libxp_FALSE -Have_Libxp_TRUE +HAS_LIBXP_FALSE +HAS_LIBXP_TRUE X_EXTRA_LIBS X_LIBS @@ -4446,11 +4450,11 @@ lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4448: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4452: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4451: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4455: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4454: output\"" >&5) + (eval echo "\"\$as_me:4458: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then @@ -5658,5 +5662,5 @@ *-*-irix6*) # Find out which ABI we are using. - echo '#line 5660 "configure"' > conftest.$ac_ext + echo '#line 5664 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -7586,9 +7590,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7588: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7592: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7592: \$? = $ac_status" >&5 + echo "$as_me:7596: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized @@ -7925,9 +7929,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7927: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7931: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7931: \$? = $ac_status" >&5 + echo "$as_me:7935: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized @@ -8030,9 +8034,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8032: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8036: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8036: \$? = $ac_status" >&5 + echo "$as_me:8040: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then @@ -8085,9 +8089,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8087: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8091: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8091: \$? = $ac_status" >&5 + echo "$as_me:8095: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then @@ -10469,5 +10473,5 @@ lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10471 "configure" +#line 10475 "configure" #include "confdefs.h" @@ -10565,5 +10569,5 @@ lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10567 "configure" +#line 10571 "configure" #include "confdefs.h" @@ -12521,9 +12525,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12523: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12527: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12527: \$? = $ac_status" >&5 + echo "$as_me:12531: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized @@ -12620,9 +12624,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12622: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12626: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12626: \$? = $ac_status" >&5 + echo "$as_me:12630: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then @@ -12672,9 +12676,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12674: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12678: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12678: \$? = $ac_status" >&5 + echo "$as_me:12682: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then @@ -18073,9 +18077,9 @@ fi if test "$lt_cv_libxp" = "yes"; then - Have_Libxp_TRUE= - Have_Libxp_FALSE='#' -else - Have_Libxp_TRUE='#' - Have_Libxp_FALSE= + HAS_LIBXP_TRUE= + HAS_LIBXP_FALSE='#' +else + HAS_LIBXP_TRUE='#' + HAS_LIBXP_FALSE= fi @@ -18325,9 +18329,9 @@ fi if test "$lt_cv_libxp" = "yes"; then - Have_Libxp_TRUE= - Have_Libxp_FALSE='#' -else - Have_Libxp_TRUE='#' - Have_Libxp_FALSE= + HAS_LIBXP_TRUE= + HAS_LIBXP_FALSE='#' +else + HAS_LIBXP_TRUE='#' + HAS_LIBXP_FALSE= fi @@ -18382,10 +18386,11 @@ LDFLAGS+=" "$MOTIF_LDFLAGS" " -#AC_CHECK_HEADERS([Mrm/MrmAppl.h], [], -# [ -# echo "Error! Mrm/MrmAppl.h not properly installed, needed to compile did (you need most probably lesstif2-dev)." -# exit -1 -# ] -#) +if test "$lt_cv_libxp" = "yes"; then + : +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Motif/lesstif not found!" >&5 +$as_echo "$as_me: WARNING: Motif/lesstif not found!" >&2;} + +fi ###################################################################### @@ -21607,5 +21612,5 @@ cat > conftest.$ac_ext < @@ -22283,4 +22288,21 @@ HAS_GUI_TRUE='#' HAS_GUI_FALSE= +fi + + + if test "x" = "y"; then + IS_FALSE_TRUE= + IS_FALSE_FALSE='#' +else + IS_FALSE_TRUE='#' + IS_FALSE_FALSE= +fi + + if test "x" = "x"; then + IS_TRUE_TRUE= + IS_TRUE_FALSE='#' +else + IS_TRUE_TRUE='#' + IS_TRUE_FALSE= fi @@ -22532,10 +22554,10 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${Have_Libxp_TRUE}" && test -z "${Have_Libxp_FALSE}"; then - as_fn_error $? "conditional \"Have_Libxp\" was never defined. +if test -z "${HAS_LIBXP_TRUE}" && test -z "${HAS_LIBXP_FALSE}"; then + as_fn_error $? "conditional \"HAS_LIBXP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${Have_Libxp_TRUE}" && test -z "${Have_Libxp_FALSE}"; then - as_fn_error $? "conditional \"Have_Libxp\" was never defined. +if test -z "${HAS_LIBXP_TRUE}" && test -z "${HAS_LIBXP_FALSE}"; then + as_fn_error $? "conditional \"HAS_LIBXP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -22582,4 +22604,12 @@ if test -z "${HAS_GUI_TRUE}" && test -z "${HAS_GUI_FALSE}"; then as_fn_error $? "conditional \"HAS_GUI\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${IS_FALSE_TRUE}" && test -z "${IS_FALSE_FALSE}"; then + as_fn_error $? "conditional \"IS_FALSE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${IS_TRUE_TRUE}" && test -z "${IS_TRUE_FALSE}"; then + as_fn_error $? "conditional \"IS_TRUE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -24906,5 +24936,5 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: BOOST_LDFLAGS = $BOOST_LDFLAGS" >&5 $as_echo "$as_me: BOOST_LDFLAGS = $BOOST_LDFLAGS" >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 $as_echo "$as_me: " >&6;} if test -n "$QT4_VERSION"; then @@ -24956,5 +24986,5 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: ROOTLDFLAGS = $ROOTLDFLAGS" >&5 $as_echo "$as_me: ROOTLDFLAGS = $ROOTLDFLAGS" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 $as_echo "$as_me: " >&6;} @@ -24964,63 +24994,70 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 $as_echo "$as_me: " >&6;} - +if test "$lt_cv_libxp" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Motif/lesstif / 'Xm/Xm.h' 'libXp' found: yes" >&5 +$as_echo "$as_me: Motif/lesstif / 'Xm/Xm.h' 'libXp' found: yes" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Motif/lesstif / 'Xm/Xm.h' 'libXp' found: no" >&5 +$as_echo "$as_me: Motif/lesstif / 'Xm/Xm.h' 'libXp' found: no" >&6;} + +fi if test "$COLORDIFF" = colordiff; then - { $as_echo "$as_me:${as_lineno-$LINENO}: colored svn diff / 'colordiff' found: yes" >&5 -$as_echo "$as_me: colored svn diff / 'colordiff' found: yes" >&6;} -else - { $as_echo "$as_me:${as_lineno-$LINENO}: colored svn diff / 'colordiff' found: no" >&5 -$as_echo "$as_me: colored svn diff / 'colordiff' found: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: colored svn diff / 'colordiff' found: yes" >&5 +$as_echo "$as_me: colored svn diff / 'colordiff' found: yes" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: colored svn diff / 'colordiff' found: no" >&5 +$as_echo "$as_me: colored svn diff / 'colordiff' found: no" >&6;} fi if test "$HELP2MAN" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: man-pages enabled / 'help2man' found: $HELP2MAN" >&5 -$as_echo "$as_me: man-pages enabled / 'help2man' found: $HELP2MAN" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: man-pages enabled / 'help2man' found: $HELP2MAN" >&5 +$as_echo "$as_me: man-pages enabled / 'help2man' found: $HELP2MAN" >&6;} if test "$GROFF" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: build of html enabled / 'groff' found: yes" >&5 -$as_echo "$as_me: build of html enabled / 'groff' found: yes" >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: build of pdf enabled / 'ps2pdf' found: $PS2PDF" >&5 -$as_echo "$as_me: build of pdf enabled / 'ps2pdf' found: $PS2PDF" >&6;} -else - { $as_echo "$as_me:${as_lineno-$LINENO}: build of html and pdf / 'groff' found: no" >&5 -$as_echo "$as_me: build of html and pdf / 'groff' found: no" >&6;} - -fi - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: man, html, pdf enabled / 'help2man' found: no" >&5 -$as_echo "$as_me: man, html, pdf enabled / 'help2man' found: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: build of html enabled / 'groff' found: yes" >&5 +$as_echo "$as_me: build of html enabled / 'groff' found: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: build of pdf enabled / 'ps2pdf' found: $PS2PDF" >&5 +$as_echo "$as_me: build of pdf enabled / 'ps2pdf' found: $PS2PDF" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: build of html and pdf / 'groff' found: no" >&5 +$as_echo "$as_me: build of html and pdf / 'groff' found: no" >&6;} + +fi + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: man, html, pdf enabled / 'help2man' found: no" >&5 +$as_echo "$as_me: man, html, pdf enabled / 'help2man' found: no" >&6;} fi if test -n "$DX_DOXYGEN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: doxygen docu enabled / 'doxygen' found: $DX_DOXYGEN" >&5 -$as_echo "$as_me: doxygen docu enabled / 'doxygen' found: $DX_DOXYGEN" >&6;} -else - { $as_echo "$as_me:${as_lineno-$LINENO}: doxygen docu enabled / 'doxygen' found: no" >&5 -$as_echo "$as_me: doxygen docu enabled / 'doxygen' found: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: doxygen docu enabled / 'doxygen' found: $DX_DOXYGEN" >&5 +$as_echo "$as_me: doxygen docu enabled / 'doxygen' found: $DX_DOXYGEN" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: doxygen docu enabled / 'doxygen' found: no" >&5 +$as_echo "$as_me: doxygen docu enabled / 'doxygen' found: no" >&6;} fi if test -n "$DX_DOT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: doxygen graphs enabled / 'dot' (graphviz) found: $DX_DOT" >&5 -$as_echo "$as_me: doxygen graphs enabled / 'dot' (graphviz) found: $DX_DOT" >&6;} -else - { $as_echo "$as_me:${as_lineno-$LINENO}: doxagen graphs enabled / 'dot' (graphviz) found: no" >&5 -$as_echo "$as_me: doxagen graphs enabled / 'dot' (graphviz) found: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: doxygen graphs enabled / 'dot' (graphviz) found: $DX_DOT" >&5 +$as_echo "$as_me: doxygen graphs enabled / 'dot' (graphviz) found: $DX_DOT" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: doxygen graphs enabled / 'dot' (graphviz) found: no" >&5 +$as_echo "$as_me: doxygen graphs enabled / 'dot' (graphviz) found: no" >&6;} fi if test -n "$QT4_VERSION"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: QT4 support enabled / QT4 toolkit found: yes" >&5 -$as_echo "$as_me: QT4 support enabled / QT4 toolkit found: yes" >&6;} -else - { $as_echo "$as_me:${as_lineno-$LINENO}: QT4 support enabled / QT4 toolkit found: no" >&5 -$as_echo "$as_me: QT4 support enabled / QT4 toolkit found: no" >&6;} - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: ROOT support enabled / root >= 5.12/00 found: $ROOTEXEC" >&5 -$as_echo "$as_me: ROOT support enabled / root >= 5.12/00 found: $ROOTEXEC" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: ROOT built with --with-qt found: $HAVE_ROOT_QT" >&5 -$as_echo "$as_me: ROOT built with --with-qt found: $HAVE_ROOT_QT" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: QT4 support enabled / QT4 toolkit found: yes" >&5 +$as_echo "$as_me: QT4 support enabled / QT4 toolkit found: yes" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: QT4 support enabled / QT4 toolkit found: no" >&5 +$as_echo "$as_me: QT4 support enabled / QT4 toolkit found: no" >&6;} + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: ROOT support enabled / root >= 5.12/00 found: $ROOTEXEC" >&5 +$as_echo "$as_me: ROOT support enabled / root >= 5.12/00 found: $ROOTEXEC" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: ROOT built with --with-qt found: $HAVE_ROOT_QT" >&5 +$as_echo "$as_me: ROOT built with --with-qt found: $HAVE_ROOT_QT" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 $as_echo "$as_me: " >&6;} @@ -25033,23 +25070,23 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 $as_echo "$as_me: " >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: - Add 'V=1' to you make-call to switch on verbose output." >&5 -$as_echo "$as_me: - Add 'V=1' to you make-call to switch on verbose output." >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: - Do not try to create man-pages with doxygen," >&5 -$as_echo "$as_me: - Do not try to create man-pages with doxygen," >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: it does most probably not work." >&5 -$as_echo "$as_me: it does most probably not work." >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: - Add 'V=1' to you make-call to switch on verbose output." >&5 +$as_echo "$as_me: - Add 'V=1' to you make-call to switch on verbose output." >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: - Do not try to create man-pages with doxygen," >&5 +$as_echo "$as_me: - Do not try to create man-pages with doxygen," >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: it does most probably not work." >&5 +$as_echo "$as_me: it does most probably not work." >&6;} if test "$GCC" = colorgcc; then : else - { $as_echo "$as_me:${as_lineno-$LINENO}: - Install colorgcc to get colored compiler output." >&5 -$as_echo "$as_me: - Install colorgcc to get colored compiler output." >&6;} - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: - If you send me a bug report about:" >&5 -$as_echo "$as_me: - If you send me a bug report about:" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: + configure please attach the file config.log" >&5 -$as_echo "$as_me: + configure please attach the file config.log" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: + make please send me the output of 'make V=1'" >&5 -$as_echo "$as_me: + make please send me the output of 'make V=1'" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: - Install colorgcc to get colored compiler output." >&5 +$as_echo "$as_me: - Install colorgcc to get colored compiler output." >&6;} + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: - If you send me a bug report about:" >&5 +$as_echo "$as_me: - If you send me a bug report about:" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: + configure: please attach the file config.log" >&5 +$as_echo "$as_me: + configure: please attach the file config.log" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: + make: please send me the output of 'make V=1'" >&5 +$as_echo "$as_me: + make: please send me the output of 'make V=1'" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 $as_echo "$as_me: " >&6;} @@ -25098,4 +25135,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 $as_echo "$as_me: " >&6;} +if test "$lt_cv_libxp" = "yes"; then + : +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Motif/lesstif not found. The dim gui did will not be built!" >&5 +$as_echo "$as_me: WARNING: Motif/lesstif not found. The dim gui did will not be built!" >&2;} + +fi if test "$ROOTEXEC" != no; then if test "$HAVE_ROOT_QT" = yes; then