Index: trunk/FACT++/configure =================================================================== --- trunk/FACT++/configure (revision 10446) +++ 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