From e9aad10ab71721934d6c297cb4cec01f71782a0f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Karsten=20Ball=C3=BCder?= Date: Tue, 10 Nov 1998 21:17:35 +0000 Subject: [PATCH] Added wxExtHelpController: wxHelpController implementation for external viewers. Made it the default viewer for wxGTK and set wxUSE_HELP=1. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 600 ++++++++++++++------------ configure.in | 10 +- include/wx/generic/helpext.h | 136 ++++++ include/wx/help.h | 6 +- src/generic/helpext.cpp | 813 +++++++++++++++++++++++++++++++++++ src/gtk.inc | 5 +- 6 files changed, 1276 insertions(+), 294 deletions(-) create mode 100644 include/wx/generic/helpext.h create mode 100644 src/generic/helpext.cpp diff --git a/configure b/configure index 82963b2499..d7f432b48f 100755 --- a/configure +++ b/configure @@ -110,6 +110,8 @@ ac_help="$ac_help ac_help="$ac_help **--with-printarch use printing architecture" ac_help="$ac_help +**--with-help use help (using external browser at present)" +ac_help="$ac_help **--with-gtk-prefix=PFX Prefix where GTK is installed" ac_help="$ac_help **--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed" @@ -696,7 +698,7 @@ SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` \ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:700: checking for $ac_word" >&5 +echo "configure:702: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -725,7 +727,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:729: checking for $ac_word" >&5 +echo "configure:731: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -773,7 +775,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:777: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:779: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -783,11 +785,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -807,12 +809,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:813: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:816: checking whether we are using GNU C" >&5 +echo "configure:818: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -821,7 +823,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -836,7 +838,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:840: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:842: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -868,10 +870,10 @@ CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'` if test "x$CC" != xcc; then echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 -echo "configure:872: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:874: checking whether $CC and cc understand -c and -o together" >&5 else echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 -echo "configure:875: checking whether cc understands -c and -o together" >&5 +echo "configure:877: checking whether cc understands -c and -o together" >&5 fi set dummy $CC; ac_cc="`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" @@ -883,16 +885,16 @@ else # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' -if { (eval echo configure:887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. - if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ac_try='cc -c conftest.c -o conftest.o 1>&5' - if { (eval echo configure:895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -919,7 +921,7 @@ EOF fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:923: checking how to run the C preprocessor" >&5 +echo "configure:925: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -934,13 +936,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -951,13 +953,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -981,13 +983,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:985: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:987: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1005,7 +1007,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1034,7 +1036,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1038: checking for $ac_word" >&5 +echo "configure:1040: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1065,7 +1067,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1069: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1071: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1075,11 +1077,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1105,12 +1107,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1109: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1111: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1114: checking whether we are using GNU C++" >&5 +echo "configure:1116: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1119,7 +1121,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1134,7 +1136,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1138: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1140: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1162,7 +1164,7 @@ else fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1166: checking how to run the C++ preprocessor" >&5 +echo "configure:1168: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1175,12 +1177,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1212,7 +1214,7 @@ CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'` # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1216: checking for $ac_word" >&5 +echo "configure:1218: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1242,7 +1244,7 @@ fi # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1246: checking for $ac_word" >&5 +echo "configure:1248: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1299,7 +1301,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1303: checking for a BSD compatible install" >&5 +echo "configure:1305: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1350,7 +1352,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1354: checking whether ln -s works" >&5 +echo "configure:1356: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1376,7 +1378,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1380: checking for $ac_word" >&5 +echo "configure:1382: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1406,7 +1408,7 @@ done echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6 -echo "configure:1410: checking "make for VPATH support"" >&5 +echo "configure:1412: checking "make for VPATH support"" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -1436,7 +1438,7 @@ fi # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1440: checking for X" >&5 +echo "configure:1442: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1498,12 +1500,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1507: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1572,14 +1574,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1685,17 +1687,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:1689: checking whether -R must be followed by a space" >&5 +echo "configure:1691: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -1711,14 +1713,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -1750,7 +1752,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:1754: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1756: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1758,7 +1760,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1791,7 +1793,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:1795: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1797: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1799,7 +1801,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1839,12 +1841,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1843: checking for gethostbyname" >&5 +echo "configure:1845: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1888,7 +1890,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1892: checking for gethostbyname in -lnsl" >&5 +echo "configure:1894: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1896,7 +1898,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1937,12 +1939,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1941: checking for connect" >&5 +echo "configure:1943: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1986,7 +1988,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1990: checking for connect in -lsocket" >&5 +echo "configure:1992: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1994,7 +1996,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2029,12 +2031,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2033: checking for remove" >&5 +echo "configure:2035: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2078,7 +2080,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2082: checking for remove in -lposix" >&5 +echo "configure:2084: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2086,7 +2088,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2121,12 +2123,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2125: checking for shmat" >&5 +echo "configure:2127: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2170,7 +2172,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2174: checking for shmat in -lipc" >&5 +echo "configure:2176: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2178,7 +2180,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2222,7 +2224,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2226: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2228: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2230,7 +2232,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2271,12 +2273,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:2275: checking for $ac_hdr that defines DIR" >&5 +echo "configure:2277: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -2284,7 +2286,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -2309,7 +2311,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:2313: checking for opendir in -ldir" >&5 +echo "configure:2315: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2317,7 +2319,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2350,7 +2352,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2354: checking for opendir in -lx" >&5 +echo "configure:2356: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2358,7 +2360,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2392,12 +2394,12 @@ fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2396: checking for ANSI C header files" >&5 +echo "configure:2398: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2405,7 +2407,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2422,7 +2424,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2440,7 +2442,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2461,7 +2463,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2472,7 +2474,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -2496,12 +2498,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2500: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2502: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2517,7 +2519,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2541,17 +2543,17 @@ for ac_hdr in fcntl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2545: checking for $ac_hdr" >&5 +echo "configure:2547: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2581,17 +2583,17 @@ for ac_hdr in limits.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2585: checking for $ac_hdr" >&5 +echo "configure:2587: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2621,17 +2623,17 @@ for ac_hdr in sys/file.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2625: checking for $ac_hdr" >&5 +echo "configure:2627: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2661,17 +2663,17 @@ for ac_hdr in sys/time.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2665: checking for $ac_hdr" >&5 +echo "configure:2667: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2701,17 +2703,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2705: checking for $ac_hdr" >&5 +echo "configure:2707: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2741,17 +2743,17 @@ for ac_hdr in fnmatch.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2745: checking for $ac_hdr" >&5 +echo "configure:2747: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2781,17 +2783,17 @@ for ac_hdr in linux/joystick.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2785: checking for $ac_hdr" >&5 +echo "configure:2787: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2835,17 +2837,17 @@ for ac_hdr in iostream do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2839: checking for $ac_hdr" >&5 +echo "configure:2841: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2886,12 +2888,12 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2890: checking for uid_t in sys/types.h" >&5 +echo "configure:2892: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -2920,7 +2922,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:2924: checking type of array argument to getgroups" >&5 +echo "configure:2926: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2928,7 +2930,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -2967,7 +2969,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -2991,12 +2993,12 @@ EOF echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:2995: checking for mode_t" >&5 +echo "configure:2997: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3024,12 +3026,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3028: checking for off_t" >&5 +echo "configure:3030: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3057,12 +3059,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3061: checking for pid_t" >&5 +echo "configure:3063: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3090,12 +3092,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3094: checking return type of signal handlers" >&5 +echo "configure:3096: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3112,7 +3114,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:3116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3131,12 +3133,12 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3135: checking for size_t" >&5 +echo "configure:3137: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3164,12 +3166,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3168: checking for uid_t in sys/types.h" >&5 +echo "configure:3170: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -3200,12 +3202,12 @@ fi echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:3204: checking whether stat file-mode macros are broken" >&5 +echo "configure:3206: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3256,12 +3258,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3260: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3262: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3270,7 +3272,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3291,12 +3293,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:3295: checking for st_blksize in struct stat" >&5 +echo "configure:3297: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3304,7 +3306,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:3308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -3325,12 +3327,12 @@ EOF fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:3329: checking for st_blocks in struct stat" >&5 +echo "configure:3331: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3338,7 +3340,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:3342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -3361,12 +3363,12 @@ else fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:3365: checking for st_rdev in struct stat" >&5 +echo "configure:3367: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3374,7 +3376,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:3378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -3395,12 +3397,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:3399: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:3401: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3408,7 +3410,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3429,12 +3431,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3433: checking for tm_zone in struct tm" >&5 +echo "configure:3435: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -3442,7 +3444,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3462,12 +3464,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3466: checking for tzname" >&5 +echo "configure:3468: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -3477,7 +3479,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3501,12 +3503,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3505: checking for working const" >&5 +echo "configure:3507: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3576,21 +3578,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3580: checking for inline" >&5 +echo "configure:3582: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3616,14 +3618,14 @@ EOF esac echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3620: checking whether char is unsigned" >&5 +echo "configure:3622: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -3679,7 +3681,7 @@ EOF fi echo $ac_n "checking for long double""... $ac_c" 1>&6 -echo "configure:3683: checking for long double" >&5 +echo "configure:3685: checking for long double" >&5 if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3690,7 +3692,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_long_double=yes else @@ -3723,14 +3725,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3727: checking whether byte ordering is bigendian" >&5 +echo "configure:3729: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -3741,11 +3743,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -3756,7 +3758,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3776,7 +3778,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3814,7 +3816,7 @@ fi echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:3818: checking size of int *" >&5 +echo "configure:3820: checking size of int *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3822,7 +3824,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -3833,7 +3835,7 @@ main() exit(0); } EOF -if { (eval echo configure:3837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_p=`cat conftestval` else @@ -3853,7 +3855,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:3857: checking size of int" >&5 +echo "configure:3859: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3861,7 +3863,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -3872,7 +3874,7 @@ main() exit(0); } EOF -if { (eval echo configure:3876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -3892,7 +3894,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:3896: checking size of long" >&5 +echo "configure:3898: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3900,7 +3902,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -3911,7 +3913,7 @@ main() exit(0); } EOF -if { (eval echo configure:3915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -3935,7 +3937,7 @@ EOF echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:3939: checking for long file names" >&5 +echo "configure:3941: checking for long file names" >&5 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3986,7 +3988,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3990: checking for $ac_word" >&5 +echo "configure:3992: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4019,7 +4021,7 @@ test -n "$YACC" || YACC="yacc" # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4023: checking for $ac_word" >&5 +echo "configure:4025: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4052,7 +4054,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:4056: checking for yywrap in -l$ac_lib" >&5 +echo "configure:4058: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4060,7 +4062,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4094,7 +4096,7 @@ fi fi echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:4098: checking lex output file root" >&5 +echo "configure:4100: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4115,7 +4117,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:4119: checking whether yytext is a pointer" >&5 +echo "configure:4121: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4127,14 +4129,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -4168,7 +4170,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:4172: checking host system type" >&5 +echo "configure:4174: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -4410,7 +4412,7 @@ DEFAULT_wxUSE_OPENGL=0 DEFAULT_wxUSE_METAFILE=0 DEFAULT_wxUSE_WXGRAPH=0 DEFAULT_wxUSE_WXTREE=0 -DEFAULT_wxUSE_HELP=0 +DEFAULT_wxUSE_HELP=1 DEFAULT_wxUSE_UNICODE=1 DEFAULT_wxUSE_WCSRTOMBS=0 @@ -4418,7 +4420,7 @@ DEFAULT_wxUSE_WCSRTOMBS=0 echo $ac_n "checking "for gtk"""... $ac_c" 1>&6 -echo "configure:4422: checking "for gtk"" >&5 +echo "configure:4424: checking "for gtk"" >&5 # Check whether --with-gtk or --without-gtk was given. if test "${with_gtk+set}" = set; then withval="$with_gtk" @@ -4448,7 +4450,7 @@ fi echo $ac_n "checking "for qt"""... $ac_c" 1>&6 -echo "configure:4452: checking "for qt"" >&5 +echo "configure:4454: checking "for qt"" >&5 # Check whether --with-qt or --without-qt was given. if test "${with_qt+set}" = set; then withval="$with_qt" @@ -4478,7 +4480,7 @@ fi echo $ac_n "checking "for motif"""... $ac_c" 1>&6 -echo "configure:4482: checking "for motif"" >&5 +echo "configure:4484: checking "for motif"" >&5 # Check whether --with-motif or --without-motif was given. if test "${with_motif+set}" = set; then withval="$with_motif" @@ -4509,7 +4511,7 @@ fi echo $ac_n "checking "for shared"""... $ac_c" 1>&6 -echo "configure:4513: checking "for shared"" >&5 +echo "configure:4515: checking "for shared"" >&5 # Check whether --with-shared or --without-shared was given. if test "${with_shared+set}" = set; then withval="$with_shared" @@ -4539,7 +4541,7 @@ fi echo $ac_n "checking "for optimise"""... $ac_c" 1>&6 -echo "configure:4543: checking "for optimise"" >&5 +echo "configure:4545: checking "for optimise"" >&5 # Check whether --with-optimise or --without-optimise was given. if test "${with_optimise+set}" = set; then withval="$with_optimise" @@ -4569,7 +4571,7 @@ fi echo $ac_n "checking "for debug_flag"""... $ac_c" 1>&6 -echo "configure:4573: checking "for debug_flag"" >&5 +echo "configure:4575: checking "for debug_flag"" >&5 # Check whether --with-debug_flag or --without-debug_flag was given. if test "${with_debug_flag+set}" = set; then withval="$with_debug_flag" @@ -4599,7 +4601,7 @@ fi echo $ac_n "checking "for debug_info"""... $ac_c" 1>&6 -echo "configure:4603: checking "for debug_info"" >&5 +echo "configure:4605: checking "for debug_info"" >&5 # Check whether --with-debug_info or --without-debug_info was given. if test "${with_debug_info+set}" = set; then withval="$with_debug_info" @@ -4629,7 +4631,7 @@ fi echo $ac_n "checking "for mem_tracing"""... $ac_c" 1>&6 -echo "configure:4633: checking "for mem_tracing"" >&5 +echo "configure:4635: checking "for mem_tracing"" >&5 # Check whether --with-mem_tracing or --without-mem_tracing was given. if test "${with_mem_tracing+set}" = set; then withval="$with_mem_tracing" @@ -4659,7 +4661,7 @@ fi echo $ac_n "checking "for dmalloc"""... $ac_c" 1>&6 -echo "configure:4663: checking "for dmalloc"" >&5 +echo "configure:4665: checking "for dmalloc"" >&5 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then withval="$with_dmalloc" @@ -4689,7 +4691,7 @@ fi echo $ac_n "checking "for profile"""... $ac_c" 1>&6 -echo "configure:4693: checking "for profile"" >&5 +echo "configure:4695: checking "for profile"" >&5 # Check whether --with-profile or --without-profile was given. if test "${with_profile+set}" = set; then withval="$with_profile" @@ -4719,7 +4721,7 @@ fi echo $ac_n "checking "for apple_ieee"""... $ac_c" 1>&6 -echo "configure:4723: checking "for apple_ieee"" >&5 +echo "configure:4725: checking "for apple_ieee"" >&5 # Check whether --with-apple_ieee or --without-apple_ieee was given. if test "${with_apple_ieee+set}" = set; then withval="$with_apple_ieee" @@ -4750,7 +4752,7 @@ fi echo $ac_n "checking "for zlib"""... $ac_c" 1>&6 -echo "configure:4754: checking "for zlib"" >&5 +echo "configure:4756: checking "for zlib"" >&5 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" @@ -4780,7 +4782,7 @@ fi echo $ac_n "checking "for libpng"""... $ac_c" 1>&6 -echo "configure:4784: checking "for libpng"" >&5 +echo "configure:4786: checking "for libpng"" >&5 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then withval="$with_libpng" @@ -4810,7 +4812,7 @@ fi echo $ac_n "checking "for odbc"""... $ac_c" 1>&6 -echo "configure:4814: checking "for odbc"" >&5 +echo "configure:4816: checking "for odbc"" >&5 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then withval="$with_odbc" @@ -4840,7 +4842,7 @@ fi echo $ac_n "checking "for opengl"""... $ac_c" 1>&6 -echo "configure:4844: checking "for opengl"" >&5 +echo "configure:4846: checking "for opengl"" >&5 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then withval="$with_opengl" @@ -4871,7 +4873,7 @@ fi echo $ac_n "checking "for gauge"""... $ac_c" 1>&6 -echo "configure:4875: checking "for gauge"" >&5 +echo "configure:4877: checking "for gauge"" >&5 # Check whether --with-gauge or --without-gauge was given. if test "${with_gauge+set}" = set; then withval="$with_gauge" @@ -4901,7 +4903,7 @@ fi echo $ac_n "checking "for combobox"""... $ac_c" 1>&6 -echo "configure:4905: checking "for combobox"" >&5 +echo "configure:4907: checking "for combobox"" >&5 # Check whether --with-combobox or --without-combobox was given. if test "${with_combobox+set}" = set; then withval="$with_combobox" @@ -4931,7 +4933,7 @@ fi echo $ac_n "checking "for scrollbar"""... $ac_c" 1>&6 -echo "configure:4935: checking "for scrollbar"" >&5 +echo "configure:4937: checking "for scrollbar"" >&5 # Check whether --with-scrollbar or --without-scrollbar was given. if test "${with_scrollbar+set}" = set; then withval="$with_scrollbar" @@ -4961,7 +4963,7 @@ fi echo $ac_n "checking "for listctrl"""... $ac_c" 1>&6 -echo "configure:4965: checking "for listctrl"" >&5 +echo "configure:4967: checking "for listctrl"" >&5 # Check whether --with-listctrl or --without-listctrl was given. if test "${with_listctrl+set}" = set; then withval="$with_listctrl" @@ -4991,7 +4993,7 @@ fi echo $ac_n "checking "for treectrl"""... $ac_c" 1>&6 -echo "configure:4995: checking "for treectrl"" >&5 +echo "configure:4997: checking "for treectrl"" >&5 # Check whether --with-treectrl or --without-treectrl was given. if test "${with_treectrl+set}" = set; then withval="$with_treectrl" @@ -5021,7 +5023,7 @@ fi echo $ac_n "checking "for grid"""... $ac_c" 1>&6 -echo "configure:5025: checking "for grid"" >&5 +echo "configure:5027: checking "for grid"" >&5 # Check whether --with-grid or --without-grid was given. if test "${with_grid+set}" = set; then withval="$with_grid" @@ -5051,7 +5053,7 @@ fi echo $ac_n "checking "for tab_dialog"""... $ac_c" 1>&6 -echo "configure:5055: checking "for tab_dialog"" >&5 +echo "configure:5057: checking "for tab_dialog"" >&5 # Check whether --with-tab_dialog or --without-tab_dialog was given. if test "${with_tab_dialog+set}" = set; then withval="$with_tab_dialog" @@ -5081,7 +5083,7 @@ fi echo $ac_n "checking "for notebook"""... $ac_c" 1>&6 -echo "configure:5085: checking "for notebook"" >&5 +echo "configure:5087: checking "for notebook"" >&5 # Check whether --with-notebook or --without-notebook was given. if test "${with_notebook+set}" = set; then withval="$with_notebook" @@ -5112,7 +5114,7 @@ fi echo $ac_n "checking "for timedate"""... $ac_c" 1>&6 -echo "configure:5116: checking "for timedate"" >&5 +echo "configure:5118: checking "for timedate"" >&5 # Check whether --with-timedate or --without-timedate was given. if test "${with_timedate+set}" = set; then withval="$with_timedate" @@ -5142,7 +5144,7 @@ fi echo $ac_n "checking "for fraction"""... $ac_c" 1>&6 -echo "configure:5146: checking "for fraction"" >&5 +echo "configure:5148: checking "for fraction"" >&5 # Check whether --with-fraction or --without-fraction was given. if test "${with_fraction+set}" = set; then withval="$with_fraction" @@ -5172,7 +5174,7 @@ fi echo $ac_n "checking "for log"""... $ac_c" 1>&6 -echo "configure:5176: checking "for log"" >&5 +echo "configure:5178: checking "for log"" >&5 # Check whether --with-log or --without-log was given. if test "${with_log+set}" = set; then withval="$with_log" @@ -5202,7 +5204,7 @@ fi echo $ac_n "checking "for intl"""... $ac_c" 1>&6 -echo "configure:5206: checking "for intl"" >&5 +echo "configure:5208: checking "for intl"" >&5 # Check whether --with-intl or --without-intl was given. if test "${with_intl+set}" = set; then withval="$with_intl" @@ -5232,7 +5234,7 @@ fi echo $ac_n "checking "for config"""... $ac_c" 1>&6 -echo "configure:5236: checking "for config"" >&5 +echo "configure:5238: checking "for config"" >&5 # Check whether --with-config or --without-config was given. if test "${with_config+set}" = set; then withval="$with_config" @@ -5262,7 +5264,7 @@ fi echo $ac_n "checking "for streams"""... $ac_c" 1>&6 -echo "configure:5266: checking "for streams"" >&5 +echo "configure:5268: checking "for streams"" >&5 # Check whether --with-streams or --without-streams was given. if test "${with_streams+set}" = set; then withval="$with_streams" @@ -5292,7 +5294,7 @@ fi echo $ac_n "checking "for serial"""... $ac_c" 1>&6 -echo "configure:5296: checking "for serial"" >&5 +echo "configure:5298: checking "for serial"" >&5 # Check whether --with-serial or --without-serial was given. if test "${with_serial+set}" = set; then withval="$with_serial" @@ -5322,7 +5324,7 @@ fi echo $ac_n "checking "for file"""... $ac_c" 1>&6 -echo "configure:5326: checking "for file"" >&5 +echo "configure:5328: checking "for file"" >&5 # Check whether --with-file or --without-file was given. if test "${with_file+set}" = set; then withval="$with_file" @@ -5352,7 +5354,7 @@ fi echo $ac_n "checking "for textfile"""... $ac_c" 1>&6 -echo "configure:5356: checking "for textfile"" >&5 +echo "configure:5358: checking "for textfile"" >&5 # Check whether --with-textfile or --without-textfile was given. if test "${with_textfile+set}" = set; then withval="$with_textfile" @@ -5383,7 +5385,7 @@ fi echo $ac_n "checking "for afmfonts"""... $ac_c" 1>&6 -echo "configure:5387: checking "for afmfonts"" >&5 +echo "configure:5389: checking "for afmfonts"" >&5 # Check whether --with-afmfonts or --without-afmfonts was given. if test "${with_afmfonts+set}" = set; then withval="$with_afmfonts" @@ -5413,7 +5415,7 @@ fi echo $ac_n "checking "for normalized"""... $ac_c" 1>&6 -echo "configure:5417: checking "for normalized"" >&5 +echo "configure:5419: checking "for normalized"" >&5 # Check whether --with-normalized or --without-normalized was given. if test "${with_normalized+set}" = set; then withval="$with_normalized" @@ -5443,7 +5445,7 @@ fi echo $ac_n "checking "for postscript"""... $ac_c" 1>&6 -echo "configure:5447: checking "for postscript"" >&5 +echo "configure:5449: checking "for postscript"" >&5 # Check whether --with-postscript or --without-postscript was given. if test "${with_postscript+set}" = set; then withval="$with_postscript" @@ -5474,7 +5476,7 @@ fi echo $ac_n "checking "for unicode"""... $ac_c" 1>&6 -echo "configure:5478: checking "for unicode"" >&5 +echo "configure:5480: checking "for unicode"" >&5 # Check whether --with-unicode or --without-unicode was given. if test "${with_unicode+set}" = set; then withval="$with_unicode" @@ -5504,7 +5506,7 @@ fi echo $ac_n "checking "for wcsrtombs"""... $ac_c" 1>&6 -echo "configure:5508: checking "for wcsrtombs"" >&5 +echo "configure:5510: checking "for wcsrtombs"" >&5 # Check whether --with-wcsrtombs or --without-wcsrtombs was given. if test "${with_wcsrtombs+set}" = set; then withval="$with_wcsrtombs" @@ -5535,7 +5537,7 @@ fi echo $ac_n "checking "for wxresources"""... $ac_c" 1>&6 -echo "configure:5539: checking "for wxresources"" >&5 +echo "configure:5541: checking "for wxresources"" >&5 # Check whether --with-wxresources or --without-wxresources was given. if test "${with_wxresources+set}" = set; then withval="$with_wxresources" @@ -5565,7 +5567,7 @@ fi echo $ac_n "checking "for prologio"""... $ac_c" 1>&6 -echo "configure:5569: checking "for prologio"" >&5 +echo "configure:5571: checking "for prologio"" >&5 # Check whether --with-prologio or --without-prologio was given. if test "${with_prologio+set}" = set; then withval="$with_prologio" @@ -5595,7 +5597,7 @@ fi echo $ac_n "checking "for RPC"""... $ac_c" 1>&6 -echo "configure:5599: checking "for RPC"" >&5 +echo "configure:5601: checking "for RPC"" >&5 # Check whether --with-rpc or --without-rpc was given. if test "${with_rpc+set}" = set; then withval="$with_rpc" @@ -5626,7 +5628,7 @@ fi echo $ac_n "checking "for IPC"""... $ac_c" 1>&6 -echo "configure:5630: checking "for IPC"" >&5 +echo "configure:5632: checking "for IPC"" >&5 # Check whether --with-ipc or --without-ipc was given. if test "${with_ipc+set}" = set; then withval="$with_ipc" @@ -5656,7 +5658,7 @@ fi echo $ac_n "checking "for resources"""... $ac_c" 1>&6 -echo "configure:5660: checking "for resources"" >&5 +echo "configure:5662: checking "for resources"" >&5 # Check whether --with-resources or --without-resources was given. if test "${with_resources+set}" = set; then withval="$with_resources" @@ -5686,7 +5688,7 @@ fi echo $ac_n "checking "for clipboard"""... $ac_c" 1>&6 -echo "configure:5690: checking "for clipboard"" >&5 +echo "configure:5692: checking "for clipboard"" >&5 # Check whether --with-clipboard or --without-clipboard was given. if test "${with_clipboard+set}" = set; then withval="$with_clipboard" @@ -5716,7 +5718,7 @@ fi echo $ac_n "checking "for dnd"""... $ac_c" 1>&6 -echo "configure:5720: checking "for dnd"" >&5 +echo "configure:5722: checking "for dnd"" >&5 # Check whether --with-dnd or --without-dnd was given. if test "${with_dnd+set}" = set; then withval="$with_dnd" @@ -5746,7 +5748,7 @@ fi echo $ac_n "checking "for constrains"""... $ac_c" 1>&6 -echo "configure:5750: checking "for constrains"" >&5 +echo "configure:5752: checking "for constrains"" >&5 # Check whether --with-constraints or --without-constraints was given. if test "${with_constraints+set}" = set; then withval="$with_constraints" @@ -5777,7 +5779,7 @@ fi echo $ac_n "checking "for mdi"""... $ac_c" 1>&6 -echo "configure:5781: checking "for mdi"" >&5 +echo "configure:5783: checking "for mdi"" >&5 # Check whether --with-mdi or --without-mdi was given. if test "${with_mdi+set}" = set; then withval="$with_mdi" @@ -5807,7 +5809,7 @@ fi echo $ac_n "checking "for docview"""... $ac_c" 1>&6 -echo "configure:5811: checking "for docview"" >&5 +echo "configure:5813: checking "for docview"" >&5 # Check whether --with-docview or --without-docview was given. if test "${with_docview+set}" = set; then withval="$with_docview" @@ -5837,7 +5839,7 @@ fi echo $ac_n "checking "for printarch"""... $ac_c" 1>&6 -echo "configure:5841: checking "for printarch"" >&5 +echo "configure:5843: checking "for printarch"" >&5 # Check whether --with-printarch or --without-printarch was given. if test "${with_printarch+set}" = set; then withval="$with_printarch" @@ -5866,6 +5868,36 @@ fi +echo $ac_n "checking "for help"""... $ac_c" 1>&6 +echo "configure:5873: checking "for help"" >&5 +# Check whether --with-help or --without-help was given. +if test "${with_help+set}" = set; then + withval="$with_help" + if test "x$with_help" = xyes; then + ac_cv_use_help='wxUSE_HELP="1"' +else + ac_cv_use_help='wxUSE_HELP="0"' +fi +else + + LINE=`grep "wxUSE_HELP" ${OSTYPE}.system.cache` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + fi + ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP + +fi + +eval "$ac_cv_use_help" +echo $ac_cv_use_help >> ${OSTYPE}.system.cache.tmp +if test "$wxUSE_HELP" = 1; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + if test "$wxUSE_UNIX" = 1 ; then cat >> confdefs.h <<\EOF #define __UNIX__ 1 @@ -5917,7 +5949,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5921: checking for $ac_word" >&5 +echo "configure:5953: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5948,7 +5980,7 @@ fi min_gtk_version=1.0.4 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:5952: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:5984: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -5961,7 +5993,7 @@ echo "configure:5952: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -5983,7 +6015,7 @@ main () } EOF -if { (eval echo configure:5987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -6022,7 +6054,7 @@ fi if test "$wxUSE_QT" = 1; then echo $ac_n "checking for Qt includes""... $ac_c" 1>&6 -echo "configure:6026: checking for Qt includes" >&5 +echo "configure:6058: checking for Qt includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6036,7 +6068,7 @@ for ac_dir in $SEARCH_INCLUDE; if test "$ac_find_includes" != "" ; then echo "$ac_t""found $ac_find_includes" 1>&6 echo $ac_n "checking for Qt library""... $ac_c" 1>&6 -echo "configure:6040: checking for Qt library" >&5 +echo "configure:6072: checking for Qt library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -6086,7 +6118,7 @@ fi if test "$wxUSE_MOTIF" = 1; then echo $ac_n "checking for Motif/Lesstif includes""... $ac_c" 1>&6 -echo "configure:6090: checking for Motif/Lesstif includes" >&5 +echo "configure:6122: checking for Motif/Lesstif includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6100,7 +6132,7 @@ for ac_dir in $SEARCH_INCLUDE; if test "$ac_find_includes" != "" ; then echo "$ac_t""found $ac_find_includes" 1>&6 echo $ac_n "checking for Motif or Lesstif library""... $ac_c" 1>&6 -echo "configure:6104: checking for Motif or Lesstif library" >&5 +echo "configure:6136: checking for Motif or Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -6543,7 +6575,7 @@ fi echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:6547: checking for main in -ldl" >&5 +echo "configure:6579: checking for main in -ldl" >&5 ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6551,14 +6583,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6588,7 +6620,7 @@ UNIX_THREAD="gtk/threadno.cpp" echo $ac_n "checking "for threads"""... $ac_c" 1>&6 -echo "configure:6592: checking "for threads"" >&5 +echo "configure:6624: checking "for threads"" >&5 # Check whether --with-threads or --without-threads was given. if test "${with_threads+set}" = set; then withval="$with_threads" @@ -6622,7 +6654,7 @@ if test "$wxUSE_THREADS" = "1"; then echo $ac_n "checking for pthread_create in -lpthread-0.7""... $ac_c" 1>&6 -echo "configure:6626: checking for pthread_create in -lpthread-0.7" >&5 +echo "configure:6658: checking for pthread_create in -lpthread-0.7" >&5 ac_lib_var=`echo pthread-0.7'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6630,7 +6662,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread-0.7 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6665,17 +6697,17 @@ else ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:6669: checking for sys/prctl.h" >&5 +echo "configure:6701: checking for sys/prctl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6701,7 +6733,7 @@ fi echo $ac_n "checking for pthread_setcanceltype in -lpthread""... $ac_c" 1>&6 -echo "configure:6705: checking for pthread_setcanceltype in -lpthread" >&5 +echo "configure:6737: checking for pthread_setcanceltype in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_setcanceltype | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6709,7 +6741,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6747,7 +6779,7 @@ fi fi echo $ac_n "checking for pthread_setcanceltype in -lpthreads""... $ac_c" 1>&6 -echo "configure:6751: checking for pthread_setcanceltype in -lpthreads" >&5 +echo "configure:6783: checking for pthread_setcanceltype in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'pthread_setcanceltype | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6755,7 +6787,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6814,7 +6846,7 @@ OPENGL_LINK= if test "$wxUSE_OPENGL" = 1; then echo $ac_n "checking for OpenGL includes""... $ac_c" 1>&6 -echo "configure:6818: checking for OpenGL includes" >&5 +echo "configure:6850: checking for OpenGL includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6829,7 +6861,7 @@ for ac_dir in $SEARCH_INCLUDE; OPENGL_INCLUDE="-I$ac_find_includes" echo "$ac_t""found $ac_find_includes" 1>&6 echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6 -echo "configure:6833: checking for OpenGL library" >&5 +echo "configure:6865: checking for OpenGL library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; diff --git a/configure.in b/configure.in index 290d717b78..5af0ce2e61 100644 --- a/configure.in +++ b/configure.in @@ -716,7 +716,7 @@ DEFAULT_wxUSE_OPENGL=0 DEFAULT_wxUSE_METAFILE=0 DEFAULT_wxUSE_WXGRAPH=0 DEFAULT_wxUSE_WXTREE=0 -DEFAULT_wxUSE_HELP=0 +DEFAULT_wxUSE_HELP=1 DEFAULT_wxUSE_UNICODE=1 DEFAULT_wxUSE_WCSRTOMBS=0 @@ -953,6 +953,10 @@ AC_OVERRIDES(printarch,printarch, **--with-printarch use printing architecture, wxUSE_PRINTING_ARCHITECTURE) +AC_OVERRIDES(help,help, +**--with-help use help (using external browser at present), +wxUSE_HELP) + dnl ---------------------------------------------------------------- dnl user options with no effect yet dnl ---------------------------------------------------------------- @@ -961,10 +965,6 @@ dnl AC_OVERRIDES(metafile, metafile, dnl **--with-metafile use metafile (no effect), dnl wxUSE_METAFILE) dnl -dnl AC_OVERRIDES(help,help, -dnl **--with-help use help (no effect), -dnl wxUSE_HELP) -dnl dnl AC_OVERRIDES(wxgraph,wxgraph, dnl **--with-wxgraph use wxgraph (no effect), dnl wxUSE_WXGRAPH) diff --git a/include/wx/generic/helpext.h b/include/wx/generic/helpext.h new file mode 100644 index 0000000000..ba21f6a338 --- /dev/null +++ b/include/wx/generic/helpext.h @@ -0,0 +1,136 @@ +/*-*- c++ -*-******************************************************** + * exthlp.h - an external help controller for wxWindows * + * * + * (C) 1998 by Karsten Ballüder (Ballueder@usa.net) * + * * + * $Id$ + *******************************************************************/ +#ifndef WXXHELP_H +#define WXXHELP_H + +#if wxUSE_HELP + +#ifdef __GNUG__ +# pragma interface "wxexthlp.h" +#endif + +/// Name for map file. +#define WXEXTHELP_MAPFILE "wxhelp.map" +/// Path separator. +#define WXEXTHELP_SEPARATOR '/' +#ifndef WXEXTHELP_DEFAULTBROWSER +/// Default browser name. +# define WXEXTHELP_DEFAULTBROWSER "kdehelp" +/// Is default browse a variant of netscape? +# define WXEXTHELP_DEFAULTBROWSER_IS_NETSCAPE false +#endif +/// Name of environment variable to set help browser. +#define WXEXTHELP_ENVVAR_BROWSER "WX_HELPBROWSER" +/// Is browser a netscape browser? +#define WXEXTHELP_ENVVAR_BROWSERISNETSCAPE "WX_HELPBROWSER_NS" +/// Maximum line length in map file. +#define WXEXTHELP_BUFLEN 512 +/// Character introducing comments/documentation field in map file. +#define WXEXTHELP_COMMENTCHAR ';' + +class wxExtHelpMapList; + + +/** + This class implements help via an external browser. + It requires the name of a directory containing the documentation + and a file mapping numerical Section numbers to relative URLS. + + The map file contains two or three fields per line: + numeric_id relative_URL [; comment/documentation] + + The numeric_id is the id used to look up the entry in + DisplaySection()/DisplayBlock(). The relative_URL is a filename of + an html file, relative to the help directory. The optional + comment/documentation field (after a ';') is used for keyword + searches, so some meaningful text here does not hurt. + If the documentation itself contains a ';', only the part before + that will be displayed in the listbox, but all of it used for search. + + Lines starting with ';' will be ignored. +*/ + +class wxExtHelpController : public wxHelpControllerBase +{ +DECLARE_CLASS(wxExtHelpController) + public: + wxExtHelpController(void); + virtual ~wxExtHelpController(void); + + /** This must be called to tell the controller where to find the + documentation. + @param file - NOT a filename, but a directory name. + @return true on success + */ + virtual bool Initialize(const wxString& file, int WXUNUSED(server)) + { return Initialize(file); } + + /** This must be called to tell the controller where to find the + documentation. + @param file - NOT a filename, but a directory name. + @return true on success + */ + virtual bool Initialize(const wxString& file); + + /** If file is "", reloads file given in Initialize. + @file Name of help directory. + @return true on success + */ + virtual bool LoadFile(const wxString& file = ""); + + /** Display list of all help entries. + @return true on success + */ + virtual bool DisplayContents(void); + /** Display help for id sectionNo. + @return true on success + */ + virtual bool DisplaySection(int sectionNo); + /** Display help for id sectionNo -- identical with DisplaySection(). + @return true on success + */ + virtual bool DisplayBlock(long blockNo); + /** Search comment/documentation fields in map file and present a + list to chose from. + @key k string to search for, empty string will list all entries + @return true on success + */ + virtual bool KeywordSearch(const wxString& k); + + /// does nothing + virtual bool Quit(void); + /// does nothing + virtual void OnQuit(void); + + /** Tell it which browser to use. + The Netscape support will check whether Netscape is already + running (by looking at the .netscape/lock file in the user's + home directory) and tell it to load the page into the existing + window. + @param browsername The command to call a browser/html viewer. + @param isNetscape Set this to TRUE if the browser is some variant of Netscape. + */ + void SetBrowser(wxString const & browsername = WXEXTHELP_DEFAULTBROWSER, + bool isNetscape = WXEXTHELP_DEFAULTBROWSER_IS_NETSCAPE); + private: + /// Filename of currently active map file. + wxString m_MapFile; + /// How many entries do we have in the map file? + int m_NumOfEntries; + /// A list containing all id,url,documentation triples. + wxExtHelpMapList *m_MapList; + /// How to call the html viewer. + wxString m_BrowserName; + /// Is the viewer a variant of netscape? + bool m_BrowserIsNetscape; + /// Call the browser using a relative URL. + bool CallBrowser(wxString const &); +}; + +#endif +#endif diff --git a/include/wx/help.h b/include/wx/help.h index 36c6b04e41..7448e58349 100644 --- a/include/wx/help.h +++ b/include/wx/help.h @@ -4,7 +4,7 @@ #ifdef __WXMSW__ #include "wx/msw/helpwin.h" #elif defined(__WXGTK__) -#include "wx/generic/helphtml.h" +#include "wx/generic/helpext.h" #else #include "wx/generic/helpxlp.h" #endif @@ -13,8 +13,8 @@ #define wxHelpController wxWinHelpController #define sm_classwxHelpController sm_classwxWinHelpController #elif defined(__WXGTK__) -#define wxHelpController wxHTMLHelpController -#define sm_classwxHelpController sm_classwxHTMLHelpController +#define wxHelpController wxExtHelpController +#define sm_classwxHelpController sm_classwxExtHelpController #else #define wxHelpController wxXLPHelpController #define sm_classwxHelpController sm_classwxXLPHelpController diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp new file mode 100644 index 0000000000..c9bbf539a3 --- /dev/null +++ b/src/generic/helpext.cpp @@ -0,0 +1,813 @@ +/*-*- c++ -*-******************************************************** + * wxexthlp.cpp - an external help controller for wxWindows * + * * + * (C) 1998 by Karsten Ballüder (Ballueder@usa.net) * + * * + * $Id$ + *******************************************************************/ +#ifdef __GNUG__ +# pragma implementation "wxexthlp.h" +#endif + +#include "wx/setup.h" +#include "wx/helpbase.h" +#include "wx/generic/helpext.h" +#include "wx/string.h" +#include "wx/utils.h" +#include +#include +#include +#include + + +#define WXEXTHELP_INCLUDE_KBLIST +/** + ** This class uses kbList, a simple linked list. Until someone + ** rewrites it to use wxList instead, I include the relevant bits and + ** pieces of kbList here. It's a tiny class anyway, so it won't make + ** a big difference. The comments probably take up more space than + ** its code. + **/ + +#ifdef WXEXTHELP_INCLUDE_KBLIST + +/********************* kbList.h, verbose copy: ****************************/ +/**@name Double linked list implementation. */ +//@{ + +/** kbListNode is a class used by kbList. It represents a single + element in the list. It is not intended for general use outside + kbList functions. +*/ +struct kbListNode +{ + /// pointer to next node or NULL + struct kbListNode *next; + /// pointer to previous node or NULL + struct kbListNode *prev; + /// pointer to the actual data + void *element; + /** Constructor - it automatically links the node into the list, if + the iprev, inext parameters are given. + @param ielement pointer to the data for this node (i.e. the data itself) + @param iprev if not NULL, use this as previous element in list + @param inext if not NULL, use this as next element in list + */ + kbListNode( void *ielement, + kbListNode *iprev = NULL, + kbListNode *inext = NULL); + /// Destructor. + ~kbListNode(); +}; + +/** The main list class, handling void pointers as data. + */ + +class kbList +{ +public: + /// An iterator class for kbList, just like for the STL classes. + class iterator + { + protected: + /// the node to which this iterator points + kbListNode *node; + friend class kbList; + public: + /** Constructor. + @param n if not NULL, the node to which to point + */ + iterator(kbListNode *n = NULL); + /** Dereference operator. + @return the data pointer of the node belonging to this + iterator + */ + void * operator*(); + + /** This operator allows us to write if(i). It is not a + dereference operator and the result is always useless apart + from its logical value! + */ + operator void*() const { return node == NULL ? (void*)0 : (void*)(-1); } + + /** Increment operator - prefix, goes to next node in list. + @return itself + */ + iterator & operator++(); + + /** Decrement operator - prefix, goes to previous node in list. + @return itself + */ + iterator & operator--(); + + /** Increment operator - prefix, goes to next node in list. + @return itself + */ + iterator & operator++(int); //postfix + + /** Decrement operator - prefix, goes to previous node in list. + @return itself + */ + iterator & operator--(int); //postfix + + /** Comparison operator. + @return true if not equal. + */ + bool operator !=(iterator const &) const; + + /* Comparison operator. + @return true if equal + */ + bool operator ==(iterator const &) const; + + /** Returns a pointer to the node associated with this iterator. + This function is not for general use and should be + protected. However, if protected, it cannot be called from + derived classes' iterators. (Is this a bug in gcc/egcs?) + @return the node pointer + */ + inline kbListNode * Node(void) const + { return node; } + }; + + /** Constructor. + @param ownsEntriesFlag if true, the list owns the entries and + will issue a delete on each of them when deleting them. If + false, the entries themselves will not get deleted. Do not use + this with array types! + */ + kbList(bool ownsEntriesFlag = true); + + /** Destructor. + If entries are owned, they will all get deleted from here. + */ + ~kbList(); + + /** Tell list whether it owns objects. If owned, they can be + deleted by list. See the constructor for more details. + @param ownsflag if true, list will own entries + */ + void ownsObjects(bool ownsflag = true) + { ownsEntries = ownsflag; } + + /** Query whether list owns entries. + @return true if list owns entries + */ + bool ownsObjects(void) + { return ownsEntries; } + + /** Add an entry at the end of the list. + @param element pointer to data + */ + void push_back(void *element); + + /** Add an entry at the head of the list. + @param element pointer to data + */ + void push_front(void *element); + + /** Get element from end of the list and delete it. + NOTE: In this case the element's data will not get deleted by + the list. It is the responsibility of the caller to free it. + @return the element data + */ + void *pop_back(void); + + /** Get element from head of the list and delete it. + NOTE: In this case the element's data will not get deleted by + the list. It is the responsibility of the caller to free it. + @return the element data + */ + void *pop_front(void); + + /** Insert an element into the list. + @param i an iterator pointing to the element, before which the new one should be inserted + @param element the element data + */ + void insert(iterator & i, void *element); + + /** Remove an element from the list _without_ deleting the object. + @param i iterator pointing to the element to be deleted + @return the value of the element just removed + */ + void *remove(iterator& i) { void *p = *i; doErase(i); return p; } + + /** Erase an element, move iterator to following element. + @param i iterator pointing to the element to be deleted + */ + void erase(iterator & i) { deleteContent(i); doErase(i); } + + /* Get head of list. + @return iterator pointing to head of list + */ + iterator begin(void) const; + + /* Get end of list. + @return iterator pointing after the end of the list. This is an + invalid iterator which cannot be dereferenced or decremented. It is + only of use in comparisons. NOTE: this is different from STL! + @see tail + */ + iterator end(void) const; + + /* Get last element in list. + @return iterator pointing to the last element in the list. + @see end + */ + iterator tail(void) const; + + /* Get the number of elements in the list. + @return number of elements in the list + */ + unsigned size(void) const; + + /* Query whether list is empty. + @return true if list is empty + */ + inline bool empty(void) const + { return first == NULL ; } + +protected: + /// if true, list owns entries + bool ownsEntries; + /// pointer to first element in list + kbListNode *first; + /// pointer to last element in list + kbListNode *last; +protected: + /** Erase an element, move iterator to following element. + @param i iterator pointing to the element to be deleted + */ + void doErase(iterator & i); + + /** Deletes the actual content if ownsflag is set. + param iterator i + */ + inline void deleteContent(iterator i) + { if(ownsEntries) delete *i; } + + +private: + /// forbid copy construction + kbList(kbList const &foo); + /// forbid assignments + kbList& operator=(const kbList& foo); +}; + +/** Macro to define a kbList with a given name, having elements of + pointer to the given type. I.e. KBLIST_DEFINE(Int,int) would + create a kbListInt type holding int pointers. +*/ +#define KBLIST_DEFINE(name,type) \ +class name : public kbList \ +{ \ +public: \ + class iterator : public kbList::iterator \ + { \ + protected: \ + inline iterator(kbList::iterator const & i) \ + { node = i.Node(); } \ + friend class name; \ + public: \ + inline iterator(kbListNode *n = NULL) \ + : kbList::iterator(n) {} \ + inline type * operator*() \ + /* the cast is needed for MS VC++ 5.0 */ \ + { return (type *)((kbList::iterator *)this)->operator*() ; } \ + }; \ + inline name(bool ownsEntriesFlag = TRUE) \ + : kbList(ownsEntriesFlag) {} \ + \ + inline type *pop_back(void) \ + { return (type *) kbList::pop_back(); } \ + \ + inline type *pop_front(void) \ + { return (type *) kbList::pop_front(); } \ + \ + type *remove(iterator& i) \ + { return (type *)kbList::remove(i); } \ + inline void erase(iterator & i) \ + { deleteContent(i); kbList::erase(i); } \ + \ + inline iterator begin(void) const \ + { return kbList::begin(); } \ + \ + inline iterator end(void) const \ + { return kbList::end(); } \ + \ + inline iterator tail(void) const \ + { return kbList::tail(); } \ + ~name() \ + { \ + kbListNode *next; \ + while ( first != NULL ) \ + { \ + next = first->next; \ + if(ownsEntries) \ + delete (type *)first->element; \ + delete first; \ + first = next; \ + } \ + } \ +protected: \ + inline void deleteContent(iterator i) \ + { if(ownsEntries) delete *i; } \ +} + + +/************************* copy of kbList.cpp: ****************************/ +kbListNode::kbListNode( void *ielement, + kbListNode *iprev, + kbListNode *inext) +{ + next = inext; + prev = iprev; + if(prev) + prev->next = this; + if(next) + next->prev = this; + element = ielement; +} + +kbListNode::~kbListNode() +{ + if(prev) + prev->next = next; + if(next) + next->prev = prev; +} + + +kbList::iterator::iterator(kbListNode *n) +{ + node = n; +} + +void * +kbList::iterator::operator*() +{ + return node->element; +} + +kbList::iterator & +kbList::iterator::operator++() +{ + node = node ? node->next : NULL; + return *this; +} + +kbList::iterator & +kbList::iterator::operator--() +{ + node = node ? node->prev : NULL; + return *this; +} +kbList::iterator & +kbList::iterator::operator++(int /* foo */) +{ + return operator++(); +} + +kbList::iterator & +kbList::iterator::operator--(int /* bar */) +{ + return operator--(); +} + + +bool +kbList::iterator::operator !=(kbList::iterator const & i) const +{ + return node != i.node; +} + +bool +kbList::iterator::operator ==(kbList::iterator const & i) const +{ + return node == i.node; +} + +kbList::kbList(bool ownsEntriesFlag) +{ + first = NULL; + last = NULL; + ownsEntries = ownsEntriesFlag; +} + +void +kbList::push_back(void *element) +{ + if(! first) // special case of empty list + { + first = new kbListNode(element); + last = first; + return; + } + else + last = new kbListNode(element, last); +} + +void +kbList::push_front(void *element) +{ + if(! first) // special case of empty list + { + push_back(element); + return; + } + else + first = new kbListNode(element, NULL, first); +} + +void * +kbList::pop_back(void) +{ + iterator i; + void *data; + bool ownsFlagBak = ownsEntries; + i = tail(); + data = *i; + ownsEntries = false; + erase(i); + ownsEntries = ownsFlagBak; + return data; +} + +void * +kbList::pop_front(void) +{ + iterator i; + void *data; + bool ownsFlagBak = ownsEntries; + + i = begin(); + data = *i; + ownsEntries = false; + erase(i); + ownsEntries = ownsFlagBak; + return data; + +} + +void +kbList::insert(kbList::iterator & i, void *element) +{ + if(! i.Node()) + return; + else if(i.Node() == first) + { + push_front(element); + i = first; + return; + } + i = kbList::iterator(new kbListNode(element, i.Node()->prev, i.Node())); +} + +void +kbList::doErase(kbList::iterator & i) +{ + kbListNode + *node = i.Node(), + *prev, *next; + + if(! node) // illegal iterator + return; + + prev = node->prev; + next = node->next; + + // correct first/last: + if(node == first) + first = node->next; + if(node == last) // don't put else here! + last = node->prev; + + // build new links: + if(prev) + prev->next = next; + if(next) + next->prev = prev; + + // delete this node and contents: + // now done separately + //if(ownsEntries) + //delete *i; + delete i.Node(); + + // change the iterator to next element: + i = kbList::iterator(next); +} + +kbList::~kbList() +{ + kbListNode *next; + + while ( first != NULL ) + { + next = first->next; + if(ownsEntries) + delete first->element; + delete first; + first = next; + } +} + +kbList::iterator +kbList::begin(void) const +{ + return kbList::iterator(first); +} + +kbList::iterator +kbList::tail(void) const +{ + return kbList::iterator(last); +} + +kbList::iterator +kbList::end(void) const +{ + return kbList::iterator(NULL); // the one after the last +} + +unsigned +kbList::size(void) const // inefficient +{ + unsigned count = 0; + kbList::iterator i; + for(i = begin(); i != end(); i++, count++) + ; + return count; +} + +#endif +/************************* end of kbList code *****************************/ + +struct wxExtHelpMapEntry +{ + int id; + wxString url; + wxString doc; + wxExtHelpMapEntry(int iid, wxString const &iurl, wxString const &idoc) + { id = iid; url = iurl; doc = idoc; } +}; +KBLIST_DEFINE(wxExtHelpMapList, wxExtHelpMapEntry); + + +struct wxBusyCursor +{ + wxBusyCursor() { wxBeginBusyCursor(); } + ~wxBusyCursor() { wxEndBusyCursor(); } +}; + +IMPLEMENT_CLASS(wxExtHelpController, wxHelpControllerBase) + +/** + This class implements help via an external browser. + It requires the name of a directory containing the documentation + and a file mapping numerical Section numbers to relative URLS. +*/ + +wxExtHelpController::wxExtHelpController(void) +{ + m_MapList = NULL; + m_BrowserName = WXEXTHELP_DEFAULTBROWSER; + m_BrowserIsNetscape = WXEXTHELP_DEFAULTBROWSER_IS_NETSCAPE; + + char *browser = getenv(WXEXTHELP_ENVVAR_BROWSER); + if(browser) + { + m_BrowserName = browser; + browser = getenv(WXEXTHELP_ENVVAR_BROWSERISNETSCAPE); + m_BrowserIsNetscape = browser && (atoi(browser) != 0); + } +} + +wxExtHelpController::~wxExtHelpController(void) +{ + if(m_MapList) delete m_MapList; +} + +void +wxExtHelpController::SetBrowser(wxString const & browsername, bool isNetscape) +{ + m_BrowserName = browsername; + m_BrowserIsNetscape = isNetscape; +} + +/** This must be called to tell the controller where to find the + documentation. + @param file - NOT a filename, but a directory name. + @return true on success +*/ +bool +wxExtHelpController::Initialize(const wxString& file) +{ + return LoadFile(file); +} + + +bool +wxExtHelpController::LoadFile(const wxString& ifile = "") +{ + wxString mapFile, file, url, doc; + int id,i,len; + char buffer[WXEXTHELP_BUFLEN]; + + wxBusyCursor b; // display a busy cursor + + if(! ifile.IsEmpty()) + { + file = ifile; + if(! wxIsAbsolutePath(file)) + { + file = wxGetWorkingDirectory(); + file << WXEXTHELP_SEPARATOR << ifile; + } + else + file = ifile; + + if(! wxDirExists(file)) + return false; + + mapFile << file << WXEXTHELP_SEPARATOR << WXEXTHELP_MAPFILE; + } + else // try to reload old file + mapFile = m_MapFile; + + if(! wxFileExists(mapFile)) + return false; + + if(m_MapList) delete m_MapList; + m_MapList = new wxExtHelpMapList; + m_NumOfEntries = 0; + + FILE *input = fopen(mapFile.c_str(),"rt"); + if(! input) + return false; + do + { + if(fgets(buffer,WXEXTHELP_BUFLEN,input) && *buffer != WXEXTHELP_COMMENTCHAR) + { + len = strlen(buffer); + if(buffer[len-1] == '\n') + buffer[len-1] = '\0'; // cut of trailing newline + if(sscanf(buffer,"%d", &id) != 1) + break; // error + for(i=0; isdigit(buffer[i])||isspace(buffer[i]); i++) + ; // find begin of URL + url = ""; + while(buffer[i] && ! isspace(buffer[i]) && buffer[i] != + WXEXTHELP_COMMENTCHAR) + url << buffer[i++]; + while(buffer[i] && buffer[i] != WXEXTHELP_COMMENTCHAR) + i++; + doc = ""; + if(buffer[i]) + doc = (buffer + i + 1); // skip the comment character + m_MapList->push_back(new wxExtHelpMapEntry(id,url,doc)); + m_NumOfEntries++; + } + else + perror(""); + }while(! feof(input)); + fclose(input); + + m_MapFile = file; // now it's valid + return true; +} + +bool +wxExtHelpController::CallBrowser(wxString const &relativeURL) +{ + wxBusyCursor b; // display a busy cursor + wxString command; + + if(m_BrowserIsNetscape) // try re-loading first + { + wxString lockfile; + wxGetHomeDir(&lockfile); + lockfile << WXEXTHELP_SEPARATOR << ".netscape/lock"; + struct stat statbuf; + if(lstat(lockfile.c_str(), &statbuf) == 0) + // cannot use wxFileExists, because it's a link pointing to a + // non-existing location if(wxFileExists(lockfile)) + { + long success; + command << m_BrowserName << " -remote openURL(" + << "file://" << m_MapFile + << WXEXTHELP_SEPARATOR << relativeURL << ")"; + success = wxExecute(command); + if(success != 0 ) // returns PID on success + return true; + } + } + command = m_BrowserName; + command << " file://" + << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL; + return wxExecute(command) != 0; +} + +bool +wxExtHelpController::DisplayContents(void) +{ + if(! m_NumOfEntries) + return false; + wxBusyCursor b; // display a busy cursor + return KeywordSearch(""); +} + +bool +wxExtHelpController::DisplaySection(int sectionNo) +{ + if(! m_NumOfEntries) + return false; + + wxBusyCursor b; // display a busy cursor + wxExtHelpMapList::iterator i = m_MapList->begin(); + while(i != m_MapList->end()) + { + if((**i).id == sectionNo) + return CallBrowser((**i).url); + i++; + } + return false; +} + +bool +wxExtHelpController::DisplayBlock(long blockNo) +{ + return DisplaySection((int)blockNo); +} + +bool +wxExtHelpController::KeywordSearch(const wxString& k) +{ + if(! m_NumOfEntries) + return false; + + wxBusyCursor b; // display a busy cursor + wxString *choices = new wxString[m_NumOfEntries]; + wxString *urls = new wxString[m_NumOfEntries]; + wxString compA, compB; + + int idx = 0, j; + bool rc; + bool showAll = k.IsEmpty(); + wxExtHelpMapList::iterator i = m_MapList->begin(); + + compA = k; compA.LowerCase(); // we compare case insensitive + while(i != m_MapList->end()) + { + compB = (**i).doc; compB.LowerCase(); + if((showAll || compB.Contains(k)) && ! compB.IsEmpty()) + { + urls[idx] = (**i).url; + // doesn't work: + // choices[idx] = (**i).doc.Contains((**i).doc.Before(WXEXTHELP_COMMENTCHAR)); + //if(choices[idx].IsEmpty()) // didn't contain the ';' + // choices[idx] = (**i).doc; + choices[idx] = ""; + for(j=0;(**i).doc.c_str()[j] + && (**i).doc.c_str()[j] != WXEXTHELP_COMMENTCHAR; j++) + choices[idx] << (**i).doc.c_str()[j]; + idx++; + } + i++; + } + + if(idx == 1) + rc = CallBrowser(urls[0]); + else if(idx == 0) + { + wxMessageBox(_("No entries found.")); + rc = false; + } + else + { + idx = wxGetSingleChoiceIndex(showAll ? _("Help Index") : _("Relevant entries:"), + showAll ? _("Help Index") : _("Entries found"), + idx,choices); + if(idx != -1) + rc = CallBrowser(urls[idx]); + else + rc = false; + } + delete[] urls; + delete[] choices; + + return rc; +} + + +bool +wxExtHelpController::Quit(void) +{ + return true; +} + +void +wxExtHelpController::OnQuit(void) +{ +} + diff --git a/src/gtk.inc b/src/gtk.inc index 89877aee97..be426aa84c 100644 --- a/src/gtk.inc +++ b/src/gtk.inc @@ -131,8 +131,9 @@ LIB_CPP_SRC=\ generic/statusbr.cpp \ generic/tabg.cpp \ generic/textdlgg.cpp \ - generic/treectrl.cpp - + generic/treectrl.cpp \ + generic/helpext.cpp + LIB_C_SRC=\ common/extended.c \ \ -- 2.45.2