From: Craig Small Date: Fri, 29 Oct 2004 14:02:15 +0000 (+0000) Subject: typos, finnish translation, changed ask to be less evil and use rpmatch for localisation X-Git-Tag: v22.11~153 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a01da4883c3e5d22004972646879305756d7783b;p=psmisc typos, finnish translation, changed ask to be less evil and use rpmatch for localisation --- diff --git a/ChangeLog b/ChangeLog index 3c96eb0..fc22e53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Changes in 21.6 (not released yet) +=============== + * Minor typo (specificiation) fixed + * Added closing bracket in fuser help + * Added Finnish translation + * Localised the yes/no prompts with rpmatch() + Changes in 21.5 =============== 2004-05-25 Craig Small diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 index 6b5b8b2..81058c3 100644 --- a/autom4te.cache/output.0 +++ b/autom4te.cache/output.0 @@ -463,7 +463,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL FLASK_LINUX FLASK_LIB TERMCAP_LIB MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB LIB@&t@OBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL FLASK_LINUX FLASK_LIB TERMCAP_LIB MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB LIB@&t@OBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1023,8 +1023,6 @@ if test -n "$ac_init_help"; then Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors --enable-shared@<:@=PKGS@:>@ build shared libraries @<:@default=yes@:>@ --enable-static@<:@=PKGS@:>@ @@ -1503,10 +1501,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_config_headers="$ac_config_headers config.h" -am__api_version="1.8" + ac_config_commands="$ac_config_commands default-1" + +am__api_version="1.4" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1615,21 +1616,20 @@ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 -echo timestamp > conftest.file +echo timestamp > conftestfile # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` if test "$*" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t $srcdir/configure conftestfile` fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then + if test "$*" != "X $srcdir/configure conftestfile" \ + && test "$*" != "X conftestfile $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # if, for instance, CONFIG_SHELL is bash and it inherits a @@ -1642,7 +1642,7 @@ alias in your environment" >&2;} { (exit 1); exit 1; }; } fi - test "$2" = conftest.file + test "$2" = conftestfile ) then # Ok. @@ -1654,6 +1654,7 @@ echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi +rm -f conftest* echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && @@ -1669,84 +1670,6 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -fi - -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi - -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$AWK" && break -done - echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` @@ -1776,159 +1699,103 @@ echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then +PACKAGE=psmisc + +VERSION=21.6cvs + +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - -# Define the identity of the package. - PACKAGE=psmisc - VERSION=21.5 - - cat >>confdefs.h <<_ACEOF @%:@define PACKAGE "$PACKAGE" _ACEOF - + cat >>confdefs.h <<_ACEOF @%:@define VERSION "$VERSION" _ACEOF -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - - -AMTAR=${AMTAR-"${am_missing_run}tar"} - -install_sh=${install_sh-"$am_aux_dir/install-sh"} - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 +missing_dir=`cd $ac_aux_dir && pwd` +echo "$as_me:$LINENO: checking for working aclocal-${am__api_version}" >&5 +echo $ECHO_N "checking for working aclocal-${am__api_version}... $ECHO_C" >&6 +# 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. +if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then + ACLOCAL=aclocal-${am__api_version} + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" + echo "$as_me:$LINENO: result: missing" >&5 +echo "${ECHO_T}missing" >&6 fi -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for working autoconf" >&5 +echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6 +# 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. +if (autoconf --version) < /dev/null > /dev/null 2>&1; then + AUTOCONF=autoconf + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" + AUTOCONF="$missing_dir/missing autoconf" + echo "$as_me:$LINENO: result: missing" >&5 +echo "${ECHO_T}missing" >&6 fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + +echo "$as_me:$LINENO: checking for working automake-${am__api_version}" >&5 +echo $ECHO_N "checking for working automake-${am__api_version}... $ECHO_C" >&6 +# 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. +if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake-${am__api_version} + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + AUTOMAKE="$missing_dir/missing automake-${am__api_version}" + echo "$as_me:$LINENO: result: missing" >&5 +echo "${ECHO_T}missing" >&6 fi - STRIP=$ac_ct_STRIP +echo "$as_me:$LINENO: checking for working autoheader" >&5 +echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6 +# 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. +if (autoheader --version) < /dev/null > /dev/null 2>&1; then + AUTOHEADER=autoheader + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else - STRIP="$ac_cv_prog_STRIP" + AUTOHEADER="$missing_dir/missing autoheader" + echo "$as_me:$LINENO: result: missing" >&5 +echo "${ECHO_T}missing" >&6 fi +echo "$as_me:$LINENO: checking for working makeinfo" >&5 +echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6 +# 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. +if (makeinfo --version) < /dev/null > /dev/null 2>&1; then + MAKEINFO=makeinfo + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 +else + MAKEINFO="$missing_dir/missing makeinfo" + echo "$as_me:$LINENO: result: missing" >&5 +echo "${ECHO_T}missing" >&6 fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. - @@ -2855,180 +2722,6 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -DEPDIR="${am__leading_dot}deps" - - ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi - - -echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 -rm -f confinc confmf - -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" - -fi; -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi - - -if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - - - -depcc="$CC" am_compiler_list= - -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - - -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3746,7 +3439,7 @@ linux*) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | knetbsd*-gnu) +netbsd* | netbsdelf*-gnu | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -4761,115 +4454,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -depcc="$CXX" am_compiler_list= - -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - - -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6695,7 +6279,7 @@ EOF fi ;; - netbsd* | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -7213,7 +6797,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs=yes ;; - netbsd* | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -7862,6 +7446,18 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + knetbsd*-gnu) version_type=linux need_lib_prefix=no @@ -10303,7 +9899,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac ;; - netbsd* | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -10858,7 +10454,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; - netbsd* | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu | knetbsd*-gnu) ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -11554,6 +11150,18 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + knetbsd*-gnu) version_type=linux need_lib_prefix=no @@ -13548,7 +13156,7 @@ EOF fi ;; - netbsd* | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -14046,7 +13654,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs_F77=yes ;; - netbsd* | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -14695,6 +14303,18 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + knetbsd*-gnu) version_type=linux need_lib_prefix=no @@ -15874,7 +15494,7 @@ EOF fi ;; - netbsd* | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -16392,7 +16012,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs_GCJ=yes ;; - netbsd* | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -17041,6 +16661,18 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + knetbsd*-gnu) version_type=linux need_lib_prefix=no @@ -20131,7 +19763,7 @@ _ACEOF fi -ALL_LINGUAS="de en fr it pt sv" +ALL_LINGUAS="de en fi fr it pt sv" MKINSTALLDIRS= if test -n "$ac_aux_dir"; then @@ -20436,7 +20068,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 rm -f messages.po fi - ac_config_commands="$ac_config_commands default-1" + ac_config_commands="$ac_config_commands default-2" @@ -22410,27 +22042,6 @@ LIB@&t@OBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -22864,7 +22475,7 @@ cat >>$CONFIG_STATUS <<_ACEOF # INIT-COMMANDS section. # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + # Capture the value of obsolete ALL_LINGUAS because we need it to compute # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it # from automake. @@ -22887,8 +22498,8 @@ do "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;; "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -22978,7 +22589,6 @@ s,@LIBS@,$LIBS,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@CYGPATH_W@,$CYGPATH_W,;t t s,@PACKAGE@,$PACKAGE,;t t s,@VERSION@,$VERSION,;t t s,@ACLOCAL@,$ACLOCAL,;t t @@ -22986,15 +22596,7 @@ s,@AUTOCONF@,$AUTOCONF,;t t s,@AUTOMAKE@,$AUTOMAKE,;t t s,@AUTOHEADER@,$AUTOHEADER,;t t s,@MAKEINFO@,$MAKEINFO,;t t -s,@AMTAR@,$AMTAR,;t t -s,@install_sh@,$install_sh,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s,@mkdir_p@,$mkdir_p,;t t -s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t -s,@am__leading_dot@,$am__leading_dot,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t @@ -23002,15 +22604,6 @@ s,@CPPFLAGS@,$CPPFLAGS,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t -s,@DEPDIR@,$DEPDIR,;t t -s,@am__include@,$am__include,;t t -s,@am__quote@,$am__quote,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t s,@CPP@,$CPP,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t @@ -23027,12 +22620,11 @@ s,@AR@,$AR,;t t s,@ac_ct_AR@,$ac_ct_AR,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t +s,@STRIP@,$STRIP,;t t +s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@CXX@,$CXX,;t t s,@CXXFLAGS@,$CXXFLAGS,;t t s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@CXXDEPMODE@,$CXXDEPMODE,;t t -s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t s,@CXXCPP@,$CXXCPP,;t t s,@F77@,$F77,;t t s,@FFLAGS@,$FFLAGS,;t t @@ -23515,28 +23107,6 @@ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} cat $tmp/config.h rm -f $tmp/config.h fi -# Compute $ac_file's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $ac_file | $ac_file:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X$ac_file | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'`/stamp-h$_am_stamp_count done _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -23653,98 +23223,8 @@ esac { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - else - continue - fi - grep '^DEP_FILES *= *[^ @%:@]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} - { (exit 1); exit 1; }; }; } - - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done - ;; - default-1 ) + default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;; + default-2 ) for ac_file in $CONFIG_FILES; do # Support "outfile[:infile[:infile...]]" case "$ac_file" in diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 4fe4308..50fc8b6 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -1,4 +1,4 @@ -# This file was generated by Autom4te Sat Mar 13 12:27:59 PST 2004. +# This file was generated by Autom4te Mon Sep 13 19:52:04 PDT 2004. # It contains the lists of macros which have been traced. # It can be safely removed. @@ -84,7 +84,6 @@ 'AC_FUNC_STRFTIME' => 1, 'AC_PROG_CPP' => 1, 'AC_C_INLINE' => 1, - 'AM_ENABLE_MULTILIB' => 1, 'AC_PROG_LEX' => 1, 'AC_C_CONST' => 1, 'AC_TYPE_PID_T' => 1, @@ -112,297 +111,6 @@ 'AC_HEADER_DIRENT' => 1, 'AC_CHECK_FUNCS' => 1 } - ], 'Autom4te::Request' ), - bless( [ - '1', - 1, - [ - '/usr/share/autoconf' - ], - [ - '/usr/share/autoconf/autoconf/autoconf.m4f', - '/usr/share/aclocal/codeset.m4', - '/usr/share/aclocal/gettext.m4', - '/usr/share/aclocal/glibc21.m4', - '/usr/share/aclocal/iconv.m4', - '/usr/share/aclocal/intdiv0.m4', - '/usr/share/aclocal/intmax.m4', - '/usr/share/aclocal/inttypes-pri.m4', - '/usr/share/aclocal/inttypes.m4', - '/usr/share/aclocal/inttypes_h.m4', - '/usr/share/aclocal/isc-posix.m4', - '/usr/share/aclocal/lcmessage.m4', - '/usr/share/aclocal/lib-ld.m4', - '/usr/share/aclocal/lib-link.m4', - '/usr/share/aclocal/lib-prefix.m4', - '/usr/share/aclocal/libtool.m4', - '/usr/share/aclocal/longdouble.m4', - '/usr/share/aclocal/longlong.m4', - '/usr/share/aclocal/nls.m4', - '/usr/share/aclocal/po.m4', - '/usr/share/aclocal/printf-posix.m4', - '/usr/share/aclocal/progtest.m4', - '/usr/share/aclocal/signed.m4', - '/usr/share/aclocal/size_max.m4', - '/usr/share/aclocal/stdint_h.m4', - '/usr/share/aclocal/uintmax_t.m4', - '/usr/share/aclocal/ulonglong.m4', - '/usr/share/aclocal/wchar_t.m4', - '/usr/share/aclocal/wint_t.m4', - '/usr/share/aclocal/xsize.m4', - '/usr/share/aclocal-1.8/amversion.m4', - '/usr/share/aclocal-1.8/auxdir.m4', - '/usr/share/aclocal-1.8/cond.m4', - '/usr/share/aclocal-1.8/depend.m4', - '/usr/share/aclocal-1.8/depout.m4', - '/usr/share/aclocal-1.8/header.m4', - '/usr/share/aclocal-1.8/init.m4', - '/usr/share/aclocal-1.8/install-sh.m4', - '/usr/share/aclocal-1.8/lead-dot.m4', - '/usr/share/aclocal-1.8/make.m4', - '/usr/share/aclocal-1.8/missing.m4', - '/usr/share/aclocal-1.8/mkdirp.m4', - '/usr/share/aclocal-1.8/options.m4', - '/usr/share/aclocal-1.8/sanity.m4', - '/usr/share/aclocal-1.8/strip.m4', - 'configure.in' - ], - { - 'AM_ENABLE_STATIC' => 1, - 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, - 'AC_TYPE_OFF_T' => 1, - 'AC_C_VOLATILE' => 1, - 'AC_FUNC_CLOSEDIR_VOID' => 1, - '_LT_AC_SHELL_INIT' => 1, - 'AC_REPLACE_FNMATCH' => 1, - '_LT_AC_LANG_CXX_CONFIG' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_FUNC_STAT' => 1, - 'AM_PROG_MKDIR_P' => 1, - 'AC_FUNC_WAIT3' => 1, - 'AC_STRUCT_TM' => 1, - 'AC_FUNC_LSTAT' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'gl_SIZE_MAX' => 1, - 'jm_AC_TYPE_UINTMAX_T' => 1, - 'AC_LIB_RPATH' => 1, - 'AC_FUNC_STRTOD' => 1, - 'AC_CHECK_HEADERS' => 1, - 'gt_PRINTF_POSIX' => 1, - 'AM_MISSING_PROG' => 1, - 'AC_FUNC_STRNLEN' => 1, - 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, - 'AC_PROG_CXX' => 1, - '_LT_AC_LANG_C_CONFIG' => 1, - 'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - 'AC_PROG_AWK' => 1, - '_m4_warn' => 1, - 'jm_AC_HEADER_STDINT_H' => 1, - 'AC_LIBTOOL_OBJDIR' => 1, - 'AC_HEADER_MAJOR' => 1, - 'AM_SANITY_CHECK' => 1, - 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, - 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, - '_LT_AC_CHECK_DLFCN' => 1, - 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, - 'AC_LIBTOOL_GCJ' => 1, - 'AC_PROG_GCC_TRADITIONAL' => 1, - 'AC_LIBSOURCE' => 1, - 'AC_STRUCT_ST_BLOCKS' => 1, - 'AC_LIB_ARG_WITH' => 1, - 'AC_LIBTOOL_CONFIG' => 1, - '_LT_AC_LANG_F77' => 1, - 'AC_CONFIG_AUX_DIR' => 1, - 'AC_PROG_MAKE_SET' => 1, - 'sinclude' => 1, - 'AM_DISABLE_SHARED' => 1, - 'AM_PROG_LIBTOOL' => 1, - '_LT_AC_LANG_CXX' => 1, - 'AM_PROG_LD' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, - 'AC_FUNC_STRERROR_R' => 1, - 'AM_ICONV_LINK' => 1, - 'AC_FUNC_FORK' => 1, - 'AC_DECL_SYS_SIGLIST' => 1, - 'AM_MKINSTALLDIRS' => 1, - 'AC_FUNC_VPRINTF' => 1, - 'AC_PROG_NM' => 1, - 'AC_LIBTOOL_DLOPEN' => 1, - 'AC_PROG_LD' => 1, - 'AC_PROG_LD_GNU' => 1, - 'AC_ENABLE_FAST_INSTALL' => 1, - 'bh_C_SIGNED' => 1, - 'AC_INIT' => 1, - 'AC_STRUCT_TIMEZONE' => 1, - 'gt_TYPE_INTMAX_T' => 1, - 'AC_SUBST' => 1, - 'AC_FUNC_ALLOCA' => 1, - 'AC_LIB_HAVE_LINKFLAGS' => 1, - 'AM_ICONV_LINKFLAGS_BODY' => 1, - '_AM_SET_OPTION' => 1, - 'AC_CANONICAL_HOST' => 1, - 'AC_PROG_RANLIB' => 1, - 'AC_LIBTOOL_PROG_CC_C_O' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, - 'AC_FUNC_SETPGRP' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'AC_FUNC_MMAP' => 1, - 'AC_LIB_PREFIX' => 1, - 'AC_TYPE_SIZE_T' => 1, - 'gt_TYPE_LONGDOUBLE' => 1, - 'AC_CHECK_TYPES' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_CHECK_MEMBERS' => 1, - 'AC_FUNC_UTIME_NULL' => 1, - 'AC_FUNC_SELECT_ARGTYPES' => 1, - 'AM_LC_MESSAGES' => 1, - '_LT_AC_LANG_GCJ' => 1, - 'AC_' => 1, - 'AC_HEADER_STAT' => 1, - 'AC_FUNC_STRFTIME' => 1, - 'AC_C_INLINE' => 1, - 'gt_INTDIV0' => 1, - 'AM_ICONV' => 1, - 'AC_LIBTOOL_RC' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - 'AC_CONFIG_FILES' => 1, - 'include' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, - 'LT_AC_PROG_SED' => 1, - 'AM_ENABLE_SHARED' => 1, - 'AC_LIB_APPENDTOVAR' => 1, - 'AM_GNU_GETTEXT' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, - 'AC_FUNC_OBSTACK' => 1, - 'AC_CHECK_LIB' => 1, - 'AM_POSTPROCESS_PO_MAKEFILE' => 1, - 'AC_ENABLE_SHARED' => 1, - 'AC_FUNC_MALLOC' => 1, - 'AC_FUNC_GETGROUPS' => 1, - 'AC_LIB_WITH_FINAL_PREFIX' => 1, - 'AC_FUNC_GETLOADAVG' => 1, - 'gt_TYPE_WINT_T' => 1, - 'AC_FUNC_FSEEKO' => 1, - 'AC_ENABLE_STATIC' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - 'AM_PROG_CC_C_O' => 1, - '_LT_AC_TAGVAR' => 1, - 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - 'AC_FUNC_MKTIME' => 1, - 'AM_CONDITIONAL' => 1, - 'AM_LANGINFO_CODESET' => 1, - 'AC_HEADER_SYS_WAIT' => 1, - 'AC_PROG_LN_S' => 1, - 'AC_FUNC_MEMCMP' => 1, - 'm4_include' => 1, - 'AM_PROG_INSTALL_SH' => 1, - 'AC_HEADER_DIRENT' => 1, - 'AC_PROG_EGREP' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - 'AC_PATH_MAGIC' => 1, - 'AM_MAKE_INCLUDE' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'm4_pattern_forbid' => 1, - 'gt_INTTYPES_PRI' => 1, - 'AM_PO_SUBDIRS' => 1, - 'AC_LIB_PREPARE_PREFIX' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1, - 'AC_DISABLE_SHARED' => 1, - 'AC_LIBTOOL_SETUP' => 1, - 'AC_LIBTOOL_WIN32_DLL' => 1, - 'AC_PROG_LD_RELOAD_FLAG' => 1, - 'AC_HEADER_TIME' => 1, - 'AC_TYPE_MODE_T' => 1, - 'AC_FUNC_GETMNTENT' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'm4_sinclude' => 1, - 'AM_GNU_GETTEXT_VERSION' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, - 'AC_PATH_X' => 1, - 'AC_LIB_PROG_LD_GNU' => 1, - 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AM_NLS' => 1, - 'AC_HEADER_STDC' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, - 'AC_LIBTOOL_CXX' => 1, - 'LT_AC_PROG_RC' => 1, - 'LT_AC_PROG_GCJ' => 1, - 'AC_FUNC_ERROR_AT_LINE' => 1, - 'AM_DEP_TRACK' => 1, - 'AM_DISABLE_STATIC' => 1, - 'AC_FUNC_MBRTOWC' => 1, - '_AC_PROG_LIBTOOL' => 1, - 'AM_CONFIG_HEADER' => 1, - 'AC_TYPE_SIGNAL' => 1, - 'AC_TYPE_UID_T' => 1, - '_AM_IF_OPTION' => 1, - 'AC_PATH_TOOL_PREFIX' => 1, - 'm4_pattern_allow' => 1, - 'AC_LIBTOOL_F77' => 1, - 'AM_PATH_PROG_WITH_TEST' => 1, - 'AM_SET_LEADING_DOT' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, - '_AM_DEPENDENCIES' => 1, - 'gt_CHECK_DECL' => 1, - 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - 'AC_PROG_CC' => 1, - '_LT_AC_SYS_COMPILER' => 1, - 'AC_LIB_LINKFLAGS' => 1, - 'AM_PROG_NM' => 1, - 'AC_FUNC_STRCOLL' => 1, - 'AC_PROG_YACC' => 1, - 'AC_LIBLTDL_CONVENIENCE' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AC_FUNC_CHOWN' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - 'AC_LIBLTDL_INSTALLABLE' => 1, - 'gl_XSIZE' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - 'AC_FUNC_GETPGRP' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AC_FUNC_REALLOC' => 1, - 'AM_INTL_SUBDIR' => 1, - 'AC_DISABLE_STATIC' => 1, - 'jm_AC_HEADER_INTTYPES_H' => 1, - 'AC_CONFIG_LINKS' => 1, - 'gt_TYPE_WCHAR_T' => 1, - 'AM_MAINTAINER_MODE' => 1, - '_LT_AC_LOCK' => 1, - 'jm_AC_TYPE_UNSIGNED_LONG_LONG' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, - 'AC_PROG_CPP' => 1, - 'AC_TYPE_PID_T' => 1, - 'AC_PROG_LEX' => 1, - 'AC_C_CONST' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, - 'AC_FUNC_SETVBUF_REVERSED' => 1, - 'AC_PROG_INSTALL' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - 'jm_GLIBC21' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, - '_AM_SET_OPTIONS' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - 'jm_AC_TYPE_LONG_LONG' => 1, - 'AH_OUTPUT' => 1, - 'AC_LIB_LINKFLAGS_BODY' => 1, - 'AC_CHECK_LIBM' => 1, - 'AC_ISC_POSIX' => 1, - 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, - 'gt_HEADER_INTTYPES_H' => 1, - '_AM_MANGLE_OPTION' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, - 'AM_SET_DEPDIR' => 1, - 'AC_CHECK_FUNCS' => 1, - 'AC_LIB_PROG_LD' => 1 - } ], 'Autom4te::Request' ) ); diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0 index 6105113..5d4657e 100644 --- a/autom4te.cache/traces.0 +++ b/autom4te.cache/traces.0 @@ -51,42 +51,37 @@ m4trace:configure.in:2: -1- AC_SUBST([ECHO_C]) m4trace:configure.in:2: -1- AC_SUBST([ECHO_N]) m4trace:configure.in:2: -1- AC_SUBST([ECHO_T]) m4trace:configure.in:2: -1- AC_SUBST([LIBS]) -m4trace:configure.in:4: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete. -You should run autoupdate.], [aclocal.m4:8312: AM_CONFIG_HEADER is expanded from... -configure.in:4: the top level]) m4trace:configure.in:4: -1- AC_CONFIG_HEADERS([config.h]) -m4trace:configure.in:5: -1- AM_INIT_AUTOMAKE([psmisc], [21.5]) -m4trace:configure.in:5: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) -m4trace:configure.in:5: -1- AM_AUTOMAKE_VERSION([1.8.4]) +m4trace:configure.in:4: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. +You should run autoupdate.], [autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from... +aclocal.m4:855: AM_CONFIG_HEADER is expanded from... +configure.in:4: the top level]) +m4trace:configure.in:4: -3- _m4_warn([obsolete], [The macro `_AC_OUTPUT_COMMANDS_CNT' is obsolete. +You should run autoupdate.], [autoconf/status.m4:321: _AC_OUTPUT_COMMANDS_CNT is expanded from... +autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from... +aclocal.m4:855: AM_CONFIG_HEADER is expanded from... +configure.in:4: the top level]) +m4trace:configure.in:5: -1- AM_INIT_AUTOMAKE([psmisc], [21.6cvs]) +m4trace:configure.in:5: -1- AM_AUTOMAKE_VERSION([1.4-p6]) m4trace:configure.in:5: -1- AC_PROG_INSTALL m4trace:configure.in:5: -1- AC_SUBST([INSTALL_PROGRAM]) m4trace:configure.in:5: -1- AC_SUBST([INSTALL_SCRIPT]) m4trace:configure.in:5: -1- AC_SUBST([INSTALL_DATA]) -m4trace:configure.in:5: -1- AC_SUBST([CYGPATH_W]) -m4trace:configure.in:5: -1- AC_SUBST([PACKAGE], [psmisc]) -m4trace:configure.in:5: -1- AC_SUBST([VERSION], [21.5]) -m4trace:configure.in:5: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE]) -m4trace:configure.in:5: -1- AH_OUTPUT([PACKAGE], [/* Name of package */ +m4trace:configure.in:5: -1- AC_SUBST([PACKAGE]) +m4trace:configure.in:5: -1- AC_SUBST([VERSION]) +m4trace:configure.in:5: -2- AC_DEFINE_TRACE_LITERAL([PACKAGE]) +m4trace:configure.in:5: -2- AH_OUTPUT([PACKAGE], [/* Name of package */ #undef PACKAGE]) -m4trace:configure.in:5: -1- AC_DEFINE_TRACE_LITERAL([VERSION]) -m4trace:configure.in:5: -1- AH_OUTPUT([VERSION], [/* Version number of package */ +m4trace:configure.in:5: -2- AC_DEFINE_TRACE_LITERAL([VERSION]) +m4trace:configure.in:5: -2- AH_OUTPUT([VERSION], [/* Version number of package */ #undef VERSION]) m4trace:configure.in:5: -1- AC_SUBST([ACLOCAL]) m4trace:configure.in:5: -1- AC_SUBST([AUTOCONF]) m4trace:configure.in:5: -1- AC_SUBST([AUTOMAKE]) m4trace:configure.in:5: -1- AC_SUBST([AUTOHEADER]) m4trace:configure.in:5: -1- AC_SUBST([MAKEINFO]) -m4trace:configure.in:5: -1- AC_SUBST([AMTAR]) -m4trace:configure.in:5: -1- AC_SUBST([install_sh]) -m4trace:configure.in:5: -1- AC_SUBST([STRIP]) -m4trace:configure.in:5: -1- AC_SUBST([ac_ct_STRIP]) -m4trace:configure.in:5: -1- AC_SUBST([INSTALL_STRIP_PROGRAM]) -m4trace:configure.in:5: -1- AC_SUBST([mkdir_p]) -m4trace:configure.in:5: -1- AC_PROG_AWK -m4trace:configure.in:5: -1- AC_SUBST([AWK]) m4trace:configure.in:5: -1- AC_PROG_MAKE_SET m4trace:configure.in:5: -1- AC_SUBST([SET_MAKE]) -m4trace:configure.in:5: -1- AC_SUBST([am__leading_dot]) m4trace:configure.in:8: -1- AC_PROG_CC m4trace:configure.in:8: -1- AC_SUBST([CC]) m4trace:configure.in:8: -1- AC_SUBST([CFLAGS]) @@ -101,19 +96,6 @@ m4trace:configure.in:8: -1- AC_SUBST([CC]) m4trace:configure.in:8: -1- AC_SUBST([ac_ct_CC]) m4trace:configure.in:8: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext]) m4trace:configure.in:8: -1- AC_SUBST([OBJEXT], [$ac_cv_objext]) -m4trace:configure.in:8: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"]) -m4trace:configure.in:8: -1- AC_SUBST([am__include]) -m4trace:configure.in:8: -1- AC_SUBST([am__quote]) -m4trace:configure.in:8: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -m4trace:configure.in:8: -1- AC_SUBST([AMDEP_TRUE]) -m4trace:configure.in:8: -1- AC_SUBST([AMDEP_FALSE]) -m4trace:configure.in:8: -1- AC_SUBST([AMDEPBACKSLASH]) -m4trace:configure.in:8: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type]) -m4trace:configure.in:8: -1- AM_CONDITIONAL([am__fastdepCC], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3]) -m4trace:configure.in:8: -1- AC_SUBST([am__fastdepCC_TRUE]) -m4trace:configure.in:8: -1- AC_SUBST([am__fastdepCC_FALSE]) m4trace:configure.in:9: -1- AC_PROG_CPP m4trace:configure.in:9: -1- AC_SUBST([CPP]) m4trace:configure.in:9: -1- AC_SUBST([CPPFLAGS]) @@ -122,35 +104,35 @@ m4trace:configure.in:10: -1- AC_PROG_LIBTOOL m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from... -aclocal.m4:3175: AC_ENABLE_SHARED is expanded from... +aclocal.m4:2739: AC_ENABLE_SHARED is expanded from... configure.in:10: AC_ENABLE_SHARED is required by... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from... -aclocal.m4:3214: AC_ENABLE_STATIC is expanded from... +aclocal.m4:2778: AC_ENABLE_STATIC is expanded from... configure.in:10: AC_ENABLE_STATIC is required by... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from... -aclocal.m4:3253: AC_ENABLE_FAST_INSTALL is expanded from... +aclocal.m4:2817: AC_ENABLE_FAST_INSTALL is expanded from... configure.in:10: AC_ENABLE_FAST_INSTALL is required by... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) m4trace:configure.in:10: -1- AC_CANONICAL_HOST m4trace:configure.in:10: -1- AC_SUBST([build], [$ac_cv_build]) @@ -164,13 +146,13 @@ m4trace:configure.in:10: -1- AC_SUBST([host_os], [`echo $ac_cv_host | sed 's/^\( m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... autoconf/general.m4:1331: AC_ARG_WITH is expanded from... -aclocal.m4:3450: AC_PROG_LD is expanded from... +aclocal.m4:3014: AC_PROG_LD is expanded from... configure.in:10: AC_PROG_LD is required by... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) m4trace:configure.in:10: -1- AC_SUBST([EGREP]) m4trace:configure.in:10: -1- AC_PROG_LN_S @@ -185,35 +167,35 @@ m4trace:configure.in:10: -1- AC_SUBST([ac_ct_STRIP]) m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... autoconf/general.m4:1331: AC_ARG_WITH is expanded from... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:1964: _LT_AC_LOCK is expanded from... +aclocal.m4:1516: _LT_AC_LOCK is expanded from... configure.in:10: _LT_AC_LOCK is required by... -aclocal.m4:2395: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from... -aclocal.m4:3997: _LT_AC_LANG_C_CONFIG is expanded from... -aclocal.m4:3864: AC_LIBTOOL_LANG_C_CONFIG is expanded from... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1947: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from... +aclocal.m4:3561: _LT_AC_LANG_C_CONFIG is expanded from... +aclocal.m4:3428: AC_LIBTOOL_LANG_C_CONFIG is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) m4trace:configure.in:10: -1- AC_CHECK_HEADERS([dlfcn.h]) m4trace:configure.in:10: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the header file. */ @@ -272,26 +254,26 @@ m4trace:configure.in:10: -1- AC_CHECK_LIB([dld], [dld_link], [lt_cv_dlopen="dld_ m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... autoconf/general.m4:1331: AC_ARG_WITH is expanded from... -aclocal.m4:3129: _LT_AC_TAGCONFIG is expanded from... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:2693: _LT_AC_TAGCONFIG is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) -m4trace:configure.in:10: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [aclocal.m4:3129: _LT_AC_TAGCONFIG is expanded from... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +m4trace:configure.in:10: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [aclocal.m4:2693: _LT_AC_TAGCONFIG is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) -m4trace:configure.in:10: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [aclocal.m4:3129: _LT_AC_TAGCONFIG is expanded from... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +m4trace:configure.in:10: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [aclocal.m4:2693: _LT_AC_TAGCONFIG is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) m4trace:configure.in:10: -1- AC_PROG_CXX m4trace:configure.in:10: -1- AC_SUBST([CXX]) @@ -300,12 +282,6 @@ m4trace:configure.in:10: -1- AC_SUBST([LDFLAGS]) m4trace:configure.in:10: -1- AC_SUBST([CPPFLAGS]) m4trace:configure.in:10: -1- AC_SUBST([CXX]) m4trace:configure.in:10: -1- AC_SUBST([ac_ct_CXX]) -m4trace:configure.in:10: -1- AC_SUBST([CXXDEPMODE], [depmode=$am_cv_CXX_dependencies_compiler_type]) -m4trace:configure.in:10: -1- AM_CONDITIONAL([am__fastdepCXX], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3]) -m4trace:configure.in:10: -1- AC_SUBST([am__fastdepCXX_TRUE]) -m4trace:configure.in:10: -1- AC_SUBST([am__fastdepCXX_FALSE]) m4trace:configure.in:10: -1- AC_SUBST([CXXCPP]) m4trace:configure.in:10: -1- AC_SUBST([CPPFLAGS]) m4trace:configure.in:10: -1- AC_SUBST([CXXCPP]) @@ -343,25 +319,25 @@ m4trace:configure.in:10: -1- AC_SUBST([F77]) m4trace:configure.in:10: -1- AC_SUBST([ac_ct_F77]) m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete. You should run autoupdate.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from... -aclocal.m4:5174: _LT_AC_LANG_GCJ_CONFIG is expanded from... -aclocal.m4:5131: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from... -aclocal.m4:3129: _LT_AC_TAGCONFIG is expanded from... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4738: _LT_AC_LANG_GCJ_CONFIG is expanded from... +aclocal.m4:4695: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from... +aclocal.m4:2693: _LT_AC_TAGCONFIG is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) m4trace:configure.in:10: -1- _m4_warn([obsolete], [instead of using `AC_LANG', `AC_LANG_SAVE', and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from... -aclocal.m4:5174: _LT_AC_LANG_GCJ_CONFIG is expanded from... -aclocal.m4:5131: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from... -aclocal.m4:3129: _LT_AC_TAGCONFIG is expanded from... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4738: _LT_AC_LANG_GCJ_CONFIG is expanded from... +aclocal.m4:4695: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from... +aclocal.m4:2693: _LT_AC_TAGCONFIG is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) m4trace:configure.in:10: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [ lt_cv_dlopen="dyld" @@ -392,47 +368,47 @@ m4trace:configure.in:10: -1- AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlope m4trace:configure.in:10: -1- AC_CHECK_LIB([dld], [dld_link], [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete. You should run autoupdate.], [autoconf/lang.m4:172: AC_LANG_RESTORE is expanded from... -aclocal.m4:5174: _LT_AC_LANG_GCJ_CONFIG is expanded from... -aclocal.m4:5131: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from... -aclocal.m4:3129: _LT_AC_TAGCONFIG is expanded from... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4738: _LT_AC_LANG_GCJ_CONFIG is expanded from... +aclocal.m4:4695: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from... +aclocal.m4:2693: _LT_AC_TAGCONFIG is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete. You should run autoupdate.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from... -aclocal.m4:5213: _LT_AC_LANG_RC_CONFIG is expanded from... -aclocal.m4:5182: AC_LIBTOOL_LANG_RC_CONFIG is expanded from... -aclocal.m4:3129: _LT_AC_TAGCONFIG is expanded from... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4777: _LT_AC_LANG_RC_CONFIG is expanded from... +aclocal.m4:4746: AC_LIBTOOL_LANG_RC_CONFIG is expanded from... +aclocal.m4:2693: _LT_AC_TAGCONFIG is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) m4trace:configure.in:10: -1- _m4_warn([obsolete], [instead of using `AC_LANG', `AC_LANG_SAVE', and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from... -aclocal.m4:5213: _LT_AC_LANG_RC_CONFIG is expanded from... -aclocal.m4:5182: AC_LIBTOOL_LANG_RC_CONFIG is expanded from... -aclocal.m4:3129: _LT_AC_TAGCONFIG is expanded from... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4777: _LT_AC_LANG_RC_CONFIG is expanded from... +aclocal.m4:4746: AC_LIBTOOL_LANG_RC_CONFIG is expanded from... +aclocal.m4:2693: _LT_AC_TAGCONFIG is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete. You should run autoupdate.], [autoconf/lang.m4:172: AC_LANG_RESTORE is expanded from... -aclocal.m4:5213: _LT_AC_LANG_RC_CONFIG is expanded from... -aclocal.m4:5182: AC_LIBTOOL_LANG_RC_CONFIG is expanded from... -aclocal.m4:3129: _LT_AC_TAGCONFIG is expanded from... -aclocal.m4:1637: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4777: _LT_AC_LANG_RC_CONFIG is expanded from... +aclocal.m4:4746: AC_LIBTOOL_LANG_RC_CONFIG is expanded from... +aclocal.m4:2693: _LT_AC_TAGCONFIG is expanded from... +aclocal.m4:1189: AC_LIBTOOL_SETUP is expanded from... configure.in:10: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1495: _AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1047: _AC_PROG_LIBTOOL is expanded from... configure.in:10: _AC_PROG_LIBTOOL is required by... -aclocal.m4:1475: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1027: AC_PROG_LIBTOOL is expanded from... configure.in:10: the top level]) m4trace:configure.in:10: -1- AC_SUBST([LIBTOOL]) m4trace:configure.in:13: -1- AC_SUBST([FLASK_LINUX]) @@ -574,37 +550,30 @@ m4trace:configure.in:41: -1- AC_SUBST([XGETTEXT]) m4trace:configure.in:41: -1- AC_SUBST([MSGMERGE]) m4trace:configure.in:41: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. You should run autoupdate.], [autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from... -aclocal.m4:7585: AM_PO_SUBDIRS is expanded from... -configure.in:41: AM_PO_SUBDIRS is required by... -aclocal.m4:354: AM_GNU_GETTEXT is expanded from... -configure.in:41: the top level]) -m4trace:configure.in:41: -3- _m4_warn([obsolete], [The macro `_AC_OUTPUT_COMMANDS_CNT' is obsolete. -You should run autoupdate.], [autoconf/status.m4:321: _AC_OUTPUT_COMMANDS_CNT is expanded from... -autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from... -aclocal.m4:7585: AM_PO_SUBDIRS is expanded from... +aclocal.m4:7587: AM_PO_SUBDIRS is expanded from... configure.in:41: AM_PO_SUBDIRS is required by... -aclocal.m4:354: AM_GNU_GETTEXT is expanded from... +aclocal.m4:7235: AM_GNU_GETTEXT is expanded from... configure.in:41: the top level]) m4trace:configure.in:41: -1- AC_SUBST([USE_NLS]) m4trace:configure.in:41: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:354: AM_GNU_GETTEXT is expanded from... +aclocal.m4:7235: AM_GNU_GETTEXT is expanded from... configure.in:41: the top level]) m4trace:configure.in:41: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:576: AM_ICONV_LINK is expanded from... -aclocal.m4:354: AM_GNU_GETTEXT is expanded from... +aclocal.m4:8026: AM_ICONV_LINK is expanded from... +aclocal.m4:7235: AM_GNU_GETTEXT is expanded from... configure.in:41: the top level]) m4trace:configure.in:41: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:576: AM_ICONV_LINK is expanded from... -aclocal.m4:354: AM_GNU_GETTEXT is expanded from... +aclocal.m4:8026: AM_ICONV_LINK is expanded from... +aclocal.m4:7235: AM_GNU_GETTEXT is expanded from... configure.in:41: the top level]) m4trace:configure.in:41: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ICONV]) m4trace:configure.in:41: -1- AH_OUTPUT([HAVE_ICONV], [/* Define if you have the iconv() function. */ @@ -615,13 +584,13 @@ m4trace:configure.in:41: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is ob You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:354: AM_GNU_GETTEXT is expanded from... +aclocal.m4:7235: AM_GNU_GETTEXT is expanded from... configure.in:41: the top level]) m4trace:configure.in:41: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:354: AM_GNU_GETTEXT is expanded from... +aclocal.m4:7235: AM_GNU_GETTEXT is expanded from... configure.in:41: the top level]) m4trace:configure.in:41: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS]) m4trace:configure.in:41: -1- AH_OUTPUT([ENABLE_NLS], [/* Define to 1 if translation of program messages to the user\'s native diff --git a/configure.in b/configure.in index ff38a48..8a7cc55 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT AC_CONFIG_SRCDIR([src/comm.h]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(psmisc,21.5) +AM_INIT_AUTOMAKE(psmisc,21.6cvs) dnl Checks for programs. AC_PROG_CC @@ -37,7 +37,7 @@ AC_TYPE_SIZE_T AC_TYPE_UID_T dnl Check for language stuff -ALL_LINGUAS="de en fr it pt sv" +ALL_LINGUAS="de en fi fr it pt sv" AM_GNU_GETTEXT([external]) dnl Checks for library functions. diff --git a/doc/Makefile.in b/doc/Makefile.in index e211741..0992d74 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,8 +1,6 @@ -# Makefile.in generated by automake 1.8.4 from Makefile.am. -# @configure_input@ +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 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. @@ -12,203 +10,139 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -@SET_MAKE@ + +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 = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) +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@ -subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -man1dir = $(mandir)/man1 -am__installdirs = "$(DESTDIR)$(man1dir)" -NROFF = nroff -MANS = $(man_MANS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ +AS = @AS@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +CATOBJEXT = @CATOBJEXT@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ +DATADIRNAME = @DATADIRNAME@ +DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ -FFLAGS = @FFLAGS@ FLASK_LIB = @FLASK_LIB@ FLASK_LINUX = @FLASK_LINUX@ +GCJ = @GCJ@ +GCJFLAGS = @GCJFLAGS@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_LIB = @HAVE_LIB@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -LDFLAGS = @LDFLAGS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LIB = @LIB@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ +RC = @RC@ STRIP = @STRIP@ TERMCAP_LIB = @TERMCAP_LIB@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ + man_MANS = fuser.1 killall.1 pstree.1 + EXTRA_DIST = $(man_MANS) -all: all-am +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../config.h +CONFIG_CLEAN_FILES = +man1dir = $(mandir)/man1 +MANS = $(man_MANS) + +NROFF = nroff +DIST_COMMON = Makefile.am Makefile.in + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP_ENV = --best +all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-man1: $(man1_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +install-man1: + $(mkinstalldirs) $(DESTDIR)$(man1dir) + @list='$(man1_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ case "$$i" in \ *.1*) list="$$list $$i" ;; \ esac; \ @@ -217,160 +151,118 @@ install-man1: $(man1_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ done + uninstall-man1: - @$(NORMAL_UNINSTALL) - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ + @list='$(man1_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ case "$$i" in \ *.1*) list="$$list $$i" ;; \ esac; \ done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ + rm -f $(DESTDIR)$(man1dir)/$$inst; \ done +install-man: $(MANS) + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-man1 +uninstall-man: + @$(NORMAL_UNINSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-man1 tags: TAGS TAGS: -ctags: CTAGS -CTAGS: +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = doc distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ + 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/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ + || 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 -all-am: Makefile $(MANS) -installdirs: - for dir in "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: install-exec: install-exec-am + +install-data-am: install-man install-data: install-data-am -uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am +install: install-am +uninstall-am: uninstall-man +uninstall: uninstall-am +all-am: Makefile $(MANS) +all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 + + mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-man - -install-exec-am: - -install-info: install-info-am - -install-man: install-man1 - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic +mostlyclean-am: mostlyclean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic mostlyclean-libtool +clean-am: clean-generic mostlyclean-am -pdf: pdf-am +clean: clean-am -pdf-am: +distclean-am: distclean-generic clean-am + -rm -f libtool -ps: ps-am +distclean: distclean-am -ps-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." -uninstall-am: uninstall-info-am uninstall-man +maintainer-clean: maintainer-clean-am -uninstall-man: uninstall-man1 +.PHONY: install-man1 uninstall-man1 install-man uninstall-man 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 -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-man1 \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-info-am uninstall-man \ - uninstall-man1 # 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. diff --git a/icons/Makefile.in b/icons/Makefile.in index d8d04ef..18f2a26 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -1,8 +1,6 @@ -# Makefile.in generated by automake 1.8.4 from Makefile.am. -# @configure_input@ +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 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. @@ -12,309 +10,213 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -@SET_MAKE@ + +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 = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) +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@ -subdir = icons -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ +AS = @AS@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +CATOBJEXT = @CATOBJEXT@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ +DATADIRNAME = @DATADIRNAME@ +DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ -FFLAGS = @FFLAGS@ FLASK_LIB = @FLASK_LIB@ FLASK_LINUX = @FLASK_LINUX@ +GCJ = @GCJ@ +GCJFLAGS = @GCJFLAGS@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_LIB = @HAVE_LIB@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -LDFLAGS = @LDFLAGS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LIB = @LIB@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ +RC = @RC@ STRIP = @STRIP@ TERMCAP_LIB = @TERMCAP_LIB@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ + EXTRA_DIST = psmisc16.gif psmisc32.gif pstree16.xpm pstree32.xpm -all: all-am +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../config.h +CONFIG_CLEAN_FILES = +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +TAR = tar +GZIP_ENV = --best +all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu icons/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + tags: TAGS TAGS: -ctags: CTAGS -CTAGS: +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = icons distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ + 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 icons/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ + || 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 -all-am: Makefile -installdirs: -install: install-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: install-exec: install-exec-am + +install-data-am: install-data: install-data-am -uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile +all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am +mostlyclean-am: mostlyclean-generic -dvi-am: - -html: html-am - -info: info-am - -info-am: +mostlyclean: mostlyclean-am -install-data-am: +clean-am: clean-generic mostlyclean-am -install-exec-am: +clean: clean-am -install-info: install-info-am +distclean-am: distclean-generic clean-am + -rm -f libtool -install-man: +distclean: distclean-am -installcheck-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 - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: -uninstall-am: uninstall-info-am +.PHONY: 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 -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am # 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. diff --git a/po/fi.po b/po/fi.po new file mode 100644 index 0000000..ad54ef8 --- /dev/null +++ b/po/fi.po @@ -0,0 +1,365 @@ +# Finnish translation for psmisc. +# Copyright (C) 2004 Free Software Foundation, Inc. +# This file is distributed under the same license as the psmisc package. +# Lars Wirzenius , 2004. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: psmisc 21.5\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-30 13:39+1000\n" +"PO-Revision-Date: 2004-10-29 15:14+0300\n" +"Last-Translator: Lars Wirzenius \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/killall.c:55 +#, c-format +msgid "Kill %s(%s%d) ? (y/n) " +msgstr "Lopeta prosessi %s(%s%d)? (y=kyllä, n=ei) " + +#: src/killall.c:243 +#, c-format +msgid "skipping partial match %s(%d)\n" +msgstr "ohitan osittaisen osuman %s(%d)\n" + +#: src/killall.c:337 +#, c-format +msgid "Killed %s(%s%d) with signal %d\n" +msgstr "Prosessi %s(%s%d) lopetettu signaalilla %d\n" + +#: src/killall.c:349 src/fuser.c:499 src/pstree.c:680 +#, c-format +msgid "%s is empty (not mounted ?)\n" +msgstr "%s on tyhjä (ei liitetty?)\n" + +#: src/killall.c:355 +#, c-format +msgid "%s: no process killed\n" +msgstr "%s: ei lopetettuja prosesseja\n" + +#: src/killall.c:607 +#, c-format +msgid "Maximum number of names is %d\n" +msgstr "Suurin sallittu määrä nimiä on %d\n" + +#: src/fuser.c:248 +#, c-format +msgid "-4 flag used but proc file %s is not readable\n" +msgstr "optio -4 käytössä mutta proc-tiedosto %s ei ole luettavissa\n" + +#: src/fuser.c:257 +#, c-format +msgid "-6 flag used but proc file %s is not readable\n" +msgstr "optio -6 käytössä mutta proc-tiedosto %s ei ole luettavissa\n" + +#: src/fuser.c:597 +#, c-format +msgid "Kill process %d ? (y/N) " +msgstr "Lopeta prosess %d? (y=kyllä, N=ei) " + +#: src/fuser.c:627 +#, c-format +msgid "kill %d" +msgstr "lopeta %d" + +#: src/fuser.c:631 src/fuser.c:635 +#, c-format +msgid "No automatic removal. Please use umount %s\n" +msgstr "Ei automaattista poistoa. Poista liitos %s\n" + +#: src/fuser.c:639 +#, c-format +msgid "No automatic removal. Please use swapoff %s\n" +msgstr "Ei automaattista poistoa. Käytä swapoff %s\n" + +#: src/fuser.c:752 +#, c-format +msgid "Internal error (type %d)\n" +msgstr "Sisäinen virhe (tyyppiä %d)\n" + +#: src/fuser.c:790 +#, c-format +msgid "kernel mount " +msgstr "kernel mount " + +#: src/fuser.c:793 +#, c-format +msgid "kernel loop " +msgstr "kernel loop " + +#: src/fuser.c:796 +#, c-format +msgid "kernel swap " +msgstr "kernel swap " + +#: src/fuser.c:952 +#, c-format +msgid "can't find sockets' device number" +msgstr "pistokkeen laitenumeroa ei löydy" + +#: src/fuser.c:961 +#, c-format +msgid "" +"usage: fuser [ -a | -s | -c ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n" +" [ - ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n" +" fuser -l\n" +" fuser -V\n" +"\n" +" -a display unused files too\n" +" -c mounted FS\n" +" -f silently ignored (for POSIX compatibility\n" +" -k kill processes accessing that file\n" +" -i ask before killing (ignored without -k)\n" +" -l list signal names\n" +" -m mounted FS\n" +" -n space search in the specified name space (file, udp, or tcp)\n" +" -s silent operation\n" +" -signal send signal instead of SIGKILL\n" +" -u display user ids\n" +" -v verbose output\n" +" -V display version information\n" +" -4 search IPv4 sockets only\n" +" -6 search IPv6 sockets only\n" +" - reset options\n" +"\n" +" udp/tcp names: [local_port][,[rmt_host][,[rmt_port]]]\n" +"\n" +msgstr "" +"käyttö: fuser [ -a | -s | -c ] [ -n nimistö ] [ -signaali ] [ -kimuv ] nimi ...\n" +" [ - ] [ -n nimistö ] [ -signaali ] [ -kimuv ] nimi ...\n" +" fuser -l\n" +" fuser -V\n" +"\n" +" -a näytä myös käyttämättömät tiedostot\n" +" -c liitetty tiedostojärjestelmä\n" +" -f ei merkitystä (tarvitaan POSIX-yhteensopivuuden takia)\n" +" -k lopeta prosessit, jotka käyttävät tiedostoa\n" +" -i kysy ennen lopetusta (ei merkitystä ilman -k)\n" +" -l näytä signaalinimien luettelo\n" +" -m liitetty tiedostojärjestelmä\n" +" -n nimiavaruus etsi annetusta nimiavaruudesta (file, udp, tai tcp)\n" +" -s ole hiljaa\n" +" -signaali lähetä muu signaali kuin SIGKILL\n" +" -u näytä käyttäjätunnukset\n" +" -v kerro paljon ylimääräistä\n" +" -V näytä versio\n" +" -4 etsi vain IPv4-pistokkeista\n" +" -6 etsi vain IPv6-pistokkeista\n" +" - nollaa optiot\n" +"\n" +" udp/tcp-nimet: [paikallinen_portti][,[etäkone][,[etäkone]]]\n" +"\n" + +#: src/fuser.c:987 +#, c-format +msgid "fuser (psmisc) %s\n" +msgstr "fuser (psmisc) %s\n" + +#: src/fuser.c:989 +#, c-format +msgid "" +"Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n" +"\n" +"PSmisc comes with ABSOLUTELY NO WARRANTY.\n" +"This is free software, and you are welcome to redistribute it under the " +"terms\n" +"of the GNU General Public License.\n" +"For more information about these matters, see the files named COPYING.\n" +msgstr "" +"Allaoleva on epävirallinen käännös. Tulkintatilanteissa pätee alkuperäinen\n" +"englanninkielinen versio.\n" +"\n" +"Copyright (C) 1993-2002 Werner Almesberger ja Craig Small\n" +"\n" +"PSmisc-ohjelmistolla ei ole mitään takuuta.\n" +"Tämä vapaa ohjelmisto ja saat kopioida ja levittää sitä GNU General Public\n" +"License -lisenssin mukaisesti. Tiedostossa COPYING on tarkemmat tiedot.\n" + +#: src/fuser.c:1172 +#, c-format +msgid "ignoring -m in name space \"%s\"\n" +msgstr "optio -m merkityksetön nimiavaruudessa \"%s\"\n" + +#: src/fuser.c:1180 +#, c-format +msgid "%s/%s: invalid specificiation\n" +msgstr "%s/%s: epäkelpo määrittely\n" + +#: src/pstree.c:384 +#, c-format +msgid "MAX_DEPTH not big enough.\n" +msgstr "MAX_DEPTH-vakio on liian pieni.\n" + +#: src/pstree.c:719 +#, c-format +msgid "" +"usage: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -u ]\n" +msgstr "" +"käyttö: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -u ]\n" + +#: src/pstree.c:720 +#, c-format +msgid " [ -A | -G | -U ] [ pid | user]\n" +msgstr " [ -A | -G | -U ] [ prosessitunniste | käyttäjätunnus]\n" + +#: src/pstree.c:721 +#, c-format +msgid "" +" pstree -V\n" +"\n" +msgstr "" +" pstree -V\n" +"\n" + +#: src/pstree.c:722 +#, c-format +msgid " -a show command line arguments\n" +msgstr " -a näytä komentoriviparametrit\n" + +#: src/pstree.c:723 +#, c-format +msgid " -A use ASCII line drawing characters\n" +msgstr " -A käytä ASCII-merkkejä viivanpiirtoon\n" + +#: src/pstree.c:724 +#, c-format +msgid " -c don't compact identical subtrees\n" +msgstr " -c älä yhdistä samanlaisia alipuita\n" + +#: src/pstree.c:725 +#, c-format +msgid " -h highlight current process and its ancestors\n" +msgstr " -h merkitse nykyinen prosessi ja sen esi-isät\n" + +#: src/pstree.c:726 +#, c-format +msgid " -H pid highlight process \"pid\" and its ancestors\n" +msgstr " -H pid merkitse prosessi \"pid\" ja sen esi-isät\n" + +#: src/pstree.c:727 +#, c-format +msgid " -G use VT100 line drawing characters\n" +msgstr " -G käytä VT100-merkkejä viivanpiirtoon\n" + +#: src/pstree.c:728 +#, c-format +msgid " -l don't truncate long lines\n" +msgstr " -l älä katko pitkiä rivejä\n" + +#: src/pstree.c:729 +#, c-format +msgid " -n sort output by PID\n" +msgstr " -n järjestä tuloste prosessitunnisteen mukaan\n" + +#: src/pstree.c:730 +#, c-format +msgid " -p show PIDs; implies -c\n" +msgstr " -p näytä prosessitunnisteet; myös -c menee päälle\n" + +#: src/pstree.c:731 +#, c-format +msgid " -u show uid transitions\n" +msgstr " -u näytä käyttäjätunnusten vaihtumiset\n" + +#: src/pstree.c:733 +#, c-format +msgid " -s show Flask SIDs\n" +msgstr " -s näytä Flask SID -tunnisteet\n" + +#: src/pstree.c:734 +#, c-format +msgid " -x show Flask security contexts\n" +msgstr " -x näytä Flask-kontekstit\n" + +#: src/pstree.c:736 +#, c-format +msgid " -U use UTF-8 (Unicode)) line drawing characters\n" +msgstr " -U käytä UTF-8 (Unicode)) -merkkejä viivanpiirtoon\n" + +#: src/pstree.c:737 +#, c-format +msgid " -V display version information\n" +msgstr " -V näytä versio\n" + +#: src/pstree.c:738 +#, c-format +msgid " pid start at pid, default 1 (init))\n" +msgstr " pid aloita prosessista pid, oletuksena 1 (init-prosessi))\n" + +#: src/pstree.c:739 +#, c-format +msgid "" +" user show only trees rooted at processes of that user\n" +"\n" +msgstr "" +" kjä näytä vain puita, jotka alkavat käyttäjän kjä omistuksessa\n" +"\n" + +#: src/pstree.c:745 +#, c-format +msgid "pstree (psmisc) %s\n" +msgstr "pstree (psmisc) %s\n" + +#: src/pstree.c:746 +#, c-format +msgid "" +"Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n" +"\n" +msgstr "" +"Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n" +"\n" + +#: src/pstree.c:747 +#, c-format +msgid "pstree comes with ABSOLUTELY NO WARRANTY.\n" +msgstr "pstree:llä ei ole mitään takuuta.\n" + +#: src/pstree.c:748 +#, c-format +msgid "" +"This is free software, and you are welcome to redistribute it under the " +"terms\n" +msgstr "" +"Tämä vapaa ohjelmisto ja saat kopioida ja levittää sitä GNU General Public\n" + +#: src/pstree.c:749 +#, c-format +msgid "of the GNU General Public License.\n" +msgstr "" +"License -lisenssin mukaisesti. Tiedostossa COPYING on tarkemmat tiedot.\n" + +#: src/pstree.c:750 +#, c-format +msgid "" +"For more information about these matters, see the files named COPYING.\n" +msgstr "" +"Tiedostossa COPYING on tarkemmat tiedot.\n" + +#: src/pstree.c:835 +#, c-format +msgid "TERM is not set\n" +msgstr "TERM ei ole asetettu\n" + +#: src/pstree.c:840 +#, c-format +msgid "Can't get terminal capabilities\n" +msgstr "Päätteen ominaisuudet eivät ole selvillä\n" + +#: src/pstree.c:884 +#, c-format +msgid "No such user name: %s\n" +msgstr "Käyttäjätunnus puuttuu: %s\n" + +#: src/pstree.c:900 +#, c-format +msgid "No processes found.\n" +msgstr "Prosesseja ei löydy.\n" + +#: src/pstree.c:905 +#, c-format +msgid "Press return to close\n" +msgstr "Enter-näppäin sulkee\n" diff --git a/po/it.po b/po/it.po index 10d76f2..2599956 100644 --- a/po/it.po +++ b/po/it.po @@ -18,7 +18,7 @@ msgstr "" #: src/killall.c:55 #, c-format msgid "Kill %s(%s%d) ? (y/n) " -msgstr "Termina %s(%s%d) ? (y/n) " +msgstr "Termina %s(%s%d) ? (s/N) " #: src/killall.c:243 #, c-format @@ -57,9 +57,9 @@ msgid "-6 flag used but proc file %s is not readable\n" msgstr "usata opzione -6 ma file proc %s non leggibile\n" #: src/fuser.c:597 -#, fuzzy, c-format +#, c-format msgid "Kill process %d ? (y/N) " -msgstr "Termina processo %d ? (y/n) " +msgstr "Termina processo %d ? (s/N) " #: src/fuser.c:627 #, c-format diff --git a/src/Makefile.in b/src/Makefile.in index 4bb5dd3..51f919c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,8 +1,6 @@ -# Makefile.in generated by automake 1.8.4 from Makefile.am. -# @configure_input@ +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 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. @@ -12,310 +10,232 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -@SET_MAKE@ - -SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(pstree_SOURCES) +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 = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) +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@ -bin_PROGRAMS = fuser$(EXEEXT) killall$(EXEEXT) pstree$(EXEEXT) -subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) -am_fuser_OBJECTS = fuser.$(OBJEXT) signals.$(OBJEXT) -fuser_OBJECTS = $(am_fuser_OBJECTS) -fuser_LDADD = $(LDADD) -am_killall_OBJECTS = killall.$(OBJEXT) signals.$(OBJEXT) -killall_OBJECTS = $(am_killall_OBJECTS) -killall_DEPENDENCIES = -am_pstree_OBJECTS = pstree.$(OBJEXT) -pstree_OBJECTS = $(am_pstree_OBJECTS) -pstree_DEPENDENCIES = -binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(bin_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/fuser.Po ./$(DEPDIR)/killall.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/pstree.Po ./$(DEPDIR)/signals.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(pstree_SOURCES) -DIST_SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(pstree_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ +AS = @AS@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +CATOBJEXT = @CATOBJEXT@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ +DATADIRNAME = @DATADIRNAME@ +DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ -FFLAGS = @FFLAGS@ FLASK_LIB = @FLASK_LIB@ FLASK_LINUX = @FLASK_LINUX@ +GCJ = @GCJ@ +GCJFLAGS = @GCJFLAGS@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_LIB = @HAVE_LIB@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -LDFLAGS = @LDFLAGS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LIB = @LIB@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ +RC = @RC@ STRIP = @STRIP@ TERMCAP_LIB = @TERMCAP_LIB@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ + AM_CFLAGS = -Wall -DLOCALEDIR=\"/usr/share/locale\" + +bin_PROGRAMS = fuser killall pstree + bin_SCRIPTS = pstree.x11 + fuser_SOURCES = fuser.c comm.h signals.c signals.h loop.h + killall_SOURCES = killall.c comm.h signals.c signals.h + killall_LDADD = @FLASK_LIB@ + pstree_SOURCES = pstree.c comm.h + pstree_LDADD = @TERMCAP_LIB@ @FLASK_LIB@ + BUILT_SOURCES = signames.h + EXTRA_DIST = signames.c + CLEANFILES = signames.h pstree.x11 -all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../config.h +CONFIG_CLEAN_FILES = +bin_PROGRAMS = fuser$(EXEEXT) killall$(EXEEXT) pstree$(EXEEXT) +PROGRAMS = $(bin_PROGRAMS) + + +DEFS = @DEFS@ -I. -I$(srcdir) -I.. +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +fuser_OBJECTS = fuser.$(OBJEXT) signals.$(OBJEXT) +fuser_LDADD = $(LDADD) +fuser_DEPENDENCIES = +fuser_LDFLAGS = +killall_OBJECTS = killall.$(OBJEXT) signals.$(OBJEXT) +killall_DEPENDENCIES = +killall_LDFLAGS = +pstree_OBJECTS = pstree.$(OBJEXT) +pstree_DEPENDENCIES = +pstree_LDFLAGS = +SCRIPTS = $(bin_SCRIPTS) +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP_ENV = --best +DEP_FILES = .deps/fuser.P .deps/killall.P .deps/pstree.P \ +.deps/signals.P +SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(pstree_SOURCES) +OBJECTS = $(fuser_OBJECTS) $(killall_OBJECTS) $(pstree_OBJECTS) + +all: all-redirect .SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +.SUFFIXES: .S .c .lo .o .obj .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-binPROGRAMS: + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + +distclean-binPROGRAMS: + +maintainer-clean-binPROGRAMS: + install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + if test -f $$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ + list='$(bin_PROGRAMS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -fuser$(EXEEXT): $(fuser_OBJECTS) $(fuser_DEPENDENCIES) - @rm -f fuser$(EXEEXT) - $(LINK) $(fuser_LDFLAGS) $(fuser_OBJECTS) $(fuser_LDADD) $(LIBS) -killall$(EXEEXT): $(killall_OBJECTS) $(killall_DEPENDENCIES) - @rm -f killall$(EXEEXT) - $(LINK) $(killall_LDFLAGS) $(killall_OBJECTS) $(killall_LDADD) $(LIBS) -pstree$(EXEEXT): $(pstree_OBJECTS) $(pstree_DEPENDENCIES) - @rm -f pstree$(EXEEXT) - $(LINK) $(pstree_LDFLAGS) $(pstree_OBJECTS) $(pstree_LDADD) $(LIBS) -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ - else :; fi; \ - done +# FIXME: We should only use cygpath when building on Windows, +# and only if it is available. +.c.obj: + $(COMPILE) -c `cygpath -w $<` -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< mostlyclean-compile: + -rm -f *.o core *.core -rm -f *.$(OBJEXT) +clean-compile: + distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fuser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/killall.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pstree.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signals.Po@am__quote@ +maintainer-clean-compile: -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< mostlyclean-libtool: -rm -f *.lo @@ -324,182 +244,199 @@ clean-libtool: -rm -rf .libs _libs distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique + +maintainer-clean-libtool: + +fuser$(EXEEXT): $(fuser_OBJECTS) $(fuser_DEPENDENCIES) + @rm -f fuser$(EXEEXT) + $(LINK) $(fuser_LDFLAGS) $(fuser_OBJECTS) $(fuser_LDADD) $(LIBS) + +killall$(EXEEXT): $(killall_OBJECTS) $(killall_DEPENDENCIES) + @rm -f killall$(EXEEXT) + $(LINK) $(killall_LDFLAGS) $(killall_OBJECTS) $(killall_LDADD) $(LIBS) + +pstree$(EXEEXT): $(pstree_OBJECTS) $(pstree_DEPENDENCIES) + @rm -f pstree$(EXEEXT) + $(LINK) $(pstree_LDFLAGS) $(pstree_OBJECTS) $(pstree_LDADD) $(LIBS) + +install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f $$p; then \ + echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + else if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + else :; fi; fi; \ + done + +uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + list='$(bin_SCRIPTS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + done + tags: TAGS -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ +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; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -z "$$unique" && unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ + 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 "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + +mostlyclean-tags: -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here +clean-tags: distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = src distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ + 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 src/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -check-am: all-am -check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(PROGRAMS) $(SCRIPTS) -installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -clean: clean-am +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am +-include $(DEP_FILES) -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags +mostlyclean-depend: -dvi: dvi-am +clean-depend: -dvi-am: +distclean-depend: + -rm -rf .deps -html: html-am +maintainer-clean-depend: -info: info-am +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp 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-binPROGRAMS install-binSCRIPTS +install-exec: install-exec-am install-data-am: +install-data: install-data-am -install-exec-am: install-binPROGRAMS install-binSCRIPTS +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) $(SCRIPTS) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) -install-info: install-info-am -install-man: +mostlyclean-generic: -installcheck-am: +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-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: + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool +clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ + clean-depend clean-generic mostlyclean-am -pdf: pdf-am +clean: clean-am -pdf-am: +distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ + distclean-tags distclean-depend distclean-generic \ + clean-am + -rm -f libtool -ps: ps-am +distclean: distclean-am -ps-am: +maintainer-clean-am: maintainer-clean-binPROGRAMS \ + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-tags maintainer-clean-depend \ + 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." -uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-info-am +maintainer-clean: maintainer-clean-am -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-binSCRIPTS install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-binSCRIPTS uninstall-info-am +.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ +maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile mostlyclean-libtool distclean-libtool \ +clean-libtool maintainer-clean-libtool uninstall-binSCRIPTS \ +install-binSCRIPTS tags mostlyclean-tags distclean-tags clean-tags \ +maintainer-clean-tags distdir mostlyclean-depend distclean-depend \ +clean-depend maintainer-clean-depend 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 signames.h: signames.c Makefile @@ -516,6 +453,7 @@ Makefile: signames.h pstree.x11: pstree ln -s pstree pstree.x11 + # 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/src/fuser.c b/src/fuser.c index f44bac2..d537db2 100644 --- a/src/fuser.c +++ b/src/fuser.c @@ -590,25 +590,34 @@ scan_swaps (void) static int ask (pid_t pid) { - int ch, c; + int res; + size_t len; + char *line; + + line = NULL; + len = 0; fflush (stdout); do { fprintf (stderr, _("Kill process %d ? (y/N) "), pid); fflush (stderr); - do { - if ((ch = getchar ()) == EOF) - exit (0); - if (ch == '\n') return 0; - } while (ch == '\t' || ch == ' '); - do - if ((c = getchar ()) == EOF) - exit (0); - while (c != '\n'); - } while (ch != '\n' && ch != 'y' && ch != 'n' && ch != 'Y' && ch != 'N'); - return ch == 'y' || ch == 'Y'; -} + if (getline (&line, &len, stdin) < 0) + return 0; + /* Check for default */ + if (line[0] == '\n') { + free(line); + return 0; + } + res = rpmatch(line); + if (res >= 0) { + free(line); + return res; + } + } while(1); + /* Never should get here */ + return 0; +} static void kill_item (const FILE_DSC * file, const ITEM_DSC * item) @@ -964,7 +973,7 @@ usage (void) " fuser -V\n\n" " -a display unused files too\n" " -c mounted FS\n" - " -f silently ignored (for POSIX compatibility\n" + " -f silently ignored (for POSIX compatibility)\n" " -k kill processes accessing that file\n" " -i ask before killing (ignored without -k)\n" " -l list signal names\n" @@ -1177,7 +1186,7 @@ main (int argc, char **argv) if (!parse_inet (*argv, this_name_space->name, &lcl_port, &rmt_addr, &rmt_port)) { - fprintf (stderr, _("%s/%s: invalid specificiation\n"), *argv, + fprintf (stderr, _("%s/%s: invalid specification\n"), *argv, this_name_space->name); continue; } diff --git a/src/killall.c b/src/killall.c index 1e9ef67..96617d9 100644 --- a/src/killall.c +++ b/src/killall.c @@ -48,24 +48,32 @@ static int verbose = 0, exact = 0, interactive = 0, static int ask (char *name, pid_t pid) { - int ch, c; - - do - { - printf (_("Kill %s(%s%d) ? (y/n) "), name, process_group ? "pgid " : "", - pid); - fflush (stdout); - do - if ((ch = getchar ()) == EOF) - exit (0); - while (ch == '\n' || ch == '\t' || ch == ' '); - do - if ((c = getchar ()) == EOF) - exit (0); - while (c != '\n'); + int res; + size_t len; + char *line; + + line = NULL; + len = 0; + + do { + printf (_("Kill %s(%s%d) ? (y/N) "), name, process_group ? "pgid " : "", + pid); + fflush (stdout); + + if (getline (&line, &len, stdin) < 0) + return 0; + /* Check for default */ + if (line[0] == '\n') { + free(line); + return 0; + } + res = rpmatch(line); + if (res >= 0) { + free(line); + return res; } - while (ch != 'y' && ch != 'n' && ch != 'Y' && ch != 'N'); - return ch == 'y' || ch == 'Y'; + } while(1); + /* Never should get here */ } #ifdef FLASK_LINUX