diff --git a/Makefile.in b/Makefile.in index c25cf51493..1be2077fc8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/configure b/configure index ae158e8a62..3bf830e156 100755 --- a/configure +++ b/configure @@ -31,6 +31,8 @@ ac_help="$ac_help --enable-profile compile with profiling set" ac_help="$ac_help --with-locale-dir=PATH specify where to look for locale-specific information" +ac_help="$ac_help + --with-help-prefix=PATH specify where to store the help files" ac_help="$ac_help --disable-nls do not use Native Language Support" ac_help="$ac_help @@ -598,7 +600,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:602: checking for a BSD compatible install" >&5 +echo "configure:604: 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 @@ -651,7 +653,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:655: checking whether build environment is sane" >&5 +echo "configure:657: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -708,7 +710,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:712: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:714: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -754,7 +756,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:758: checking for working aclocal" >&5 +echo "configure:760: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -767,7 +769,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:771: checking for working autoconf" >&5 +echo "configure:773: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -780,7 +782,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:784: checking for working automake" >&5 +echo "configure:786: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -793,7 +795,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:797: checking for working autoheader" >&5 +echo "configure:799: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -806,7 +808,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:810: checking for working makeinfo" >&5 +echo "configure:812: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -830,7 +832,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:834: checking host system type" >&5 +echo "configure:836: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -923,7 +925,7 @@ else fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:927: checking build system type" >&5 +echo "configure:929: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -943,7 +945,7 @@ echo "$ac_t""$build" 1>&6 # 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:947: checking for $ac_word" >&5 +echo "configure:949: 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 @@ -973,7 +975,7 @@ fi # 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:977: checking for $ac_word" >&5 +echo "configure:979: 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 @@ -1003,7 +1005,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:1007: checking for $ac_word" >&5 +echo "configure:1009: 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 @@ -1054,7 +1056,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1058: checking for $ac_word" >&5 +echo "configure:1060: 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 @@ -1086,7 +1088,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1090: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1092: 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. @@ -1097,12 +1099,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1101 "configure" +#line 1103 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 @@ -1128,12 +1130,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:1132: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1134: 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:1137: checking whether we are using GNU C" >&5 +echo "configure:1139: 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 @@ -1142,7 +1144,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1146: \"$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:1148: \"$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 @@ -1161,7 +1163,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1165: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1167: 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 @@ -1204,7 +1206,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1208: checking for ld used by GCC" >&5 +echo "configure:1210: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1228,10 +1230,10 @@ echo "configure:1208: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1232: checking for GNU ld" >&5 +echo "configure:1234: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1235: checking for non-GNU ld" >&5 +echo "configure:1237: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1266,7 +1268,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1270: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1272: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1282,7 +1284,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1286: checking for BSD-compatible nm" >&5 +echo "configure:1288: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1318,7 +1320,7 @@ NM="$ac_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1322: checking whether ln -s works" >&5 +echo "configure:1324: 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 @@ -1372,8 +1374,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1376 "configure"' > conftest.$ac_ext - if { (eval echo configure:1377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1378 "configure"' > conftest.$ac_ext + if { (eval echo configure:1379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1394,19 +1396,19 @@ case "$lt_target" in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1398: checking whether the C compiler needs -belf" >&5 +echo "configure:1400: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+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${ac_exeext}; then +if { (eval echo configure:1412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1520,7 +1522,7 @@ exec 5>>./config.log # 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:1524: checking for a BSD compatible install" >&5 +echo "configure:1526: 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 @@ -1575,7 +1577,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # 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:1579: checking for $ac_word" >&5 +echo "configure:1581: 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 @@ -1605,7 +1607,7 @@ fi # 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:1609: checking for $ac_word" >&5 +echo "configure:1611: 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 @@ -1635,7 +1637,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:1639: checking for $ac_word" >&5 +echo "configure:1641: 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 @@ -1686,7 +1688,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1690: checking for $ac_word" >&5 +echo "configure:1692: 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 @@ -1718,7 +1720,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1722: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1724: 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. @@ -1729,12 +1731,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1733 "configure" +#line 1735 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 @@ -1760,12 +1762,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:1764: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1766: 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:1769: checking whether we are using GNU C" >&5 +echo "configure:1771: 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 @@ -1774,7 +1776,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1778: \"$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:1780: \"$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 @@ -1793,7 +1795,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1797: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1799: 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 @@ -1826,7 +1828,7 @@ fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1830: checking for POSIXized ISC" >&5 +echo "configure:1832: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1847,14 +1849,14 @@ else fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1851: checking whether byte ordering is bigendian" >&5 +echo "configure:1853: 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 @@ -1865,11 +1867,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1871: \"$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 @@ -1880,7 +1882,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1900,7 +1902,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${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -1937,7 +1939,7 @@ EOF fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1941: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1943: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1964,7 +1966,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1968: checking how to run the C preprocessor" >&5 +echo "configure:1970: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1979,13 +1981,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:1989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1996,13 +1998,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:2006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2013,13 +2015,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2044,12 +2046,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2048: checking for ANSI C header files" >&5 +echo "configure:2050: 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 @@ -2057,7 +2059,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2061: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2074,7 +2076,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 @@ -2092,7 +2094,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 @@ -2113,7 +2115,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2124,7 +2126,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2152,17 +2154,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:2156: checking for $ac_hdr" >&5 +echo "configure:2158: 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:2166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2191,12 +2193,12 @@ done for ac_func in stpcpy memcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2195: checking for $ac_func" >&5 +echo "configure:2197: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+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${ac_exeext}; then +if { (eval echo configure:2225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2346,15 +2348,28 @@ fi +### -------------------------------------------------------------------------- +### help files +# Check whether --with-help-prefix or --without-help-prefix was given. +if test "${with_help_prefix+set}" = set; then + withval="$with_help_prefix" + GNC_HELPDIR="$with_help_prefix/gnome/help/gnucash" +else + GNC_HELPDIR="\${datadir}/gnome/help/gnucash" +fi + + + + ### -------------------------------------------------------------------------- ### Check for gettext echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2353: checking for working const" >&5 +echo "configure:2368: 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:2422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2424,21 +2439,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2428: checking for inline" >&5 +echo "configure:2443: 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:2457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2464,12 +2479,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2468: checking for off_t" >&5 +echo "configure:2483: 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 @@ -2497,12 +2512,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2501: checking for size_t" >&5 +echo "configure:2516: 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 @@ -2532,19 +2547,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2536: checking for working alloca.h" >&5 +echo "configure:2551: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2565,12 +2580,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2569: checking for alloca" >&5 +echo "configure:2584: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+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${ac_exeext}; then +if { (eval echo configure:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2630,12 +2645,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2634: checking whether alloca needs Cray hooks" >&5 +echo "configure:2649: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2664: checking for $ac_func" >&5 +echo "configure:2679: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+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${ac_exeext}; then +if { (eval echo configure:2707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2715,7 +2730,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2719: checking stack direction for C alloca" >&5 +echo "configure:2734: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2723,7 +2738,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2767,17 +2782,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:2771: checking for $ac_hdr" >&5 +echo "configure:2786: 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:2781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2806,12 +2821,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2810: checking for $ac_func" >&5 +echo "configure:2825: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+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${ac_exeext}; then +if { (eval echo configure:2853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2859,7 +2874,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2863: checking for working mmap" >&5 +echo "configure:2878: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2867,7 +2882,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -3035,17 +3050,17 @@ unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3039: checking for $ac_hdr" >&5 +echo "configure:3054: 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:3049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3075,12 +3090,12 @@ done strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3079: checking for $ac_func" >&5 +echo "configure:3094: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+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${ac_exeext}; then +if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3132,12 +3147,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3136: checking for $ac_func" >&5 +echo "configure:3151: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+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${ac_exeext}; then +if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3194,19 +3209,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3198: checking for LC_MESSAGES" >&5 +echo "configure:3213: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:3210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -3227,7 +3242,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3231: checking whether NLS is requested" >&5 +echo "configure:3246: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -3247,7 +3262,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3251: checking whether included gettext is requested" >&5 +echo "configure:3266: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -3266,17 +3281,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3270: checking for libintl.h" >&5 +echo "configure:3285: checking for libintl.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:3280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3293,19 +3308,19 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:3297: checking for gettext in libc" >&5 +echo "configure:3312: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:3309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -3321,7 +3336,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3325: checking for bindtextdomain in -lintl" >&5 +echo "configure:3340: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3329,7 +3344,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3356,12 +3371,12 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:3360: checking for gettext in libintl" >&5 +echo "configure:3375: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:3365: checking for gettext in -lintl" >&5 +echo "configure:3380: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3369,7 +3384,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3419,7 +3434,7 @@ EOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3423: checking for $ac_word" >&5 +echo "configure:3438: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3453,12 +3468,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3457: checking for $ac_func" >&5 +echo "configure:3472: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+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${ac_exeext}; then +if { (eval echo configure:3500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3508,7 +3523,7 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3512: checking for $ac_word" >&5 +echo "configure:3527: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3544,7 +3559,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3548: checking for $ac_word" >&5 +echo "configure:3563: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3576,7 +3591,7 @@ else fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -3607,7 +3622,7 @@ fi if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:3611: checking whether catgets can be used" >&5 +echo "configure:3626: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then withval="$with_catgets" @@ -3620,7 +3635,7 @@ fi if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:3624: checking for main in -li" >&5 +echo "configure:3639: checking for main in -li" >&5 ac_lib_var=`echo i'_'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 @@ -3628,14 +3643,14 @@ else ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3663,12 +3678,12 @@ else fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:3667: checking for catgets" >&5 +echo "configure:3682: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+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${ac_exeext}; then +if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -3713,7 +3728,7 @@ EOF # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3717: checking for $ac_word" >&5 +echo "configure:3732: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3749,7 +3764,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3753: checking for $ac_word" >&5 +echo "configure:3768: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3786,7 +3801,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3790: checking for $ac_word" >&5 +echo "configure:3805: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3821,7 +3836,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3825: checking for $ac_word" >&5 +echo "configure:3840: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3879,7 +3894,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3883: checking for $ac_word" >&5 +echo "configure:3898: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3913,7 +3928,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3917: checking for $ac_word" >&5 +echo "configure:3932: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3949,7 +3964,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3953: checking for $ac_word" >&5 +echo "configure:3968: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4042,7 +4057,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:4046: checking for catalogs to be installed" >&5 +echo "configure:4061: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -4070,17 +4085,17 @@ echo "configure:4046: checking for catalogs to be installed" >&5 if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:4074: checking for linux/version.h" >&5 +echo "configure:4089: checking for linux/version.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:4084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4164,7 +4179,7 @@ then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4168: checking for $ac_word" >&5 +echo "configure:4183: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4237,7 +4252,7 @@ fi # Extract the first word of "swig", so it can be a program name with args. set dummy swig; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4241: checking for $ac_word" >&5 +echo "configure:4256: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SWIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4297,7 +4312,7 @@ then # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4301: checking for $ac_word" >&5 +echo "configure:4316: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG_BIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4356,7 +4371,7 @@ then # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4360: checking for $ac_word" >&5 +echo "configure:4375: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG_BIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4406,7 +4421,7 @@ LIBS="$LIBS -lm" # 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:4410: checking for X" >&5 +echo "configure:4425: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -4468,12 +4483,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:4477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4542,14 +4557,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${ac_exeext}; then +if { (eval echo configure:4568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -4655,17 +4670,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:4659: checking whether -R must be followed by a space" >&5 +echo "configure:4674: 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${ac_exeext}; then +if { (eval echo configure:4684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -4681,14 +4696,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${ac_exeext}; then +if { (eval echo configure:4707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -4720,7 +4735,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:4724: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:4739: 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 @@ -4728,7 +4743,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4761,7 +4776,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:4765: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:4780: 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 @@ -4769,7 +4784,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4809,12 +4824,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:4813: checking for gethostbyname" >&5 +echo "configure:4828: 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${ac_exeext}; then +if { (eval echo configure:4856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -4858,7 +4873,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4862: checking for gethostbyname in -lnsl" >&5 +echo "configure:4877: 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 @@ -4866,7 +4881,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4907,12 +4922,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:4911: checking for connect" >&5 +echo "configure:4926: 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${ac_exeext}; then +if { (eval echo configure:4954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -4956,7 +4971,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4960: checking for connect in -lsocket" >&5 +echo "configure:4975: 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 @@ -4964,7 +4979,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${ac_exeext}; then +if { (eval echo configure:4994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4999,12 +5014,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:5003: checking for remove" >&5 +echo "configure:5018: 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${ac_exeext}; then +if { (eval echo configure:5046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -5048,7 +5063,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:5052: checking for remove in -lposix" >&5 +echo "configure:5067: 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 @@ -5056,7 +5071,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5091,12 +5106,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:5095: checking for shmat" >&5 +echo "configure:5110: 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${ac_exeext}; then +if { (eval echo configure:5138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -5140,7 +5155,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:5144: checking for shmat in -lipc" >&5 +echo "configure:5159: 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 @@ -5148,7 +5163,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5192,7 +5207,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:5196: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:5211: 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 @@ -5200,7 +5215,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5289,7 +5304,7 @@ fi # the gtkhtml widget needs libz, libjpeg, and libpng. # it also uses #ifdef's not #if's so DONT #def to zero. echo $ac_n "checking for deflateEnd in -lz""... $ac_c" 1>&6 -echo "configure:5293: checking for deflateEnd in -lz" >&5 +echo "configure:5308: checking for deflateEnd in -lz" >&5 ac_lib_var=`echo z'_'deflateEnd | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5297,7 +5312,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5332,7 +5347,7 @@ else fi echo $ac_n "checking for jpeg_read_scanlines in -ljpeg""... $ac_c" 1>&6 -echo "configure:5336: checking for jpeg_read_scanlines in -ljpeg" >&5 +echo "configure:5351: checking for jpeg_read_scanlines in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_scanlines | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5340,7 +5355,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5375,7 +5390,7 @@ else fi echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:5379: checking for png_read_image in -lpng" >&5 +echo "configure:5394: checking for png_read_image in -lpng" >&5 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5383,7 +5398,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5424,7 +5439,7 @@ fi # LIBS="-lXmu -lXt -lXext $X_PRE_LIBS -lX11 $X_LIBS $X_EXTRA_LIBS $LIBS" echo $ac_n "checking for XpmReadFileToXpmImage in -lXpm""... $ac_c" 1>&6 -echo "configure:5428: checking for XpmReadFileToXpmImage in -lXpm" >&5 +echo "configure:5443: checking for XpmReadFileToXpmImage in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmReadFileToXpmImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5432,7 +5447,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $X_PRE_LIBS -lX11 $X_LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5477,7 +5492,7 @@ EXTRALIBS=`$GNOME_CONFIG_BIN --libs xml` #check for libxml echo $ac_n "checking for xmlDefaultSAXHandlerInit in -lxml""... $ac_c" 1>&6 -echo "configure:5481: checking for xmlDefaultSAXHandlerInit in -lxml" >&5 +echo "configure:5496: checking for xmlDefaultSAXHandlerInit in -lxml" >&5 ac_lib_var=`echo xml'_'xmlDefaultSAXHandlerInit | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5485,7 +5500,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxml $EXTRALIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5524,7 +5539,7 @@ EXTRALIBS=`$GNOME_CONFIG_BIN --libs print` # check for gnome-print and enable it via HAVE_LIBGNOMEPRINT # if found echo $ac_n "checking for gnome_print_context_new in -lgnomeprint""... $ac_c" 1>&6 -echo "configure:5528: checking for gnome_print_context_new in -lgnomeprint" >&5 +echo "configure:5543: checking for gnome_print_context_new in -lgnomeprint" >&5 ac_lib_var=`echo gnomeprint'_'gnome_print_context_new | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5532,7 +5547,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgnomeprint $EXTRALIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5573,7 +5588,7 @@ EXTRALIBS=`$GNOME_CONFIG_BIN --libs gtkhtml` # check for gtkhtml and enable it via HAVE_LIBGTKHTML # if found echo $ac_n "checking for gtk_html_new in -lgtkhtml""... $ac_c" 1>&6 -echo "configure:5577: checking for gtk_html_new in -lgtkhtml" >&5 +echo "configure:5592: checking for gtk_html_new in -lgtkhtml" >&5 ac_lib_var=`echo gtkhtml'_'gtk_html_new | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5581,7 +5596,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgtkhtml $EXTRALIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5653,7 +5668,7 @@ G_WRAP_LINK_ARGS="" # Extract the first word of "g-wrap-config", so it can be a program name with args. set dummy g-wrap-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5657: checking for $ac_word" >&5 +echo "configure:5672: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_G_WRAP_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5697,7 +5712,7 @@ fi # Extract the first word of "g-wrap", so it can be a program name with args. set dummy g-wrap; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5701: checking for $ac_word" >&5 +echo "configure:5716: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_G_WRAP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5755,7 +5770,7 @@ GUILE_LINK_ARGS="" # Extract the first word of "guile-config", so it can be a program name with args. set dummy guile-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5759: checking for $ac_word" >&5 +echo "configure:5774: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GUILE_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5799,7 +5814,7 @@ fi # Extract the first word of "guile", so it can be a program name with args. set dummy guile; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5803: checking for $ac_word" >&5 +echo "configure:5818: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GUILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5960,6 +5975,7 @@ trap 'rm -fr `echo " Makefile doc/html/fr/image/Makefile doc/sgml/Makefile doc/sgml/C/Makefile + doc/sgml/C/image/Makefile intl/Makefile lib/Makefile po/Makefile.in @@ -6056,6 +6072,7 @@ s%@GNC_SHAREDIR@%$GNC_SHAREDIR%g s%@GNC_SCM_INSTALL_DIR@%$GNC_SCM_INSTALL_DIR%g s%@GNC_DOC_INSTALL_DIR@%$GNC_DOC_INSTALL_DIR%g s%@LOCALE_DIR@%$LOCALE_DIR%g +s%@GNC_HELPDIR@%$GNC_HELPDIR%g s%@ALLOCA@%$ALLOCA%g s%@USE_NLS@%$USE_NLS%g s%@MSGFMT@%$MSGFMT%g @@ -6153,6 +6170,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/html/fr/image/Makefile doc/sgml/Makefile doc/sgml/C/Makefile + doc/sgml/C/image/Makefile intl/Makefile lib/Makefile po/Makefile.in diff --git a/configure.in b/configure.in index 038032cfd0..db6ef7409b 100644 --- a/configure.in +++ b/configure.in @@ -117,6 +117,15 @@ AC_ARG_WITH( locale-dir, AC_SUBST(LOCALE_DIR) +### -------------------------------------------------------------------------- +### help files +AC_ARG_WITH( help-prefix, + [ --with-help-prefix=PATH specify where to store the help files], + GNC_HELPDIR="$with_help_prefix/gnome/help/gnucash", + GNC_HELPDIR="\${datadir}/gnome/help/gnucash") + +AC_SUBST(GNC_HELPDIR) + ### -------------------------------------------------------------------------- ### Check for gettext AM_GNU_GETTEXT @@ -417,6 +426,7 @@ AC_OUTPUT( doc/html/fr/image/Makefile doc/sgml/Makefile doc/sgml/C/Makefile + doc/sgml/C/image/Makefile intl/Makefile lib/Makefile po/Makefile.in diff --git a/debian/Makefile.in b/debian/Makefile.in index d06c23b281..69c53d2d3b 100644 --- a/debian/Makefile.in +++ b/debian/Makefile.in @@ -76,6 +76,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/doc/Makefile.in b/doc/Makefile.in index fa6ebae514..b0ef5c46ad 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/doc/examples/Makefile.in b/doc/examples/Makefile.in index ab3c7fce3f..a89cd35bd8 100644 --- a/doc/examples/Makefile.in +++ b/doc/examples/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/doc/html/C/Makefile.in b/doc/html/C/Makefile.in index 3a99790f43..f061bd27af 100644 --- a/doc/html/C/Makefile.in +++ b/doc/html/C/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/doc/html/C/image/Makefile.in b/doc/html/C/image/Makefile.in index 18d78dbe77..80f3b19d25 100644 --- a/doc/html/C/image/Makefile.in +++ b/doc/html/C/image/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in index eb3754c96b..30ce5e1613 100644 --- a/doc/html/Makefile.in +++ b/doc/html/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/doc/html/fr/Makefile.in b/doc/html/fr/Makefile.in index 34d0b06225..25cafd7e05 100644 --- a/doc/html/fr/Makefile.in +++ b/doc/html/fr/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/doc/html/fr/image/Makefile.in b/doc/html/fr/image/Makefile.in index 8fe7622969..416cef32c5 100644 --- a/doc/html/fr/image/Makefile.in +++ b/doc/html/fr/image/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/doc/sgml/C/Makefile.am b/doc/sgml/C/Makefile.am index 00ebb934bc..e46214e837 100644 --- a/doc/sgml/C/Makefile.am +++ b/doc/sgml/C/Makefile.am @@ -1,4 +1,6 @@ -gnucash_helpdir = $(datadir)/gnome/help/gnucash/C +SUBDIRS = image + +gnucash_helpdir = $(GNC_HELPDIR)/C GNUCASH_SGML_FILES = \ bofa-mym.sgml \ @@ -25,7 +27,6 @@ GNUCASH_SGML_FILES = \ xacc-pnl.sgml \ xacc-portfolio-report.sgml \ xacc-preferences.sgml \ - xacc-preferences2.sgml \ xacc-print-check.sgml \ xacc-print.sgml \ xacc-qif-import.sgml \ @@ -43,9 +44,8 @@ install-data-local: gnucash/index.html $(mkinstalldirs) $(DESTDIR)$(gnucash_helpdir) $(mkinstalldirs) $(DESTDIR)$(gnucash_helpdir)/image $(mkinstalldirs) $(DESTDIR)$(gnucash_helpdir)/stylesheet-images -# $(INSTALL_DATA) $(srcdir)/topic.dat \ -# $(DESTDIR)$(gnucash_helpdir)/topic.dat -# $(INSTALL_DATA) $(srcdir)/index.html $(DESTDIR)$(gnucash_helpdir)/ + $(INSTALL_DATA) $(srcdir)/topic.dat \ + $(DESTDIR)$(gnucash_helpdir)/topic.dat -(for file in gnucash/*.html; do \ basefile=`basename $$file` \ $(INSTALL_DATA) $(srcdir)/$$file \ @@ -56,11 +56,6 @@ install-data-local: gnucash/index.html $(INSTALL_DATA) $(srcdir)/$$file \ $(DESTDIR)$(gnucash_helpdir)/$$basefile; \ done) -# for file in gnucash/image/*.png; do \ -# basefile=`basename $$file` \ -# $(INSTALL_DATA) $(srcdir)/$$file \ -# $(DESTDIR)$(gnucash_helpdir)/figs/$$basefile;\ -# done -(for file in gnucash/stylesheet-images/*.gif; do \ basefile=`basename $$file` \ $(INSTALL_DATA) \ @@ -70,8 +65,8 @@ install-data-local: gnucash/index.html EXTRA_DIST = \ - $(GNUCASH_SGML_FILES) -# topic.dat + $(GNUCASH_SGML_FILES) \ + topic.dat manual-html: gnucash/index.html manual-dvi: gnucash/gnucash.dvi @@ -95,16 +90,16 @@ gnucash/gnucash.rtf: $(GNUCASH_SGML_FILES) db2rtf gnucash.sgml gnucash/index.html: $(GNUCASH_SGML_FILES) - -(db2html gnucash.sgml) -# && mkdir -p users-guide/figs \ -# && cp $(srcdir)/figs/*.png users-guide/figs || exit 1) + -(db2html gnucash.sgml \ + && mkdir -p gnucash/image \ + && cp $(srcdir)/image/*.png gnucash/image || exit 1) dist-hook: mkdir $(distdir)/gnucash -# mkdir $(distdir)/gnucash/figs + mkdir $(distdir)/gnucash/image mkdir $(distdir)/gnucash/stylesheet-images cp gnucash/*.html $(distdir)/gnucash cp gnucash/*.css $(distdir)/gnucash -# cp gnucash/figs/*.png $(distdir)/gnucash/figs + cp gnucash/image/*.png $(distdir)/gnucash/image cp gnucash/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images diff --git a/doc/sgml/C/Makefile.in b/doc/sgml/C/Makefile.in index 04ef228ccd..356a49e14c 100644 --- a/doc/sgml/C/Makefile.in +++ b/doc/sgml/C/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ @@ -115,12 +116,14 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ l = @l@ -gnucash_helpdir = $(datadir)/gnome/help/gnucash/C +SUBDIRS = image -GNUCASH_SGML_FILES = bofa-mym.sgml gnucash.sgml xacc-about.sgml xacc-accountedit.sgml xacc-acctypes.sgml xacc-adjbalwin.sgml xacc-apar.sgml xacc-balancereport.sgml xacc-balancesheet.sgml xacc-chartofaccts.sgml xacc-currencyhandling.sgml xacc-dateinput.sgml xacc-depreciation.sgml xacc-dochack.sgml xacc-doubleentry.sgml xacc-euro.sgml xacc-gpl.sgml xacc-incomeexpense.sgml xacc-locatingtxns.sgml xacc-mainwin.sgml xacc-newacctwin.sgml xacc-pnl.sgml xacc-portfolio-report.sgml xacc-preferences.sgml xacc-preferences2.sgml xacc-print-check.sgml xacc-print.sgml xacc-qif-import.sgml xacc-quicken.sgml xacc-recnwin.sgml xacc-regwin-kbd.sgml xacc-regwin.sgml xacc-reports.sgml xacc-ticker.sgml xacc-trans-report.sgml xacc-userdocs.sgml xacc-y2k.sgml +gnucash_helpdir = $(GNC_HELPDIR)/C + +GNUCASH_SGML_FILES = bofa-mym.sgml gnucash.sgml xacc-about.sgml xacc-accountedit.sgml xacc-acctypes.sgml xacc-adjbalwin.sgml xacc-apar.sgml xacc-balancereport.sgml xacc-balancesheet.sgml xacc-chartofaccts.sgml xacc-currencyhandling.sgml xacc-dateinput.sgml xacc-depreciation.sgml xacc-dochack.sgml xacc-doubleentry.sgml xacc-euro.sgml xacc-gpl.sgml xacc-incomeexpense.sgml xacc-locatingtxns.sgml xacc-mainwin.sgml xacc-newacctwin.sgml xacc-pnl.sgml xacc-portfolio-report.sgml xacc-preferences.sgml xacc-print-check.sgml xacc-print.sgml xacc-qif-import.sgml xacc-quicken.sgml xacc-recnwin.sgml xacc-regwin-kbd.sgml xacc-regwin.sgml xacc-reports.sgml xacc-ticker.sgml xacc-trans-report.sgml xacc-userdocs.sgml xacc-y2k.sgml -EXTRA_DIST = $(GNUCASH_SGML_FILES) +EXTRA_DIST = $(GNUCASH_SGML_FILES) topic.dat mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h @@ -141,9 +144,95 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -tags: TAGS -TAGS: +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. + +@SET_MAKE@ + +all-recursive install-data-recursive install-exec-recursive \ +installdirs-recursive install-recursive uninstall-recursive \ +check-recursive installcheck-recursive info-recursive dvi-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ + done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) @@ -165,31 +254,42 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done + for subdir in $(SUBDIRS); do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ + done $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook info-am: -info: info-am +info: info-recursive dvi-am: -dvi: dvi-am +dvi: dvi-recursive check-am: all-am -check: check-am +check: check-recursive installcheck-am: -installcheck: installcheck-am +installcheck: installcheck-recursive install-exec-am: -install-exec: install-exec-am +install-exec: install-exec-recursive install-data-am: install-data-local -install-data: install-data-am +install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am +install: install-recursive uninstall-am: -uninstall: uninstall-am +uninstall: uninstall-recursive all-am: Makefile -all-redirect: all-am +all-redirect: all-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: +installdirs: installdirs-recursive +installdirs-am: mostlyclean-generic: @@ -201,30 +301,37 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic +mostlyclean-am: mostlyclean-tags mostlyclean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive -clean-am: clean-generic mostlyclean-am +clean-am: clean-tags clean-generic mostlyclean-am -clean: clean-am +clean: clean-recursive -distclean-am: distclean-generic clean-am +distclean-am: distclean-tags distclean-generic clean-am -rm -f libtool -distclean: distclean-am +distclean: distclean-recursive -maintainer-clean-am: maintainer-clean-generic distclean-am +maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-local install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ +.PHONY: install-data-recursive uninstall-data-recursive \ +install-exec-recursive uninstall-exec-recursive installdirs-recursive \ +uninstalldirs-recursive all-recursive check-recursive \ +installcheck-recursive info-recursive dvi-recursive \ +mostlyclean-recursive distclean-recursive clean-recursive \ +maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-local install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs-am \ +installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean @@ -232,9 +339,8 @@ install-data-local: gnucash/index.html $(mkinstalldirs) $(DESTDIR)$(gnucash_helpdir) $(mkinstalldirs) $(DESTDIR)$(gnucash_helpdir)/image $(mkinstalldirs) $(DESTDIR)$(gnucash_helpdir)/stylesheet-images -# $(INSTALL_DATA) $(srcdir)/topic.dat \ -# $(DESTDIR)$(gnucash_helpdir)/topic.dat -# $(INSTALL_DATA) $(srcdir)/index.html $(DESTDIR)$(gnucash_helpdir)/ + $(INSTALL_DATA) $(srcdir)/topic.dat \ + $(DESTDIR)$(gnucash_helpdir)/topic.dat -(for file in gnucash/*.html; do \ basefile=`basename $$file` \ $(INSTALL_DATA) $(srcdir)/$$file \ @@ -245,18 +351,12 @@ install-data-local: gnucash/index.html $(INSTALL_DATA) $(srcdir)/$$file \ $(DESTDIR)$(gnucash_helpdir)/$$basefile; \ done) -# for file in gnucash/image/*.png; do \ -# basefile=`basename $$file` \ -# $(INSTALL_DATA) $(srcdir)/$$file \ -# $(DESTDIR)$(gnucash_helpdir)/figs/$$basefile;\ -# done -(for file in gnucash/stylesheet-images/*.gif; do \ basefile=`basename $$file` \ $(INSTALL_DATA) \ $(srcdir)/$$file \ $(DESTDIR)$(gnucash_helpdir)/stylesheet-images/$$basefile; \ done) -# topic.dat manual-html: gnucash/index.html manual-dvi: gnucash/gnucash.dvi @@ -280,17 +380,17 @@ gnucash/gnucash.rtf: $(GNUCASH_SGML_FILES) db2rtf gnucash.sgml gnucash/index.html: $(GNUCASH_SGML_FILES) - -(db2html gnucash.sgml) -# && mkdir -p users-guide/figs \ -# && cp $(srcdir)/figs/*.png users-guide/figs || exit 1) + -(db2html gnucash.sgml \ + && mkdir -p gnucash/image \ + && cp $(srcdir)/image/*.png gnucash/image || exit 1) dist-hook: mkdir $(distdir)/gnucash -# mkdir $(distdir)/gnucash/figs + mkdir $(distdir)/gnucash/image mkdir $(distdir)/gnucash/stylesheet-images cp gnucash/*.html $(distdir)/gnucash cp gnucash/*.css $(distdir)/gnucash -# cp gnucash/figs/*.png $(distdir)/gnucash/figs + cp gnucash/image/*.png $(distdir)/gnucash/image cp gnucash/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/doc/sgml/C/gnucash.sgml b/doc/sgml/C/gnucash.sgml index f1b9aeda70..d2a018d3d4 100644 --- a/doc/sgml/C/gnucash.sgml +++ b/doc/sgml/C/gnucash.sgml @@ -15,7 +15,6 @@ - @@ -36,8 +35,9 @@ ]> + -GnuCash Documentation Set +GnuCash User Manual &xaccabout; &xaccaccountedit; @@ -55,7 +55,6 @@ &xaccincomeexpense; &xacclocatingtxns; &xaccpreferences; -&xaccpreferences2; &xaccchartofaccts; &xaccuserdocs; &xaccmainwin; @@ -76,4 +75,4 @@ &xaccgpl; &bofamym; - \ No newline at end of file + diff --git a/doc/sgml/C/image/.cvsignore b/doc/sgml/C/image/.cvsignore new file mode 100644 index 0000000000..f3c7a7c5da --- /dev/null +++ b/doc/sgml/C/image/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/doc/sgml/C/image/Makefile.am b/doc/sgml/C/image/Makefile.am new file mode 100644 index 0000000000..052a68c3e9 --- /dev/null +++ b/doc/sgml/C/image/Makefile.am @@ -0,0 +1,38 @@ +imagedir = ${GNC_HELPDIR}/C/image + +image_DATA = \ + appr-asset1.png \ + appr-asset2.png \ + appr-income.png \ + appr-main1.png \ + appr-main2.png \ + bal-graph.png \ + contract.png \ + depr-asset.png \ + depr-main.png \ + expand.png \ + foliowin-single.png \ + foliowin.png \ + logo-NetBSD-banner.png \ + logo-debian.png \ + logo-linux.png \ + newaccwin-code.png \ + newaccwin-trade.png \ + recnwin.png \ + recninfo.png \ + regwin-double.png \ + regwin-multi.png \ + regwin-single.png \ + regwin-single2.png \ + report-av-baln.png \ + report-baln.png \ + report-folio.png \ + report-option.png \ + report-pnl.png \ + reportwin.png \ + ticker-a.png \ + ticker-b.png + +EXTRA_DIST = \ + .cvsignore \ + ${image_DATA} diff --git a/doc/sgml/C/image/Makefile.in b/doc/sgml/C/image/Makefile.in new file mode 100644 index 0000000000..da2a297627 --- /dev/null +++ b/doc/sgml/C/image/Makefile.in @@ -0,0 +1,255 @@ +# Makefile.in generated automatically by automake 1.4 from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = @SHELL@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DESTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = ../../../.. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AS = @AS@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +DATADIRNAME = @DATADIRNAME@ +DLLTOOL = @DLLTOOL@ +GENCAT = @GENCAT@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_CONFIG_BIN = @GLIB_CONFIG_BIN@ +GLIB_LIBS = @GLIB_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GNC_CONFIGDIR = @GNC_CONFIGDIR@ +GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ +GNC_LIBDIR = @GNC_LIBDIR@ +GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ +GNC_SHAREDIR = @GNC_SHAREDIR@ +GNOME_CFLAGS = @GNOME_CFLAGS@ +GNOME_CONFIG_BIN = @GNOME_CONFIG_BIN@ +GNOME_LIBS = @GNOME_LIBS@ +GNOME_STATIC_TARGET = @GNOME_STATIC_TARGET@ +GNOME_TARGET = @GNOME_TARGET@ +GT_NO = @GT_NO@ +GT_YES = @GT_YES@ +GUILE = @GUILE@ +GUILE_COMPILE_ARGS = @GUILE_COMPILE_ARGS@ +GUILE_CONFIG = @GUILE_CONFIG@ +GUILE_LINK_ARGS = @GUILE_LINK_ARGS@ +G_WRAP = @G_WRAP@ +G_WRAP_COMPILE_ARGS = @G_WRAP_COMPILE_ARGS@ +G_WRAP_CONFIG = @G_WRAP_CONFIG@ +G_WRAP_LINK_ARGS = @G_WRAP_LINK_ARGS@ +INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ +INSTOBJEXT = @INSTOBJEXT@ +INTLDEPS = @INTLDEPS@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LOCALE_DIR = @LOCALE_DIR@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +OBJDUMP = @OBJDUMP@ +PACKAGE = @PACKAGE@ +PERL = @PERL@ +PERLINCL = @PERLINCL@ +POFILES = @POFILES@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SWIG = @SWIG@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +l = @l@ + +imagedir = ${GNC_HELPDIR}/C/image + +image_DATA = appr-asset1.png appr-asset2.png appr-income.png appr-main1.png appr-main2.png bal-graph.png contract.png depr-asset.png depr-main.png expand.png foliowin-single.png foliowin.png logo-NetBSD-banner.png logo-debian.png logo-linux.png newaccwin-code.png newaccwin-trade.png recnwin.png recninfo.png regwin-double.png regwin-multi.png regwin-single.png regwin-single2.png report-av-baln.png report-baln.png report-folio.png report-option.png report-pnl.png reportwin.png ticker-a.png ticker-b.png + + +EXTRA_DIST = .cvsignore ${image_DATA} + +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../../../../config.h +CONFIG_CLEAN_FILES = +DATA = $(image_DATA) + +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +all: all-redirect +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sgml/C/image/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +install-imageDATA: $(image_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(imagedir) + @list='$(image_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(imagedir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(imagedir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(imagedir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(imagedir)/$$p; \ + fi; fi; \ + done + +uninstall-imageDATA: + @$(NORMAL_UNINSTALL) + list='$(image_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(imagedir)/$$p; \ + done +tags: TAGS +TAGS: + + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = doc/sgml/C/image + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/sgml/C/image/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-imageDATA +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-imageDATA +uninstall: uninstall-am +all-am: Makefile $(DATA) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + $(mkinstalldirs) $(DESTDIR)$(imagedir) + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-generic clean-am + -rm -f libtool + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-generic distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: uninstall-imageDATA install-imageDATA tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/doc/sgml/C/image/appr-asset1.png b/doc/sgml/C/image/appr-asset1.png new file mode 100644 index 0000000000..7df01f2dac Binary files /dev/null and b/doc/sgml/C/image/appr-asset1.png differ diff --git a/doc/sgml/C/image/appr-asset2.png b/doc/sgml/C/image/appr-asset2.png new file mode 100644 index 0000000000..8840e06969 Binary files /dev/null and b/doc/sgml/C/image/appr-asset2.png differ diff --git a/doc/sgml/C/image/appr-income.png b/doc/sgml/C/image/appr-income.png new file mode 100644 index 0000000000..dd3627757a Binary files /dev/null and b/doc/sgml/C/image/appr-income.png differ diff --git a/doc/sgml/C/image/appr-main1.png b/doc/sgml/C/image/appr-main1.png new file mode 100644 index 0000000000..ecf3dc5117 Binary files /dev/null and b/doc/sgml/C/image/appr-main1.png differ diff --git a/doc/sgml/C/image/appr-main2.png b/doc/sgml/C/image/appr-main2.png new file mode 100644 index 0000000000..5b90754efa Binary files /dev/null and b/doc/sgml/C/image/appr-main2.png differ diff --git a/doc/sgml/C/image/bal-graph.png b/doc/sgml/C/image/bal-graph.png new file mode 100644 index 0000000000..d8e7b04542 Binary files /dev/null and b/doc/sgml/C/image/bal-graph.png differ diff --git a/doc/sgml/C/image/contract.png b/doc/sgml/C/image/contract.png new file mode 100644 index 0000000000..9a5089265d Binary files /dev/null and b/doc/sgml/C/image/contract.png differ diff --git a/doc/sgml/C/image/depr-asset.png b/doc/sgml/C/image/depr-asset.png new file mode 100644 index 0000000000..79d5834d93 Binary files /dev/null and b/doc/sgml/C/image/depr-asset.png differ diff --git a/doc/sgml/C/image/depr-main.png b/doc/sgml/C/image/depr-main.png new file mode 100644 index 0000000000..e15b3fc051 Binary files /dev/null and b/doc/sgml/C/image/depr-main.png differ diff --git a/doc/sgml/C/image/expand.png b/doc/sgml/C/image/expand.png new file mode 100644 index 0000000000..28b7582ee5 Binary files /dev/null and b/doc/sgml/C/image/expand.png differ diff --git a/doc/sgml/C/image/foliowin-single.png b/doc/sgml/C/image/foliowin-single.png new file mode 100644 index 0000000000..7a4784cee9 Binary files /dev/null and b/doc/sgml/C/image/foliowin-single.png differ diff --git a/doc/sgml/C/image/foliowin.png b/doc/sgml/C/image/foliowin.png new file mode 100644 index 0000000000..a25a5a2977 Binary files /dev/null and b/doc/sgml/C/image/foliowin.png differ diff --git a/doc/sgml/C/image/logo-NetBSD-banner.png b/doc/sgml/C/image/logo-NetBSD-banner.png new file mode 100644 index 0000000000..26a33923fc Binary files /dev/null and b/doc/sgml/C/image/logo-NetBSD-banner.png differ diff --git a/doc/sgml/C/image/logo-debian.png b/doc/sgml/C/image/logo-debian.png new file mode 100644 index 0000000000..4a3c9a1141 Binary files /dev/null and b/doc/sgml/C/image/logo-debian.png differ diff --git a/doc/sgml/C/image/logo-linux.png b/doc/sgml/C/image/logo-linux.png new file mode 100644 index 0000000000..17bb82a51f Binary files /dev/null and b/doc/sgml/C/image/logo-linux.png differ diff --git a/doc/sgml/C/image/newaccwin-code.png b/doc/sgml/C/image/newaccwin-code.png new file mode 100644 index 0000000000..e6fe7f1b08 Binary files /dev/null and b/doc/sgml/C/image/newaccwin-code.png differ diff --git a/doc/sgml/C/image/newaccwin-trade.png b/doc/sgml/C/image/newaccwin-trade.png new file mode 100644 index 0000000000..1b7a398399 Binary files /dev/null and b/doc/sgml/C/image/newaccwin-trade.png differ diff --git a/doc/sgml/C/image/newaccwin.png b/doc/sgml/C/image/newaccwin.png new file mode 100644 index 0000000000..5b52c356c5 Binary files /dev/null and b/doc/sgml/C/image/newaccwin.png differ diff --git a/doc/sgml/C/image/recninfo.png b/doc/sgml/C/image/recninfo.png new file mode 100644 index 0000000000..8f1e843254 Binary files /dev/null and b/doc/sgml/C/image/recninfo.png differ diff --git a/doc/sgml/C/image/recnwin.png b/doc/sgml/C/image/recnwin.png new file mode 100644 index 0000000000..4ec10ae71e Binary files /dev/null and b/doc/sgml/C/image/recnwin.png differ diff --git a/doc/sgml/C/image/regwin-double.png b/doc/sgml/C/image/regwin-double.png new file mode 100644 index 0000000000..e0f308bb50 Binary files /dev/null and b/doc/sgml/C/image/regwin-double.png differ diff --git a/doc/sgml/C/image/regwin-multi.png b/doc/sgml/C/image/regwin-multi.png new file mode 100644 index 0000000000..f5d1680388 Binary files /dev/null and b/doc/sgml/C/image/regwin-multi.png differ diff --git a/doc/sgml/C/image/regwin-single.png b/doc/sgml/C/image/regwin-single.png new file mode 100644 index 0000000000..6b470e9d37 Binary files /dev/null and b/doc/sgml/C/image/regwin-single.png differ diff --git a/doc/sgml/C/image/regwin-single2.png b/doc/sgml/C/image/regwin-single2.png new file mode 100644 index 0000000000..627cd47d40 Binary files /dev/null and b/doc/sgml/C/image/regwin-single2.png differ diff --git a/doc/sgml/C/image/regwin.png b/doc/sgml/C/image/regwin.png new file mode 100644 index 0000000000..e6272362a6 Binary files /dev/null and b/doc/sgml/C/image/regwin.png differ diff --git a/doc/sgml/C/image/report-av-baln.png b/doc/sgml/C/image/report-av-baln.png new file mode 100644 index 0000000000..826dc918b8 Binary files /dev/null and b/doc/sgml/C/image/report-av-baln.png differ diff --git a/doc/sgml/C/image/report-baln.png b/doc/sgml/C/image/report-baln.png new file mode 100644 index 0000000000..a68f567521 Binary files /dev/null and b/doc/sgml/C/image/report-baln.png differ diff --git a/doc/sgml/C/image/report-folio.png b/doc/sgml/C/image/report-folio.png new file mode 100644 index 0000000000..e988ef90c7 Binary files /dev/null and b/doc/sgml/C/image/report-folio.png differ diff --git a/doc/sgml/C/image/report-option.png b/doc/sgml/C/image/report-option.png new file mode 100644 index 0000000000..57b7b33327 Binary files /dev/null and b/doc/sgml/C/image/report-option.png differ diff --git a/doc/sgml/C/image/report-pnl.png b/doc/sgml/C/image/report-pnl.png new file mode 100644 index 0000000000..7bc734d9f2 Binary files /dev/null and b/doc/sgml/C/image/report-pnl.png differ diff --git a/doc/sgml/C/image/reportwin.png b/doc/sgml/C/image/reportwin.png new file mode 100644 index 0000000000..b89ae0a44f Binary files /dev/null and b/doc/sgml/C/image/reportwin.png differ diff --git a/doc/sgml/C/image/ticker-a.png b/doc/sgml/C/image/ticker-a.png new file mode 100644 index 0000000000..8a93ca85fc Binary files /dev/null and b/doc/sgml/C/image/ticker-a.png differ diff --git a/doc/sgml/C/image/ticker-b.png b/doc/sgml/C/image/ticker-b.png new file mode 100644 index 0000000000..16e3ec7c0b Binary files /dev/null and b/doc/sgml/C/image/ticker-b.png differ diff --git a/doc/sgml/C/topic.dat b/doc/sgml/C/topic.dat new file mode 100644 index 0000000000..188a1e21be --- /dev/null +++ b/doc/sgml/C/topic.dat @@ -0,0 +1 @@ +index.html GnuCash Users Guide diff --git a/doc/sgml/C/xacc-about.sgml b/doc/sgml/C/xacc-about.sgml index 8353a890d5..b1d456ca5f 100644 --- a/doc/sgml/C/xacc-about.sgml +++ b/doc/sgml/C/xacc-about.sgml @@ -1,9 +1,11 @@
+ About GnuCash + - About GnuCash +Introduction GnuCash is a program to keep track of your finances. Its features include: @@ -95,7 +97,9 @@ similar transactions. - + + + Advanced Features GnuCash offers some features not found in simpler accounting @@ -159,8 +163,9 @@ similar transactions. - - + + + Versioning The versioning scheme for GnuCash parallels that of the @@ -190,8 +195,9 @@ similar transactions. page in order to get some perspective on the overall design. - - + + + Lead Developers @@ -259,8 +265,9 @@ Motif as a school project, taking it to version 0.9 by October - - + + + Fixers and Patchers The cast of thousands includes: @@ -844,93 +851,66 @@ Motif as a school project, taking it to version 0.9 by October - - + + + Supported Operating Systems - gnucash-1.0.18 (xacc-1.0.18) is known to work on the following - systems: - - -Linux 2.0.x -- Intel w/ RedHat Motif +GnuCash 1.5.0 is known to work on the following systems: - - - -Linux 2.0.x -- Intel w/ Lesstif v0.81 + - - -Linux Debian -- Intel w/ Lesstif v0.81 +Linux + - - -SGI IRIX -- MIPS +FreeBSD + - - -IBM AIX 4.1.5 -- RS/6000 +NetBSD + - - -SCO Unixware 7 -- Intel +Solaris + - - - -SCO OpenServer 5.0.4 -- Intel - - - - -NetBSD -- Intel - - - - + + + + + + + + + + + + + - + - + + + - + - - - - - - - - - - - - - - - - - - - - - + - - + + + History The table below shows some historical lines-of-code and -number-of-files metrics for the X-Accountant -GnuCash development project +number-of-files metrics for the GnuCash +development project. Historical Development Stats @@ -1129,6 +1109,5 @@ number-of-files metrics for the X-Accountant - diff --git a/doc/sgml/C/xacc-balancereport.sgml b/doc/sgml/C/xacc-balancereport.sgml index 8f02e535fe..aeaad7f1df 100644 --- a/doc/sgml/C/xacc-balancereport.sgml +++ b/doc/sgml/C/xacc-balancereport.sgml @@ -1,18 +1,16 @@ -
+ Balance Tracking Report - - Balance Tracking Report + - + - - + Parameters for this report include: @@ -62,5 +60,4 @@ -
diff --git a/doc/sgml/C/xacc-balancesheet.sgml b/doc/sgml/C/xacc-balancesheet.sgml index b1fe169f93..94b1c6f600 100644 --- a/doc/sgml/C/xacc-balancesheet.sgml +++ b/doc/sgml/C/xacc-balancesheet.sgml @@ -7,7 +7,7 @@ Balance Sheet - + diff --git a/doc/sgml/C/xacc-depreciation.sgml b/doc/sgml/C/xacc-depreciation.sgml index 88d42cc174..023d323b81 100644 --- a/doc/sgml/C/xacc-depreciation.sgml +++ b/doc/sgml/C/xacc-depreciation.sgml @@ -174,7 +174,7 @@ Your main window will resemble this: - + Main window after purchase and appreciation @@ -185,7 +185,7 @@ and your asset account will resemble this: - + Asset account after purchase and appreciation @@ -423,7 +423,7 @@ Below, we show the second case discussed. - + Main window after sale @@ -431,7 +431,7 @@ - + Asset account after sale @@ -783,7 +783,7 @@ fairly simple, taxation often gets terribly complicated... digits" scheme for the example above. - + Asset account after depreciation @@ -791,7 +791,7 @@ fairly simple, taxation often gets terribly complicated... - + Main window after depreciation diff --git a/doc/sgml/C/xacc-doubleentry.sgml b/doc/sgml/C/xacc-doubleentry.sgml index 0f041cb99a..959c98d90a 100644 --- a/doc/sgml/C/xacc-doubleentry.sgml +++ b/doc/sgml/C/xacc-doubleentry.sgml @@ -40,8 +40,10 @@ - + + The Rule of Double-Entry Accounting + The intuitive way of understanding double-entry is as a transfer from one bank account to another, where the amount taken out of one bank account must equal that @@ -120,6 +122,7 @@ to track the change over time.) + Using Double Entry diff --git a/doc/sgml/C/xacc-gpl.sgml b/doc/sgml/C/xacc-gpl.sgml index 84652cfd06..b1e775b8e6 100644 --- a/doc/sgml/C/xacc-gpl.sgml +++ b/doc/sgml/C/xacc-gpl.sgml @@ -1,23 +1,27 @@
+ GNU General Public License + - GNU General Public License - +GNU General Public License + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 - Mass Ave, Cambridge, MA 02139, USA +Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 + Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - + <ANCHOR ID="SEC001">Preamble + The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to @@ -81,6 +85,7 @@ + <ANCHOR ID="SEC002">GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -336,6 +341,7 @@ + <ANCHOR ID="SEC003">NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS @@ -363,10 +369,14 @@ + END OF TERMS AND CONDITIONS + + +
diff --git a/doc/sgml/C/xacc-incomeexpense.sgml b/doc/sgml/C/xacc-incomeexpense.sgml index 718a181731..f6c6619f9b 100644 --- a/doc/sgml/C/xacc-incomeexpense.sgml +++ b/doc/sgml/C/xacc-incomeexpense.sgml @@ -1,8 +1,9 @@ -
+ Using Expense/Income Accounts + What are Incomes and Expenses? @@ -18,7 +19,7 @@ section deals with the more basic recording of incomes and expenses. - + Recording Income and Expenses In a double entry system, two kinds of accounts must be diff --git a/doc/sgml/C/xacc-mainwin.sgml b/doc/sgml/C/xacc-mainwin.sgml index d2b6f67d76..2fa3cf52ea 100644 --- a/doc/sgml/C/xacc-mainwin.sgml +++ b/doc/sgml/C/xacc-mainwin.sgml @@ -1,11 +1,9 @@ -
+ Main Window - - Main GnuCash Window - + This is the main account window. You control your set of accounts from here. @@ -20,7 +18,7 @@ - + @@ -32,7 +30,7 @@ - + @@ -52,5 +50,5 @@ recommended only for accounting experts. - +
diff --git a/doc/sgml/C/xacc-newacctwin.sgml b/doc/sgml/C/xacc-newacctwin.sgml index 404ea19cd5..e0998f0b8c 100644 --- a/doc/sgml/C/xacc-newacctwin.sgml +++ b/doc/sgml/C/xacc-newacctwin.sgml @@ -12,7 +12,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/doc/sgml/C/xacc-pnl.sgml b/doc/sgml/C/xacc-pnl.sgml index c984cbe30e..52c88983fe 100644 --- a/doc/sgml/C/xacc-pnl.sgml +++ b/doc/sgml/C/xacc-pnl.sgml @@ -1,13 +1,11 @@ -
Profit And Loss Statement - - Profit and Loss Statement + - + @@ -20,5 +18,5 @@ the "parameters" toolbar button. - +
diff --git a/doc/sgml/C/xacc-portfolio-report.sgml b/doc/sgml/C/xacc-portfolio-report.sgml index 2631513a10..87b83babcf 100644 --- a/doc/sgml/C/xacc-portfolio-report.sgml +++ b/doc/sgml/C/xacc-portfolio-report.sgml @@ -7,7 +7,7 @@ Stock Portfolio Report - + diff --git a/doc/sgml/C/xacc-preferences.sgml b/doc/sgml/C/xacc-preferences.sgml index 071ef3c0e4..4f6e4ed2a5 100644 --- a/doc/sgml/C/xacc-preferences.sgml +++ b/doc/sgml/C/xacc-preferences.sgml @@ -1,11 +1,9 @@ -
+ Preferences - - Preferences - + You can customize the behavior of GnuCash by changing the settings in this dialog box.All settings are automatically saved so changes are preserved for future sessions. @@ -55,5 +53,4 @@ -
diff --git a/doc/sgml/C/xacc-preferences2.sgml b/doc/sgml/C/xacc-preferences2.sgml deleted file mode 100644 index d623fdedb0..0000000000 --- a/doc/sgml/C/xacc-preferences2.sgml +++ /dev/null @@ -1,59 +0,0 @@ - -
- -Preferences - - - Preferences - -You can customize the behavior of GnuCash by changing the - settings in this dialog box.All settings are automatically - saved so changes are preserved for future sessions. - - -To change settings, simply click to select the appropriate - page, then make appropriate changes, and click the "Apply" - button to see your changes take effect. Clicking "OK" applies - changes, then closes the properties dialog box. them. The - "Close" button simply closes the dialog box without applying - the latest changes. - - -The settings are grouped into the following categories: - - - -Account Fields: sets which fields are displayed in - the account list of the main window. - - - - -Account Types: sets which account types are - displayed in the main window. - - - - -General: anything that doesn't fit anywhere - else. - - - - -International: Options relating to date and time - display formats. - - - - -Register: Options relating to the default - appearance of account registers. - - - - - - - -
diff --git a/doc/sgml/C/xacc-print.sgml b/doc/sgml/C/xacc-print.sgml index ff090eb487..ea46744d25 100644 --- a/doc/sgml/C/xacc-print.sgml +++ b/doc/sgml/C/xacc-print.sgml @@ -1,19 +1,19 @@ -
+ Printing - - Printing - + At present, the only type of printing directly supported by GnuCash is check printing. Other types of printing will be added in version 1.5. -Reports can also be exported as HTML. + +Reports can also be exported as HTML. - +
diff --git a/doc/sgml/C/xacc-recnwin.sgml b/doc/sgml/C/xacc-recnwin.sgml index e40958457c..061e9a0f4e 100644 --- a/doc/sgml/C/xacc-recnwin.sgml +++ b/doc/sgml/C/xacc-recnwin.sgml @@ -1,10 +1,9 @@ -
+ Reconciliation Window - - Reconciliation Window + The Reconciliation window is used to reconcile cleared transactions from a bank statement. Enter a dollar amount from your last bank statement in the box, and then click OK @@ -15,7 +14,7 @@ - + @@ -32,9 +31,9 @@ At the end of the month, you receive your bank statement, - perhaps including canceled checks. At that point, you - should "reconcile" the account, that is, agree your personal - records to the documentation provided by the bank. +perhaps including canceled checks. At that point, +you should "reconcile" the account, that is, agree your personal +records to the documentation provided by the bank. @@ -114,5 +113,5 @@ transaction - +
diff --git a/doc/sgml/C/xacc-regwin-kbd.sgml b/doc/sgml/C/xacc-regwin-kbd.sgml index 3a1fddd97e..399ccd5cc7 100644 --- a/doc/sgml/C/xacc-regwin-kbd.sgml +++ b/doc/sgml/C/xacc-regwin-kbd.sgml @@ -1,10 +1,9 @@ -
+ Register Keyboard Shortcuts - - Register Keyboard Shortcuts + The following keys can be used to move around in the register: Please check that I didn't miss any @@ -70,5 +69,5 @@ - +
diff --git a/doc/sgml/C/xacc-regwin.sgml b/doc/sgml/C/xacc-regwin.sgml index 4c0c867234..7418cda8b9 100644 --- a/doc/sgml/C/xacc-regwin.sgml +++ b/doc/sgml/C/xacc-regwin.sgml @@ -1,13 +1,14 @@ -
+ Register Window + Register Window - + @@ -24,7 +25,7 @@ the transaction: - + @@ -177,12 +178,12 @@ - + - + diff --git a/doc/sgml/C/xacc-reports.sgml b/doc/sgml/C/xacc-reports.sgml index e44f682e5b..d3eb7017b1 100644 --- a/doc/sgml/C/xacc-reports.sgml +++ b/doc/sgml/C/xacc-reports.sgml @@ -52,7 +52,7 @@ - + @@ -75,7 +75,7 @@ - + diff --git a/doc/sgml/C/xacc-ticker.sgml b/doc/sgml/C/xacc-ticker.sgml index 4f2059ced1..ef318511b9 100644 --- a/doc/sgml/C/xacc-ticker.sgml +++ b/doc/sgml/C/xacc-ticker.sgml @@ -1,57 +1,57 @@ -
+ Stock Ticker + - Stock Pricing and Ticker Symbols - GnuCash provides a somewhat rudimentary automated stock quote - gathering system. - -If a GnuCash stock - account is suitably configured, and the host computer is - connected to the Internet, the program gnc-prices may - be used to load stock and mutual fund price quotes from various - web sites directly into GnuCash. +Stock Pricing and Ticker Symbols - -To make use of this facility, the following must be - done: +GnuCash provides a somewhat rudimentary automated stock quote +gathering system. + - - -Create an account and mark it as being of type "Mutual +If a GnuCash stock account is +suitably configured, and the host computer is connected to the +Internet, the program gnc-prices may be +used to load stock and mutual fund price quotes from various web sites +directly into GnuCash. + + +To make use of this facility, the following must be done: + + + + Create an account and mark it as being of type "Mutual Fund" or "Stock". - - - - -Enter a valid ticker symbol in the box marked - "Security:" - - - - -Select a quote source from the pull-down menu. Currently - supported quote sources include Yahoo, Yahoo - Europe, Fidelity Investments, T. Rowe - Price, the Vanguard Group, the Australian Stock - Exchange (ASX) and TIAA-CREF. Note that Yahoo will - provide price quotes for many mutual funds including - Fidelity, T.Rowe Price and Vanguard, and that the quoted - prices at Yahoo should be identical to those that may - be found at the source sites (otherwise, somebody's reporting - wrong information!). If you choose Yahoo Europe, you should - append the market code for the security, such as PA for - Paris, BE for Berlin, etc. Example: 12150.PA (a Peugeot - security in the Paris market). - - - - - Ensure that the currency of the account matches the source - of the stock you have selected. This means: + + + + Enter a valid ticker symbol in the box marked "Security:" + + + + Select a quote source from the pull-down menu. Currently + supported quote sources include Yahoo, + Yahoo Europe, Fidelity + Investments, T. Rowe Price, the + Vanguard Group, the Australian + Stock Exchange (ASX) and + TIAA-CREF. Note that Yahoo will provide + price quotes for many mutual funds including + Fidelity, T.Rowe Price and Vanguard, and that the quoted prices at + Yahoo should be identical to those that may + be found at the source sites (otherwise, somebody's reporting + wrong information!). If you choose Yahoo Europe, you should append + the market code for the security, such as PA for Paris, BE for + Berlin, etc. Example: 12150.PA (a Peugeot security in the Paris + market). + + + + Ensure that the currency of the account matches the source + of the stock you have selected. This means: @@ -236,7 +236,7 @@ A sample image is shown below: - + Sample Diagram @@ -279,7 +279,7 @@ accounts will begin to resemble the following: - + Later Ticker Listing diff --git a/doc/sgml/C/xacc-trans-report.sgml b/doc/sgml/C/xacc-trans-report.sgml index fd7576eee6..70f858c3ce 100644 --- a/doc/sgml/C/xacc-trans-report.sgml +++ b/doc/sgml/C/xacc-trans-report.sgml @@ -1,10 +1,8 @@ -
+ Transaction Report - - Transaction Report Transaction reports list details for transactions in a specified account over a specified period, in a convenient @@ -137,5 +135,5 @@ in the report. The choices include: - +
diff --git a/doc/sgml/C/xacc-y2k.sgml b/doc/sgml/C/xacc-y2k.sgml index d101e1627e..c51d52f09b 100644 --- a/doc/sgml/C/xacc-y2k.sgml +++ b/doc/sgml/C/xacc-y2k.sgml @@ -1,9 +1,8 @@
+ GnuCash Y2K Readiness - - GnuCash Y2K Readiness GnuCash versions 1.1.25 and later store all dates as seconds and nanoseconds, where the seconds are stored in a 64-bit signed @@ -38,5 +37,5 @@ consider that takes place in 2000 or in 2001... Y2K issues are described in more detail at Linux and Year 2000. - +
diff --git a/doc/sgml/Makefile.in b/doc/sgml/Makefile.in index 720a3b59bb..5f11eb1b9e 100644 --- a/doc/sgml/Makefile.in +++ b/doc/sgml/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/lib/Makefile.in b/lib/Makefile.in index 54e88dd66a..f2f42a7cb9 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/po/gnucash.pot b/po/gnucash.pot index 4ee18ca936..b98483fe2b 100644 --- a/po/gnucash.pot +++ b/po/gnucash.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-09-08 01:04-0700\n" +"POT-Creation-Date: 2000-09-08 16:23-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/rpm/Makefile.in b/rpm/Makefile.in index 9e23f6e682..7f7d50dc49 100644 --- a/rpm/Makefile.in +++ b/rpm/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/Makefile.in b/src/Makefile.in index 08c1c02822..f024b2a296 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/calculation/Makefile.in b/src/calculation/Makefile.in index 34942e1619..24a0af1771 100644 --- a/src/calculation/Makefile.in +++ b/src/calculation/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in index 6191bd3fe2..0d21031eb1 100644 --- a/src/doc/Makefile.in +++ b/src/doc/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/doc/design/Makefile.in b/src/doc/design/Makefile.in index c42d8c9167..dbe36d5a0a 100644 --- a/src/doc/design/Makefile.in +++ b/src/doc/design/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/doc/finderv.html b/src/doc/finderv.html index d850168f87..6d84113538 100644 --- a/src/doc/finderv.html +++ b/src/doc/finderv.html @@ -333,5 +333,5 @@ guess for i is obtained as follows:
-Return +Return diff --git a/src/engine/Makefile.in b/src/engine/Makefile.in index d69900d513..0c882fa301 100644 --- a/src/engine/Makefile.in +++ b/src/engine/Makefile.in @@ -75,6 +75,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/engine/sql/Makefile.in b/src/engine/sql/Makefile.in index f34c21aa68..e7fc162bd2 100644 --- a/src/engine/sql/Makefile.in +++ b/src/engine/sql/Makefile.in @@ -76,6 +76,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/experimental/Makefile.in b/src/experimental/Makefile.in index c256fb6018..ebb2da1310 100644 --- a/src/experimental/Makefile.in +++ b/src/experimental/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/experimental/cbb/Makefile.in b/src/experimental/cbb/Makefile.in index 1d12bec3b7..5ec18bf7f1 100644 --- a/src/experimental/cbb/Makefile.in +++ b/src/experimental/cbb/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/experimental/cbb/cbb-engine/Makefile.in b/src/experimental/cbb/cbb-engine/Makefile.in index a5792e5e42..38e6bb50a0 100644 --- a/src/experimental/cbb/cbb-engine/Makefile.in +++ b/src/experimental/cbb/cbb-engine/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/experimental/gg/Makefile.in b/src/experimental/gg/Makefile.in index 3d711ec29e..c5f2b596a2 100644 --- a/src/experimental/gg/Makefile.in +++ b/src/experimental/gg/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/experimental/ofx/Makefile.in b/src/experimental/ofx/Makefile.in index 91a4b92976..e0fc617930 100644 --- a/src/experimental/ofx/Makefile.in +++ b/src/experimental/ofx/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/experimental/ofx/dtd/Makefile.in b/src/experimental/ofx/dtd/Makefile.in index 757e969b52..64345a5233 100644 --- a/src/experimental/ofx/dtd/Makefile.in +++ b/src/experimental/ofx/dtd/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/experimental/ofx/explore/Makefile.in b/src/experimental/ofx/explore/Makefile.in index d62d580bcb..dce877b148 100644 --- a/src/experimental/ofx/explore/Makefile.in +++ b/src/experimental/ofx/explore/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/experimental/ofx/parser/Makefile.in b/src/experimental/ofx/parser/Makefile.in index b493333b23..7da0f961f7 100644 --- a/src/experimental/ofx/parser/Makefile.in +++ b/src/experimental/ofx/parser/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/gnome/Makefile.in b/src/gnome/Makefile.in index 95db34fe70..dd5904bb59 100644 --- a/src/gnome/Makefile.in +++ b/src/gnome/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/optional/Makefile.in b/src/optional/Makefile.in index bb1b4d8ad8..d6500565ec 100644 --- a/src/optional/Makefile.in +++ b/src/optional/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/optional/swig/Makefile.in b/src/optional/swig/Makefile.in index ab68733bdb..4b62a48eb7 100644 --- a/src/optional/swig/Makefile.in +++ b/src/optional/swig/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/pixmaps/Makefile.in b/src/pixmaps/Makefile.in index ce9099bb6d..c40d03f940 100644 --- a/src/pixmaps/Makefile.in +++ b/src/pixmaps/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/quotes/Makefile.in b/src/quotes/Makefile.in index 86eb9eb516..b512717a88 100644 --- a/src/quotes/Makefile.in +++ b/src/quotes/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/register/Makefile.in b/src/register/Makefile.in index b48bce99ae..6ac54d2874 100644 --- a/src/register/Makefile.in +++ b/src/register/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/register/gnome/Makefile.in b/src/register/gnome/Makefile.in index 4c372a1a01..00fa6bd746 100644 --- a/src/register/gnome/Makefile.in +++ b/src/register/gnome/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/scm/Makefile.am b/src/scm/Makefile.am index 047037cbee..c01864f2c4 100644 --- a/src/scm/Makefile.am +++ b/src/scm/Makefile.am @@ -56,6 +56,7 @@ bootstrap.scm: bootstrap.scm.in Makefile sed < $@.in > $@.tmp \ -e 's:@-VERSION-@:${VERSION}:' \ -e 's:@-GNC_CONFIGDIR-@:${GNC_CONFIGDIR}:' \ - -e 's:@-GNC_SHAREDIR-@:${GNC_SHAREDIR}:' + -e 's:@-GNC_SHAREDIR-@:${GNC_SHAREDIR}:' \ + -e 's:@-GNC_HELPDIR-@:${GNC_HELPDIR}:' mv $@.tmp $@ CLEANFILES += bootstrap.scm diff --git a/src/scm/Makefile.in b/src/scm/Makefile.in index 5a06883b2a..2b1baae6ce 100644 --- a/src/scm/Makefile.in +++ b/src/scm/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ @@ -367,7 +368,8 @@ bootstrap.scm: bootstrap.scm.in Makefile sed < $@.in > $@.tmp \ -e 's:@-VERSION-@:${VERSION}:' \ -e 's:@-GNC_CONFIGDIR-@:${GNC_CONFIGDIR}:' \ - -e 's:@-GNC_SHAREDIR-@:${GNC_SHAREDIR}:' + -e 's:@-GNC_SHAREDIR-@:${GNC_SHAREDIR}:' \ + -e 's:@-GNC_HELPDIR-@:${GNC_HELPDIR}:' mv $@.tmp $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/scm/bootstrap.scm.in b/src/scm/bootstrap.scm.in index 77d3947e4e..85bb80361f 100644 --- a/src/scm/bootstrap.scm.in +++ b/src/scm/bootstrap.scm.in @@ -91,6 +91,7 @@ ;; Automatically generated defaults (define gnc:_config-dir-default_ "@-GNC_CONFIGDIR-@") (define gnc:_share-dir-default_ "@-GNC_SHAREDIR-@") +(define gnc:_help-dir-default_ "@-GNC_HELPDIR-@") (define gnc:version "@-VERSION-@") ;; These will be converted to config vars later (see prefs.scm) diff --git a/src/scm/gnumeric/Makefile.in b/src/scm/gnumeric/Makefile.in index aac3a232a4..252f4147c8 100644 --- a/src/scm/gnumeric/Makefile.in +++ b/src/scm/gnumeric/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/scm/path.scm b/src/scm/path.scm index a8e1b4e0bc..7406ff6370 100644 --- a/src/scm/path.scm +++ b/src/scm/path.scm @@ -27,15 +27,12 @@ (let ((user-paths (list (list (getenv "HOME") ".gnucash" "html"))) (locale-paths (map (lambda (prefix) - (list gnc:_share-dir-default_ "html" prefix)) + (list gnc:_help-dir-default_ prefix)) (gnc:locale-prefixes))) - (pix-paths (map (lambda (prefix) - (list gnc:_share-dir-default_ "html" prefix "image")) - (gnc:locale-prefixes))) (base-paths (list - (list gnc:_share-dir-default_ "html")))) + (list gnc:_help-dir-default_)))) (map (lambda (paths) (apply build-path paths)) - (append user-paths locale-paths pix-paths base-paths)))) + (append user-paths locale-paths base-paths)))) (define (gnc:_expand-doc-path_ new-path) ;; FIXME: Bad items should probably cause this to abort with #f or diff --git a/src/scm/printing/Makefile.in b/src/scm/printing/Makefile.in index c2247498ca..120bc1ce56 100644 --- a/src/scm/printing/Makefile.in +++ b/src/scm/printing/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/scm/qif-import/Makefile.in b/src/scm/qif-import/Makefile.in index 50599fda20..358fc30b73 100644 --- a/src/scm/qif-import/Makefile.in +++ b/src/scm/qif-import/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/scm/report/Makefile.in b/src/scm/report/Makefile.in index f50099e223..8fff48e08c 100644 --- a/src/scm/report/Makefile.in +++ b/src/scm/report/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/scm/srfi/Makefile.in b/src/scm/srfi/Makefile.in index 03e400d626..2a82f11468 100644 --- a/src/scm/srfi/Makefile.in +++ b/src/scm/srfi/Makefile.in @@ -73,6 +73,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNC_CONFIGDIR = @GNC_CONFIGDIR@ GNC_DOC_INSTALL_DIR = @GNC_DOC_INSTALL_DIR@ +GNC_HELPDIR = @GNC_HELPDIR@ GNC_LIBDIR = @GNC_LIBDIR@ GNC_SCM_INSTALL_DIR = @GNC_SCM_INSTALL_DIR@ GNC_SHAREDIR = @GNC_SHAREDIR@ diff --git a/src/top-level.h b/src/top-level.h index d65c5cf076..969fb19e1a 100644 --- a/src/top-level.h +++ b/src/top-level.h @@ -33,17 +33,17 @@ /** HELP STUFF: *****************************************************/ #define HH_ABOUT "xacc-about.html" -#define HH_ACC "xacc-accwin.html" +#define HH_ACC "xacc-newacctwin.html" #define HH_REGWIN "xacc-regwin.html" #define HH_RECNWIN "xacc-recnwin.html" #define HH_ADJBWIN "xacc-adjbwin.html" -#define HH_MAIN "xacc-main.html" +#define HH_MAIN "index.html" #define HH_GPL "xacc-gpl.html" -#define HH_GLOBPREFS "xacc-globalprefs.html" +#define HH_GLOBPREFS "xacc-preferences.html" #define HH_ACCEDIT "xacc-accountedit.html" #define HH_QIFIMPORT "xacc-qif-import.html" #define HH_PRINTCHECK "xacc-print-check.html" -#define HH_FIND_TRANSACTIONS "xacc-find-transactions.html" +#define HH_FIND_TRANSACTIONS "xacc-locatingtxns.html" #define HH_PRINT "xacc-print.html"