Index: trunk/FACT++/configure =================================================================== --- trunk/FACT++/configure (revision 11720) +++ trunk/FACT++/configure (revision 11721) @@ -753,4 +753,8 @@ HAS_VIEWER_FALSE HAS_VIEWER_TRUE +HAS_QWT_FALSE +HAS_QWT_TRUE +HAS_QGL_FALSE +HAS_QGL_TRUE HAS_GLU_FALSE HAS_GLU_TRUE @@ -1078,4 +1082,7 @@ with_QGL_include with_QGL_libdir +with_qwt +with_qwt_include +with_qwt_libdir with_root with_rootsys @@ -1826,7 +1833,11 @@ --with-qt4-libraries where the Qt 4 library is installed --with-QGL=DIR root directory of QGL installation - --with-QGL-include=DIR specify exact include dir for QGL headers (e.g. QtOpenGL/QGlWidget) + --with-QGL-include=DIR specify exact include dir for QGL headers (e.g. QtOpenGL/QGLWidget) --with-QGL-libdir=DIR specify exact library dir for QGL library (e.g. libQtOpenGL) --without-QGL disables QGL usage completely + --with-qwt=DIR root directory of qwt installation + --with-qwt-include=DIR specify exact include dir for qwt headers (e.g. qwt_plot.h) + --with-qwt-libdir=DIR specify exact library dir for qwt library (e.g. libqwt-qt4) + --without-qwt disables qwt usage completely --without-root Disable root, i.e. disable gui support. --with-rootsys path to the ROOT executables or top ROOT @@ -4835,11 +4846,11 @@ lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4837: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4848: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4840: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4851: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4843: output\"" >&5) + (eval echo "\"\$as_me:4854: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then @@ -6046,5 +6057,5 @@ *-*-irix6*) # Find out which ABI we are using. - echo '#line 6048 "configure"' > conftest.$ac_ext + echo '#line 6059 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -7707,9 +7718,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7709: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7720: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7713: \$? = $ac_status" >&5 + echo "$as_me:7724: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized @@ -8046,9 +8057,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8048: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8059: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8052: \$? = $ac_status" >&5 + echo "$as_me:8063: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized @@ -8151,9 +8162,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8153: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8164: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8157: \$? = $ac_status" >&5 + echo "$as_me:8168: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then @@ -8206,9 +8217,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8208: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8219: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8212: \$? = $ac_status" >&5 + echo "$as_me:8223: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then @@ -10590,5 +10601,5 @@ lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10592 "configure" +#line 10603 "configure" #include "confdefs.h" @@ -10686,5 +10697,5 @@ lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10688 "configure" +#line 10699 "configure" #include "confdefs.h" @@ -12642,9 +12653,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12644: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12655: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12648: \$? = $ac_status" >&5 + echo "$as_me:12659: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized @@ -12741,9 +12752,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12743: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12754: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12747: \$? = $ac_status" >&5 + echo "$as_me:12758: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then @@ -12793,9 +12804,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12795: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12806: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12799: \$? = $ac_status" >&5 + echo "$as_me:12810: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then @@ -18297,4 +18308,16 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LANGUAGE}" >&5 +$as_echo "$as_me: WARNING: ${LANGUAGE}" >&2;} + + + ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +if test "x$ac_cv_header_zlib_h" = x""yes; then : + +else + no_good=yes +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateEnd in -lz" >&5 $as_echo_n "checking for inflateEnd in -lz... " >&6; } @@ -18344,12 +18367,4 @@ fi - ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" -if test "x$ac_cv_header_zlib_h" = x""yes; then : - -else - no_good=yes -fi - - if test "$no_good" = yes; then HAVE_ZLIB=no @@ -18412,4 +18427,16 @@ CFLAGS="$CFLAGS -I${GL_include}" fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LANGUAGE}" >&5 +$as_echo "$as_me: WARNING: ${LANGUAGE}" >&2;} + + + ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" +if test "x$ac_cv_header_GL_gl_h" = x""yes; then : + +else + no_good=yes +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glLoadIdentity in -lGL" >&5 @@ -18460,12 +18487,4 @@ fi - ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -if test "x$ac_cv_header_GL_gl_h" = x""yes; then : - -else - no_good=yes -fi - - if test "$no_good" = yes; then HAVE_GL=no @@ -18526,4 +18545,16 @@ CFLAGS="$CFLAGS -I${GLU_include}" fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LANGUAGE}" >&5 +$as_echo "$as_me: WARNING: ${LANGUAGE}" >&2;} + + + ac_fn_c_check_header_mongrel "$LINENO" "GL/glu.h" "ac_cv_header_GL_glu_h" "$ac_includes_default" +if test "x$ac_cv_header_GL_glu_h" = x""yes; then : + +else + no_good=yes +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluNewTess in -lGLU" >&5 @@ -18574,12 +18605,4 @@ fi - ac_fn_c_check_header_mongrel "$LINENO" "GL/glu.h" "ac_cv_header_GL_glu_h" "$ac_includes_default" -if test "x$ac_cv_header_GL_glu_h" = x""yes; then : - -else - no_good=yes -fi - - if test "$no_good" = yes; then HAVE_GLU=no @@ -18691,4 +18714,16 @@ CFLAGS="$CFLAGS -I${cfitsio_include}" fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LANGUAGE}" >&5 +$as_echo "$as_me: WARNING: ${LANGUAGE}" >&2;} + + + ac_fn_c_check_header_mongrel "$LINENO" "fitsio.h" "ac_cv_header_fitsio_h" "$ac_includes_default" +if test "x$ac_cv_header_fitsio_h" = x""yes; then : + +else + no_good=yes +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ffpss in -lcfitsio" >&5 @@ -18739,12 +18774,4 @@ fi - ac_fn_c_check_header_mongrel "$LINENO" "fitsio.h" "ac_cv_header_fitsio_h" "$ac_includes_default" -if test "x$ac_cv_header_fitsio_h" = x""yes; then : - -else - no_good=yes -fi - - if test "$no_good" = yes; then HAVE_CFITSIO=no @@ -18818,4 +18845,16 @@ CFLAGS="$CFLAGS -I${ccfits_include}" fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LANGUAGE}" >&5 +$as_echo "$as_me: WARNING: ${LANGUAGE}" >&2;} + + + ac_fn_cxx_check_header_mongrel "$LINENO" "CCfits/CCfits" "ac_cv_header_CCfits_CCfits" "$ac_includes_default" +if test "x$ac_cv_header_CCfits_CCfits" = x""yes; then : + +else + no_good=yes +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lCCfits" >&5 @@ -18859,12 +18898,4 @@ no_good=yes fi - - ac_fn_cxx_check_header_mongrel "$LINENO" "CCfits/CCfits" "ac_cv_header_CCfits_CCfits" "$ac_includes_default" -if test "x$ac_cv_header_CCfits_CCfits" = x""yes; then : - -else - no_good=yes -fi - if test "$no_good" = yes; then @@ -22121,5 +22152,5 @@ cat > conftest.$ac_ext < @@ -22284,4 +22315,6 @@ +# This allows to list the QT4 stuff independantly later +CPPFLAGS+=" "${QT4_INCLUDES}" " @@ -22326,19 +22359,40 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lQtOpenGL" >&5 -$as_echo_n "checking for main in -lQtOpenGL... " >&6; } -if test "${ac_cv_lib_QtOpenGL_main+set}" = set; then : + ac_fn_cxx_check_header_mongrel "$LINENO" "QtOpenGL/QGLWidget" "ac_cv_header_QtOpenGL_QGLWidget" "$ac_includes_default" +if test "x$ac_cv_header_QtOpenGL_QGLWidget" = x""yes; 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 QGLWidget qgl in -lQtOpenGL" >&5 +$as_echo_n "checking for QGLWidget qgl in -lQtOpenGL... " >&6; } +if test "${ac_cv_lib_QtOpenGL_QGLWidget_qgl+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lQtOpenGL $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + ac_check_lib_save_LIBS=$LIBS + LIBS="-lQtOpenGL $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - - +#include int main () { -return main (); +QGLWidget qgl ; return 0; @@ -22346,20 +22400,23 @@ _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_QtOpenGL_main=yes -else - ac_cv_lib_QtOpenGL_main=no + ac_cv_lib_QtOpenGL_QGLWidget_qgl=yes +else + ac_cv_lib_QtOpenGL_QGLWidget_qgl=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_QtOpenGL_main" >&5 -$as_echo "$ac_cv_lib_QtOpenGL_main" >&6; } -if test "x$ac_cv_lib_QtOpenGL_main" = x""yes; then : - cat >>confdefs.h <<_ACEOF + LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_QtOpenGL_QGLWidget_qgl" >&5 +$as_echo "$ac_cv_lib_QtOpenGL_QGLWidget_qgl" >&6; } + if test $ac_cv_lib_QtOpenGL_QGLWidget_qgl = yes; then : + + + cat >>confdefs.h <<_ACEOF #define HAVE_LIBQTOPENGL 1 _ACEOF - LIBS="-lQtOpenGL $LIBS" + LIBS="-lQtOpenGL $LIBS" + else @@ -22367,14 +22424,15 @@ fi - ac_fn_cxx_check_header_mongrel "$LINENO" "QtOpenGL/QGlWidget" "ac_cv_header_QtOpenGL_QGlWidget" "$ac_includes_default" -if test "x$ac_cv_header_QtOpenGL_QGlWidget" = x""yes; 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 if test "$no_good" = yes; then - + HAVE_QGL=no LIBS=$OLD_LIBS @@ -22383,5 +22441,5 @@ CFLAGS=$OLD_CFLAGS else - + HAVE_QGL=yes $as_echo "#define HAVE_PKG_QGL 1" >>confdefs.h @@ -22391,4 +22449,136 @@ fi + + + + +# Check whether --with-qwt was given. +if test "${with_qwt+set}" = set; then : + withval=$with_qwt; with_qwt=$withval +if test "${with_qwt}" != yes; then + qwt_include="$withval/include" + qwt_libdir="$withval/lib" +fi + +fi + + + +# Check whether --with-qwt-include was given. +if test "${with_qwt_include+set}" = set; then : + withval=$with_qwt_include; qwt_include="$withval" +fi + + + +# Check whether --with-qwt-libdir was given. +if test "${with_qwt_libdir+set}" = set; then : + withval=$with_qwt_libdir; qwt_libdir="$withval" +fi + + +if test "${with_qwt}" != no ; then + OLD_LIBS=$LIBS + OLD_LDFLAGS=$LDFLAGS + OLD_CFLAGS=$CFLAGS + OLD_CPPFLAGS=$CPPFLAGS + + if test "${qwt_libdir}" ; then + LDFLAGS="$LDFLAGS -L${qwt_libdir}" + fi + if test "${qwt_include}" ; then + CPPFLAGS="$CPPFLAGS -I${qwt_include}" + CFLAGS="$CFLAGS -I${qwt_include}" + fi + + ac_fn_cxx_check_header_mongrel "$LINENO" "qwt_plot.h" "ac_cv_header_qwt_plot_h" "$ac_includes_default" +if test "x$ac_cv_header_qwt_plot_h" = x""yes; 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 QwtPlot qwt in -lqwt-qt4" >&5 +$as_echo_n "checking for QwtPlot qwt in -lqwt-qt4... " >&6; } +if test "${ac_cv_lib_qwt_qt4_QwtPlot_qwt+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + ac_check_lib_save_LIBS=$LIBS + LIBS="-lqwt-qt4 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +QwtPlot qwt + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_qwt_qt4_QwtPlot_qwt=yes +else + ac_cv_lib_qwt_qt4_QwtPlot_qwt=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_qwt_qt4_QwtPlot_qwt" >&5 +$as_echo "$ac_cv_lib_qwt_qt4_QwtPlot_qwt" >&6; } + if test $ac_cv_lib_qwt_qt4_QwtPlot_qwt = yes; then : + + + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBQWT_QT4 1 +_ACEOF + + LIBS="-lqwt-qt4 $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_QWT=no + + LIBS=$OLD_LIBS + LDFLAGS=$OLD_LDFLAGS + CPPFLAGS=$OLD_CPPFLAGS + CFLAGS=$OLD_CFLAGS + else + HAVE_QWT=yes + + $as_echo "#define HAVE_PKG_qwt 1" >>confdefs.h + + fi + +fi @@ -22972,6 +23162,22 @@ fi - - if test "$QT4_VERSION" -a "$HAVE_FITS_H" = yes -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes; then + if test "$HAVE_QGL" = yes; then + HAS_QGL_TRUE= + HAS_QGL_FALSE='#' +else + HAS_QGL_TRUE='#' + HAS_QGL_FALSE= +fi + + if test "$HAVE_QWT" = yes; then + HAS_QWT_TRUE= + HAS_QWT_FALSE='#' +else + HAS_QWT_TRUE='#' + HAS_QWT_FALSE= +fi + + + if test "$QT4_VERSION" -a "$HAVE_FITS_H" = yes -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes -a "$HAVE_QGL" = yes -a "$HAVE_QWT" = yes; then HAS_VIEWER_TRUE= HAS_VIEWER_FALSE='#' @@ -23350,4 +23556,12 @@ if test -z "${HAS_GLU_TRUE}" && test -z "${HAS_GLU_FALSE}"; then as_fn_error $? "conditional \"HAS_GLU\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAS_QGL_TRUE}" && test -z "${HAS_QGL_FALSE}"; then + as_fn_error $? "conditional \"HAS_QGL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAS_QWT_TRUE}" && test -z "${HAS_QWT_FALSE}"; then + as_fn_error $? "conditional \"HAS_QWT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -25744,97 +25958,101 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 $as_echo "$as_me: " >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: zlib / 'zlib.h' found: $HAVE_ZLIB" >&5 -$as_echo "$as_me: zlib / 'zlib.h' found: $HAVE_ZLIB" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: gui/RawEventsViewer/izstream.h found: $HAVE_IZSTREAM_H" >&5 -$as_echo "$as_me: gui/RawEventsViewer/izstream.h found: $HAVE_IZSTREAM_H" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: gui/RawEventsViewer/fits.h found: $HAVE_FITS_H" >&5 -$as_echo "$as_me: gui/RawEventsViewer/fits.h found: $HAVE_FITS_H" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: GL / GL/gl.h found: $HAVE_GL" >&5 -$as_echo "$as_me: GL / GL/gl.h found: $HAVE_GL" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: GLU / GL/glu.h found: $HAVE_GLU" >&5 -$as_echo "$as_me: GLU / GL/glu.h found: $HAVE_GLU" >&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;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: CCfits / 'CCfits/CCfits' found: $HAVE_CCFITS" >&5 -$as_echo "$as_me: CCfits / 'CCfits/CCfits' found: $HAVE_CCFITS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: zlib / 'zlib.h' found: $HAVE_ZLIB" >&5 +$as_echo "$as_me: zlib / 'zlib.h' found: $HAVE_ZLIB" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: gui/RawEventsViewer/izstream.h found: $HAVE_IZSTREAM_H" >&5 +$as_echo "$as_me: gui/RawEventsViewer/izstream.h found: $HAVE_IZSTREAM_H" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: gui/RawEventsViewer/fits.h found: $HAVE_FITS_H" >&5 +$as_echo "$as_me: gui/RawEventsViewer/fits.h found: $HAVE_FITS_H" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: GL / GL/gl.h found: $HAVE_GL" >&5 +$as_echo "$as_me: GL / GL/gl.h found: $HAVE_GL" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: GLU / GL/glu.h found: $HAVE_GLU" >&5 +$as_echo "$as_me: GLU / GL/glu.h found: $HAVE_GLU" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: QtOpenGL / QtOpenGL/QGLWidget found: $HAVE_QGL" >&5 +$as_echo "$as_me: QtOpenGL / QtOpenGL/QGLWidget found: $HAVE_QGL" >&6;} +{ $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}: cfitsio / 'fitsio.h' found: $HAVE_CFITSIO" >&5 +$as_echo "$as_me: cfitsio / 'fitsio.h' found: $HAVE_CFITSIO" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: CCfits / 'CCfits/CCfits' found: $HAVE_CCFITS" >&5 +$as_echo "$as_me: CCfits / 'CCfits/CCfits' found: $HAVE_CCFITS" >&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;} + { $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 "$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;} + { $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}: doxygen graphs enabled / 'dot' (graphviz) found: no" >&5 -$as_echo "$as_me: doxygen 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}: 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;} if test "$HAVE_ROOT_QT" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: ROOT built with --with-qt found: yes" >&5 -$as_echo "$as_me: ROOT built with --with-qt found: yes" >&6;} -else - { $as_echo "$as_me:${as_lineno-$LINENO}: ROOT built with --with-qt found: no" >&5 -$as_echo "$as_me: ROOT built with --with-qt found: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: ROOT built with --with-qt found: yes" >&5 +$as_echo "$as_me: ROOT built with --with-qt found: yes" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: ROOT built with --with-qt found: no" >&5 +$as_echo "$as_me: ROOT built with --with-qt found: no" >&6;} fi Index: trunk/FACT++/configure.ac =================================================================== --- trunk/FACT++/configure.ac (revision 11720) +++ trunk/FACT++/configure.ac (revision 11721) @@ -133,5 +133,5 @@ #AC_CHECK_LIB([cfitsio], main,,AC_MSG_ERROR([cfitsio library not found])) -AC_LANG_POP +AC_LANG_POP(C) # Needed to compile FACT++ @@ -226,6 +226,10 @@ [], [QT4_DO_IT_ALL]) -AC_CHECK_PACKAGE(QGL, main, QtOpenGL, QtOpenGL/QGlWidget) - +# This allows to list the QT4 stuff independantly later +CPPFLAGS+=" "${QT4_INCLUDES}" " +AC_CHECK_CLASS(QGL, [QGLWidget qgl], QtOpenGL, QtOpenGL/QGLWidget, + HAVE_QGL=yes, HAVE_QGL=no) +AC_CHECK_CLASS(qwt, [QwtPlot qwt], qwt-qt4, qwt_plot.h, + HAVE_QWT=yes, HAVE_QWT=no) ###################################################################### @@ -309,6 +313,8 @@ AM_CONDITIONAL(HAS_GL, [test "$HAVE_GL" = yes]) AM_CONDITIONAL(HAS_GLU, [test "$HAVE_GLU" = yes]) - -AM_CONDITIONAL(HAS_VIEWER, [test "$QT4_VERSION" -a "$HAVE_FITS_H" = yes -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes]) +AM_CONDITIONAL(HAS_QGL, [test "$HAVE_QGL" = yes]) +AM_CONDITIONAL(HAS_QWT, [test "$HAVE_QWT" = yes]) + +AM_CONDITIONAL(HAS_VIEWER, [test "$QT4_VERSION" -a "$HAVE_FITS_H" = yes -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes -a "$HAVE_QGL" = yes -a "$HAVE_QWT" = yes]) AM_CONDITIONAL(IS_FALSE, [test "x" = "y"]) @@ -371,51 +377,53 @@ AC_MSG_NOTICE(--------------------------------------------------------------------) AC_MSG_NOTICE() -AC_MSG_NOTICE([ zlib / 'zlib.h' found: $HAVE_ZLIB]) -AC_MSG_NOTICE([ gui/RawEventsViewer/izstream.h found: $HAVE_IZSTREAM_H]) -AC_MSG_NOTICE([ gui/RawEventsViewer/fits.h found: $HAVE_FITS_H]) -AC_MSG_NOTICE([ GL / GL/gl.h found: $HAVE_GL]) -AC_MSG_NOTICE([ GLU / GL/glu.h found: $HAVE_GLU]) -AC_MSG_NOTICE([ cfitsio / 'fitsio.h' found: $HAVE_CFITSIO]) -AC_MSG_NOTICE([ CCfits / 'CCfits/CCfits' found: $HAVE_CCFITS]) +AC_MSG_NOTICE([ zlib / 'zlib.h' found: $HAVE_ZLIB]) +AC_MSG_NOTICE([ gui/RawEventsViewer/izstream.h found: $HAVE_IZSTREAM_H]) +AC_MSG_NOTICE([ gui/RawEventsViewer/fits.h found: $HAVE_FITS_H]) +AC_MSG_NOTICE([ GL / GL/gl.h found: $HAVE_GL]) +AC_MSG_NOTICE([ GLU / GL/glu.h found: $HAVE_GLU]) +AC_MSG_NOTICE([ QtOpenGL / QtOpenGL/QGLWidget found: $HAVE_QGL]) +AC_MSG_NOTICE([ Qwt / qwt_plot.h found: $HAVE_QWT]) +AC_MSG_NOTICE([ cfitsio / 'fitsio.h' found: $HAVE_CFITSIO]) +AC_MSG_NOTICE([ CCfits / 'CCfits/CCfits' found: $HAVE_CCFITS]) AM_COND_IF(HAS_LIBXP, - AC_MSG_NOTICE([ Motif/lesstif / 'Xm/Xm.h' 'libXp' found: yes]), - AC_MSG_NOTICE([ Motif/lesstif / 'Xm/Xm.h' 'libXp' found: no]) + AC_MSG_NOTICE([ Motif/lesstif / 'Xm/Xm.h' 'libXp' found: yes]), + AC_MSG_NOTICE([ Motif/lesstif / 'Xm/Xm.h' 'libXp' found: no]) ) AM_COND_IF(HAS_LIBXP, - AC_MSG_NOTICE([ Motif/lesstif / 'Xm/Xm.h' 'libXp' found: yes]), - AC_MSG_NOTICE([ Motif/lesstif / 'Xm/Xm.h' 'libXp' found: no]) + AC_MSG_NOTICE([ Motif/lesstif / 'Xm/Xm.h' 'libXp' found: yes]), + AC_MSG_NOTICE([ Motif/lesstif / 'Xm/Xm.h' 'libXp' found: no]) ) AM_COND_IF(HAS_COLORDIFF, - AC_MSG_NOTICE([ colored svn diff / 'colordiff' found: yes]), - AC_MSG_NOTICE([ colored svn diff / 'colordiff' found: no]) + AC_MSG_NOTICE([ colored svn diff / 'colordiff' found: yes]), + AC_MSG_NOTICE([ colored svn diff / 'colordiff' found: no]) ) AM_COND_IF(HAS_HELP2MAN,[ - AC_MSG_NOTICE([ man-pages enabled / 'help2man' found: $HELP2MAN]) + AC_MSG_NOTICE([ man-pages enabled / 'help2man' found: $HELP2MAN]) AM_COND_IF(HAS_GROFF, - AC_MSG_NOTICE([ build of html enabled / 'groff' found: yes]) - AC_MSG_NOTICE([ build of pdf enabled / 'ps2pdf' found: $PS2PDF]), - AC_MSG_NOTICE([ build of html and pdf / 'groff' found: no]) + AC_MSG_NOTICE([ build of html enabled / 'groff' found: yes]) + AC_MSG_NOTICE([ build of pdf enabled / 'ps2pdf' found: $PS2PDF]), + AC_MSG_NOTICE([ build of html and pdf / 'groff' found: no]) ) ],[ - AC_MSG_NOTICE([ man, html, pdf enabled / 'help2man' found: no]) + AC_MSG_NOTICE([ man, html, pdf enabled / 'help2man' found: no]) ]) AM_COND_IF(HAS_DOXYGEN, - AC_MSG_NOTICE([ doxygen docu enabled / 'doxygen' found: $DX_DOXYGEN]), - AC_MSG_NOTICE([ doxygen docu enabled / 'doxygen' found: no]) + AC_MSG_NOTICE([ doxygen docu enabled / 'doxygen' found: $DX_DOXYGEN]), + AC_MSG_NOTICE([ doxygen docu enabled / 'doxygen' found: no]) ) AM_COND_IF(HAS_DOT, - AC_MSG_NOTICE([ doxygen graphs enabled / 'dot' (graphviz) found: $DX_DOT]), - AC_MSG_NOTICE([ doxygen graphs enabled / 'dot' (graphviz) found: no]) + AC_MSG_NOTICE([ doxygen graphs enabled / 'dot' (graphviz) found: $DX_DOT]), + AC_MSG_NOTICE([ doxygen graphs enabled / 'dot' (graphviz) found: no]) ) AM_COND_IF(HAS_QT4, - AC_MSG_NOTICE([ QT4 support enabled / QT4 toolkit found: yes]), - AC_MSG_NOTICE([ QT4 support enabled / QT4 toolkit found: no]) -) -AC_MSG_NOTICE([ ROOT support enabled / root >= 5.12/00 found: $ROOTEXEC]) + AC_MSG_NOTICE([ QT4 support enabled / QT4 toolkit found: yes]), + AC_MSG_NOTICE([ QT4 support enabled / QT4 toolkit found: no]) +) +AC_MSG_NOTICE([ ROOT support enabled / root >= 5.12/00 found: $ROOTEXEC]) AM_COND_IF(HAS_ROOT_QT, - AC_MSG_NOTICE([ ROOT built with --with-qt found: yes]), - AC_MSG_NOTICE([ ROOT built with --with-qt found: no]) + AC_MSG_NOTICE([ ROOT built with --with-qt found: yes]), + AC_MSG_NOTICE([ ROOT built with --with-qt found: no]) ) AC_MSG_NOTICE()