Index: /trunk/FACT++/Makefile.am =================================================================== --- /trunk/FACT++/Makefile.am (revision 16956) +++ /trunk/FACT++/Makefile.am (revision 16957) @@ -36,7 +36,9 @@ fadctrl \ fscctrl \ + gcn \ chatclient chatserv \ biasctrl drivectrl agilentctrl \ mcp feedback ratescan ratecontrol \ + tngweather lidctrl pwrctrl \ magicweather magiclidar \ smartfact \ @@ -50,8 +52,4 @@ if HAS_GUI bin_PROGRAMS += fact -endif - -if HAS_SOPRANO -bin_PROGRAMS += tngweather lidctrl pwrctrl endif @@ -100,29 +98,28 @@ if HAS_HELP2MAN dist_man1_MANS = \ + biasctrl.man \ + datalogger.man \ dimctrl.man \ dimserver.man \ - datalogger.man \ - ftmctrl.man \ + drivectrl.man \ fadctrl.man \ - fscctrl.man \ - biasctrl.man \ - drivectrl.man \ - mcp.man \ feedback.man \ - ratescan.man \ - ratecontrol.man \ fitsdump.man \ fitscheck.man \ + fscctrl.man \ + ftmctrl.man \ + lidctrl.man \ + magiclidar.man \ magicweather.man \ - magiclidar.man \ + mcp.man \ + pwrctrl.man \ + ratecontrol.man \ + ratescan.man \ + showlog.man \ smartfact.man \ temperature.man \ timecheck.man \ - showlog.man \ + tngweather.man \ zfits.man -if HAS_SOPRANO -dist_man1_MANS += tngweather.man lidctrl.man pwrctrl.man -endif - endif @@ -327,10 +324,10 @@ tngweather_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ - libConfiguration.la + libConfiguration.la -lQtXml lidctrl_SOURCES = src/lidctrl.cc src/LocalControl.h lidctrl_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ - libConfiguration.la -lQtWebKit -lQtXml + libConfiguration.la -lQtXml temperature_SOURCES = src/temperature.cc src/LocalControl.h @@ -343,5 +340,5 @@ pwrctrl_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ - libConfiguration.la -lQtWebKit -lQtXml + libConfiguration.la -lQtXml timecheck_SOURCES = src/timecheck.cc src/LocalControl.h @@ -364,5 +361,5 @@ fadctrl_SOURCES += src/FitsFile.h src/FitsFile.cc \ src/DataWriteFits.cc src/DataWriteFits.h \ - src/DataWriteFits2.cc src/DataWriteFits2.h + src/DataWriteFits2.cc src/DataWriteFits2.h endif fadctrl_LDADD = libDim++.la libDim.la libDimExtension.la \ @@ -374,4 +371,9 @@ libStateMachine.la libTools.la libTime.la \ libConfiguration.la + +gcn_SOURCES = src/gcn.cc src/LocalControl.h +gcn_LDADD = libDim++.la libDim.la libDimExtension.la \ + libStateMachine.la libTools.la libTime.la \ + libConfiguration.la -lQtXml biasctrl_SOURCES = src/biasctrl.cc src/LocalControl.h src/PixelMap.cc Index: /trunk/FACT++/Makefile.in =================================================================== --- /trunk/FACT++/Makefile.in (revision 16956) +++ /trunk/FACT++/Makefile.in (revision 16957) @@ -45,25 +45,25 @@ time$(EXEEXT) argv$(EXEEXT) dimctrl$(EXEEXT) \ dimserver$(EXEEXT) datalogger$(EXEEXT) ftmctrl$(EXEEXT) \ - fadctrl$(EXEEXT) fscctrl$(EXEEXT) chatclient$(EXEEXT) \ - chatserv$(EXEEXT) biasctrl$(EXEEXT) drivectrl$(EXEEXT) \ - agilentctrl$(EXEEXT) mcp$(EXEEXT) feedback$(EXEEXT) \ - ratescan$(EXEEXT) ratecontrol$(EXEEXT) magicweather$(EXEEXT) \ - magiclidar$(EXEEXT) smartfact$(EXEEXT) temperature$(EXEEXT) \ - timecheck$(EXEEXT) showlog$(EXEEXT) fitsdump$(EXEEXT) \ - fitscheck$(EXEEXT) zfits$(EXEEXT) fitsCompressor$(EXEEXT) \ - $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ - $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \ - $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) + fadctrl$(EXEEXT) fscctrl$(EXEEXT) gcn$(EXEEXT) \ + chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \ + drivectrl$(EXEEXT) agilentctrl$(EXEEXT) mcp$(EXEEXT) \ + feedback$(EXEEXT) ratescan$(EXEEXT) ratecontrol$(EXEEXT) \ + tngweather$(EXEEXT) lidctrl$(EXEEXT) pwrctrl$(EXEEXT) \ + magicweather$(EXEEXT) magiclidar$(EXEEXT) smartfact$(EXEEXT) \ + temperature$(EXEEXT) timecheck$(EXEEXT) showlog$(EXEEXT) \ + fitsdump$(EXEEXT) fitscheck$(EXEEXT) zfits$(EXEEXT) \ + fitsCompressor$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \ + $(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5) \ + $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) @HAS_GUI_TRUE@am__append_1 = fact -@HAS_SOPRANO_TRUE@am__append_2 = tngweather lidctrl pwrctrl -@HAS_DBUS_TRUE@am__append_3 = skypeclient -@HAS_VIEWER_TRUE@am__append_4 = viewer -@HAS_NOVA_TRUE@am__append_5 = moon -@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__append_6 = makedata -@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_7 = makeplots -@HAS_LIBXP_TRUE@am__append_8 = did webDid +@HAS_DBUS_TRUE@am__append_2 = skypeclient +@HAS_VIEWER_TRUE@am__append_3 = viewer +@HAS_NOVA_TRUE@am__append_4 = moon +@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__append_5 = makedata +@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_6 = makeplots +@HAS_LIBXP_TRUE@am__append_7 = did webDid # This is a trick to be able to build them but not having them in 'all' -@IS_FALSE@am__append_9 = \ +@IS_FALSE@am__append_8 = \ @IS_FALSE@ ftm fsc fad \ @IS_FALSE@ test scheduler \ @@ -73,16 +73,15 @@ @IS_FALSE@ sched astro readfits -@HAS_HELP2MAN_TRUE@@HAS_SOPRANO_TRUE@am__append_10 = tngweather.man lidctrl.man pwrctrl.man -@HAS_FITS_TRUE@am__append_11 = src/FitsFile.h src/FitsFile.cc \ +@HAS_FITS_TRUE@am__append_9 = src/FitsFile.h src/FitsFile.cc \ @HAS_FITS_TRUE@ src/DataWriteFits.cc src/DataWriteFits.h \ -@HAS_FITS_TRUE@ src/DataWriteFits2.cc src/DataWriteFits2.h - -@HAS_FITS_TRUE@am__append_12 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc -@HAS_GROFF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.html) -@HAS_GROFF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.html) -@HAS_GROFF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.html) +@HAS_FITS_TRUE@ src/DataWriteFits2.cc src/DataWriteFits2.h + +@HAS_FITS_TRUE@am__append_10 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc +@HAS_GROFF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.html) +@HAS_GROFF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.html) +@HAS_GROFF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.html) +@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.pdf) +@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.pdf) @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_16 = $(dist_man1_MANS:.man=.pdf) -@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_17 = $(dist_man1_MANS:.man=.pdf) -@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_18 = $(dist_man1_MANS:.man=.pdf) subdir = . DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \ @@ -188,13 +187,11 @@ libTools_la_OBJECTS = $(am_libTools_la_OBJECTS) @HAS_GUI_TRUE@am__EXEEXT_1 = fact$(EXEEXT) -@HAS_SOPRANO_TRUE@am__EXEEXT_2 = tngweather$(EXEEXT) lidctrl$(EXEEXT) \ -@HAS_SOPRANO_TRUE@ pwrctrl$(EXEEXT) -@HAS_DBUS_TRUE@am__EXEEXT_3 = skypeclient$(EXEEXT) -@HAS_VIEWER_TRUE@am__EXEEXT_4 = viewer$(EXEEXT) -@HAS_NOVA_TRUE@am__EXEEXT_5 = moon$(EXEEXT) -@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__EXEEXT_6 = makedata$(EXEEXT) -@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_7 = makeplots$(EXEEXT) -@HAS_LIBXP_TRUE@am__EXEEXT_8 = did$(EXEEXT) webDid$(EXEEXT) -@IS_FALSE@am__EXEEXT_9 = ftm$(EXEEXT) fsc$(EXEEXT) fad$(EXEEXT) \ +@HAS_DBUS_TRUE@am__EXEEXT_2 = skypeclient$(EXEEXT) +@HAS_VIEWER_TRUE@am__EXEEXT_3 = viewer$(EXEEXT) +@HAS_NOVA_TRUE@am__EXEEXT_4 = moon$(EXEEXT) +@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__EXEEXT_5 = makedata$(EXEEXT) +@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_6 = makeplots$(EXEEXT) +@HAS_LIBXP_TRUE@am__EXEEXT_7 = did$(EXEEXT) webDid$(EXEEXT) +@IS_FALSE@am__EXEEXT_8 = ftm$(EXEEXT) fsc$(EXEEXT) fad$(EXEEXT) \ @IS_FALSE@ test$(EXEEXT) scheduler$(EXEEXT) \ @IS_FALSE@ triggerschedule$(EXEEXT) dclient5$(EXEEXT) \ @@ -355,4 +352,8 @@ ftmctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTime.la libTools.la libConfiguration.la +am_gcn_OBJECTS = src/gcn.$(OBJEXT) +gcn_OBJECTS = $(am_gcn_OBJECTS) +gcn_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \ + libStateMachine.la libTools.la libTime.la libConfiguration.la am_lidctrl_OBJECTS = src/lidctrl.$(OBJEXT) lidctrl_OBJECTS = $(am_lidctrl_OBJECTS) @@ -539,13 +540,13 @@ $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \ $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \ - $(ftm_SOURCES) $(ftmctrl_SOURCES) $(lidctrl_SOURCES) \ - $(log_SOURCES) $(logtime_SOURCES) $(magiclidar_SOURCES) \ - $(magicweather_SOURCES) $(makedata_SOURCES) \ - $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \ - $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \ - $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \ - $(showlog_SOURCES) $(skypeclient_SOURCES) $(smartfact_SOURCES) \ - $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \ - $(timecheck_SOURCES) $(tngweather_SOURCES) \ + $(ftm_SOURCES) $(ftmctrl_SOURCES) $(gcn_SOURCES) \ + $(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \ + $(magiclidar_SOURCES) $(magicweather_SOURCES) \ + $(makedata_SOURCES) $(makeplots_SOURCES) $(mcp_SOURCES) \ + $(moon_SOURCES) $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) \ + $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \ + $(scheduler_SOURCES) $(showlog_SOURCES) $(skypeclient_SOURCES) \ + $(smartfact_SOURCES) $(temperature_SOURCES) $(test_SOURCES) \ + $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \ $(triggerschedule_SOURCES) $(viewer_SOURCES) $(webDid_SOURCES) \ $(zfits_SOURCES) @@ -563,6 +564,6 @@ $(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \ $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \ - $(ftmctrl_SOURCES) $(lidctrl_SOURCES) $(log_SOURCES) \ - $(logtime_SOURCES) $(magiclidar_SOURCES) \ + $(ftmctrl_SOURCES) $(gcn_SOURCES) $(lidctrl_SOURCES) \ + $(log_SOURCES) $(logtime_SOURCES) $(magiclidar_SOURCES) \ $(magicweather_SOURCES) $(makedata_SOURCES) \ $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \ @@ -826,15 +827,33 @@ # libAstro.la -@HAS_HELP2MAN_TRUE@dist_man1_MANS = dimctrl.man dimserver.man \ -@HAS_HELP2MAN_TRUE@ datalogger.man ftmctrl.man fadctrl.man \ -@HAS_HELP2MAN_TRUE@ fscctrl.man biasctrl.man drivectrl.man \ -@HAS_HELP2MAN_TRUE@ mcp.man feedback.man ratescan.man \ -@HAS_HELP2MAN_TRUE@ ratecontrol.man fitsdump.man fitscheck.man \ -@HAS_HELP2MAN_TRUE@ magicweather.man magiclidar.man \ -@HAS_HELP2MAN_TRUE@ smartfact.man temperature.man timecheck.man \ -@HAS_HELP2MAN_TRUE@ showlog.man zfits.man $(am__append_10) +@HAS_HELP2MAN_TRUE@dist_man1_MANS = \ +@HAS_HELP2MAN_TRUE@ biasctrl.man \ +@HAS_HELP2MAN_TRUE@ datalogger.man \ +@HAS_HELP2MAN_TRUE@ dimctrl.man \ +@HAS_HELP2MAN_TRUE@ dimserver.man \ +@HAS_HELP2MAN_TRUE@ drivectrl.man \ +@HAS_HELP2MAN_TRUE@ fadctrl.man \ +@HAS_HELP2MAN_TRUE@ feedback.man \ +@HAS_HELP2MAN_TRUE@ fitsdump.man \ +@HAS_HELP2MAN_TRUE@ fitscheck.man \ +@HAS_HELP2MAN_TRUE@ fscctrl.man \ +@HAS_HELP2MAN_TRUE@ ftmctrl.man \ +@HAS_HELP2MAN_TRUE@ lidctrl.man \ +@HAS_HELP2MAN_TRUE@ magiclidar.man \ +@HAS_HELP2MAN_TRUE@ magicweather.man \ +@HAS_HELP2MAN_TRUE@ mcp.man \ +@HAS_HELP2MAN_TRUE@ pwrctrl.man \ +@HAS_HELP2MAN_TRUE@ ratecontrol.man \ +@HAS_HELP2MAN_TRUE@ ratescan.man \ +@HAS_HELP2MAN_TRUE@ showlog.man \ +@HAS_HELP2MAN_TRUE@ smartfact.man \ +@HAS_HELP2MAN_TRUE@ temperature.man \ +@HAS_HELP2MAN_TRUE@ timecheck.man \ +@HAS_HELP2MAN_TRUE@ tngweather.man \ +@HAS_HELP2MAN_TRUE@ zfits.man + #------------------------------------------------------------------------- -CLEANFILES = $(BUILT_SOURCES) $(am__append_15) $(am__append_18) +CLEANFILES = $(BUILT_SOURCES) $(am__append_13) $(am__append_16) dist_noinst_SCRIPTS = autogen.sh EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \ @@ -844,5 +863,5 @@ dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \ $(fact_DIALOGS) $(fact_RESOURCES) $(viewer_DIALOGS) \ - $(viewer_RESOURCES) $(am__append_14) $(am__append_17) + $(viewer_RESOURCES) $(am__append_12) $(am__append_15) dns_LDADD = libDim.la libDimExtension.la dns_SOURCES = src/dns.c @@ -1008,10 +1027,10 @@ tngweather_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ - libConfiguration.la + libConfiguration.la -lQtXml lidctrl_SOURCES = src/lidctrl.cc src/LocalControl.h lidctrl_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ - libConfiguration.la -lQtWebKit -lQtXml + libConfiguration.la -lQtXml temperature_SOURCES = src/temperature.cc src/LocalControl.h @@ -1025,5 +1044,5 @@ pwrctrl_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ - libConfiguration.la -lQtWebKit -lQtXml + libConfiguration.la -lQtXml timecheck_SOURCES = src/timecheck.cc src/LocalControl.h @@ -1041,5 +1060,5 @@ src/DataProcessorImp.h src/DataCalib.cc src/DataCalib.h \ src/DataWriteRaw.cc src/DataWriteRaw.h src/DrsCalib.h \ - $(am__append_11) + $(am__append_9) fadctrl_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ @@ -1050,4 +1069,9 @@ libStateMachine.la libTools.la libTime.la \ libConfiguration.la + +gcn_SOURCES = src/gcn.cc src/LocalControl.h +gcn_LDADD = libDim++.la libDim.la libDimExtension.la \ + libStateMachine.la libTools.la libTime.la \ + libConfiguration.la -lQtXml biasctrl_SOURCES = src/biasctrl.cc src/LocalControl.h src/PixelMap.cc @@ -1105,5 +1129,5 @@ test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \ - src/DimState.cc src/DimState.h $(am__append_12) + src/DimState.cc src/DimState.h $(am__append_10) datalogger_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ @@ -1190,5 +1214,5 @@ #------------------------------------------------------------------------- -MAN_TARGETS = $(dist_man1_MANS) $(am__append_13) $(am__append_16) +MAN_TARGETS = $(dist_man1_MANS) $(am__append_11) $(am__append_14) @HAS_JSDOC_TRUE@JAVA_SCRIPT_DOC = jsdoc all: $(BUILT_SOURCES) @@ -1614,4 +1638,8 @@ @rm -f ftmctrl$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ftmctrl_OBJECTS) $(ftmctrl_LDADD) $(LIBS) +src/gcn.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) +gcn$(EXEEXT): $(gcn_OBJECTS) $(gcn_DEPENDENCIES) $(EXTRA_gcn_DEPENDENCIES) + @rm -f gcn$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(gcn_OBJECTS) $(gcn_LDADD) $(LIBS) src/lidctrl.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) @@ -1945,4 +1973,5 @@ -rm -f src/ftm.$(OBJEXT) -rm -f src/ftmctrl.$(OBJEXT) + -rm -f src/gcn.$(OBJEXT) -rm -f src/lidctrl.$(OBJEXT) -rm -f src/log.$(OBJEXT) @@ -2093,4 +2122,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftmctrl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/gcn.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lidctrl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/log.Po@am__quote@ Index: /trunk/FACT++/configure =================================================================== --- /trunk/FACT++/configure (revision 16956) +++ /trunk/FACT++/configure (revision 16957) @@ -628,6 +628,4 @@ HAS_DBUS_FALSE HAS_DBUS_TRUE -HAS_SOPRANO_FALSE -HAS_SOPRANO_TRUE HAS_NOVA_FALSE HAS_NOVA_TRUE @@ -982,7 +980,4 @@ with_qwt_include with_qwt_libdir -with_soprano -with_soprano_include -with_soprano_libdir with_root with_rootsys @@ -1757,8 +1752,4 @@ --with-qwt-libdir=DIR specify exact library dir for qwt library (e.g. libqwt-qt4) --without-qwt disables qwt usage completely - --with-soprano=DIR root directory of soprano installation - --with-soprano-include=DIR specify exact include dir for soprano headers (e.g. Soprano/Soprano) - --with-soprano-libdir=DIR specify exact library dir for soprano library (e.g. libsoprano) - --without-soprano disables soprano usage completely --without-root Disable root, i.e. disable gui support. --with-rootsys path to the ROOT executables or top ROOT @@ -4933,5 +4924,4 @@ # gl # QtCore -# soprano # cfitsio @@ -23980,5 +23970,5 @@ cat > conftest.$ac_ext < @@ -24416,139 +24406,4 @@ - - -# Check whether --with-soprano was given. -if test "${with_soprano+set}" = set; then : - withval=$with_soprano; with_soprano=$withval -if test "${with_soprano}" != yes; then - soprano_include="$withval/include" - soprano_libdir="$withval/lib" -fi - -fi - - - -# Check whether --with-soprano-include was given. -if test "${with_soprano_include+set}" = set; then : - withval=$with_soprano_include; soprano_include="$withval" -fi - - - -# Check whether --with-soprano-libdir was given. -if test "${with_soprano_libdir+set}" = set; then : - withval=$with_soprano_libdir; soprano_libdir="$withval" -fi - - -if test "${with_soprano}" != no ; then - OLD_LIBS=$LIBS - OLD_LDFLAGS=$LDFLAGS - OLD_CFLAGS=$CFLAGS - OLD_CPPFLAGS=$CPPFLAGS - - if test "${soprano_libdir}" ; then - LDFLAGS="$LDFLAGS -L${soprano_libdir}" - fi - if test "${soprano_include}" ; then - CPPFLAGS="$CPPFLAGS -I${soprano_include}" - CFLAGS="$CFLAGS -I${soprano_include}" - fi - - no_good=no - - ac_fn_cxx_check_header_mongrel "$LINENO" "Soprano/Soprano" "ac_cv_header_Soprano_Soprano" "$ac_includes_default" -if test "x$ac_cv_header_Soprano_Soprano" = xyes; then : - -else - no_good=yes -fi - - - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Soprano::PluginManager::instance in -lsoprano" >&5 -$as_echo_n "checking for Soprano::PluginManager::instance in -lsoprano... " >&6; } -if ${ac_cv_lib_soprano_Soprano__PluginManager__instance+:} false; then : - $as_echo_n "(cached) " >&6 -else - - ac_check_lib_save_LIBS=$LIBS - LIBS="-lsoprano $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -Soprano::PluginManager::instance - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_soprano_Soprano__PluginManager__instance=yes -else - ac_cv_lib_soprano_Soprano__PluginManager__instance=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soprano_Soprano__PluginManager__instance" >&5 -$as_echo "$ac_cv_lib_soprano_Soprano__PluginManager__instance" >&6; } - if test $ac_cv_lib_soprano_Soprano__PluginManager__instance = yes; then : - - - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSOPRANO 1 -_ACEOF - - LIBS="-lsoprano $LIBS" - - -else - no_good=yes -fi - - - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - if test "$no_good" = yes; then - HAVE_SOPRANO=no - - LIBS=$OLD_LIBS - LDFLAGS=$OLD_LDFLAGS - CPPFLAGS=$OLD_CPPFLAGS - CFLAGS=$OLD_CFLAGS - else - HAVE_SOPRANO=yes - - $as_echo "#define HAVE_PKG_soprano 1" >>confdefs.h - - fi - -fi - - - ###################################################################### # ROOT SUPPORT @@ -25227,12 +25082,4 @@ HAS_NOVA_TRUE='#' HAS_NOVA_FALSE= -fi - - if test "$HAVE_SOPRANO" = yes; then - HAS_SOPRANO_TRUE= - HAS_SOPRANO_FALSE='#' -else - HAS_SOPRANO_TRUE='#' - HAS_SOPRANO_FALSE= fi @@ -25628,8 +25475,4 @@ if test -z "${HAS_NOVA_TRUE}" && test -z "${HAS_NOVA_FALSE}"; then as_fn_error $? "conditional \"HAS_NOVA\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${HAS_SOPRANO_TRUE}" && test -z "${HAS_SOPRANO_FALSE}"; then - as_fn_error $? "conditional \"HAS_SOPRANO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -28142,6 +27985,4 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: Qwt / qwt_plot.h found: $HAVE_QWT" >&5 $as_echo "$as_me: Qwt / qwt_plot.h found: $HAVE_QWT" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: Soprano / Soprano/Soprano found: $HAVE_SOPRANO" >&5 -$as_echo "$as_me: Soprano / Soprano/Soprano found: $HAVE_SOPRANO" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: cfitsio / 'fitsio.h' found: $HAVE_CFITSIO" >&5 $as_echo "$as_me: cfitsio / 'fitsio.h' found: $HAVE_CFITSIO" >&6;} @@ -28427,9 +28268,4 @@ $as_echo "$as_me: WARNING: DBus libraries missing - skypeclient will not be compiled!" >&2;} fi -if test -z "$HAS_SOPRANO_TRUE"; then : - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Soprano libraries missing - tngweather will not be compiled!" >&5 -$as_echo "$as_me: WARNING: Soprano libraries missing - tngweather will not be compiled!" >&2;} -fi { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 $as_echo "$as_me: " >&6;} Index: /trunk/FACT++/configure.ac =================================================================== --- /trunk/FACT++/configure.ac (revision 16956) +++ /trunk/FACT++/configure.ac (revision 16957) @@ -69,5 +69,4 @@ # gl # QtCore -# soprano # cfitsio @@ -305,6 +304,4 @@ AC_CHECK_CLASS(qwt, [QwtPlot qwt], qwt-qt4, qwt_plot.h, HAVE_QWT=yes, HAVE_QWT=no) -AC_CHECK_CLASS(soprano, Soprano::PluginManager::instance, soprano, Soprano/Soprano, - HAVE_SOPRANO=yes, HAVE_SOPRANO=no) ###################################################################### @@ -393,5 +390,4 @@ AM_CONDITIONAL(HAS_QWT, [test "$HAVE_QWT" = yes]) AM_CONDITIONAL(HAS_NOVA, [test "$HAVE_NOVA" = yes]) -AM_CONDITIONAL(HAS_SOPRANO, [test "$HAVE_SOPRANO" = yes]) AM_CONDITIONAL(HAS_DBUS, [test "$HAVE_DBUS" = yes]) AM_CONDITIONAL(HAS_V8, [test "$HAVE_V8" = yes]) @@ -476,5 +472,4 @@ AC_MSG_NOTICE([ QtOpenGL / QtOpenGL/QGLWidget found: $HAVE_QGL]) AC_MSG_NOTICE([ Qwt / qwt_plot.h found: $HAVE_QWT]) -AC_MSG_NOTICE([ Soprano / Soprano/Soprano found: $HAVE_SOPRANO]) AC_MSG_NOTICE([ cfitsio / 'fitsio.h' found: $HAVE_CFITSIO]) AC_MSG_NOTICE([ CCfits / 'CCfits/CCfits' found: $HAVE_CCFITS]) @@ -607,4 +602,3 @@ AM_COND_IF(HAS_V8,, AC_MSG_WARN([ libv8 missing - JavaScript support will be disabled!])) AM_COND_IF(HAS_DBUS,, AC_MSG_WARN([ DBus libraries missing - skypeclient will not be compiled!])) -AM_COND_IF(HAS_SOPRANO,, AC_MSG_WARN([ Soprano libraries missing - tngweather will not be compiled!])) -AC_MSG_NOTICE() +AC_MSG_NOTICE()