diff -ruN old/mc-4.5.45/VERSION new/mc-4.5.46/VERSION --- old/mc-4.5.45/VERSION Tue May 9 18:52:01 2000 +++ new/mc-4.5.46/VERSION Wed May 10 18:58:00 2000 @@ -1 +1 @@ -#define VERSION "4.5.45" +#define VERSION "4.5.46" diff -ruN old/mc-4.5.45/aclocal.m4 new/mc-4.5.46/aclocal.m4 --- old/mc-4.5.45/aclocal.m4 Tue May 9 18:52:01 2000 +++ new/mc-4.5.46/aclocal.m4 Wed May 10 18:58:00 2000 @@ -1,1852 +1,2468 @@ -dnl -dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits]) -dnl -dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh -dnl is not found. -dnl +dnl aclocal.m4 generated automatically by aclocal 1.4 -AC_DEFUN([GNOME_INIT_HOOK],[ - AC_SUBST(GNOME_LIBS) - AC_SUBST(GNOMEUI_LIBS) - AC_SUBST(GNOMEGNORBA_LIBS) - AC_SUBST(GTKXMHTML_LIBS) - AC_SUBST(ZVT_LIBS) - AC_SUBST(GNOME_LIBDIR) - AC_SUBST(GNOME_INCLUDEDIR) +dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. - AC_ARG_WITH(gnome-includes, - [ --with-gnome-includes Specify location of GNOME headers],[ - CFLAGS="$CFLAGS -I$withval" - ]) - - AC_ARG_WITH(gnome-libs, - [ --with-gnome-libs Specify location of GNOME libs],[ - LDFLAGS="$LDFLAGS -L$withval" - gnome_prefix=$withval - ]) +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. - AC_ARG_WITH(gnome, - [ --with-gnome Specify prefix for GNOME files], - if test x$withval = xyes; then - want_gnome=yes - dnl Note that an empty true branch is not - dnl valid sh syntax. - ifelse([$1], [], :, [$1]) - else - if test "x$withval" = xno; then - want_gnome=no - else - want_gnome=yes - LDFLAGS="$LDFLAGS -L$withval/lib" - CFLAGS="$CFLAGS -I$withval/include" - gnome_prefix=$withval/lib - fi - fi, - want_gnome=yes) +dnl +dnl XView & SlingShot library checking +dnl (c) 1995 Jakub Jelinek +dnl - if test "x$want_gnome" = xyes; then +dnl Set xview_includes, xview_libraries, and no_xview (initially yes). +dnl Also sets xview_no_private_headers to yes if there are no xview_private +dnl headers in the system. +AC_DEFUN(AC_PATH_XVIEW, +[ +no_xview=yes +AC_ARG_WITH(xview, [--with-xview Use the XView toolkit],no_xview=) - AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) - if test "$GNOME_CONFIG" = "no"; then - no_gnome_config="yes" - else - AC_MSG_CHECKING(if $GNOME_CONFIG works) - if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then - AC_MSG_RESULT(yes) - GNOME_GNORBA_HOOK([],$2) - GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`" - GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`" - GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" - GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" - ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" - GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" - GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" - $1 - else - AC_MSG_RESULT(no) - no_gnome_config="yes" - fi - fi +AC_ARG_WITH(xview-includes, [--with-xview-includes=path Specifies XView includes directory], +[ +if test x$withval = xyes; then + AC_MSG_WARN(Usage is: --with-xview-includes=path) + xview_includes=NONE + no_xview= +else + xview_includes=$withval +fi +], +[ +xview_includes=NONE +])dnl +AC_ARG_WITH(xview-libraries, [--with-xview-libraries=path Specifies XView libraries directory], +[ +if test x$withval = xyes; then + AC_MSG_WARN(Usage is: --with-xview-libraries=path) + xview_libraries=NONE + no_xview= +else + xview_libraries=$withval +fi +], +[ +xview_libraries=NONE +])dnl - if test x$exec_prefix = xNONE; then - if test x$prefix = xNONE; then - gnome_prefix=$ac_default_prefix/lib - else - gnome_prefix=$prefix/lib - fi - else - gnome_prefix=`eval echo \`echo $libdir\`` - fi - - if test "$no_gnome_config" = "yes"; then - AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix) - if test -f $gnome_prefix/gnomeConf.sh; then - AC_MSG_RESULT(found) - echo "loading gnome configuration from" \ - "$gnome_prefix/gnomeConf.sh" - . $gnome_prefix/gnomeConf.sh - $1 - else - AC_MSG_RESULT(not found) - if test x$2 = xfail; then - AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) - fi - fi - fi - fi +if test "$no_xview" != yes; then + if test "$no_x" = yes; then + no_xview=yes + fi +fi +if test "$no_xview" != yes; then +AC_MSG_CHECKING(for XView) +if test x$xview_libraries = xNONE; then + if test x$xview_includes = xNONE; then +AC_CACHE_VAL(ac_cv_path_xview, +[ + no_xview=yes +AC_PATH_XVIEW_XMKMF + if test "x$no_xview" = xyes; then +AC_PATH_XVIEW_DIRECT + fi + if test "x$no_xview" = xyes; then + ac_cv_path_xview="no_xview=yes" + else + ac_cv_path_xview="no_xview= ac_xview_includes=$ac_xview_includes ac_xview_libraries=$ac_xview_libraries ac_xview_no_private_headers=$ac_xview_no_private_headers" + fi +])dnl + eval "$ac_cv_path_xview" + fi +fi - if test -n "$3"; then - n="$3" - for i in $n; do - AC_MSG_CHECKING(extra library \"$i\") - case $i in - applets) - AC_SUBST(GNOME_APPLETS_LIBS) - GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` - AC_MSG_RESULT($GNOME_APPLETS_LIBS);; - docklets) - AC_SUBST(GNOME_DOCKLETS_LIBS) - GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets` - AC_MSG_RESULT($GNOME_DOCKLETS_LIBS);; - capplet) - AC_SUBST(GNOME_CAPPLET_LIBS) - GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` - AC_MSG_RESULT($GNOME_CAPPLET_LIBS);; - *) - AC_MSG_RESULT(unknown library) - esac - done +if test "x$no_xview" = xyes; then + AC_MSG_RESULT(no) +else + if test "x$xview_includes" = x || test "x$xview_includes" = xNONE; then + xview_includes=$ac_xview_includes + fi + if test "x$xview_libraries" = x || test "x$xview_libraries" = xNONE; then + xview_libraries=$ac_xview_libraries + fi + xview_no_private_headers=$ac_xview_no_private_headers + ac_cv_path_xview="no_xview= ac_xview_includes=$xview_includes ac_xview_libraries=$xview_libraries ac_xview_no_private_headers=$ac_xview_no_private_headers" + if test "x$xview_libraries" != x; then + ac_msg_xview="libraries $xview_libraries" + else + ac_msg_xview="" + fi + if test "x$xview_includes" != x; then + if test "x$ac_msg_xview" != x; then + ac_msg_xview="$ac_msg_xview, " + fi + ac_msg_xview="${ac_msg_xview}headers $xview_includes" + fi + if test "x$xview_no_private_headers" = xyes; then + if test "x$ac_msg_xview" != x; then + ac_msg_xview="$ac_msg_xview, " fi + ac_msg_xview="${ac_msg_xview}without xview_private headers" + fi + AC_MSG_RESULT([$ac_msg_xview]) +fi +fi ]) -dnl -dnl GNOME_INIT ([additional-inits]) -dnl - -AC_DEFUN([GNOME_INIT],[ - GNOME_INIT_HOOK([],fail,$1) +dnl Internal subroutine of AC_PATH_XVIEW +dnl Set ac_xview_includes, ac_xview_libraries, and no_xview (initially yes). +AC_DEFUN(AC_PATH_XVIEW_XMKMF, +[rm -fr conftestdir +if mkdir conftestdir; then + cd conftestdir + # Make sure to not put "make" in the Imakefile rules, since we grep it out. + cat > Imakefile <<'EOF' +#include +acfindxv: + @echo 'ac_im_library_dest="${LIBRARY_DEST}"; ac_im_header_dest="${HEADER_DEST}"' +EOF + if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then + no_xview= + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + eval `make acfindxv 2>/dev/null | grep -v make` + # Screen out bogus values from the imake configuration. + if test -f "$ac_im_header_dest/xview/xview.h"; then + ac_xview_includes="$ac_im_header_dest" + else + no_xview=yes + fi + if test -d "$ac_im_library_dest"; then + ac_xview_libraries="$ac_im_library_dest" + else + no_xview=yes + fi + fi + if test "x$no_xview" != xyes; then + if test -f "$ac_xview_includes/xview_private/draw_impl.h"; then + ac_xview_no_private_headers= + else + ac_xview_no_private_headers=yes + fi + fi + cd .. + rm -fr conftestdir +fi ]) -dnl GNOME_VFS_CHECKS -dnl Check for various functions needed by libvfs. -dnl This has various effects: -dnl Sets GNOME_VFS_LIBS to libraries required -dnl Sets termnet to true or false depending on whether it is required. -dnl If yes, defines USE_TERMNET. -dnl Sets vfs_flags to "pretty" list of vfs implementations we include. -dnl Sets shell variable use_vfs to yes (default, --with-vfs) or -dnl "no" (--without-vfs). -dnl Calls AC_SUBST(mcserv), which is either empty or "mcserv". - -dnl Private define -AC_DEFUN([GNOME_WITH_VFS],[ - dnl FIXME: network checks should probably be in their own macro. - AC_CHECK_LIB(nsl, t_accept) - AC_CHECK_LIB(socket, socket) - - have_socket=no - AC_CHECK_FUNCS(socket, have_socket=yes) - if test $have_socket = no; then - # socket is not in the default libraries. See if it's in some other. - for lib in bsd socket inet; do - AC_CHECK_LIB($lib, socket, [ - LIBS="$LIBS -l$lib" - have_socket=yes - AC_DEFINE(HAVE_SOCKET) - break]) - done - fi - have_gethostbyname=no - AC_CHECK_FUNC(gethostbyname, have_gethostbyname=yes) - if test $have_gethostbyname = no; then - # gethostbyname is not in the default libraries. See if it's in some other. - for lib in bsd socket inet; do - AC_CHECK_LIB($lib, gethostbyname, [LIBS="$LIBS -l$lib"; have_gethostbyname=yes; break]) - done - fi +dnl Internal subroutine of AC_PATH_XVIEW +dnl Set ac_xview_includes, ac_xview_libraries, and no_xview (initially yes). +AC_DEFUN(AC_PATH_XVIEW_DIRECT, +[test -z "$xview_direct_test_library" && xview_direct_test_library=xview +test -z "$xview_direct_test_function" && xview_direct_test_function=xv_unique_key +test -z "$xview_direct_test_include" && xview_direct_test_include=xview/xview.h +AC_TRY_CPP([#include <$xview_direct_test_include>], +[no_xview= ac_xview_includes=], +[ for ac_dir in \ + $OPENWINHOME/include \ + /usr/openwin/include \ + /usr/openwin/share/include \ + \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ + \ + /usr/include/X11R6 \ + /usr/include/X11R5 \ + /usr/include/X11R4 \ + \ + /usr/local/X11R6/include \ + /usr/local/X11R5/include \ + /usr/local/X11R4/include \ + \ + /usr/local/include/X11R6 \ + /usr/local/include/X11R5 \ + /usr/local/include/X11R4 \ + \ + /usr/X11/include \ + /usr/include/X11 \ + /usr/local/X11/include \ + /usr/local/include/X11 \ + \ + /usr/X386/include \ + /usr/x386/include \ + /usr/XFree86/include/X11 \ + \ + /usr/include \ + /usr/local/include \ + /usr/unsupported/include \ + /usr/athena/include \ + /usr/local/x11r5/include \ + /usr/lpp/Xamples/include \ + ; \ + do + if test -r "$ac_dir/$xview_direct_test_include"; then + no_xview= ac_xview_includes=$ac_dir + break + fi + done]) - vfs_flags="tarfs" - use_net_code=false - if test $have_socket = yes; then - AC_STRUCT_LINGER - AC_CHECK_FUNCS(pmap_set, , [ - AC_CHECK_LIB(rpc, pmap_set, [ - LIBS="-lrpc $LIBS" - AC_DEFINE(HAVE_PMAP_SET) - ])]) - AC_CHECK_FUNCS(pmap_getport pmap_getmaps rresvport) - dnl add for source routing support setsockopt - AC_CHECK_HEADERS(rpc/pmap_clnt.h) - vfs_flags="$vfs_flags, mcfs, ftpfs, fish" - use_net_code=true - fi +if test "x$no_xview" != xyes; then + if test "x$ac_xview_includes" != x; then + if test -f "$ac_xview_includes/xview_private/draw_impl.h"; then + ac_xview_no_private_headers= + else + ac_xview_no_private_headers=yes + fi + else +AC_TRY_CPP([#include ], +[ac_xview_no_private_headers=],[ac_xview_no_private_headers=yes]) + fi +fi - dnl - dnl Samba support - dnl - smbfs="" - SAMBAFILES="" - AC_ARG_WITH(samba, - [--with-samba Support smb virtual file system],[ - if test "x$withval != xno"; then - AC_DEFINE(WITH_SMBFS) - vfs_flags="$vfs_flags, smbfs" - smbfs="smbfs.o" - SAMBAFILES="\$(SAMBAFILES)" - fi - ]) - AC_SUBST(smbfs) - AC_SUBST(SAMBAFILES) - - dnl - dnl The termnet support - dnl - termnet=false - AC_ARG_WITH(termnet, - [--with-termnet If you want a termified net support],[ - if test x$withval = xyes; then - AC_DEFINE(USE_TERMNET) - termnet=true - fi - ]) +# Check for the libraries. +# See if we find them without any special options. +# Don't add to $LIBS permanently. +ac_save_LIBS="$LIBS" +ac_save_LDFLAGS="$LDFLAGS" +LDFLAGS="$LDFLAGS $X_LIBS" +LIBS="-l$xview_direct_test_library -lolgx $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" +AC_TRY_LINK([#include <$xview_direct_test_include> +], [${xview_direct_test_function}()], +[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" no_xview= ac_xview_libraries=], +[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" +# First see if replacing the include by lib works. +for ac_dir in `echo "$ac_xview_includes" | sed s/include/lib/` \ + $OPENWINHOME/lib \ + $OPENWINHOME/share/lib \ + /usr/openwin/lib \ + /usr/openwin/share/lib \ + \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ + \ + /usr/lib/X11R6 \ + /usr/lib/X11R5 \ + /usr/lib/X11R4 \ + \ + /usr/local/X11R6/lib \ + /usr/local/X11R5/lib \ + /usr/local/X11R4/lib \ + \ + /usr/local/lib/X11R6 \ + /usr/local/lib/X11R5 \ + /usr/local/lib/X11R4 \ + \ + /usr/X11/lib \ + /usr/lib/X11 \ + /usr/local/X11/lib \ + /usr/local/lib/X11 \ + \ + /usr/X386/lib \ + /usr/x386/lib \ + /usr/XFree86/lib/X11 \ + \ + /usr/lib \ + /usr/local/lib \ + /usr/unsupported/lib \ + /usr/athena/lib \ + /usr/local/x11r5/lib \ + /usr/lpp/Xamples/lib \ + ; \ +do + for ac_extension in a so sl; do + if test -r $ac_dir/lib${xview_direct_test_library}.$ac_extension; then + no_xview= ac_xview_libraries=$ac_dir + break 2 + fi + done +done])]) - TERMNET="" - AC_DEFINE(USE_VFS) - if $use_net_code; then - AC_DEFINE(USE_NETCODE) - fi - mcserv= - if test $have_socket = yes; then - mcserv="mcserv" - if $termnet; then - TERMNET="-ltermnet" - fi +dnl Substitute XVIEW_LIBS and XVIEW_CFLAGS and +dnl HAVE_XVIEW, which is either yes or no. +dnl Both contain X_LIBS resp. X_CFLAGS inside +dnl Also substitutes HAVE_XVIEW_PRIVATE_HEADERS +dnl if there are xview_private headers in the system +AC_DEFUN(AC_PATH_XVIEW_XTRA, +[AC_REQUIRE([AC_PATH_XVIEW])dnl +if test "$no_xview" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + XVIEW_CFLAGS="$X_CFGLAGS $XVIEW_CFLAGS -DXVIEW_MISSING" +else + if test -n "$xview_includes"; then + XVIEW_CFLAGS="$X_CFLAGS $XVIEW_CFGLAGS" + if test "$xview_includes" != "$x_includes"; then + XVIEW_CPPFLAGS="-I$xview_includes" + fi fi - AC_SUBST(TERMNET) - AC_SUBST(mcserv) - -dnl FIXME: -dnl GNOME_VFS_LIBS= - -]) - -AC_DEFUN([GNOME_VFS_CHECKS],[ - use_vfs=yes - AC_ARG_WITH(vfs, - [--with-vfs Compile with the VFS code], - use_vfs=$withval - ) - case $use_vfs in - yes) GNOME_WITH_VFS;; - no) use_vfs=no;; - *) use_vfs=no;; - dnl Should we issue a warning? - esac -]) - - -dnl GNOME_UNDELFS_CHECKS -dnl Check for ext2fs undel support. -dnl Set shell variable ext2fs_undel to "yes" if we have it, -dnl "no" otherwise. May define USE_EXT2FSLIB for cpp. -dnl Will set EXT2FS_UNDEL_LIBS to required libraries. - -AC_DEFUN([GNOME_UNDELFS_CHECKS], [ - AC_CHECK_HEADERS(ext2fs/ext2fs.h linux/ext2_fs.h) - ext2fs_undel=no - EXT2FS_UNDEL_LIBS= - if test x$ac_cv_header_ext2fs_ext2fs_h = xyes - then - if test x$ac_cv_header_linux_ext2_fs_h = xyes - then - AC_DEFINE(USE_EXT2FSLIB) - ext2fs_undel=yes - EXT2FS_UNDEL_LIBS="-lext2fs -lcom_err" + # It would be nice to have a more robust check for the -R ld option than + # just checking for Solaris. + # It would also be nice to do this for all -L options, not just this one. + if test -n "$xview_libraries"; then + if test "$xview_libraries" = "$x_libraries"; then + XVIEW_LIBS="$X_LIBS $XVIEW_LIBS" + else + XVIEW_LIBS="$X_LIBS $XVIEW_LIBS -L$xview_libraries" + if test "`(uname) 2>/dev/null`" = SunOS && + uname -r | grep '^5' >/dev/null; then + XVIEW_LIBS="$XVIEW_LIBS -R$xview_libraries" + fi fi fi -]) -dnl -dnl Check for struct linger -dnl -AC_DEFUN(AC_STRUCT_LINGER, [ -av_struct_linger=no -AC_MSG_CHECKING(struct linger is available) -AC_TRY_RUN([ -#include -#include +fi +if test "x$no_xview" = xyes; then + HAVE_XVIEW=no +else + HAVE_XVIEW=yes +fi +if test "x$xview_no_private_headers" = xyes; then + HAVE_XVIEW_PRIVATE_HEADERS=no +else + HAVE_XVIEW_PRIVATE_HEADERS=yes +fi +AC_SUBST(XVIEW_CFLAGS)dnl +AC_SUBST(XVIEW_CPPFLAGS)dnl +AC_SUBST(XVIEW_LIBS)dnl +AC_SUBST(HAVE_XVIEW)dnl +AC_SUBST(HAVE_XVIEW_PRIVATE_HEADERS)dnl +])dnl -struct linger li; +dnl Internal subroutine of AC_PATH_SLINGSHOT +AC_DEFUN(AC_PATH_SLINGSHOT_DIRECT, +[ +AC_TRY_CPP([#include ],[no_ss= ac_ss_includes=], +[ for ac_dir in \ + $OPENWINHOME/include \ + /usr/openwin/include \ + /usr/openwin/share/include \ + \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ + \ + /usr/include/X11R6 \ + /usr/include/X11R5 \ + /usr/include/X11R4 \ + \ + /usr/local/X11R6/include \ + /usr/local/X11R5/include \ + /usr/local/X11R4/include \ + \ + /usr/local/include/X11R6 \ + /usr/local/include/X11R5 \ + /usr/local/include/X11R4 \ + \ + /usr/X11/include \ + /usr/include/X11 \ + /usr/local/X11/include \ + /usr/local/include/X11 \ + \ + /usr/X386/include \ + /usr/x386/include \ + /usr/XFree86/include/X11 \ + \ + /usr/include \ + /usr/local/include \ + /usr/unsupported/include \ + /usr/athena/include \ + /usr/local/x11r5/include \ + /usr/lpp/Xamples/include \ + ; \ + do + if test -r "$ac_dir/sspkg/rectobj.h"; then + no_ss= ac_ss_includes=$ac_dir + break + fi + done]) -main () -{ - li.l_onoff = 1; - li.l_linger = 120; - exit (0); -} -],[ -AC_DEFINE(HAVE_STRUCT_LINGER) -av_struct_linger=yes -],[ -av_struct_linger=no -],[ -av_struct_linger=no -]) -AC_MSG_RESULT($av_struct_linger) -]) -dnl -dnl XView & SlingShot library checking -dnl (c) 1995 Jakub Jelinek -dnl +# Check for the libraries. +# See if we find them without any special options. +# Don't add to $LIBS permanently. +ac_save_LIBS="$LIBS" +ac_save_LDFLAGS="$LDFLAGS" +LDFLAGS="$LDFLAGS $XVIEW_LIBS" +LIBS="-lsspkg -lm -lxview -lolgx $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" +AC_TRY_LINK([#include +], [rectobj_get_selected_list()], +[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" no_ss= ac_ss_libraries=], +[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" +# First see if replacing the include by lib works. +for ac_dir in `echo "$ac_ss_includes" | sed s/include/lib/` \ + $OPENWINHOME/lib \ + $OPENWINHOME/share/lib \ + /usr/openwin/lib \ + /usr/openwin/share/lib \ + \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ + \ + /usr/lib/X11R6 \ + /usr/lib/X11R5 \ + /usr/lib/X11R4 \ + \ + /usr/local/X11R6/lib \ + /usr/local/X11R5/lib \ + /usr/local/X11R4/lib \ + \ + /usr/local/lib/X11R6 \ + /usr/local/lib/X11R5 \ + /usr/local/lib/X11R4 \ + \ + /usr/X11/lib \ + /usr/lib/X11 \ + /usr/local/X11/lib \ + /usr/local/lib/X11 \ + \ + /usr/X386/lib \ + /usr/x386/lib \ + /usr/XFree86/lib/X11 \ + \ + /usr/lib \ + /usr/local/lib \ + /usr/unsupported/lib \ + /usr/athena/lib \ + /usr/local/x11r5/lib \ + /usr/lpp/Xamples/lib \ + ; \ +do + for ac_extension in a so sl; do + if test -r $ac_dir/libsspkg.$ac_extension; then + no_ss= ac_ss_libraries=$ac_dir + break 2 + fi + done +done])]) -dnl Set xview_includes, xview_libraries, and no_xview (initially yes). -dnl Also sets xview_no_private_headers to yes if there are no xview_private -dnl headers in the system. -AC_DEFUN(AC_PATH_XVIEW, -[ -no_xview=yes -AC_ARG_WITH(xview, [--with-xview Use the XView toolkit],no_xview=) +dnl Set ss_includes, ss_libraries, and no_ss (initially yes). +AC_DEFUN(AC_PATH_SLINGSHOT, +[AC_REQUIRE([AC_PATH_XVIEW_XTRA])dnl +AC_MSG_CHECKING(for SlingShot) +AC_ARG_WITH(ss, [--with-ss Use the SlingShot extension]) -AC_ARG_WITH(xview-includes, [--with-xview-includes=path Specifies XView includes directory], +AC_ARG_WITH(ss-includes, [--with-ss-includes=path Specifies SlingShot includes directory], [ if test x$withval = xyes; then - AC_MSG_WARN(Usage is: --with-xview-includes=path) - xview_includes=NONE - no_xview= + AC_MSG_WARN(Usage is: --with-ss-includes=path) + ss_includes=NONE else - xview_includes=$withval + ss_includes=$withval fi ], [ -xview_includes=NONE +ss_includes=NONE ])dnl -AC_ARG_WITH(xview-libraries, [--with-xview-libraries=path Specifies XView libraries directory], +AC_ARG_WITH(ss-libraries, [--with-ss-libraries=path Specifies SlingShot libraries directory], [ if test x$withval = xyes; then - AC_MSG_WARN(Usage is: --with-xview-libraries=path) - xview_libraries=NONE - no_xview= + AC_MSG_WARN(Usage is: --with-ss-libraries=path) + ss_libraries=NONE else - xview_libraries=$withval + ss_libraries=$withval fi ], [ -xview_libraries=NONE +ss_libraries=NONE ])dnl -if test "$no_xview" != yes; then - if test "$no_x" = yes; then - no_xview=yes +if test "x$with_ss" = xno; then + no_ss=yes +else + if test "x$ss_includes" != xNONE && test "x$ss_libraries" != xNONE; then + no_ss= + else +AC_CACHE_VAL(ac_cv_path_ss, +[ + no_ss=yes +AC_PATH_SLINGSHOT_DIRECT + if test "x$no_ss" = xyes; then + ac_cv_path_ss="ac_noss=yes" + else + ac_cv_path_ss="ac_ss_includes=$ac_ss_includes ac_ss_libraries=$ac_ss_libraries" + fi +])dnl + eval "$ac_cv_path_ss" fi fi -if test "$no_xview" != yes; then -AC_MSG_CHECKING(for XView) -if test x$xview_libraries = xNONE; then - if test x$xview_includes = xNONE; then -AC_CACHE_VAL(ac_cv_path_xview, -[ - no_xview=yes -AC_PATH_XVIEW_XMKMF - if test "x$no_xview" = xyes; then -AC_PATH_XVIEW_DIRECT +fi +if test "x$no_ss" = xyes; then + AC_MSG_RESULT(no) +else + if test "x$ss_includes" = x || test "x$ss_includes" = xNONE; then + ss_includes=$ac_ss_includes fi - if test "x$no_xview" = xyes; then - ac_cv_path_xview="no_xview=yes" + if test "x$ss_libraries" = x || test "x$ss_libraries" = xNONE; then + ss_libraries=$ac_ss_libraries + fi + ac_cv_path_ss="no_ss= ac_ss_includes=$ss_includes ac_ss_libraries=$ss_libraries" + if test "x$ss_libraries" = x; then + if test "x$ss_includes" = x; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT([headers $ss_includes]) + fi else - ac_cv_path_xview="no_xview= ac_xview_includes=$ac_xview_includes ac_xview_libraries=$ac_xview_libraries ac_xview_no_private_headers=$ac_xview_no_private_headers" + if test "x$ss_includes" = x; then + AC_MSG_RESULT([libraries $ss_libraries]) + else + AC_MSG_RESULT([libraries $ss_libraries, headers $ss_includes]) + fi + fi +fi +]) + +dnl Substitute SLINGSHOT_LIBS and SLINGSHOT_CFLAGS and +dnl HAVE_SLINGSHOT, which is either yes or no. +dnl Both contain XVIEW_LIBS resp. XVIEW_CFLAGS inside +AC_DEFUN(AC_PATH_SLINGSHOT_XTRA, +[AC_REQUIRE([AC_PATH_SLINGSHOT])dnl +if test "$no_ss" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + SLINGSHOT_CFLAGS="$XVIEW_CFGLAGS $SLINGSHOT_CFLAGS -DSLINGSHOT_MISSING" +else + if test -n "$ss_includes"; then + SLINGSHOT_CFLAGS="$XVIEW_CFLAGS $SLINGSHOT_CFGLAGS -I$ss_includes" + fi + + # It would be nice to have a more robust check for the -R ld option than + # just checking for Solaris. + # It would also be nice to do this for all -L options, not just this one. + if test -n "$ss_libraries"; then + SLINGSHOT_LIBS="$XVIEW_LIBS $SLINGSHOT_LIBS -L$ss_libraries" + if test "`(uname) 2>/dev/null`" = SunOS && + uname -r | grep '^5' >/dev/null; then + SLINGSHOT_LIBS="$SLINGSHOT_LIBS -R$ss_libraries" fi + fi +fi +if test "x$no_ss" = xyes; then + HAVE_SLINGSHOT=no +else + HAVE_SLINGSHOT=yes +fi +AC_SUBST(SLINGSHOT_CFLAGS)dnl +AC_SUBST(SLINGSHOT_LIBS)dnl +AC_SUBST(HAVE_SLINGSHOT)dnl ])dnl - eval "$ac_cv_path_xview" + +dnl +dnl XView library checking end +dnl + +dnl +dnl Check for size of d_name dirent member +dnl +AC_DEFUN(AC_SHORT_D_NAME_LEN, [ +AC_MSG_CHECKING(filename fits on dirent.d_name) +AC_CACHE_VAL(ac_cv_dnamesize, [ +OCFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -I$srcdir" +AC_TRY_RUN([ +#include + +main () +{ + struct dirent ddd; + + if (sizeof (ddd.d_name) < 12) + exit (0); + else + exit (1); +} + +],[ + ac_cv_dnamesize="no" +], [ + ac_cv_dnamesize="yes" +], [ +# Cannot find out, so assume no + ac_cv_dnamesize="no" +]) +CFLAGS="$OCFLAGS" +]) +if test x$ac_cv_dnamesize = xno; then + AC_DEFINE(NEED_EXTRA_DIRENT_BUFFER) +fi +AC_MSG_RESULT($ac_cv_dnamesize) +]) + +dnl +dnl Filesystem information detection +dnl +dnl To get information about the disk, mount points, etc. +dnl + +AC_DEFUN(AC_GET_FS_INFO, [ + AC_CHECK_HEADERS(fcntl.h sys/dustat.h sys/param.h sys/statfs.h sys/fstyp.h) + AC_CHECK_HEADERS(mnttab.h mntent.h utime.h sys/statvfs.h sys/vfs.h) + AC_CHECK_HEADERS(sys/mount.h sys/filsys.h sys/fs_types.h) + AC_CHECK_FUNCS(getmntinfo) + + dnl This configure.in code has been stolen from GNU fileutils-3.12. Its + dnl job is to detect a method to get list of mounted filesystems. + + AC_MSG_CHECKING([for d_ino member in directory struct]) + AC_CACHE_VAL(fu_cv_sys_d_ino_in_dirent, + [AC_TRY_LINK([ +#include +#ifdef HAVE_DIRENT_H +# include +#else /* not HAVE_DIRENT_H */ +# define dirent direct +# ifdef HAVE_SYS_NDIR_H +# include +# endif /* HAVE_SYS_NDIR_H */ +# ifdef HAVE_SYS_DIR_H +# include +# endif /* HAVE_SYS_DIR_H */ +# ifdef HAVE_NDIR_H +# include +# endif /* HAVE_NDIR_H */ +#endif /* HAVE_DIRENT_H */ + ], + [struct dirent dp; dp.d_ino = 0;], + fu_cv_sys_d_ino_in_dirent=yes, + fu_cv_sys_d_ino_in_dirent=no)]) + AC_MSG_RESULT($fu_cv_sys_d_ino_in_dirent) + if test $fu_cv_sys_d_ino_in_dirent = yes; then + AC_DEFINE(D_INO_IN_DIRENT) + fi + + # Determine how to get the list of mounted filesystems. + list_mounted_fs= + + # If the getmntent function is available but not in the standard library, + # make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX). + AC_FUNC_GETMNTENT + + if test $ac_cv_func_getmntent = yes; then + + # This system has the getmntent function. + # Determine whether it's the one-argument variant or the two-argument one. + + if test -z "$list_mounted_fs"; then + # SVR4 + AC_MSG_CHECKING([for two-argument getmntent function]) + AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2, + [AC_EGREP_HEADER(getmntent, sys/mnttab.h, + fu_cv_sys_mounted_getmntent2=yes, + fu_cv_sys_mounted_getmntent2=no)]) + AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2) + if test $fu_cv_sys_mounted_getmntent2 = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_GETMNTENT2) + fi + fi + + if test -z "$list_mounted_fs"; then + # 4.3BSD, SunOS, HP-UX, Dynix, Irix + AC_MSG_CHECKING([for one-argument getmntent function]) + AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1, + [test $ac_cv_header_mntent_h = yes \ + && fu_cv_sys_mounted_getmntent1=yes \ + || fu_cv_sys_mounted_getmntent1=no]) + AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1) + if test $fu_cv_sys_mounted_getmntent1 = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_GETMNTENT1) + fi + fi + + if test -z "$list_mounted_fs"; then + AC_WARN([could not determine how to read list of mounted fs]) + CPPFLAGS="$CPPFLAGS -DNO_INFOMOUNT" + fi + fi -fi -if test "x$no_xview" = xyes; then - AC_MSG_RESULT(no) -else - if test "x$xview_includes" = x || test "x$xview_includes" = xNONE; then - xview_includes=$ac_xview_includes + if test -z "$list_mounted_fs"; then + # DEC Alpha running OSF/1. + AC_MSG_CHECKING([for getfsstat function]) + AC_CACHE_VAL(fu_cv_sys_mounted_getsstat, + [AC_TRY_LINK([ +#include +#include +#include ], + [struct statfs *stats; + numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ], + fu_cv_sys_mounted_getsstat=yes, + fu_cv_sys_mounted_getsstat=no)]) + AC_MSG_RESULT($fu_cv_sys_mounted_getsstat) + if test $fu_cv_sys_mounted_getsstat = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_GETFSSTAT) + fi fi - if test "x$xview_libraries" = x || test "x$xview_libraries" = xNONE; then - xview_libraries=$ac_xview_libraries + + if test -z "$list_mounted_fs"; then + # AIX. + AC_MSG_CHECKING([for mntctl function and struct vmount]) + AC_CACHE_VAL(fu_cv_sys_mounted_vmount, + [AC_TRY_CPP([#include ], + fu_cv_sys_mounted_vmount=yes, + fu_cv_sys_mounted_vmount=no)]) + AC_MSG_RESULT($fu_cv_sys_mounted_vmount) + if test $fu_cv_sys_mounted_vmount = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_VMOUNT) + fi fi - xview_no_private_headers=$ac_xview_no_private_headers - ac_cv_path_xview="no_xview= ac_xview_includes=$xview_includes ac_xview_libraries=$xview_libraries ac_xview_no_private_headers=$ac_xview_no_private_headers" - if test "x$xview_libraries" != x; then - ac_msg_xview="libraries $xview_libraries" - else - ac_msg_xview="" + + if test -z "$list_mounted_fs"; then + # SVR3 + AC_MSG_CHECKING([for existence of three headers]) + AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp, + [AC_TRY_CPP([ +#include +#include +#include ], + fu_cv_sys_mounted_fread_fstyp=yes, + fu_cv_sys_mounted_fread_fstyp=no)]) + AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp) + if test $fu_cv_sys_mounted_fread_fstyp = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_FREAD_FSTYP) + fi fi - if test "x$xview_includes" != x; then - if test "x$ac_msg_xview" != x; then - ac_msg_xview="$ac_msg_xview, " + + if test -z "$list_mounted_fs"; then + # 4.4BSD and DEC OSF/1. + AC_MSG_CHECKING([for getmntinfo function]) + AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo, + [ + ok= + if test $ac_cv_func_getmntinfo = yes; then + AC_EGREP_HEADER(f_type;, sys/mount.h, + ok=yes) + fi + test -n "$ok" \ + && fu_cv_sys_mounted_getmntinfo=yes \ + || fu_cv_sys_mounted_getmntinfo=no + ]) + AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo) + if test $fu_cv_sys_mounted_getmntinfo = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_GETMNTINFO) + AC_MSG_CHECKING([if struct statfs has f_fstypename]) + AC_CACHE_VAL(fu_cv_sys_mounted_f_fstypename, + [ + AC_EGREP_HEADER(f_type;, sys/mount.h, ok=yes, ok=) + test -n "$ok" \ + && fu_cv_sys_mounted_f_fstypename=yes \ + || fu_cv_sys_mounted_f_fstypename=no + ]) + AC_MSG_RESULT($fu_cv_sys_mounted_f_fstypename) + if test $fu_cv_sys_mounted_f_fstypename = yes; then + AC_DEFINE(HAVE_F_FSTYPENAME) fi - ac_msg_xview="${ac_msg_xview}headers $xview_includes" + fi fi - if test "x$xview_no_private_headers" = xyes; then - if test "x$ac_msg_xview" != x; then - ac_msg_xview="$ac_msg_xview, " - fi - ac_msg_xview="${ac_msg_xview}without xview_private headers" - fi - AC_MSG_RESULT([$ac_msg_xview]) -fi -fi -]) -dnl Internal subroutine of AC_PATH_XVIEW -dnl Set ac_xview_includes, ac_xview_libraries, and no_xview (initially yes). -AC_DEFUN(AC_PATH_XVIEW_XMKMF, -[rm -fr conftestdir -if mkdir conftestdir; then - cd conftestdir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat > Imakefile <<'EOF' -#include -acfindxv: - @echo 'ac_im_library_dest="${LIBRARY_DEST}"; ac_im_header_dest="${HEADER_DEST}"' -EOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - no_xview= - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `make acfindxv 2>/dev/null | grep -v make` - # Screen out bogus values from the imake configuration. - if test -f "$ac_im_header_dest/xview/xview.h"; then - ac_xview_includes="$ac_im_header_dest" - else - no_xview=yes - fi - if test -d "$ac_im_library_dest"; then - ac_xview_libraries="$ac_im_library_dest" - else - no_xview=yes + if test -z "$list_mounted_fs"; then + # Ultrix + AC_MSG_CHECKING([for getmnt function]) + AC_CACHE_VAL(fu_cv_sys_mounted_getmnt, + [AC_TRY_CPP([ +#include +#include ], + fu_cv_sys_mounted_getmnt=yes, + fu_cv_sys_mounted_getmnt=no)]) + AC_MSG_RESULT($fu_cv_sys_mounted_getmnt) + if test $fu_cv_sys_mounted_getmnt = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_GETMNT) + fi fi - fi - if test "x$no_xview" != xyes; then - if test -f "$ac_xview_includes/xview_private/draw_impl.h"; then - ac_xview_no_private_headers= - else - ac_xview_no_private_headers=yes + + if test -z "$list_mounted_fs"; then + # SVR2 + AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab]) + AC_CACHE_VAL(fu_cv_sys_mounted_fread, + [AC_TRY_CPP([#include ], + fu_cv_sys_mounted_fread=yes, + fu_cv_sys_mounted_fread=no)]) + AC_MSG_RESULT($fu_cv_sys_mounted_fread) + if test $fu_cv_sys_mounted_fread = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_FREAD) + fi fi - fi - cd .. - rm -fr conftestdir -fi -]) -dnl Internal subroutine of AC_PATH_XVIEW -dnl Set ac_xview_includes, ac_xview_libraries, and no_xview (initially yes). -AC_DEFUN(AC_PATH_XVIEW_DIRECT, -[test -z "$xview_direct_test_library" && xview_direct_test_library=xview -test -z "$xview_direct_test_function" && xview_direct_test_function=xv_unique_key -test -z "$xview_direct_test_include" && xview_direct_test_include=xview/xview.h -AC_TRY_CPP([#include <$xview_direct_test_include>], -[no_xview= ac_xview_includes=], -[ for ac_dir in \ - $OPENWINHOME/include \ - /usr/openwin/include \ - /usr/openwin/share/include \ - \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X11/include \ - /usr/include/X11 \ - /usr/local/X11/include \ - /usr/local/include/X11 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - ; \ - do - if test -r "$ac_dir/$xview_direct_test_include"; then - no_xview= ac_xview_includes=$ac_dir - break + if test -z "$list_mounted_fs"; then + AC_MSG_WARN([could not determine how to read list of mounted fs]) + CPPFLAGS="$CPPFLAGS -DNO_INFOMOUNT" + # FIXME -- no need to abort building the whole package + # Can't build mountlist.c or anything that needs its functions fi - done]) -if test "x$no_xview" != xyes; then - if test "x$ac_xview_includes" != x; then - if test -f "$ac_xview_includes/xview_private/draw_impl.h"; then - ac_xview_no_private_headers= - else - ac_xview_no_private_headers=yes - fi - else -AC_TRY_CPP([#include ], -[ac_xview_no_private_headers=],[ac_xview_no_private_headers=yes]) +dnl This configure.in code has been stolen from GNU fileutils-3.12. Its +dnl job is to detect a method to get file system information. + + AC_CHECKING(how to get filesystem space usage) + space=no + + # Here we'll compromise a little (and perform only the link test) + # since it seems there are no variants of the statvfs function. + if test $space = no; then + # SVR4 + AC_CHECK_FUNCS(statvfs) + if test $ac_cv_func_statvfs = yes; then + space=yes + AC_DEFINE(STAT_STATVFS) + fi fi -fi -# Check for the libraries. -# See if we find them without any special options. -# Don't add to $LIBS permanently. -ac_save_LIBS="$LIBS" -ac_save_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS $X_LIBS" -LIBS="-l$xview_direct_test_library -lolgx $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" -AC_TRY_LINK([#include <$xview_direct_test_include> -], [${xview_direct_test_function}()], -[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" no_xview= ac_xview_libraries=], -[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" -# First see if replacing the include by lib works. -for ac_dir in `echo "$ac_xview_includes" | sed s/include/lib/` \ - $OPENWINHOME/lib \ - $OPENWINHOME/share/lib \ - /usr/openwin/lib \ - /usr/openwin/share/lib \ - \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ - /usr/X11R4/lib \ - \ - /usr/lib/X11R6 \ - /usr/lib/X11R5 \ - /usr/lib/X11R4 \ - \ - /usr/local/X11R6/lib \ - /usr/local/X11R5/lib \ - /usr/local/X11R4/lib \ - \ - /usr/local/lib/X11R6 \ - /usr/local/lib/X11R5 \ - /usr/local/lib/X11R4 \ - \ - /usr/X11/lib \ - /usr/lib/X11 \ - /usr/local/X11/lib \ - /usr/local/lib/X11 \ - \ - /usr/X386/lib \ - /usr/x386/lib \ - /usr/XFree86/lib/X11 \ - \ - /usr/lib \ - /usr/local/lib \ - /usr/unsupported/lib \ - /usr/athena/lib \ - /usr/local/x11r5/lib \ - /usr/lpp/Xamples/lib \ - ; \ -do - for ac_extension in a so sl; do - if test -r $ac_dir/lib${xview_direct_test_library}.$ac_extension; then - no_xview= ac_xview_libraries=$ac_dir - break 2 + if test $space = no; then + # DEC Alpha running OSF/1 + AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)]) + AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1, + [AC_TRY_RUN([ +#include +#include +#include + main () + { + struct statfs fsd; + fsd.f_fsize = 0; + exit (statfs (".", &fsd, sizeof (struct statfs))); + }], + fu_cv_sys_stat_statfs3_osf1=yes, + fu_cv_sys_stat_statfs3_osf1=no, + fu_cv_sys_stat_statfs3_osf1=no)]) + AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1) + if test $fu_cv_sys_stat_statfs3_osf1 = yes; then + space=yes + AC_DEFINE(STAT_STATFS3_OSF1) + fi fi - done -done])]) -dnl Substitute XVIEW_LIBS and XVIEW_CFLAGS and -dnl HAVE_XVIEW, which is either yes or no. -dnl Both contain X_LIBS resp. X_CFLAGS inside -dnl Also substitutes HAVE_XVIEW_PRIVATE_HEADERS -dnl if there are xview_private headers in the system -AC_DEFUN(AC_PATH_XVIEW_XTRA, -[AC_REQUIRE([AC_PATH_XVIEW])dnl -if test "$no_xview" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - XVIEW_CFLAGS="$X_CFGLAGS $XVIEW_CFLAGS -DXVIEW_MISSING" -else - if test -n "$xview_includes"; then - XVIEW_CFLAGS="$X_CFLAGS $XVIEW_CFGLAGS" - if test "$xview_includes" != "$x_includes"; then - XVIEW_CPPFLAGS="-I$xview_includes" + if test $space = no; then + # AIX + AC_MSG_CHECKING([for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)]) + AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize, + [AC_TRY_RUN([ +#ifdef HAVE_SYS_PARAM_H +#include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif +#ifdef HAVE_SYS_VFS_H +#include +#endif + main () + { + struct statfs fsd; + fsd.f_bsize = 0; + exit (statfs (".", &fsd)); + }], + fu_cv_sys_stat_statfs2_bsize=yes, + fu_cv_sys_stat_statfs2_bsize=no, + fu_cv_sys_stat_statfs2_bsize=no)]) + AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize) + if test $fu_cv_sys_stat_statfs2_bsize = yes; then + space=yes + AC_DEFINE(STAT_STATFS2_BSIZE) + fi fi - fi - # It would be nice to have a more robust check for the -R ld option than - # just checking for Solaris. - # It would also be nice to do this for all -L options, not just this one. - if test -n "$xview_libraries"; then - if test "$xview_libraries" = "$x_libraries"; then - XVIEW_LIBS="$X_LIBS $XVIEW_LIBS" - else - XVIEW_LIBS="$X_LIBS $XVIEW_LIBS -L$xview_libraries" - if test "`(uname) 2>/dev/null`" = SunOS && - uname -r | grep '^5' >/dev/null; then - XVIEW_LIBS="$XVIEW_LIBS -R$xview_libraries" + if test $space = no; then + # SVR3 + AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)]) + AC_CACHE_VAL(fu_cv_sys_stat_statfs4, + [AC_TRY_RUN([#include +#include + main () + { + struct statfs fsd; + exit (statfs (".", &fsd, sizeof fsd, 0)); + }], + fu_cv_sys_stat_statfs4=yes, + fu_cv_sys_stat_statfs4=no, + fu_cv_sys_stat_statfs4=no)]) + AC_MSG_RESULT($fu_cv_sys_stat_statfs4) + if test $fu_cv_sys_stat_statfs4 = yes; then + space=yes + AC_DEFINE(STAT_STATFS4) fi fi - fi -fi -if test "x$no_xview" = xyes; then - HAVE_XVIEW=no -else - HAVE_XVIEW=yes -fi -if test "x$xview_no_private_headers" = xyes; then - HAVE_XVIEW_PRIVATE_HEADERS=no -else - HAVE_XVIEW_PRIVATE_HEADERS=yes -fi -AC_SUBST(XVIEW_CFLAGS)dnl -AC_SUBST(XVIEW_CPPFLAGS)dnl -AC_SUBST(XVIEW_LIBS)dnl -AC_SUBST(HAVE_XVIEW)dnl -AC_SUBST(HAVE_XVIEW_PRIVATE_HEADERS)dnl -])dnl -dnl Internal subroutine of AC_PATH_SLINGSHOT -AC_DEFUN(AC_PATH_SLINGSHOT_DIRECT, -[ -AC_TRY_CPP([#include ],[no_ss= ac_ss_includes=], -[ for ac_dir in \ - $OPENWINHOME/include \ - /usr/openwin/include \ - /usr/openwin/share/include \ - \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X11/include \ - /usr/include/X11 \ - /usr/local/X11/include \ - /usr/local/include/X11 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - ; \ - do - if test -r "$ac_dir/sspkg/rectobj.h"; then - no_ss= ac_ss_includes=$ac_dir - break + if test $space = no; then + # 4.4BSD and NetBSD + AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl + member (4.4BSD and NetBSD)]) + AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize, + [AC_TRY_RUN([#include +#ifdef HAVE_SYS_PARAM_H +#include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif + main () + { + struct statfs fsd; + fsd.f_fsize = 0; + exit (statfs (".", &fsd)); + }], + fu_cv_sys_stat_statfs2_fsize=yes, + fu_cv_sys_stat_statfs2_fsize=no, + fu_cv_sys_stat_statfs2_fsize=no)]) + AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize) + if test $fu_cv_sys_stat_statfs2_fsize = yes; then + space=yes + AC_DEFINE(STAT_STATFS2_FSIZE) + fi fi - done]) -# Check for the libraries. -# See if we find them without any special options. -# Don't add to $LIBS permanently. -ac_save_LIBS="$LIBS" -ac_save_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS $XVIEW_LIBS" -LIBS="-lsspkg -lm -lxview -lolgx $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" -AC_TRY_LINK([#include -], [rectobj_get_selected_list()], -[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" no_ss= ac_ss_libraries=], -[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" -# First see if replacing the include by lib works. -for ac_dir in `echo "$ac_ss_includes" | sed s/include/lib/` \ - $OPENWINHOME/lib \ - $OPENWINHOME/share/lib \ - /usr/openwin/lib \ - /usr/openwin/share/lib \ - \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ - /usr/X11R4/lib \ - \ - /usr/lib/X11R6 \ - /usr/lib/X11R5 \ - /usr/lib/X11R4 \ - \ - /usr/local/X11R6/lib \ - /usr/local/X11R5/lib \ - /usr/local/X11R4/lib \ - \ - /usr/local/lib/X11R6 \ - /usr/local/lib/X11R5 \ - /usr/local/lib/X11R4 \ - \ - /usr/X11/lib \ - /usr/lib/X11 \ - /usr/local/X11/lib \ - /usr/local/lib/X11 \ - \ - /usr/X386/lib \ - /usr/x386/lib \ - /usr/XFree86/lib/X11 \ - \ - /usr/lib \ - /usr/local/lib \ - /usr/unsupported/lib \ - /usr/athena/lib \ - /usr/local/x11r5/lib \ - /usr/lpp/Xamples/lib \ - ; \ -do - for ac_extension in a so sl; do - if test -r $ac_dir/libsspkg.$ac_extension; then - no_ss= ac_ss_libraries=$ac_dir - break 2 + if test $space = no; then + # Ultrix + AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)]) + AC_CACHE_VAL(fu_cv_sys_stat_fs_data, + [AC_TRY_RUN([ +#include +#ifdef HAVE_SYS_PARAM_H +#include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif +#ifdef HAVE_SYS_FS_TYPES_H +#include +#endif + main () + { + struct fs_data fsd; + /* Ultrix's statfs returns 1 for success, + 0 for not mounted, -1 for failure. */ + exit (statfs (".", &fsd) != 1); + }], + fu_cv_sys_stat_fs_data=yes, + fu_cv_sys_stat_fs_data=no, + fu_cv_sys_stat_fs_data=no)]) + AC_MSG_RESULT($fu_cv_sys_stat_fs_data) + if test $fu_cv_sys_stat_fs_data = yes; then + space=yes + AC_DEFINE(STAT_STATFS2_FS_DATA) + fi fi - done -done])]) -dnl Set ss_includes, ss_libraries, and no_ss (initially yes). -AC_DEFUN(AC_PATH_SLINGSHOT, -[AC_REQUIRE([AC_PATH_XVIEW_XTRA])dnl -AC_MSG_CHECKING(for SlingShot) -AC_ARG_WITH(ss, [--with-ss Use the SlingShot extension]) + dnl Not supported + dnl if test $space = no; then + dnl # SVR2 + dnl AC_TRY_CPP([#include ], + dnl AC_DEFINE(STAT_READ_FILSYS) space=yes) + dnl fi +]) -AC_ARG_WITH(ss-includes, [--with-ss-includes=path Specifies SlingShot includes directory], -[ -if test x$withval = xyes; then - AC_MSG_WARN(Usage is: --with-ss-includes=path) - ss_includes=NONE -else - ss_includes=$withval -fi -], -[ -ss_includes=NONE +dnl AC_CHECK_HEADER_IN_PATH(HEADER-FILE, ADDITIONAL_PATH, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) +AC_DEFUN(AC_CHECK_HEADER_IN_PATH, +[dnl Do the transliteration at runtime so arg 1 can be a shell variable. +ac_safe=`echo "$1" | tr './\055' '___'` +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(ac_cv_header_in_path_$ac_safe, +[AC_TRY_CPP([#include <$1>], ac_header_in_path=yes, [ + ac_header_in_path_found=no + for ac_header_in_path_value in [$2]; do + ac_in_path_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$ac_header_in_path_value" + AC_TRY_CPP([#include <$1>], [ +ac_header_in_path_found=yes +ac_header_in_path=$ac_header_in_path_value +], ) + CPPFLAGS=$ac_in_path_save_CPPFLAGS + if test x$ac_header_in_path_found = xyes; then + break + fi + done + if test $ac_header_in_path_found = xno; then + ac_header_in_path=no + fi +]) + eval "ac_cv_header_in_path_$ac_safe=$ac_header_in_path" ])dnl -AC_ARG_WITH(ss-libraries, [--with-ss-libraries=path Specifies SlingShot libraries directory], -[ -if test x$withval = xyes; then - AC_MSG_WARN(Usage is: --with-ss-libraries=path) - ss_libraries=NONE -else - ss_libraries=$withval -fi -], -[ -ss_libraries=NONE +eval "ac_header_in_path=`echo '$ac_cv_header_in_path_'$ac_safe`" +if test "$ac_header_in_path" = no; then + AC_MSG_RESULT(no) +ifelse([$4], , , [$4 ])dnl - -if test "x$with_ss" = xno; then - no_ss=yes else - if test "x$ss_includes" != xNONE && test "x$ss_libraries" != xNONE; then - no_ss= - else -AC_CACHE_VAL(ac_cv_path_ss, -[ - no_ss=yes -AC_PATH_SLINGSHOT_DIRECT - if test "x$no_ss" = xyes; then - ac_cv_path_ss="ac_noss=yes" - else - ac_cv_path_ss="ac_ss_includes=$ac_ss_includes ac_ss_libraries=$ac_ss_libraries" - fi + if test -n "$ac_header_in_path"; then + AC_MSG_RESULT($ac_header_in_path) + else + AC_MSG_RESULT(yes) + fi + if test x$ac_header_in_path = xyes; then + ac_header_in_path= + eval "ac_cv_header_in_path_$ac_safe=" + fi + ifelse([$3], , , [$3 ])dnl - eval "$ac_cv_path_ss" - fi -fi fi -if test "x$no_ss" = xyes; then - AC_MSG_RESULT(no) -else - if test "x$ss_includes" = x || test "x$ss_includes" = xNONE; then - ss_includes=$ac_ss_includes - fi - if test "x$ss_libraries" = x || test "x$ss_libraries" = xNONE; then - ss_libraries=$ac_ss_libraries +]) + +dnl Hope I can check for libXpm only in the X11 library directory +AC_DEFUN(AC_LIB_XPM, [ +AC_MSG_CHECKING(for -lXpm) +AC_CACHE_VAL(ac_cv_has_xpm, [ + ac_cv_has_xpm=no + if test x$no_x = xyes; then + : + else + has_xpm_save_LIBS=$LIBS + LIBS="-lXpm $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" + has_xpm_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $X_LIBS" + has_xpm_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $X_CFLAGS" + AC_TRY_LINK([ +#include +#include +], [XpmLibraryVersion();], ac_cv_has_xpm=yes) + CFLAGS="$has_xpm_save_CFLAGS" + LDFLAGS="$has_xpm_save_LDFLAGS" + LIBS="$has_xpm_save_LIBS" fi - ac_cv_path_ss="no_ss= ac_ss_includes=$ss_includes ac_ss_libraries=$ss_libraries" - if test "x$ss_libraries" = x; then - if test "x$ss_includes" = x; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT([headers $ss_includes]) - fi +]) +AC_MSG_RESULT($ac_cv_has_xpm) +]) + +dnl Hope I can check for libXext only in the X11 library directory +dnl and shape.h will be in X11/extensions/shape.h +AC_DEFUN(AC_X_SHAPE_EXTENSION, [ +AC_MSG_CHECKING(for X11 non-rectangular shape extension) +AC_CACHE_VAL(ac_cv_has_shape, [ + ac_cv_has_shape=no + if test x$no_x = xyes; then + : else - if test "x$ss_includes" = x; then - AC_MSG_RESULT([libraries $ss_libraries]) - else - AC_MSG_RESULT([libraries $ss_libraries, headers $ss_includes]) - fi + has_shape_save_LIBS=$LIBS + LIBS="-lXext $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" + has_shape_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $X_LIBS" + has_shape_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $X_CFLAGS" + AC_TRY_LINK([ +#include +#include +#include +], [ +Display *dpy = (Display *)NULL; +int a, b; +XShapeQueryVersion(dpy,&a,&b); +], ac_cv_has_shape=yes) + CFLAGS="$has_shape_save_CFLAGS" + LDFLAGS="$has_shape_save_LDFLAGS" + LIBS="$has_shape_save_LIBS" fi +]) +AC_MSG_RESULT($ac_cv_has_shape) +]) + +dnl AC_TRY_WARNINGS(INCLUDES, FUNCTION-BODY, +dnl ACTION-IF-NO-WARNINGS [, ACTION-IF-WARNINGS-OR-ERROR]) +AC_DEFUN(AC_TRY_WARNINGS, +[cat > conftest.$ac_ext <&AC_FD_CC 2>&AC_FD_CC; then + ifelse([$4], , :, [rm -rf conftest* + $4]) +ifelse([$3], , , [else + rm -rf conftest* + $3 +])dnl fi -]) +rm -f conftest*] +) -dnl Substitute SLINGSHOT_LIBS and SLINGSHOT_CFLAGS and -dnl HAVE_SLINGSHOT, which is either yes or no. -dnl Both contain XVIEW_LIBS resp. XVIEW_CFLAGS inside -AC_DEFUN(AC_PATH_SLINGSHOT_XTRA, -[AC_REQUIRE([AC_PATH_SLINGSHOT])dnl -if test "$no_ss" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - SLINGSHOT_CFLAGS="$XVIEW_CFGLAGS $SLINGSHOT_CFLAGS -DSLINGSHOT_MISSING" +dnl Find if make is GNU make. +AC_DEFUN(AC_PROG_GNU_MAKE, +[AC_MSG_CHECKING(whether we are using GNU make) +set dummy ${MAKE-make}; ac_make=[$]2 +AC_CACHE_VAL(ac_cv_prog_gnu_make, +[cat > conftestmake <<\EOF +all: + @echo ' ' +EOF +if ${MAKE-make} --version -f conftestmake 2>/dev/null | grep GNU >/dev/null 2>&1; then + ac_cv_prog_gnu_make=yes else - if test -n "$ss_includes"; then - SLINGSHOT_CFLAGS="$XVIEW_CFLAGS $SLINGSHOT_CFGLAGS -I$ss_includes" - fi - - # It would be nice to have a more robust check for the -R ld option than - # just checking for Solaris. - # It would also be nice to do this for all -L options, not just this one. - if test -n "$ss_libraries"; then - SLINGSHOT_LIBS="$XVIEW_LIBS $SLINGSHOT_LIBS -L$ss_libraries" - if test "`(uname) 2>/dev/null`" = SunOS && - uname -r | grep '^5' >/dev/null; then - SLINGSHOT_LIBS="$SLINGSHOT_LIBS -R$ss_libraries" - fi - fi + ac_cv_prog_gnu_make=no fi -if test "x$no_ss" = xyes; then - HAVE_SLINGSHOT=no +rm -f conftestmake])dnl +if test $ac_cv_prog_gnu_make = yes; then + AC_MSG_RESULT(yes) + GNU_MAKE="GNU_MAKE=yes" else - HAVE_SLINGSHOT=yes + AC_MSG_RESULT(no) + GNU_MAKE= fi -AC_SUBST(SLINGSHOT_CFLAGS)dnl -AC_SUBST(SLINGSHOT_LIBS)dnl -AC_SUBST(HAVE_SLINGSHOT)dnl -])dnl +AC_SUBST([GNU_MAKE])dnl +]) -dnl -dnl XView library checking end -dnl +dnl +dnl Local additions to Autoconf macros. +dnl Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. +dnl François Pinard , 1992. -dnl -dnl Check for size of d_name dirent member -dnl -AC_DEFUN(AC_SHORT_D_NAME_LEN, [ -AC_MSG_CHECKING(filename fits on dirent.d_name) -AC_CACHE_VAL(ac_cv_dnamesize, [ -OCFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -I$srcdir" -AC_TRY_RUN([ -#include +dnl ## ----------------------------------------- ## +dnl ## ANSIfy the C compiler whenever possible. ## +dnl ## ----------------------------------------- ## -main () -{ - struct dirent ddd; +dnl @defmac AC_PROG_CC_STDC +dnl @maindex PROG_CC_STDC +dnl @ovindex CC +dnl If the C compiler in not in ANSI C mode by default, try to add an option +dnl to output variable @code{CC} to make it so. This macro tries various +dnl options that select ANSI C on some system or another. It considers the +dnl compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and +dnl handles function prototypes correctly. +dnl +dnl If you use this macro, you should check after calling it whether the C +dnl compiler has been set to accept ANSI C; if not, the shell variable +dnl @code{ac_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source +dnl code in ANSI C, you can make an un-ANSIfied copy of it by using the +dnl program @code{ansi2knr}, which comes with Ghostscript. +dnl @end defmac - if (sizeof (ddd.d_name) < 12) - exit (0); - else - exit (1); -} +dnl Unixware 2.1 defines __STDC__ to 1 only when some useful extensions are +dnl turned off. They are on by default and turned off with the option -Xc. +dnl The consequence is that __STDC__ is defined but e.g. struct sigaction +dnl is not defined. -- Norbert -],[ - ac_cv_dnamesize="no" -], [ - ac_cv_dnamesize="yes" -], [ -# Cannot find out, so assume no - ac_cv_dnamesize="no" +dnl Below all tests but the one for HP-UX are removed. They caused more +dnl problems than they soved, sigh. -- Norbert + +AC_DEFUN(MC_HPUX_PROG_CC_STDC, +[AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) +AC_CACHE_VAL(ac_cv_prog_cc_stdc, +[ac_cv_prog_cc_stdc=no +ac_save_CFLAGS="$CFLAGS" +dnl Don't try gcc -ansi; that turns off useful extensions and +dnl breaks some systems' header files. +dnl AIX -qlanglvl=ansi (removed -- Norbert) +dnl Ultrix and OSF/1 -std1 (removed -- Norbert) +dnl HP-UX -Aa -D_HPUX_SOURCE +dnl SVR4 -Xc (removed -- Norbert) +for ac_arg in "" "-Aa -D_HPUX_SOURCE" +do + CFLAGS="$ac_save_CFLAGS $ac_arg" + AC_TRY_COMPILE( +[#include +#if !defined(__STDC__) || __STDC__ != 1 +choke me +#endif +], [int test (int i, double x); +struct sigaction sa; +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);};], +[ac_cv_prog_cc_stdc="$ac_arg"; break]) +done +CFLAGS="$ac_save_CFLAGS" ]) -CFLAGS="$OCFLAGS" +AC_MSG_RESULT($ac_cv_prog_cc_stdc) +case "x$ac_cv_prog_cc_stdc" in + x|xno) ;; + *) CC="$CC $ac_cv_prog_cc_stdc" ;; +esac ]) -if test x$ac_cv_dnamesize = xno; then - AC_DEFINE(NEED_EXTRA_DIRENT_BUFFER) + +dnl aclocal.m4 generated automatically by aclocal 1.2f + +dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +dnl This Makefile.in is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. + + +# progtest.m4 from gettext 0.32 +# Search path for a program which passes the given test. +# Ulrich Drepper , 1996. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN(AM_PATH_PROG_WITH_TEST, +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test -n "[$]$1"; then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) fi -AC_MSG_RESULT($ac_cv_dnamesize) +AC_SUBST($1)dnl ]) -dnl -dnl Filesystem information detection -dnl -dnl To get information about the disk, mount points, etc. -dnl -AC_DEFUN(AC_GET_FS_INFO, [ - AC_CHECK_HEADERS(fcntl.h sys/dustat.h sys/param.h sys/statfs.h sys/fstyp.h) - AC_CHECK_HEADERS(mnttab.h mntent.h utime.h sys/statvfs.h sys/vfs.h) - AC_CHECK_HEADERS(sys/mount.h sys/filsys.h sys/fs_types.h) - AC_CHECK_FUNCS(getmntinfo) +# lcmessage.m4 from gettext 0.32 +# Check whether LC_MESSAGES is available in . +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +AC_DEFUN(AM_LC_MESSAGES, + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES) + fi + fi]) + - dnl This configure.in code has been stolen from GNU fileutils-3.12. Its - dnl job is to detect a method to get list of mounted filesystems. - AC_MSG_CHECKING([for d_ino member in directory struct]) - AC_CACHE_VAL(fu_cv_sys_d_ino_in_dirent, - [AC_TRY_LINK([ -#include -#ifdef HAVE_DIRENT_H -# include -#else /* not HAVE_DIRENT_H */ -# define dirent direct -# ifdef HAVE_SYS_NDIR_H -# include -# endif /* HAVE_SYS_NDIR_H */ -# ifdef HAVE_SYS_DIR_H -# include -# endif /* HAVE_SYS_DIR_H */ -# ifdef HAVE_NDIR_H -# include -# endif /* HAVE_NDIR_H */ -#endif /* HAVE_DIRENT_H */ - ], - [struct dirent dp; dp.d_ino = 0;], - fu_cv_sys_d_ino_in_dirent=yes, - fu_cv_sys_d_ino_in_dirent=no)]) - AC_MSG_RESULT($fu_cv_sys_d_ino_in_dirent) - if test $fu_cv_sys_d_ino_in_dirent = yes; then - AC_DEFINE(D_INO_IN_DIRENT) - fi +# gettext.m4 from gettext 0.32 +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. - # Determine how to get the list of mounted filesystems. - list_mounted_fs= +# serial 3 - # If the getmntent function is available but not in the standard library, - # make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX). - AC_FUNC_GETMNTENT +AC_DEFUN(AM_WITH_NLS, + [AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) - if test $ac_cv_func_getmntent = yes; then + USE_INCLUDED_LIBINTL=no - # This system has the getmntent function. - # Determine whether it's the one-argument variant or the two-argument one. + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + AC_DEFINE(ENABLE_NLS) + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH(included-gettext, + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) - if test -z "$list_mounted_fs"; then - # SVR4 - AC_MSG_CHECKING([for two-argument getmntent function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2, - [AC_EGREP_HEADER(getmntent, sys/mnttab.h, - fu_cv_sys_mounted_getmntent2=yes, - fu_cv_sys_mounted_getmntent2=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2) - if test $fu_cv_sys_mounted_getmntent2 = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_GETMNTENT2) - fi - fi + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE - if test -z "$list_mounted_fs"; then - # 4.3BSD, SunOS, HP-UX, Dynix, Irix - AC_MSG_CHECKING([for one-argument getmntent function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1, - [test $ac_cv_header_mntent_h = yes \ - && fu_cv_sys_mounted_getmntent1=yes \ - || fu_cv_sys_mounted_getmntent1=no]) - AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1) - if test $fu_cv_sys_mounted_getmntent1 = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_GETMNTENT1) - fi - fi + AC_CHECK_HEADER(libintl.h, + [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, + [AC_TRY_LINK([#include ], [return (int) gettext ("")], + gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) - if test -z "$list_mounted_fs"; then - AC_WARN([could not determine how to read list of mounted fs]) - CPPFLAGS="$CPPFLAGS -DNO_INFOMOUNT" - fi + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CACHE_CHECK([for gettext in libintl], + gt_cv_func_gettext_libintl, + [AC_TRY_LINK([], [return (int) gettext ("")], + gt_cv_func_gettext_libintl=yes, + gt_cv_func_gettext_libintl=no)])]) + fi - fi + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$gt_cv_func_gettext_libintl" = "yes"; then + AC_DEFINE(HAVE_GETTEXT) + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi + fi + ]) - if test -z "$list_mounted_fs"; then - # DEC Alpha running OSF/1. - AC_MSG_CHECKING([for getfsstat function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getsstat, - [AC_TRY_LINK([ -#include -#include -#include ], - [struct statfs *stats; - numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ], - fu_cv_sys_mounted_getsstat=yes, - fu_cv_sys_mounted_getsstat=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_getsstat) - if test $fu_cv_sys_mounted_getsstat = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_GETFSSTAT) - fi - fi + if test "$CATOBJEXT" = "NONE"; then + AC_MSG_CHECKING([whether catgets can be used]) + AC_ARG_WITH(catgets, + [ --with-catgets use catgets functions if available], + nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) + AC_MSG_RESULT($nls_cv_use_catgets) - if test -z "$list_mounted_fs"; then - # AIX. - AC_MSG_CHECKING([for mntctl function and struct vmount]) - AC_CACHE_VAL(fu_cv_sys_mounted_vmount, - [AC_TRY_CPP([#include ], - fu_cv_sys_mounted_vmount=yes, - fu_cv_sys_mounted_vmount=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_vmount) - if test $fu_cv_sys_mounted_vmount = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_VMOUNT) - fi - fi + if test "$nls_cv_use_catgets" = "yes"; then + dnl No gettext in C library. Try catgets next. + AC_CHECK_LIB(i, main) + AC_CHECK_FUNC(catgets, + [AC_DEFINE(HAVE_CATGETS) + INTLOBJS="\$(CATOBJS)" + AC_PATH_PROG(GENCAT, gencat, no)dnl + if test "$GENCAT" != "no"; then + AC_PATH_PROG(GMSGFMT, gmsgfmt, no) + if test "$GMSGFMT" = "no"; then + AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) + fi + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.cat + INSTOBJEXT=.cat + DATADIRNAME=lib + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi]) + fi + fi - if test -z "$list_mounted_fs"; then - # SVR3 - AC_MSG_CHECKING([for existence of three headers]) - AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp, - [AC_TRY_CPP([ -#include -#include -#include ], - fu_cv_sys_mounted_fread_fstyp=yes, - fu_cv_sys_mounted_fread_fstyp=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp) - if test $fu_cv_sys_mounted_fread_fstyp = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_FREAD_FSTYP) + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. + dnl Fall back on GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi fi - fi - if test -z "$list_mounted_fs"; then - # 4.4BSD and DEC OSF/1. - AC_MSG_CHECKING([for getmntinfo function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo, - [ - ok= - if test $ac_cv_func_getmntinfo = yes; then - AC_EGREP_HEADER(f_type;, sys/mount.h, - ok=yes) - fi - test -n "$ok" \ - && fu_cv_sys_mounted_getmntinfo=yes \ - || fu_cv_sys_mounted_getmntinfo=no - ]) - AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo) - if test $fu_cv_sys_mounted_getmntinfo = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_GETMNTINFO) - AC_MSG_CHECKING([if struct statfs has f_fstypename]) - AC_CACHE_VAL(fu_cv_sys_mounted_f_fstypename, - [ - AC_EGREP_HEADER(f_type;, sys/mount.h, ok=yes, ok=) - test -n "$ok" \ - && fu_cv_sys_mounted_f_fstypename=yes \ - || fu_cv_sys_mounted_f_fstypename=no - ]) - AC_MSG_RESULT($fu_cv_sys_mounted_f_fstypename) - if test $fu_cv_sys_mounted_f_fstypename = yes; then - AC_DEFINE(HAVE_F_FSTYPENAME) - fi + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + INTLOBJS="\$(GETTOBJS)" + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_SUBST(MSGFMT) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h fi - fi - if test -z "$list_mounted_fs"; then - # Ultrix - AC_MSG_CHECKING([for getmnt function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getmnt, - [AC_TRY_CPP([ -#include -#include ], - fu_cv_sys_mounted_getmnt=yes, - fu_cv_sys_mounted_getmnt=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_getmnt) - if test $fu_cv_sys_mounted_getmnt = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_GETMNT) + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext programs is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi fi - fi - if test -z "$list_mounted_fs"; then - # SVR2 - AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab]) - AC_CACHE_VAL(fu_cv_sys_mounted_fread, - [AC_TRY_CPP([#include ], - fu_cv_sys_mounted_fread=yes, - fu_cv_sys_mounted_fread=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_fread) - if test $fu_cv_sys_mounted_fread = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_FREAD) - fi + # We need to process the po/ directory. + POSUB=po + else + DATADIRNAME=share + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h fi - if test -z "$list_mounted_fs"; then - AC_MSG_WARN([could not determine how to read list of mounted fs]) - CPPFLAGS="$CPPFLAGS -DNO_INFOMOUNT" - # FIXME -- no need to abort building the whole package - # Can't build mountlist.c or anything that needs its functions + # If this is used in GNU gettext we have to set USE_NLS to `yes' + # because some of the sources are only built for this goal. + if test "$PACKAGE" = gettext; then + USE_NLS=yes + USE_INCLUDED_LIBINTL=yes fi -dnl This configure.in code has been stolen from GNU fileutils-3.12. Its -dnl job is to detect a method to get file system information. + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done - AC_CHECKING(how to get filesystem space usage) - space=no + dnl Make all variables we use known to autoconf. + AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLDEPS) + AC_SUBST(INTLLIBS) + AC_SUBST(INTLOBJS) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) - # Here we'll compromise a little (and perform only the link test) - # since it seems there are no variants of the statvfs function. - if test $space = no; then - # SVR4 - AC_CHECK_FUNCS(statvfs) - if test $ac_cv_func_statvfs = yes; then - space=yes - AC_DEFINE(STAT_STATVFS) - fi - fi +AC_DEFUN(AM_GNU_GETTEXT, + [AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl - if test $space = no; then - # DEC Alpha running OSF/1 - AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)]) - AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1, - [AC_TRY_RUN([ -#include -#include -#include - main () - { - struct statfs fsd; - fsd.f_fsize = 0; - exit (statfs (".", &fsd, sizeof (struct statfs))); - }], - fu_cv_sys_stat_statfs3_osf1=yes, - fu_cv_sys_stat_statfs3_osf1=no, - fu_cv_sys_stat_statfs3_osf1=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1) - if test $fu_cv_sys_stat_statfs3_osf1 = yes; then - space=yes - AC_DEFINE(STAT_STATFS3_OSF1) - fi - fi + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ +unistd.h values.h sys/param.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ +__argz_count __argz_stringify __argz_next]) - if test $space = no; then - # AIX - AC_MSG_CHECKING([for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)]) - AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize, - [AC_TRY_RUN([ -#ifdef HAVE_SYS_PARAM_H -#include -#endif -#ifdef HAVE_SYS_MOUNT_H -#include -#endif -#ifdef HAVE_SYS_VFS_H -#include -#endif - main () - { - struct statfs fsd; - fsd.f_bsize = 0; - exit (statfs (".", &fsd)); - }], - fu_cv_sys_stat_statfs2_bsize=yes, - fu_cv_sys_stat_statfs2_bsize=no, - fu_cv_sys_stat_statfs2_bsize=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize) - if test $fu_cv_sys_stat_statfs2_bsize = yes; then - space=yes - AC_DEFINE(STAT_STATFS2_BSIZE) - fi - fi + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + AC_DEFINE(HAVE_STPCPY) + fi - if test $space = no; then - # SVR3 - AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)]) - AC_CACHE_VAL(fu_cv_sys_stat_statfs4, - [AC_TRY_RUN([#include -#include - main () - { - struct statfs fsd; - exit (statfs (".", &fsd, sizeof fsd, 0)); - }], - fu_cv_sys_stat_statfs4=yes, - fu_cv_sys_stat_statfs4=no, - fu_cv_sys_stat_statfs4=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_statfs4) - if test $fu_cv_sys_stat_statfs4 = yes; then - space=yes - AC_DEFINE(STAT_STATFS4) - fi - fi + AM_LC_MESSAGES + AM_WITH_NLS + + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi + + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + dnl The reference to in the installed file + dnl must be resolved because we cannot expect the users of this + dnl to define HAVE_LOCALE_H. + if test $ac_cv_header_locale_h = yes; then + INCLUDE_LOCALE_H="#include " + else + INCLUDE_LOCALE_H="\ +/* The system does not provide the header . Take care yourself. */" + fi + AC_SUBST(INCLUDE_LOCALE_H) + + dnl Determine which catalog format we have (if any is needed) + dnl For now we know about two different formats: + dnl Linux libc-5 and the normal X/Open format + test -d intl || mkdir intl + if test "$CATOBJEXT" = ".cat"; then + AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) + + dnl Transform the SED scripts while copying because some dumb SEDs + dnl cannot handle comments. + sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed + fi + dnl po2tbl.sed is always needed. + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed + + dnl In the intl/Makefile.in we have a special dependency which makes + dnl only sense for gettext. We comment this out for non-gettext + dnl packages. + if test "$PACKAGE" = "gettext"; then + GT_NO="#NO#" + GT_YES= + else + GT_NO= + GT_YES="#YES#" + fi + AC_SUBST(GT_NO) + AC_SUBST(GT_YES) + + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) - if test $space = no; then - # 4.4BSD and NetBSD - AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl - member (4.4BSD and NetBSD)]) - AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize, - [AC_TRY_RUN([#include -#ifdef HAVE_SYS_PARAM_H -#include -#endif -#ifdef HAVE_SYS_MOUNT_H -#include -#endif - main () - { - struct statfs fsd; - fsd.f_fsize = 0; - exit (statfs (".", &fsd)); - }], - fu_cv_sys_stat_statfs2_fsize=yes, - fu_cv_sys_stat_statfs2_fsize=no, - fu_cv_sys_stat_statfs2_fsize=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize) - if test $fu_cv_sys_stat_statfs2_fsize = yes; then - space=yes - AC_DEFINE(STAT_STATFS2_FSIZE) - fi - fi + dnl *** For now the libtool support in intl/Makefile is not for real. + l= + AC_SUBST(l) - if test $space = no; then - # Ultrix - AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)]) - AC_CACHE_VAL(fu_cv_sys_stat_fs_data, - [AC_TRY_RUN([ -#include -#ifdef HAVE_SYS_PARAM_H -#include -#endif -#ifdef HAVE_SYS_MOUNT_H -#include -#endif -#ifdef HAVE_SYS_FS_TYPES_H -#include -#endif - main () - { - struct fs_data fsd; - /* Ultrix's statfs returns 1 for success, - 0 for not mounted, -1 for failure. */ - exit (statfs (".", &fsd) != 1); - }], - fu_cv_sys_stat_fs_data=yes, - fu_cv_sys_stat_fs_data=no, - fu_cv_sys_stat_fs_data=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_fs_data) - if test $fu_cv_sys_stat_fs_data = yes; then - space=yes - AC_DEFINE(STAT_STATFS2_FS_DATA) - fi - fi + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) - dnl Not supported - dnl if test $space = no; then - dnl # SVR2 - dnl AC_TRY_CPP([#include ], - dnl AC_DEFINE(STAT_READ_FILSYS) space=yes) - dnl fi -]) -dnl AC_CHECK_HEADER_IN_PATH(HEADER-FILE, ADDITIONAL_PATH, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) -AC_DEFUN(AC_CHECK_HEADER_IN_PATH, -[dnl Do the transliteration at runtime so arg 1 can be a shell variable. -ac_safe=`echo "$1" | tr './\055' '___'` -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(ac_cv_header_in_path_$ac_safe, -[AC_TRY_CPP([#include <$1>], ac_header_in_path=yes, [ - ac_header_in_path_found=no - for ac_header_in_path_value in [$2]; do - ac_in_path_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$ac_header_in_path_value" - AC_TRY_CPP([#include <$1>], [ -ac_header_in_path_found=yes -ac_header_in_path=$ac_header_in_path_value -], ) - CPPFLAGS=$ac_in_path_save_CPPFLAGS - if test x$ac_header_in_path_found = xyes; then - break - fi - done - if test $ac_header_in_path_found = xno; then - ac_header_in_path=no - fi -]) - eval "ac_cv_header_in_path_$ac_safe=$ac_header_in_path" -])dnl -eval "ac_header_in_path=`echo '$ac_cv_header_in_path_'$ac_safe`" -if test "$ac_header_in_path" = no; then - AC_MSG_RESULT(no) -ifelse([$4], , , [$4 -])dnl -else - if test -n "$ac_header_in_path"; then - AC_MSG_RESULT($ac_header_in_path) - else - AC_MSG_RESULT(yes) +# Configure paths for GLIB +# Owen Taylor 97-11-3 + +dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or +dnl gthread is specified in MODULES, pass to glib-config +dnl +AC_DEFUN(AM_PATH_GLIB, +[dnl +dnl Get the cflags and libraries from the glib-config script +dnl +AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], + glib_config_prefix="$withval", glib_config_prefix="") +AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], + glib_config_exec_prefix="$withval", glib_config_exec_prefix="") +AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], + , enable_glibtest=yes) + + if test x$glib_config_exec_prefix != x ; then + glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" + if test x${GLIB_CONFIG+set} != xset ; then + GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config + fi fi - if test x$ac_header_in_path = xyes; then - ac_header_in_path= - eval "ac_cv_header_in_path_$ac_safe=" + if test x$glib_config_prefix != x ; then + glib_config_args="$glib_config_args --prefix=$glib_config_prefix" + if test x${GLIB_CONFIG+set} != xset ; then + GLIB_CONFIG=$glib_config_prefix/bin/glib-config + fi fi - ifelse([$3], , , [$3 -])dnl -fi -]) -dnl Hope I can check for libXpm only in the X11 library directory -AC_DEFUN(AC_LIB_XPM, [ -AC_MSG_CHECKING(for -lXpm) -AC_CACHE_VAL(ac_cv_has_xpm, [ - ac_cv_has_xpm=no - if test x$no_x = xyes; then - : - else - has_xpm_save_LIBS=$LIBS - LIBS="-lXpm $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" - has_xpm_save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS $X_LIBS" - has_xpm_save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $X_CFLAGS" - AC_TRY_LINK([ -#include -#include -], [XpmLibraryVersion();], ac_cv_has_xpm=yes) - CFLAGS="$has_xpm_save_CFLAGS" - LDFLAGS="$has_xpm_save_LDFLAGS" - LIBS="$has_xpm_save_LIBS" - fi -]) -AC_MSG_RESULT($ac_cv_has_xpm) -]) + for module in . $4 + do + case "$module" in + gmodule) + glib_config_args="$glib_config_args gmodule" + ;; + gthread) + glib_config_args="$glib_config_args gthread" + ;; + esac + done -dnl Hope I can check for libXext only in the X11 library directory -dnl and shape.h will be in X11/extensions/shape.h -AC_DEFUN(AC_X_SHAPE_EXTENSION, [ -AC_MSG_CHECKING(for X11 non-rectangular shape extension) -AC_CACHE_VAL(ac_cv_has_shape, [ - ac_cv_has_shape=no - if test x$no_x = xyes; then - : - else - has_shape_save_LIBS=$LIBS - LIBS="-lXext $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" - has_shape_save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS $X_LIBS" - has_shape_save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $X_CFLAGS" - AC_TRY_LINK([ -#include -#include -#include -], [ -Display *dpy = (Display *)NULL; -int a, b; -XShapeQueryVersion(dpy,&a,&b); -], ac_cv_has_shape=yes) - CFLAGS="$has_shape_save_CFLAGS" - LDFLAGS="$has_shape_save_LDFLAGS" - LIBS="$has_shape_save_LIBS" - fi -]) -AC_MSG_RESULT($ac_cv_has_shape) -]) + AC_PATH_PROG(GLIB_CONFIG, glib-config, no) + min_glib_version=ifelse([$1], ,0.99.7,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes + else + GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` + GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` + glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of glib-config to some extent +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include +#include +#include -dnl AC_TRY_WARNINGS(INCLUDES, FUNCTION-BODY, -dnl ACTION-IF-NO-WARNINGS [, ACTION-IF-WARNINGS-OR-ERROR]) -AC_DEFUN(AC_TRY_WARNINGS, -[cat > conftest.$ac_ext <&AC_FD_CC 2>&AC_FD_CC; then - ifelse([$4], , :, [rm -rf conftest* - $4]) -ifelse([$3], , , [else - rm -rf conftest* - $3 -])dnl -fi -rm -f conftest*] -) +int +main () +{ + int major, minor, micro; + char *tmp_version; -dnl Find if make is GNU make. -AC_DEFUN(AC_PROG_GNU_MAKE, -[AC_MSG_CHECKING(whether we are using GNU make) -set dummy ${MAKE-make}; ac_make=[$]2 -AC_CACHE_VAL(ac_cv_prog_gnu_make, -[cat > conftestmake <<\EOF -all: - @echo ' ' -EOF -if ${MAKE-make} --version -f conftestmake 2>/dev/null | grep GNU >/dev/null 2>&1; then - ac_cv_prog_gnu_make=yes -else - ac_cv_prog_gnu_make=no -fi -rm -f conftestmake])dnl -if test $ac_cv_prog_gnu_make = yes; then - AC_MSG_RESULT(yes) - GNU_MAKE="GNU_MAKE=yes" -else - AC_MSG_RESULT(no) - GNU_MAKE= -fi -AC_SUBST([GNU_MAKE])dnl + system ("touch conf.glibtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If glib-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); + printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the glib-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); + printf("*** correct copy of glib-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$GLIB_CONFIG" = "no" ; then + echo "*** The glib-config script installed by GLIB could not be found" + echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the GLIB_CONFIG environment variable to the" + echo "*** full path to glib-config." + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + echo "***" + echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" + echo "*** came with the system with the command" + echo "***" + echo "*** rpm --erase --nodeps gtk gtk-devel" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB was incorrectly installed" + echo "*** or that you have moved GLIB since it was installed. In the latter case, you" + echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GLIB_CFLAGS="" + GLIB_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + rm -f conf.glibtest ]) -dnl -dnl Local additions to Autoconf macros. -dnl Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. -dnl François Pinard , 1992. +dnl GNOME_VFS_CHECKS +dnl Check for various functions needed by libvfs. +dnl This has various effects: +dnl Sets GNOME_VFS_LIBS to libraries required +dnl Sets termnet to true or false depending on whether it is required. +dnl If yes, defines USE_TERMNET. +dnl Sets vfs_flags to "pretty" list of vfs implementations we include. +dnl Sets shell variable use_vfs to yes (default, --with-vfs) or +dnl "no" (--without-vfs). +dnl Calls AC_SUBST(mcserv), which is either empty or "mcserv". -dnl ## ----------------------------------------- ## -dnl ## ANSIfy the C compiler whenever possible. ## -dnl ## ----------------------------------------- ## +dnl Private define +AC_DEFUN([GNOME_WITH_VFS],[ + dnl FIXME: network checks should probably be in their own macro. + AC_CHECK_LIB(nsl, t_accept) + AC_CHECK_LIB(socket, socket) -dnl @defmac AC_PROG_CC_STDC -dnl @maindex PROG_CC_STDC -dnl @ovindex CC -dnl If the C compiler in not in ANSI C mode by default, try to add an option -dnl to output variable @code{CC} to make it so. This macro tries various -dnl options that select ANSI C on some system or another. It considers the -dnl compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and -dnl handles function prototypes correctly. -dnl -dnl If you use this macro, you should check after calling it whether the C -dnl compiler has been set to accept ANSI C; if not, the shell variable -dnl @code{ac_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source -dnl code in ANSI C, you can make an un-ANSIfied copy of it by using the -dnl program @code{ansi2knr}, which comes with Ghostscript. -dnl @end defmac + have_socket=no + AC_CHECK_FUNCS(socket, have_socket=yes) + if test $have_socket = no; then + # socket is not in the default libraries. See if it's in some other. + for lib in bsd socket inet; do + AC_CHECK_LIB($lib, socket, [ + LIBS="$LIBS -l$lib" + have_socket=yes + AC_DEFINE(HAVE_SOCKET) + break]) + done + fi -dnl Unixware 2.1 defines __STDC__ to 1 only when some useful extensions are -dnl turned off. They are on by default and turned off with the option -Xc. -dnl The consequence is that __STDC__ is defined but e.g. struct sigaction -dnl is not defined. -- Norbert + have_gethostbyname=no + AC_CHECK_FUNC(gethostbyname, have_gethostbyname=yes) + if test $have_gethostbyname = no; then + # gethostbyname is not in the default libraries. See if it's in some other. + for lib in bsd socket inet; do + AC_CHECK_LIB($lib, gethostbyname, [LIBS="$LIBS -l$lib"; have_gethostbyname=yes; break]) + done + fi -dnl Below all tests but the one for HP-UX are removed. They caused more -dnl problems than they soved, sigh. -- Norbert + vfs_flags="tarfs" + use_net_code=false + if test $have_socket = yes; then + AC_STRUCT_LINGER + AC_CHECK_FUNCS(pmap_set, , [ + AC_CHECK_LIB(rpc, pmap_set, [ + LIBS="-lrpc $LIBS" + AC_DEFINE(HAVE_PMAP_SET) + ])]) + AC_CHECK_FUNCS(pmap_getport pmap_getmaps rresvport) + dnl add for source routing support setsockopt + AC_CHECK_HEADERS(rpc/pmap_clnt.h) + vfs_flags="$vfs_flags, mcfs, ftpfs, fish" + use_net_code=true + fi -AC_DEFUN(MC_HPUX_PROG_CC_STDC, -[AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) -AC_CACHE_VAL(ac_cv_prog_cc_stdc, -[ac_cv_prog_cc_stdc=no -ac_save_CFLAGS="$CFLAGS" -dnl Don't try gcc -ansi; that turns off useful extensions and -dnl breaks some systems' header files. -dnl AIX -qlanglvl=ansi (removed -- Norbert) -dnl Ultrix and OSF/1 -std1 (removed -- Norbert) -dnl HP-UX -Aa -D_HPUX_SOURCE -dnl SVR4 -Xc (removed -- Norbert) -for ac_arg in "" "-Aa -D_HPUX_SOURCE" -do - CFLAGS="$ac_save_CFLAGS $ac_arg" - AC_TRY_COMPILE( -[#include -#if !defined(__STDC__) || __STDC__ != 1 -choke me -#endif -], [int test (int i, double x); -struct sigaction sa; -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);};], -[ac_cv_prog_cc_stdc="$ac_arg"; break]) -done -CFLAGS="$ac_save_CFLAGS" -]) -AC_MSG_RESULT($ac_cv_prog_cc_stdc) -case "x$ac_cv_prog_cc_stdc" in - x|xno) ;; - *) CC="$CC $ac_cv_prog_cc_stdc" ;; -esac -]) + dnl + dnl Samba support + dnl + smbfs="" + SAMBAFILES="" + AC_ARG_WITH(samba, + [--with-samba Support smb virtual file system],[ + if test "x$withval != xno"; then + AC_DEFINE(WITH_SMBFS) + vfs_flags="$vfs_flags, smbfs" + smbfs="smbfs.o" + SAMBAFILES="\$(SAMBAFILES)" + fi + ]) + AC_SUBST(smbfs) + AC_SUBST(SAMBAFILES) + + dnl + dnl The termnet support + dnl + termnet=false + AC_ARG_WITH(termnet, + [--with-termnet If you want a termified net support],[ + if test x$withval = xyes; then + AC_DEFINE(USE_TERMNET) + termnet=true + fi + ]) -dnl aclocal.m4 generated automatically by aclocal 1.2f + TERMNET="" + AC_DEFINE(USE_VFS) + if $use_net_code; then + AC_DEFINE(USE_NETCODE) + fi + mcserv= + if test $have_socket = yes; then + mcserv="mcserv" + if $termnet; then + TERMNET="-ltermnet" + fi + fi -dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -dnl This Makefile.in is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. + AC_SUBST(TERMNET) + AC_SUBST(mcserv) -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. +dnl FIXME: +dnl GNOME_VFS_LIBS= +]) -# progtest.m4 from gettext 0.32 -# Search path for a program which passes the given test. -# Ulrich Drepper , 1996. -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. +AC_DEFUN([GNOME_VFS_CHECKS],[ + use_vfs=yes + AC_ARG_WITH(vfs, + [--with-vfs Compile with the VFS code], + use_vfs=$withval + ) + case $use_vfs in + yes) GNOME_WITH_VFS;; + no) use_vfs=no;; + *) use_vfs=no;; + dnl Should we issue a warning? + esac +]) -# serial 1 -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN(AM_PATH_PROG_WITH_TEST, -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test -n "[$]$1"; then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl + +dnl +dnl Check for struct linger +dnl +AC_DEFUN(AC_STRUCT_LINGER, [ +av_struct_linger=no +AC_MSG_CHECKING(struct linger is available) +AC_TRY_RUN([ +#include +#include + +struct linger li; + +main () +{ + li.l_onoff = 1; + li.l_linger = 120; + exit (0); +} +],[ +AC_DEFINE(HAVE_STRUCT_LINGER) +av_struct_linger=yes +],[ +av_struct_linger=no +],[ +av_struct_linger=no +]) +AC_MSG_RESULT($av_struct_linger) ]) +dnl Curses detection: Munged from Midnight Commander's configure.in +dnl +dnl What it does: +dnl ============= +dnl +dnl - Determine which version of curses is installed on your system +dnl and set the -I/-L/-l compiler entries and add a few preprocessor +dnl symbols +dnl - Do an AC_SUBST on the CURSES_INCLUDEDIR and CURSES_LIBS so that +dnl @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in +dnl Makefile.in's +dnl - Modify the following configure variables (these are the only +dnl curses.m4 variables you can access from within configure.in) +dnl CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if +dnl an ncurses.h that's been renamed to curses.h +dnl is found. +dnl CURSES_LIBS - sets -L and -l's appropriately +dnl CFLAGS - if --with-sco, add -D_SVID3 +dnl has_curses - exports result of tests to rest of configure +dnl +dnl Usage: +dnl ====== +dnl 1) Add lines indicated below to acconfig.h +dnl 2) call AC_CHECK_CURSES after AC_PROG_CC in your configure.in +dnl 3) Instead of #include you should use the following to +dnl properly locate ncurses or curses header file +dnl +dnl #if defined(USE_NCURSES) && !defined(RENAMED_NCURSES) +dnl #include +dnl #else +dnl #include +dnl #endif +dnl +dnl 4) Make sure to add @CURSES_INCLUDEDIR@ to your preprocessor flags +dnl 5) Make sure to add @CURSES_LIBS@ to your linker flags or LIBS +dnl +dnl Notes with automake: +dnl - call AM_CONDITIONAL(HAS_CURSES, test "$has_curses" = true) from +dnl configure.in +dnl - your Makefile.am can look something like this +dnl ----------------------------------------------- +dnl INCLUDES= blah blah blah $(CURSES_INCLUDEDIR) +dnl if HAS_CURSES +dnl CURSES_TARGETS=name_of_curses_prog +dnl endif +dnl bin_PROGRAMS = other_programs $(CURSES_TARGETS) +dnl other_programs_SOURCES = blah blah blah +dnl name_of_curses_prog_SOURCES = blah blah blah +dnl other_programs_LDADD = blah +dnl name_of_curses_prog_LDADD = blah $(CURSES_LIBS) +dnl ----------------------------------------------- +dnl +dnl +dnl The following lines should be added to acconfig.h: +dnl ================================================== +dnl +dnl /*=== Curses version detection defines ===*/ +dnl /* Found some version of curses that we're going to use */ +dnl #undef HAS_CURSES +dnl +dnl /* Use SunOS SysV curses? */ +dnl #undef USE_SUNOS_CURSES +dnl +dnl /* Use old BSD curses - not used right now */ +dnl #undef USE_BSD_CURSES +dnl +dnl /* Use SystemV curses? */ +dnl #undef USE_SYSV_CURSES +dnl +dnl /* Use Ncurses? */ +dnl #undef USE_NCURSES +dnl +dnl /* If you Curses does not have color define this one */ +dnl #undef NO_COLOR_CURSES +dnl +dnl /* Define if you want to turn on SCO-specific code */ +dnl #undef SCO_FLAVOR +dnl +dnl /* Set to reflect version of ncurses * +dnl * 0 = version 1.* +dnl * 1 = version 1.9.9g +dnl * 2 = version 4.0/4.1 */ +dnl #undef NCURSES_970530 +dnl +dnl /*=== End new stuff for acconfig.h ===*/ +dnl -# lcmessage.m4 from gettext 0.32 -# Check whether LC_MESSAGES is available in . -# Ulrich Drepper , 1995. -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. -# serial 1 +AC_DEFUN(AC_CHECK_CURSES,[ + search_ncurses=true + screen_manager="" + has_curses=false -AC_DEFUN(AM_LC_MESSAGES, - [if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES) - fi - fi]) + CFLAGS=${CFLAGS--O} + AC_SUBST(CURSES_LIBS) + AC_SUBST(CURSES_INCLUDEDIR) + AC_ARG_WITH(sco, + [ --with-sco Use this to turn on SCO-specific code],[ + if test x$withval = xyes; then + AC_DEFINE(SCO_FLAVOR) + CFLAGS="$CFLAGS -D_SVID3" + fi + ]) -# gettext.m4 from gettext 0.32 -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995. -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. + AC_ARG_WITH(sunos-curses, + [ --with-sunos-curses Used to force SunOS 4.x curses],[ + if test x$withval = xyes; then + AC_USE_SUNOS_CURSES + fi + ]) -# serial 3 + AC_ARG_WITH(osf1-curses, + [ --with-osf1-curses Used to force OSF/1 curses],[ + if test x$withval = xyes; then + AC_USE_OSF1_CURSES + fi + ]) -AC_DEFUN(AM_WITH_NLS, - [AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + AC_ARG_WITH(vcurses, + [ --with-vcurses[=incdir] Used to force SysV curses], + if test x$withval != xyes; then + CURSES_INCLUDEDIR="-I$withval" + fi + AC_USE_SYSV_CURSES + ) - USE_INCLUDED_LIBINTL=no + AC_ARG_WITH(ncurses, + [ --with-ncurses[=dir] Compile with ncurses/locate base dir], + if test x$withval = xno ; then + search_ncurses=false + elif test x$withval != xyes ; then + CURSES_LIBS="$LIBS -L$withval/lib -lncurses" + CURSES_INCLUDEDIR="-I$withval/include" + search_ncurses=false + screen_manager="ncurses" + AC_DEFINE(USE_NCURSES) + AC_DEFINE(HAS_CURSES) + has_curses=true + fi + ) - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS) - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, - [ --with-included-gettext use the GNU gettext library included here], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + if $search_ncurses + then + AC_SEARCH_NCURSES() + fi - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If gettext or catgets are available (in this order) we - dnl use this. Else we have to fall back to GNU NLS library. - dnl catgets is only used if permitted by option --with-catgets. - nls_cv_header_intl= - nls_cv_header_libgt= - CATOBJEXT=NONE - AC_CHECK_HEADER(libintl.h, - [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, - [AC_TRY_LINK([#include ], [return (int) gettext ("")], - gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) +]) - if test "$gt_cv_func_gettext_libc" != "yes"; then - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CACHE_CHECK([for gettext in libintl], - gt_cv_func_gettext_libintl, - [AC_TRY_LINK([], [return (int) gettext ("")], - gt_cv_func_gettext_libintl=yes, - gt_cv_func_gettext_libintl=no)])]) - fi - if test "$gt_cv_func_gettext_libc" = "yes" \ - || test "$gt_cv_func_gettext_libintl" = "yes"; then - AC_DEFINE(HAVE_GETTEXT) - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - AC_CHECK_FUNCS(dcgettext) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - INSTOBJEXT=.mo - fi - fi - ]) +AC_DEFUN(AC_USE_SUNOS_CURSES, [ + search_ncurses=false + screen_manager="SunOS 4.x /usr/5include curses" + AC_MSG_RESULT(Using SunOS 4.x /usr/5include curses) + AC_DEFINE(USE_SUNOS_CURSES) + AC_DEFINE(HAS_CURSES) + has_curses=true + AC_DEFINE(NO_COLOR_CURSES) + AC_DEFINE(USE_SYSV_CURSES) + CURSES_INCLUDEDIR="-I/usr/5include" + CURSES_LIBS="/usr/5lib/libcurses.a /usr/5lib/libtermcap.a" + AC_MSG_RESULT(Please note that some screen refreshs may fail) +]) + +AC_DEFUN(AC_USE_OSF1_CURSES, [ + AC_MSG_RESULT(Using OSF1 curses) + search_ncurses=false + screen_manager="OSF1 curses" + AC_DEFINE(HAS_CURSES) + has_curses=true + AC_DEFINE(NO_COLOR_CURSES) + AC_DEFINE(USE_SYSV_CURSES) + CURSES_LIBS="-lcurses" +]) + +AC_DEFUN(AC_USE_SYSV_CURSES, [ + AC_MSG_RESULT(Using SysV curses) + AC_DEFINE(HAS_CURSES) + has_curses=true + AC_DEFINE(USE_SYSV_CURSES) + search_ncurses=false + screen_manager="SysV/curses" + CURSES_LIBS="-lcurses" +]) + +dnl AC_ARG_WITH(bsd-curses, +dnl [--with-bsd-curses Used to compile with bsd curses, not very fancy], +dnl search_ncurses=false +dnl screen_manager="Ultrix/cursesX" +dnl if test $system = ULTRIX +dnl then +dnl THIS_CURSES=cursesX +dnl else +dnl THIS_CURSES=curses +dnl fi +dnl +dnl CURSES_LIBS="-l$THIS_CURSES -ltermcap" +dnl AC_DEFINE(HAS_CURSES) +dnl has_curses=true +dnl AC_DEFINE(USE_BSD_CURSES) +dnl AC_MSG_RESULT(Please note that some screen refreshs may fail) +dnl AC_WARN(Use of the bsdcurses extension has some) +dnl AC_WARN(display/input problems.) +dnl AC_WARN(Reconsider using xcurses) +dnl) - if test "$CATOBJEXT" = "NONE"; then - AC_MSG_CHECKING([whether catgets can be used]) - AC_ARG_WITH(catgets, - [ --with-catgets use catgets functions if available], - nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) - AC_MSG_RESULT($nls_cv_use_catgets) + +dnl +dnl Parameters: directory filename cureses_LIBS curses_INCLUDEDIR nicename +dnl +AC_DEFUN(AC_NCURSES, [ + if $search_ncurses + then + if test -f $1/$2 + then + AC_MSG_RESULT(Found ncurses on $1/$2) + CURSES_LIBS="$3" + CURSES_INCLUDEDIR="$4" + search_ncurses=false + screen_manager=$5 + AC_DEFINE(HAS_CURSES) + has_curses=true + AC_DEFINE(USE_NCURSES) + fi + fi +]) - if test "$nls_cv_use_catgets" = "yes"; then - dnl No gettext in C library. Try catgets next. - AC_CHECK_LIB(i, main) - AC_CHECK_FUNC(catgets, - [AC_DEFINE(HAVE_CATGETS) - INTLOBJS="\$(CATOBJS)" - AC_PATH_PROG(GENCAT, gencat, no)dnl - if test "$GENCAT" != "no"; then - AC_PATH_PROG(GMSGFMT, gmsgfmt, no) - if test "$GMSGFMT" = "no"; then - AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) - fi - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.cat - INSTOBJEXT=.cat - DATADIRNAME=lib - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi]) - fi - fi +AC_DEFUN(AC_SEARCH_NCURSES, [ + AC_CHECKING("location of ncurses.h file") - if test "$CATOBJEXT" = "NONE"; then - dnl Neither gettext nor catgets in included in the C library. - dnl Fall back on GNU gettext library. - nls_cv_use_gnu_gettext=yes + AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include") + AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses") + AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include, "ncurses on /usr/local") + AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses") + + AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses") + + AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses") + + dnl + dnl We couldn't find ncurses, try SysV curses + dnl + if $search_ncurses + then + AC_EGREP_HEADER(init_color, /usr/include/curses.h, + AC_USE_SYSV_CURSES) + AC_EGREP_CPP(USE_NCURSES,[ +#include +#ifdef __NCURSES_H +#undef USE_NCURSES +USE_NCURSES +#endif +],[ + CURSES_INCLUDEDIR="$CURSES_INCLUDEDIR -DRENAMED_NCURSES" + AC_DEFINE(HAS_CURSES) + has_curses=true + AC_DEFINE(USE_NCURSES) + search_ncurses=false + screen_manager="ncurses installed as curses" +]) + fi + + dnl + dnl Try SunOS 4.x /usr/5{lib,include} ncurses + dnl The flags USE_SUNOS_CURSES, USE_BSD_CURSES and BUGGY_CURSES + dnl should be replaced by a more fine grained selection routine + dnl + if $search_ncurses + then + if test -f /usr/5include/curses.h + then + AC_USE_SUNOS_CURSES fi - fi + else + # check for ncurses version, to properly ifdef mouse-fix + AC_MSG_CHECKING(for ncurses version) + ncurses_version=unknown +cat > conftest.$ac_ext < +#else +#include +#endif +#undef VERSION +VERSION:NCURSES_VERSION +EOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | + egrep "VERSION:" >conftest.out 2>&1; then +changequote(,)dnl + ncurses_version=`cat conftest.out|sed -e 's/^[^"]*"//' -e 's/".*//'` +changequote([,])dnl + fi + rm -rf conftest* + AC_MSG_RESULT($ncurses_version) + case "$ncurses_version" in +changequote(,)dnl + 4.[01]) +changequote([,])dnl + AC_DEFINE(NCURSES_970530,2) + ;; + 1.9.9g) + AC_DEFINE(NCURSES_970530,1) + ;; + 1*) + AC_DEFINE(NCURSES_970530,0) + ;; + esac + fi +]) - if test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions used to generate GNU NLS library. - INTLOBJS="\$(GETTOBJS)" - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_SUBST(MSGFMT) - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.gmo - INSTOBJEXT=.mo - DATADIRNAME=share - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext programs is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - # We need to process the po/ directory. - POSUB=po - else - DATADIRNAME=share - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi - # If this is used in GNU gettext we have to set USE_NLS to `yes' - # because some of the sources are only built for this goal. - if test "$PACKAGE" = gettext; then - USE_NLS=yes - USE_INCLUDED_LIBINTL=yes - fi - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - dnl Make all variables we use known to autoconf. - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLDEPS) - AC_SUBST(INTLLIBS) - AC_SUBST(INTLOBJS) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) +# Define a conditional. + +AC_DEFUN(AM_CONDITIONAL, +[AC_SUBST($1_TRUE) +AC_SUBST($1_FALSE) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) + +dnl +dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits]) +dnl +dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh +dnl is not found. +dnl + +AC_DEFUN([GNOME_INIT_HOOK],[ + AC_SUBST(GNOME_LIBS) + AC_SUBST(GNOMEUI_LIBS) + AC_SUBST(GNOMEGNORBA_LIBS) + AC_SUBST(GTKXMHTML_LIBS) + AC_SUBST(ZVT_LIBS) + AC_SUBST(GNOME_LIBDIR) + AC_SUBST(GNOME_INCLUDEDIR) + + AC_ARG_WITH(gnome-includes, + [ --with-gnome-includes Specify location of GNOME headers],[ + CFLAGS="$CFLAGS -I$withval" + ]) + + AC_ARG_WITH(gnome-libs, + [ --with-gnome-libs Specify location of GNOME libs],[ + LDFLAGS="$LDFLAGS -L$withval" + gnome_prefix=$withval + ]) + + AC_ARG_WITH(gnome, + [ --with-gnome Specify prefix for GNOME files], + if test x$withval = xyes; then + want_gnome=yes + dnl Note that an empty true branch is not + dnl valid sh syntax. + ifelse([$1], [], :, [$1]) + else + if test "x$withval" = xno; then + want_gnome=no + else + want_gnome=yes + LDFLAGS="$LDFLAGS -L$withval/lib" + CFLAGS="$CFLAGS -I$withval/include" + gnome_prefix=$withval/lib + fi + fi, + want_gnome=yes) + + if test "x$want_gnome" = xyes; then -AC_DEFUN(AM_GNU_GETTEXT, - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl + AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) + if test "$GNOME_CONFIG" = "no"; then + no_gnome_config="yes" + else + AC_MSG_CHECKING(if $GNOME_CONFIG works) + if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then + AC_MSG_RESULT(yes) + GNOME_GNORBA_HOOK([],$2) + GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`" + GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`" + GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" + GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" + ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" + GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" + GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" + $1 + else + AC_MSG_RESULT(no) + no_gnome_config="yes" + fi + fi - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ -unistd.h values.h sys/param.h]) - AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ -__argz_count __argz_stringify __argz_next]) + if test x$exec_prefix = xNONE; then + if test x$prefix = xNONE; then + gnome_prefix=$ac_default_prefix/lib + else + gnome_prefix=$prefix/lib + fi + else + gnome_prefix=`eval echo \`echo $libdir\`` + fi + + if test "$no_gnome_config" = "yes"; then + AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix) + if test -f $gnome_prefix/gnomeConf.sh; then + AC_MSG_RESULT(found) + echo "loading gnome configuration from" \ + "$gnome_prefix/gnomeConf.sh" + . $gnome_prefix/gnomeConf.sh + $1 + else + AC_MSG_RESULT(not found) + if test x$2 = xfail; then + AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) + fi + fi + fi + fi - if test "${ac_cv_func_stpcpy+set}" != "set"; then - AC_CHECK_FUNCS(stpcpy) - fi - if test "${ac_cv_func_stpcpy}" = "yes"; then - AC_DEFINE(HAVE_STPCPY) - fi + if test -n "$3"; then + n="$3" + for i in $n; do + AC_MSG_CHECKING(extra library \"$i\") + case $i in + applets) + AC_SUBST(GNOME_APPLETS_LIBS) + GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` + AC_MSG_RESULT($GNOME_APPLETS_LIBS);; + docklets) + AC_SUBST(GNOME_DOCKLETS_LIBS) + GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets` + AC_MSG_RESULT($GNOME_DOCKLETS_LIBS);; + capplet) + AC_SUBST(GNOME_CAPPLET_LIBS) + GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` + AC_MSG_RESULT($GNOME_CAPPLET_LIBS);; + *) + AC_MSG_RESULT(unknown library) + esac + done + fi +]) - AM_LC_MESSAGES - AM_WITH_NLS +dnl +dnl GNOME_INIT ([additional-inits]) +dnl - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; - esac - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi +AC_DEFUN([GNOME_INIT],[ + GNOME_INIT_HOOK([],fail,$1) +]) - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi +dnl +dnl GNOME_GNORBA_HOOK (script-if-gnorba-found, failflag) +dnl +dnl if failflag is "failure" it aborts if gnorba is not found. +dnl - dnl The reference to in the installed file - dnl must be resolved because we cannot expect the users of this - dnl to define HAVE_LOCALE_H. - if test $ac_cv_header_locale_h = yes; then - INCLUDE_LOCALE_H="#include " - else - INCLUDE_LOCALE_H="\ -/* The system does not provide the header . Take care yourself. */" - fi - AC_SUBST(INCLUDE_LOCALE_H) +AC_DEFUN([GNOME_GNORBA_HOOK],[ + GNOME_ORBIT_HOOK([],$2) + AC_CACHE_CHECK([for gnorba libraries],gnome_cv_gnorba_found,[ + gnome_cv_gnorba_found=no + if test x$gnome_cv_orbit_found = xyes; then + GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" + GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" + if test -n "$GNORBA_LIBS"; then + gnome_cv_gnorba_found=yes + fi + fi + ]) + AM_CONDITIONAL(HAVE_GNORBA, test x$gnome_cv_gnorba_found = xyes) + if test x$gnome_cv_orbit_found = xyes; then + $1 + GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" + GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" + AC_SUBST(GNORBA_CFLAGS) + AC_SUBST(GNORBA_LIBS) + else + if test x$2 = xfailure; then + AC_MSG_ERROR(gnorba library not installed or installation problem) + fi + fi +]) - dnl Determine which catalog format we have (if any is needed) - dnl For now we know about two different formats: - dnl Linux libc-5 and the normal X/Open format - test -d intl || mkdir intl - if test "$CATOBJEXT" = ".cat"; then - AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) +AC_DEFUN([GNOME_GNORBA_CHECK], [ + GNOME_GNORBA_HOOK([],failure) +]) - dnl Transform the SED scripts while copying because some dumb SEDs - dnl cannot handle comments. - sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed - fi - dnl po2tbl.sed is always needed. - sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ - $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed +dnl +dnl GNOME_ORBIT_HOOK (script-if-orbit-found, failflag) +dnl +dnl if failflag is "failure" it aborts if orbit is not found. +dnl - dnl In the intl/Makefile.in we have a special dependency which makes - dnl only sense for gettext. We comment this out for non-gettext - dnl packages. - if test "$PACKAGE" = "gettext"; then - GT_NO="#NO#" - GT_YES= - else - GT_NO= - GT_YES="#YES#" - fi - AC_SUBST(GT_NO) - AC_SUBST(GT_YES) +AC_DEFUN([GNOME_ORBIT_HOOK],[ + AC_PATH_PROG(ORBIT_CONFIG,orbit-config,no) + AC_PATH_PROG(ORBIT_IDL,orbit-idl,no) + AC_CACHE_CHECK([for working ORBit environment],gnome_cv_orbit_found,[ + if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then + gnome_cv_orbit_found=no + else + gnome_cv_orbit_found=yes + fi + ]) + AM_CONDITIONAL(HAVE_ORBIT, test x$gnome_cv_orbit_found = xyes) + if test x$gnome_cv_orbit_found = xyes; then + $1 + ORBIT_CFLAGS=`orbit-config --cflags client server` + ORBIT_LIBS=`orbit-config --use-service=name --libs client server` + AC_SUBST(ORBIT_CFLAGS) + AC_SUBST(ORBIT_LIBS) + else + if test x$2 = xfailure; then + AC_MSG_ERROR(ORBit not installed or installation problem) + fi + fi +]) - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) +AC_DEFUN([GNOME_ORBIT_CHECK], [ + GNOME_ORBIT_HOOK([],failure) +]) - dnl *** For now the libtool support in intl/Makefile is not for real. - l= - AC_SUBST(l) +dnl GNOME_UNDELFS_CHECKS +dnl Check for ext2fs undel support. +dnl Set shell variable ext2fs_undel to "yes" if we have it, +dnl "no" otherwise. May define USE_EXT2FSLIB for cpp. +dnl Will set EXT2FS_UNDEL_LIBS to required libraries. - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) +AC_DEFUN([GNOME_UNDELFS_CHECKS], [ + AC_CHECK_HEADERS(ext2fs/ext2fs.h linux/ext2_fs.h) + ext2fs_undel=no + EXT2FS_UNDEL_LIBS= + if test x$ac_cv_header_ext2fs_ext2fs_h = xyes + then + if test x$ac_cv_header_linux_ext2_fs_h = xyes + then + AC_DEFINE(USE_EXT2FSLIB) + ext2fs_undel=yes + EXT2FS_UNDEL_LIBS="-lext2fs -lcom_err" + fi + fi +]) diff -ruN old/mc-4.5.45/config.h.in new/mc-4.5.46/config.h.in --- old/mc-4.5.45/config.h.in Tue May 9 18:52:01 2000 +++ new/mc-4.5.46/config.h.in Wed May 10 18:58:00 2000 @@ -176,6 +176,9 @@ /* If you don't have gcc, define this */ #undef OLD_TOOLS +/* Found some version of curses that we're going to use */ +#undef HAS_CURSES + /* Is the subshell the default or optional? */ #undef SUBSHELL_OPTIONAL diff -ruN old/mc-4.5.45/configure new/mc-4.5.46/configure --- old/mc-4.5.45/configure Tue May 9 18:52:01 2000 +++ new/mc-4.5.46/configure Wed May 10 18:58:00 2000 @@ -588,7 +588,7 @@ PACKAGE=mc -VERSION=4.5.45 +VERSION=4.5.46 cat >> confdefs.h <&6;; + docklets) + + GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets` + echo "$ac_t""$GNOME_DOCKLETS_LIBS" 1>&6;; capplet) GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` @@ -9727,7 +9731,7 @@ # Extract the first word of "nroff", so it can be a program name with args. set dummy nroff; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9731: checking for $ac_word" >&5 +echo "configure:9735: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HAVE_nroff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9756,7 +9760,7 @@ if $HAVE_nroff; then echo $ac_n "checking for manual formatting macros""... $ac_c" 1>&6 -echo "configure:9760: checking for manual formatting macros" >&5 +echo "configure:9764: checking for manual formatting macros" >&5 if eval "test \"`echo '$''{'ac_cv_mandoc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9780,7 +9784,7 @@ if $HAVE_nroff; then echo $ac_n "checking if nroff accepts -Tlatin1 or -Tascii""... $ac_c" 1>&6 -echo "configure:9784: checking if nroff accepts -Tlatin1 or -Tascii" >&5 +echo "configure:9788: checking if nroff accepts -Tlatin1 or -Tascii" >&5 if eval "test \"`echo '$''{'ac_cv_nroff_tascii'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9811,7 +9815,7 @@ # Extract the first word of "file", so it can be a program name with args. set dummy file; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9815: checking for $ac_word" >&5 +echo "configure:9819: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HAVE_FILECMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9840,7 +9844,7 @@ if $HAVE_FILECMD; then echo $ac_n "checking for - option to file command""... $ac_c" 1>&6 -echo "configure:9844: checking for - option to file command" >&5 +echo "configure:9848: checking for - option to file command" >&5 if eval "test \"`echo '$''{'ac_cv_filestdin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9883,7 +9887,7 @@ echo $ac_n "checking for -L option to file command""... $ac_c" 1>&6 -echo "configure:9887: checking for -L option to file command" >&5 +echo "configure:9891: checking for -L option to file command" >&5 if eval "test \"`echo '$''{'ac_cv_filel'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9909,7 +9913,7 @@ fi echo $ac_n "checking for - option to grep command""... $ac_c" 1>&6 -echo "configure:9913: checking for - option to grep command" >&5 +echo "configure:9917: checking for - option to grep command" >&5 if eval "test \"`echo '$''{'ac_cv_grep_stdin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9933,7 +9937,7 @@ echo $ac_n "checking for subshell support""... $ac_c" 1>&6 -echo "configure:9937: checking for subshell support" >&5 +echo "configure:9941: checking for subshell support" >&5 # Check whether --with-subshell or --without-subshell was given. if test "${with_subshell+set}" = set; then withval="$with_subshell" @@ -10075,7 +10079,7 @@ slang_term="" slang_use_system_installed_lib=false echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6 -echo "configure:10079: checking for SLang_init_tty in -lslang" >&5 +echo "configure:10083: checking for SLang_init_tty in -lslang" >&5 ac_lib_var=`echo slang'_'SLang_init_tty | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10083,7 +10087,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10113,17 +10117,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10117: checking for $ac_hdr" >&5 +echo "configure:10121: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10158,17 +10162,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10162: checking for $ac_hdr" >&5 +echo "configure:10166: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10240,7 +10244,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10244: checking for tgoto in -ltermcap" >&5 +echo "configure:10248: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10248,7 +10252,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10332,7 +10336,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS="$ac_save_LIBS"; cat >> confdefs.h <<\EOF #define SLANG_TERMINFO 1 @@ -10365,7 +10369,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10369: checking for tgoto in -ltermcap" >&5 +echo "configure:10373: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10373,7 +10377,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10450,7 +10454,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10454: checking for tgoto in -ltermcap" >&5 +echo "configure:10458: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10458,7 +10462,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10584,17 +10588,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10588: checking for $ac_hdr" >&5 +echo "configure:10592: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10648,7 +10652,7 @@ else echo $ac_n "checking for ext2fs_close in -lext2fs""... $ac_c" 1>&6 -echo "configure:10652: checking for ext2fs_close in -lext2fs" >&5 +echo "configure:10656: checking for ext2fs_close in -lext2fs" >&5 ac_lib_var=`echo ext2fs'_'ext2fs_close | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10656,7 +10660,7 @@ ac_save_LIBS="$LIBS" LIBS="-lext2fs -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10688,17 +10692,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10692: checking for $ac_hdr" >&5 +echo "configure:10696: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10763,7 +10767,7 @@ if $search_ncurses then echo "checking "location of ncurses.h file"" 1>&6 -echo "configure:10767: checking "location of ncurses.h file"" >&5 +echo "configure:10771: checking "location of ncurses.h file"" >&5 if $search_ncurses @@ -10903,7 +10907,7 @@ if $search_ncurses then cat > conftest.$ac_ext < EOF @@ -10929,7 +10933,7 @@ rm -f conftest* cat > conftest.$ac_ext < @@ -10989,10 +10993,10 @@ else # check for ncurses version, to properly ifdef mouse-fix echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:10993: checking for ncurses version" >&5 +echo "configure:10997: checking for ncurses version" >&5 ncurses_version=unknown cat > conftest.$ac_ext < @@ -11036,12 +11040,12 @@ for ac_func in resizeterm keyok do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11040: checking for $ac_func" >&5 +echo "configure:11044: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11113,7 +11117,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS="$ac_save_LIBS"; cat >> confdefs.h <<\EOF #define SLANG_TERMINFO 1 @@ -11146,7 +11150,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:11150: checking for tgoto in -ltermcap" >&5 +echo "configure:11154: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11154,7 +11158,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11231,7 +11235,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:11235: checking for tgoto in -ltermcap" >&5 +echo "configure:11239: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11239,7 +11243,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11290,7 +11294,7 @@ install_saver="yes" echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 -echo "configure:11294: checking for pam_start in -lpam" >&5 +echo "configure:11298: checking for pam_start in -lpam" >&5 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11298,7 +11302,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpam -ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11352,7 +11356,7 @@ else echo $ac_n "checking for -lXpm""... $ac_c" 1>&6 -echo "configure:11356: checking for -lXpm" >&5 +echo "configure:11360: checking for -lXpm" >&5 if eval "test \"`echo '$''{'ac_cv_has_xpm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11368,7 +11372,7 @@ has_xpm_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat > conftest.$ac_ext < @@ -11378,7 +11382,7 @@ XpmLibraryVersion(); ; return 0; } EOF -if { (eval echo configure:11382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_has_xpm=yes else @@ -11400,7 +11404,7 @@ echo $ac_n "checking for X11 non-rectangular shape extension""... $ac_c" 1>&6 -echo "configure:11404: checking for X11 non-rectangular shape extension" >&5 +echo "configure:11408: checking for X11 non-rectangular shape extension" >&5 if eval "test \"`echo '$''{'ac_cv_has_shape'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11416,7 +11420,7 @@ has_shape_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat > conftest.$ac_ext < @@ -11431,7 +11435,7 @@ ; return 0; } EOF -if { (eval echo configure:11435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_has_shape=yes else @@ -11467,7 +11471,7 @@ echo else echo $ac_n "checking for setupterm in -lcurses""... $ac_c" 1>&6 -echo "configure:11471: checking for setupterm in -lcurses" >&5 +echo "configure:11475: checking for setupterm in -lcurses" >&5 ac_lib_var=`echo curses'_'setupterm | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11475,7 +11479,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11503,7 +11507,7 @@ echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -11516,7 +11520,7 @@ ; return 0; } EOF -if { (eval echo configure:11520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* LIBS="$LIBS -lcurses" @@ -11856,6 +11860,7 @@ s%@GNORBA_CFLAGS@%$GNORBA_CFLAGS%g s%@GNORBA_LIBS@%$GNORBA_LIBS%g s%@GNOME_APPLETS_LIBS@%$GNOME_APPLETS_LIBS%g +s%@GNOME_DOCKLETS_LIBS@%$GNOME_DOCKLETS_LIBS%g s%@GNOME_CAPPLET_LIBS@%$GNOME_CAPPLET_LIBS%g s%@gnomeicondir@%$gnomeicondir%g s%@mx@%$mx%g diff -ruN old/mc-4.5.45/configure.in new/mc-4.5.46/configure.in --- old/mc-4.5.45/configure.in Tue May 9 18:52:01 2000 +++ new/mc-4.5.46/configure.in Wed May 10 18:58:00 2000 @@ -5,7 +5,7 @@ AC_CONFIG_HEADER(config.h) PACKAGE=mc -VERSION=4.5.45 +VERSION=4.5.46 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(VERSION) diff -ruN old/mc-4.5.45/gtkedit/Makefile.in new/mc-4.5.46/gtkedit/Makefile.in --- old/mc-4.5.45/gtkedit/Makefile.in Tue May 9 18:52:03 2000 +++ new/mc-4.5.46/gtkedit/Makefile.in Wed May 10 18:58:01 2000 @@ -21,7 +21,7 @@ EDITSRC = edit.c editcmd.c editdraw.c gtkedit.c gtkeditkey.c \ propfont.c syntax.c wordproc.c edit.h editcmddef.h global.h gtkedit.h \ libgettext.h lkeysym.h editmenu.c editoptions.c mousemark.h \ - editwidget.c bookmark.c + editwidget.c bookmark.c edit-widget.h EDITOBJS = edit.o editcmd.o editdraw.o gtkedit.o gtkeditkey.o \ propfont.o syntax.o wordproc.o bookmark.o diff -ruN old/mc-4.5.45/gtkedit/edit-widget.h new/mc-4.5.46/gtkedit/edit-widget.h --- old/mc-4.5.45/gtkedit/edit-widget.h Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.46/gtkedit/edit-widget.h Wed May 10 18:58:01 2000 @@ -0,0 +1,144 @@ +#ifndef __EDIT_WIDGET_H +#define __EDIT_WIDGET_H + +struct macro { + short command; + short ch; +}; + +struct syntax_rule { + unsigned short keyword; + unsigned char end; + unsigned char context; + unsigned char _context; +#define RULE_ON_LEFT_BORDER 1 +#define RULE_ON_RIGHT_BORDER 2 + unsigned char border; +}; + +/*there are a maximum of ... */ +#define MAXBUFF 1024 +#define MAX_MACRO_LENGTH 1024 + +struct _syntax_marker { + long offset; + struct syntax_rule rule; + struct _syntax_marker *next; +}; + +struct _book_mark { + int line; /* line number */ +/* #define BOOK_MARK_COLOR ((0 << 8) | 26) */ /* black on white */ +#define BOOK_MARK_COLOR ((25 << 8) | 5) +#define BOOK_MARK_FOUND_COLOR ((26 << 8) | 4) + int c; /* colour */ + struct _book_mark *next; + struct _book_mark *prev; +}; + +struct editor_widget { +#ifdef MIDNIGHT + Widget widget; +#elif defined(GTK) + GtkEdit *widget; +#else + struct cool_widget *widget; +#endif +#define from_here num_widget_lines + int num_widget_lines; + int num_widget_columns; + +#ifdef MIDNIGHT + int have_frame; +#else + int stopped; +#endif + + char *filename; /* Name of the file */ + char *dir; /* current directory */ + +/* dynamic buffers and cursor position for editor: */ + long curs1; /*position of the cursor from the beginning of the file. */ + long curs2; /*position from the end of the file */ + unsigned char *buffers1[MAXBUFF + 1]; /*all data up to curs1 */ + unsigned char *buffers2[MAXBUFF + 1]; /*all data from end of file down to curs2 */ + +/* search variables */ + long search_start; /* First character to start searching from */ + int found_len; /* Length of found string or 0 if none was found */ + long found_start; /* the found word from a search - start position */ + +/* display information */ + long last_byte; /* Last byte of file */ + long start_display; /* First char displayed */ + long start_col; /* First displayed column, negative */ + long max_column; /* The maximum cursor position ever reached used to calc hori scroll bar */ + long curs_row; /*row position of cursor on the screen */ + long curs_col; /*column position on screen */ + int force; /* how much of the screen do we redraw? */ + unsigned char overwrite; + unsigned char modified; /*has the file been changed?: 1 if char inserted or + deleted at all since last load or save */ + unsigned char screen_modified; /* has the file been changed since the last screen draw? */ +#if defined(MIDNIGHT) || defined(GTK) + int delete_file; /* has the file been created in edit_load_file? Delete + it at end of editing when it hasn't been modified + or saved */ +#endif + unsigned char highlight; + long prev_col; /*recent column position of the cursor - used when moving + up or down past lines that are shorter than the current line */ + long curs_line; /*line number of the cursor. */ + long start_line; /*line nummber of the top of the page */ + +/* file info */ + long total_lines; /*total lines in the file */ + long mark1; /*position of highlight start */ + long mark2; /*position of highlight end */ + int column1; /*position of column highlight start */ + int column2; /*position of column highlight end */ + long bracket; /*position of a matching bracket */ + +/* cache speedup for line lookups */ +#define N_LINE_CACHES 32 + int caches_valid; + int line_numbers[N_LINE_CACHES]; + long line_offsets[N_LINE_CACHES]; + + struct _book_mark *book_mark; + +/* undo stack and pointers */ + unsigned long stack_pointer; + long *undo_stack; + unsigned long stack_size; + unsigned long stack_size_mask; + unsigned long stack_bottom; + struct stat stat; + +/* syntax higlighting */ + struct _syntax_marker *syntax_marker; + struct context_rule **rules; + long last_get_rule; + struct syntax_rule rule; + char *syntax_type; /* description of syntax highlighting type being used */ + int explicit_syntax; /* have we forced the syntax hi. type in spite of the filename? */ + + int to_here; /* dummy marker */ + + +/* macro stuff */ + int macro_i; /* -1 if not recording index to macro[] otherwise */ + struct macro macro[MAX_MACRO_LENGTH]; +}; + +typedef struct editor_widget WEdit; + +#define EDIT_DIR "/.cedit" +#define SYNTAX_FILE "/.cedit/Syntax" +#define CLIP_FILE "/.cedit/cooledit.clip" +#define MACRO_FILE "/.cedit/cooledit.macros" +#define BLOCK_FILE "/.cedit/cooledit.block" +#define ERROR_FILE "/.cedit/cooledit.error" +#define TEMP_FILE "/.cedit/cooledit.temp" + +#endif diff -ruN old/mc-4.5.45/mc.spec new/mc-4.5.46/mc.spec --- old/mc-4.5.45/mc.spec Tue May 9 18:52:01 2000 +++ new/mc-4.5.46/mc.spec Wed May 10 18:58:00 2000 @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 4.5.45 +%define ver 4.5.46 %define RELEASE 1 %define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} %define prefix /usr Binary files old/mc-4.5.45/po/ca.gmo and new/mc-4.5.46/po/ca.gmo differ Binary files old/mc-4.5.45/po/cs.gmo and new/mc-4.5.46/po/cs.gmo differ Binary files old/mc-4.5.45/po/da.gmo and new/mc-4.5.46/po/da.gmo differ Binary files old/mc-4.5.45/po/de.gmo and new/mc-4.5.46/po/de.gmo differ Binary files old/mc-4.5.45/po/el.gmo and new/mc-4.5.46/po/el.gmo differ Binary files old/mc-4.5.45/po/es.gmo and new/mc-4.5.46/po/es.gmo differ Binary files old/mc-4.5.45/po/es_ES.gmo and new/mc-4.5.46/po/es_ES.gmo differ Binary files old/mc-4.5.45/po/fi.gmo and new/mc-4.5.46/po/fi.gmo differ Binary files old/mc-4.5.45/po/fr.gmo and new/mc-4.5.46/po/fr.gmo differ Binary files old/mc-4.5.45/po/hu.gmo and new/mc-4.5.46/po/hu.gmo differ Binary files old/mc-4.5.45/po/it.gmo and new/mc-4.5.46/po/it.gmo differ Binary files old/mc-4.5.45/po/ja.gmo and new/mc-4.5.46/po/ja.gmo differ diff -ruN old/mc-4.5.45/po/ja.po new/mc-4.5.46/po/ja.po --- old/mc-4.5.45/po/ja.po Tue May 9 18:52:09 2000 +++ new/mc-4.5.46/po/ja.po Wed May 10 18:58:04 2000 @@ -3,11 +3,14 @@ # Yasuyuki Furukawa , 1999. # Takayuki KUSANO , 1999. # Akira TAGOH , 2000. +#. Not essential to translate +#: gtkedit/edit.c:2768 gtkedit/editcmd.c:2880 gtkedit/editcmd.c:2886 +#: gtkedit/editcmd.c:2893 gtkedit/editcmd.c:2898 gtkedit/editcmd.c:2943 msgid "" msgstr "" -"Project-Id-Version: mc CVS-20000420\n" -"POT-Creation-Date: 2000-04-20 23:31+0900\n" -"PO-Revision-Date: 2000-04-20 23:37+0900\n" +"Project-Id-Version: mc CVS-20000510\n" +"POT-Creation-Date: 2000-05-10 18:12+0900\n" +"PO-Revision-Date: 2000-05-10 21:35+0900\n" "Last-Translator: Akira TAGOH \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -15,25 +18,25 @@ "Content-Transfer-Encoding: 8bit\n" "First-Translator: Yasuyuki Furukawa \n" -#: edit/edit_key_translator.c:124 +#: edit/edit_key_translator.c:126 msgid " Emacs key: " msgstr " Emacs¥­¡¼: " -#: edit/edit_key_translator.c:136 edit/edit_key_translator.c:151 +#: edit/edit_key_translator.c:138 edit/edit_key_translator.c:153 msgid " Execute Macro " msgstr " ¥Þ¥¯¥í¤ò¼Â¹Ô " #. Input line for a single key press follows the ':' -#: edit/edit_key_translator.c:136 edit/edit_key_translator.c:151 +#: edit/edit_key_translator.c:138 edit/edit_key_translator.c:153 #: gtkedit/editcmd.c:760 gtkedit/editcmd.c:769 msgid " Press macro hotkey: " msgstr " ¥Þ¥¯¥í¥Û¥Ã¥È¥­¡¼¤ò²¡¤·¤Æ²¼¤µ¤¤: " -#: edit/edit_key_translator.c:147 +#: edit/edit_key_translator.c:149 msgid " Insert Literal " msgstr " ʸ»ú¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ " -#: edit/edit_key_translator.c:147 +#: edit/edit_key_translator.c:149 msgid " Press any key: " msgstr " ¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤: " @@ -268,7 +271,7 @@ msgid "Enter a regular expression here to select files in the panel view with." msgstr "¥Ñ¥Í¥ë¤ÇÁªÂò¤¹¤ë¥Õ¥¡¥¤¥ë¤Î¥Õ¥£¥ë¥¿¤ÎÀµµ¬É½¸½¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" -#: gnome/gcmd.c:917 src/cmd.c:543 src/cmd.c:594 +#: gnome/gcmd.c:917 src/cmd.c:540 src/cmd.c:591 msgid " Malformed regular expression " msgstr " ¤ª¤«¤·¤ÊÀµµ¬É½¸½¤Ç¤¹ " @@ -349,28 +352,28 @@ msgid "Custom View" msgstr "¥«¥¹¥¿¥àɽ¼¨" -#: gnome/gdesktop.c:532 gnome/gmount.c:382 +#: gnome/gdesktop.c:622 gnome/gmount.c:382 msgid "Warning" msgstr "·Ù¹ð" -#: gnome/gdesktop.c:533 +#: gnome/gdesktop.c:623 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "%s¤ò³«¤±¤Þ¤»¤ó; ¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥¤¥³¥ó¤¬¤¢¤ê¤Þ¤»¤ó" -#: gnome/gdesktop.c:1205 +#: gnome/gdesktop.c:1298 msgid "While running the mount/umount command" msgstr "mount/umount¥³¥Þ¥ó¥É¼Â¹ÔÃæ" -#: gnome/gdesktop.c:1274 +#: gnome/gdesktop.c:1367 msgid "While running the eject command" msgstr "eject¥³¥Þ¥ó¥É¼Â¹ÔÃæ" -#: gnome/gdesktop.c:1458 gnome/gicon.c:282 gnome/gtools.c:46 +#: gnome/gdesktop.c:1551 gnome/gicon.c:282 gnome/gtools.c:46 msgid "Error" msgstr "¥¨¥é¡¼" -#: gnome/gdesktop.c:2617 +#: gnome/gdesktop.c:2775 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -384,84 +387,84 @@ "\n" "ÇطʤòÀßÄê¤Ç¤­¤Þ¤»¤ó." -#: gnome/gdesktop.c:2640 gnome/glayout.c:362 +#: gnome/gdesktop.c:2798 gnome/glayout.c:362 msgid "_Terminal" msgstr "üËö (_T)" -#: gnome/gdesktop.c:2640 gnome/glayout.c:363 +#: gnome/gdesktop.c:2798 gnome/glayout.c:363 msgid "Launch a new terminal in the current directory" msgstr "¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¿·µ¬Ã¼Ëö¤òµ¯Æ°" #. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/gdesktop.c:2642 gnome/glayout.c:365 +#: gnome/gdesktop.c:2800 gnome/glayout.c:365 msgid "_Directory..." msgstr "¥Ç¥£¥ì¥¯¥È¥ê (_D)..." -#: gnome/gdesktop.c:2642 gnome/glayout.c:366 +#: gnome/gdesktop.c:2800 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "¿·µ¬¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®" -#: gnome/gdesktop.c:2643 +#: gnome/gdesktop.c:2801 msgid "URL L_ink..." msgstr "URL¥ê¥ó¥¯ (_L)..." -#: gnome/gdesktop.c:2643 +#: gnome/gdesktop.c:2801 msgid "Creates a new URL link" msgstr "¿·µ¬URL¥ê¥ó¥¯¤òºîÀ®¤¹¤ë" -#: gnome/gdesktop.c:2644 +#: gnome/gdesktop.c:2802 msgid "_Launcher..." msgstr "¥é¥ó¥Á¥ã (_L)..." -#: gnome/gdesktop.c:2644 +#: gnome/gdesktop.c:2802 msgid "Creates a new launcher" msgstr "¿·µ¬¥é¥ó¥Á¥ã¤ò¤³¤Î¾ì½ê¤ÇºîÀ®¤¹¤ë" -#: gnome/gdesktop.c:2650 +#: gnome/gdesktop.c:2808 msgid "By _Name" msgstr "̾Á° (_N)" -#: gnome/gdesktop.c:2651 +#: gnome/gdesktop.c:2809 msgid "By File _Type" msgstr "¥Õ¥¡¥¤¥ë¥¿¥¤¥× (_T)" -#: gnome/gdesktop.c:2652 +#: gnome/gdesktop.c:2810 msgid "By _Size" msgstr "¥µ¥¤¥º (_S)" -#: gnome/gdesktop.c:2653 +#: gnome/gdesktop.c:2811 msgid "By Time Last _Accessed" msgstr "ºÇ½ª¥¢¥¯¥»¥¹»þ¹ï (_A)" -#: gnome/gdesktop.c:2654 +#: gnome/gdesktop.c:2812 msgid "By Time Last _Modified" msgstr "ºÇ½ª¹¹¿·»þ¹ï (_M)" -#: gnome/gdesktop.c:2655 +#: gnome/gdesktop.c:2813 msgid "By Time Last _Changed" msgstr "ºÇ½ªÊѹ¹»þ¹ï (_C)" -#: gnome/gdesktop.c:2663 gnome/glayout.c:462 +#: gnome/gdesktop.c:2821 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "¥¢¥¤¥³¥ó¤ÎÀ°Îó (_A)" -#: gnome/gdesktop.c:2664 +#: gnome/gdesktop.c:2822 msgid "Create _New Window" msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤ÎºîÀ® (_N)" -#: gnome/gdesktop.c:2666 gnome/glayout.c:464 +#: gnome/gdesktop.c:2824 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "¥Ç¥¹¥¯¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤òºÆ¥¹¥­¥ã¥ó (_D)" -#: gnome/gdesktop.c:2667 gnome/glayout.c:465 +#: gnome/gdesktop.c:2825 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "¥Ç¥Ð¥¤¥¹¤òºÆ¥¹¥­¥ã¥ó (_V)" -#: gnome/gdesktop.c:2668 gnome/glayout.c:466 +#: gnome/gdesktop.c:2826 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¥¢¥¤¥³¥ó¤òºÆºîÀ® (_I)" -#: gnome/gdesktop.c:2670 +#: gnome/gdesktop.c:2828 msgid "Configure _Background Image" msgstr "ÇطʲèÁü¤òÀßÄê (_B)" @@ -558,7 +561,7 @@ msgstr "¾å½ñ¤­¤·¤Þ¤¹¤«?" #: gnome/gdialogs.c:568 gtkedit/editwidget.c:1140 gtkedit/gtkedit.c:1250 -#: src/file.c:802 src/screen.c:2398 src/screen.c:2428 src/tree.c:1014 +#: src/file.c:802 src/screen.c:2400 src/screen.c:2430 src/tree.c:1014 msgid "Copy" msgstr "¥³¥Ô¡¼" @@ -658,7 +661,7 @@ #. Translators should take care as "Password" or its translations #. are used to identify password boxes and hide characters with "*" -#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1834 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1833 msgid "Password:" msgstr "¥Ñ¥¹¥ï¡¼¥É:" @@ -1092,6 +1095,12 @@ msgid "File Created on: " msgstr "¥Õ¥¡¥¤¥ëºîÀ®ÆüÉÕ: " +#: gnome/gnome-file-property-dialog.c:281 +#: gnome/gnome-file-property-dialog.c:290 +#: gnome/gnome-file-property-dialog.c:299 +msgid "%a, %b %d %Y, %I:%M:%S %p" +msgstr "%a, %b %d %Y, %I:%M:%S %p" + #: gnome/gnome-file-property-dialog.c:286 msgid "Last Modified on: " msgstr "ºÇ½ª¹¹¿·ÆüÉÕ: " @@ -1119,7 +1128,7 @@ #: gnome/gnome-file-property-dialog.c:413 #: gnome/gnome-file-property-dialog.c:501 gnome/gpopup2.c:203 -#: src/screen.c:2396 src/screen.c:2426 +#: src/screen.c:2398 src/screen.c:2428 msgid "View" msgstr "ɽ¼¨" @@ -1149,7 +1158,7 @@ msgstr "ɸ½à¤ÇÍÑ°Õ¤µ¤ì¤¿É½¼¨½èÍý¤ò¹Ô¤¦" #: gnome/gnome-file-property-dialog.c:523 gnome/gpopup2.c:205 -#: src/screen.c:2397 src/screen.c:2427 src/view.c:2081 +#: src/screen.c:2399 src/screen.c:2429 src/view.c:2081 msgid "Edit" msgstr "ÊÔ½¸" @@ -1305,8 +1314,8 @@ msgid "Copy..." msgstr "¥³¥Ô¡¼..." -#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2401 -#: src/screen.c:2431 +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2403 +#: src/screen.c:2433 msgid "Delete" msgstr "ºï½ü" @@ -1554,8 +1563,8 @@ msgstr "¾ì½ê:" #. 1 -#: gnome/gtools.c:105 gtkedit/editcmd.c:386 gtkedit/editcmd.c:1234 -#: gtkedit/editcmd.c:1319 gtkedit/editcmd.c:2983 gtkedit/editoptions.c:69 +#: gnome/gtools.c:105 gtkedit/editcmd.c:386 gtkedit/editcmd.c:1235 +#: gtkedit/editcmd.c:1320 gtkedit/editcmd.c:3027 gtkedit/editoptions.c:69 #: src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 src/boxes.c:466 #: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:898 #: src/filegui.c:839 src/find.c:171 src/layout.c:370 src/option.c:143 @@ -1701,48 +1710,57 @@ msgstr "¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¥Ç¥£¥ì¥¯¥È¥ê¤Î¥¦¥¤¥ó¥É¥¦¤òÊĤ¸¤ë" #. The file-name is printed after the ':' -#: gtkedit/edit.c:145 gtkedit/edit.c:314 gtkedit/edit.c:319 gtkedit/edit.c:333 -#: gtkedit/edit.c:337 gtkedit/edit.c:369 gtkedit/edit.c:375 gtkedit/edit.c:382 -#: gtkedit/edit.c:389 gtkedit/edit.c:395 gtkedit/editcmd.c:298 -#: gtkedit/editcmd.c:304 gtkedit/editcmd.c:2030 gtkedit/editwidget.c:1023 +#: gtkedit/edit.c:149 gtkedit/edit.c:318 gtkedit/edit.c:323 gtkedit/edit.c:337 +#: gtkedit/edit.c:341 gtkedit/edit.c:373 gtkedit/edit.c:379 gtkedit/edit.c:386 +#: gtkedit/edit.c:393 gtkedit/edit.c:399 gtkedit/editcmd.c:298 +#: gtkedit/editcmd.c:304 gtkedit/editcmd.c:2031 gtkedit/editwidget.c:1023 #: src/dir.c:386 src/tree.c:682 src/tree.c:688 src/wtools.c:222 msgid " Error " msgstr " ¥¨¥é¡¼ " -#: gtkedit/edit.c:145 gtkedit/edit.c:337 gtkedit/edit.c:375 +#: gtkedit/edit.c:149 gtkedit/edit.c:341 gtkedit/edit.c:379 msgid " Failed trying to open file for reading: " msgstr "Æɤ߽Ф·¤Î¤¿¤á¥Õ¥¡¥¤¥ë¤ò³«¤¯¤³¤È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: " -#: gtkedit/edit.c:314 +#: gtkedit/edit.c:318 msgid " Error reading from pipe: " msgstr " ¥Ñ¥¤¥×¤«¤é¤ÎÆɤ߹þ¤ß¥¨¥é¡¼: " -#: gtkedit/edit.c:319 +#: gtkedit/edit.c:323 msgid " Failed trying to open pipe for reading: " msgstr "Æɤ߹þ¤à¤¿¤á¤Î¥Ñ¥¤¥×¤ò³«¤¯»î¤ß¤¬¼ºÇÔ¤·¤Þ¤·¤¿: " -#: gtkedit/edit.c:333 +#: gtkedit/edit.c:337 msgid " Error reading file: " msgstr " ¥Õ¥¡¥¤¥ëÆɤ߹þ¤ß¥¨¥é¡¼: " -#: gtkedit/edit.c:382 +#: gtkedit/edit.c:386 msgid " Cannot get size/permissions info on file: " msgstr "¥Õ¥¡¥¤¥ë¤ÎÂ礭¤µ¡¦¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤Î¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: " -#: gtkedit/edit.c:389 +#: gtkedit/edit.c:393 msgid " Not an ordinary file: " msgstr "ÉáÄ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: " -#: gtkedit/edit.c:395 +#: gtkedit/edit.c:399 msgid " File is too large: " msgstr "¥Õ¥¡¥¤¥ë¤¬Â礭¤¹¤®¤Þ¤¹: " -#: gtkedit/edit.c:396 +#: gtkedit/edit.c:400 msgid "" " \n" " Increase edit.h:MAXBUF and recompile the editor. " msgstr "edit.h ¤Î MAXBUF ¤òÁý¤ä¤·¤Æ¥¨¥Ç¥£¥¿¤òºÆ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤" +#: gtkedit/edit.c:2571 +msgid "User menu avalaible only in mcedit invoked from mc" +msgstr "mc ¤«¤é¸Æ¤Ó½Ð¤µ¤ì¤ë mcedit ¤Ç¤À¤±ÍøÍѲÄǽ¤Ê¥æ¡¼¥¶¥á¥Ë¥å¡¼¤Ç¤¹" + +#. Not essential to translate +#: gtkedit/edit.c:2769 gtkedit/editcmd.c:2945 +msgid "Error trying to stat file:" +msgstr " ¥Õ¥¡¥¤¥ë¤Î stat »î¹ÔÃæ¤Î¥¨¥é¡¼:" + #: gtkedit/editcmd.c:298 msgid " Error writing to pipe: " msgstr " ¥Ñ¥¤¥×¤Ø¤Î½ñ¤­½Ð¤·¥¨¥é¡¼: " @@ -1764,11 +1782,11 @@ msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë ¢ª" #. NLS for hotkeys? -#: gtkedit/editcmd.c:384 gtkedit/editcmd.c:1188 gtkedit/editcmd.c:1232 -#: gtkedit/editcmd.c:1317 gtkedit/editcmd.c:2981 gtkedit/editoptions.c:66 +#: gtkedit/editcmd.c:384 gtkedit/editcmd.c:1189 gtkedit/editcmd.c:1233 +#: gtkedit/editcmd.c:1318 gtkedit/editcmd.c:3025 gtkedit/editoptions.c:66 #: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376 #: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781 -#: src/chmod.c:114 src/chown.c:79 src/cmd.c:859 src/filegui.c:822 +#: src/chmod.c:114 src/chown.c:79 src/cmd.c:858 src/filegui.c:822 #: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911 #: src/layout.c:371 src/learn.c:59 src/option.c:144 src/panelize.c:86 #: src/view.c:406 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 @@ -1791,7 +1809,7 @@ #. Warning message with a query to continue or cancel the operation #: gtkedit/editcmd.c:539 gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 -#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1135 src/ext.c:315 src/file.c:619 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1136 src/ext.c:315 src/file.c:619 #: src/help.c:318 src/main.c:708 src/screen.c:1451 src/screen.c:2128 #: src/screen.c:2178 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:382 #: src/utilunix.c:386 src/utilunix.c:406 src/utilunix.c:457 vfs/mcfs.c:172 @@ -1809,7 +1827,7 @@ #: gtkedit/editcmd.c:542 gtkedit/editcmd.c:609 gtkedit/editcmd.c:836 #: gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 gtkedit/editcmd.c:1038 -#: gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1671 msgid "Cancel" msgstr "¥­¥ã¥ó¥»¥ë" @@ -1817,7 +1835,7 @@ msgid " Save as " msgstr " ÊÌ̾¤ÇÊݸ " -#: gtkedit/editcmd.c:561 gtkedit/editcmd.c:2770 +#: gtkedit/editcmd.c:561 gtkedit/editcmd.c:2771 msgid " Error trying to save file. " msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ»þ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" @@ -1900,105 +1918,105 @@ msgid " Load " msgstr " Æɤ߹þ¤ß " -#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1135 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1136 msgid " Block is large, you may not be able to undo this action. " msgstr "Â礭¤Ê¥Ö¥í¥Ã¥¯¤Ç¤¹¡£¤³¤ÎÁàºî¤Ï¤ä¤êľ¤»¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó" -#: gtkedit/editcmd.c:1135 +#: gtkedit/editcmd.c:1136 msgid " Continue " msgstr " ·Ñ³ " -#: gtkedit/editcmd.c:1135 +#: gtkedit/editcmd.c:1136 msgid " Cancel " msgstr " ¥­¥ã¥ó¥»¥ë " -#: gtkedit/editcmd.c:1190 +#: gtkedit/editcmd.c:1191 msgid "o&Ne" msgstr "°ì¤Ä (&N)" -#: gtkedit/editcmd.c:1192 src/filegui.c:597 +#: gtkedit/editcmd.c:1193 src/filegui.c:597 msgid "al&L" msgstr "Á´Éô (&L)" -#: gtkedit/editcmd.c:1194 src/file.c:2190 src/filegui.c:267 +#: gtkedit/editcmd.c:1195 src/file.c:2190 src/filegui.c:267 msgid "&Skip" msgstr "¥¹¥­¥Ã¥× (&S)" -#: gtkedit/editcmd.c:1196 +#: gtkedit/editcmd.c:1197 msgid "&Replace" msgstr "ÃÖ´¹ (&R)" -#: gtkedit/editcmd.c:1202 gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1203 gtkedit/editcmd.c:1671 msgid " Replace with: " msgstr " ÃÖ¤­´¹¤¨¤ëʸ»úÎó: " -#: gtkedit/editcmd.c:1206 +#: gtkedit/editcmd.c:1207 msgid " Confirm replace " msgstr " ³ÎǧÃÖ´¹ " -#: gtkedit/editcmd.c:1236 gtkedit/editcmd.c:1321 +#: gtkedit/editcmd.c:1237 gtkedit/editcmd.c:1322 msgid "scanf &Expression" msgstr "scanf ·Á¼° (&E)" -#: gtkedit/editcmd.c:1238 +#: gtkedit/editcmd.c:1239 msgid "replace &All" msgstr "Á´¤ÆÃÖ¤­´¹¤¨¤ë (&A)" -#: gtkedit/editcmd.c:1240 +#: gtkedit/editcmd.c:1241 msgid "pr&Ompt on replace" msgstr "ÃÖ´¹»þ¤Ë¥×¥í¥ó¥×¥È (&O)" -#: gtkedit/editcmd.c:1242 gtkedit/editcmd.c:1323 +#: gtkedit/editcmd.c:1243 gtkedit/editcmd.c:1324 msgid "&Backwards" msgstr "¸åÊý (&B)" -#: gtkedit/editcmd.c:1244 gtkedit/editcmd.c:1325 +#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1326 msgid "&Regular expression" msgstr "Àµµ¬É½¸½ (&R)" -#: gtkedit/editcmd.c:1246 gtkedit/editcmd.c:1327 +#: gtkedit/editcmd.c:1247 gtkedit/editcmd.c:1328 msgid "&Whole words only" msgstr "ñ¸ì¤Î¤ß (&W)" -#: gtkedit/editcmd.c:1248 gtkedit/editcmd.c:1329 +#: gtkedit/editcmd.c:1249 gtkedit/editcmd.c:1330 msgid "case &Sensitive" msgstr "Âçʸ»ú¡¦¾®Ê¸»ú¤ò¶èÊÌ (&S)" -#: gtkedit/editcmd.c:1252 +#: gtkedit/editcmd.c:1253 msgid " Enter replacement argument order eg. 3,2,1,4 " msgstr "ÃÖ´¹¤Î°ú¿ô¤Î½çÈÖ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ (Îã) 3,2,1,4 " -#: gtkedit/editcmd.c:1256 +#: gtkedit/editcmd.c:1257 msgid " Enter replacement string:" msgstr "ÃÖ´¹Ê¸»úÎó¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:" -#: gtkedit/editcmd.c:1260 gtkedit/editcmd.c:1333 src/view.c:2000 +#: gtkedit/editcmd.c:1261 gtkedit/editcmd.c:1334 src/view.c:2000 msgid " Enter search string:" msgstr "¸¡º÷ʸ»úÎó¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:" #. Heads the 'Replace' dialog box -#: gtkedit/editcmd.c:1279 gtkedit/editcmd.c:1583 gtkedit/editcmd.c:1670 -#: gtkedit/editcmd.c:2209 gtkedit/editcmd.c:2240 gtkedit/editcmd.c:2242 +#: gtkedit/editcmd.c:1280 gtkedit/editcmd.c:1584 gtkedit/editcmd.c:1671 +#: gtkedit/editcmd.c:2210 gtkedit/editcmd.c:2241 gtkedit/editcmd.c:2243 msgid " Replace " msgstr " ÃÖ´¹ " #. Heads the 'Search' dialog box -#: gtkedit/editcmd.c:1347 gtkedit/editcmd.c:1577 gtkedit/editcmd.c:2308 -#: gtkedit/editcmd.c:2310 gtkedit/editcmd.c:2338 src/view.c:1528 +#: gtkedit/editcmd.c:1348 gtkedit/editcmd.c:1578 gtkedit/editcmd.c:2309 +#: gtkedit/editcmd.c:2311 gtkedit/editcmd.c:2339 src/view.c:1528 #: src/view.c:1627 src/view.c:1750 src/view.c:1968 src/view.c:2000 msgid " Search " msgstr " ¸¡º÷ " #. An input line comes after the ':' -#: gtkedit/editcmd.c:1401 +#: gtkedit/editcmd.c:1402 msgid " Enter search text : " msgstr "¸¡º÷¥Æ¥­¥¹¥È¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ : " -#: gtkedit/editcmd.c:1408 +#: gtkedit/editcmd.c:1409 msgid " Enter replace text : " msgstr "ÃÖ´¹¥Æ¥­¥¹¥È¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ : " -#: gtkedit/editcmd.c:1411 gtkedit/editcmd.c:1412 +#: gtkedit/editcmd.c:1412 gtkedit/editcmd.c:1413 #, c-format msgid "" "You can enter regexp substrings with %s\n" @@ -2007,12 +2025,12 @@ "Àµµ¬É½¸½¤ÎÉôʬʸ»úÎó¤ò %s ¤ÇÆþÎϤǤ­¤Þ¤¹\n" "(sed ¤Î¤è¤¦¤Ë \\1 ¤ä \\2 ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ¤½¤ì¤«¤é \"°ú¿ô¤Î¡ÁÆþÎÏ\" ¤ò»È¤¤¤Þ¤¹" -#: gtkedit/editcmd.c:1414 +#: gtkedit/editcmd.c:1415 msgid " Enter argument (or substring) order : " msgstr "°ú¿ô (¤¢¤ë¤¤¤ÏÉôʬʸ»úÎó) ¤Î½çÈÖ¤òÆþÎÏ : " #. Tool hint -#: gtkedit/editcmd.c:1418 gtkedit/editcmd.c:1419 +#: gtkedit/editcmd.c:1419 gtkedit/editcmd.c:1420 msgid "" "Enter the order of replacement of your scanf\n" "format specifiers or regexp substrings, eg 3,1,2" @@ -2021,19 +2039,19 @@ "ÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ (Îã) 3,1,2" #. The following are check boxes -#: gtkedit/editcmd.c:1424 +#: gtkedit/editcmd.c:1425 msgid " Whole words only " msgstr "ñ¸ì¤Î¤ß " -#: gtkedit/editcmd.c:1426 +#: gtkedit/editcmd.c:1427 msgid " Case sensitive " msgstr "Âçʸ»ú¡¦¾®Ê¸»ú¤ò¶èÊÌ " -#: gtkedit/editcmd.c:1429 +#: gtkedit/editcmd.c:1430 msgid " Regular expression " msgstr "Àµµ¬É½¸½ " -#: gtkedit/editcmd.c:1430 gtkedit/editcmd.c:1431 +#: gtkedit/editcmd.c:1431 gtkedit/editcmd.c:1432 msgid "" "See the regex man page for how\n" "to compose a regular expression" @@ -2041,48 +2059,48 @@ "Àµµ¬É½¸½¤Î½ñ¤­Êý¤Ë¤Ä¤¤¤Æ¤Ï\n" "Àµµ¬É½¸½¤Î¥Þ¥Ë¥å¥¢¥ë¤òÆɤó¤Ç¤¯¤À¤µ¤¤" -#: gtkedit/editcmd.c:1439 +#: gtkedit/editcmd.c:1440 msgid " Backwards " msgstr "¸åÊý " #. Tool hint -#: gtkedit/editcmd.c:1441 gtkedit/editcmd.c:1442 +#: gtkedit/editcmd.c:1442 gtkedit/editcmd.c:1443 msgid "Warning: Searching backward can be slow" msgstr "·Ù¹ð: ¸åÊý¸¡º÷¤Ë¤Ï»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹" -#: gtkedit/editcmd.c:1463 +#: gtkedit/editcmd.c:1464 msgid " Prompt on replace " msgstr "ÃÖ´¹»þ¤Ë³Îǧ " #. Tool hint -#: gtkedit/editcmd.c:1465 +#: gtkedit/editcmd.c:1466 msgid "Ask before making each replacement" msgstr "ÃÖ´¹¤¹¤ë¤´¤È¤Ë¿Ò¤Í¤ë" -#: gtkedit/editcmd.c:1467 +#: gtkedit/editcmd.c:1468 msgid " Replace all " msgstr "Á´ÉôÃÖ´¹¤¹¤ë " #. Tool hint -#: gtkedit/editcmd.c:1469 +#: gtkedit/editcmd.c:1470 msgid "Replace repeatedly" msgstr "·«¤êÊÖ¤·ÃÖ´¹" -#: gtkedit/editcmd.c:1473 +#: gtkedit/editcmd.c:1474 msgid " Bookmarks " msgstr " ¥Ö¥Ã¥¯¥Þ¡¼¥¯ " #. Tool hint -#: gtkedit/editcmd.c:1475 gtkedit/editcmd.c:1476 +#: gtkedit/editcmd.c:1476 gtkedit/editcmd.c:1477 msgid "Create bookmarks at all lines found" msgstr "Á´¤Æ¤Î¹Ô¤Ç¸«¤Ä¤±¤¿¥Ö¥Ã¥¯¥Þ¡¼¥¯¤òºîÀ®" -#: gtkedit/editcmd.c:1479 +#: gtkedit/editcmd.c:1480 msgid " Scanf expression " msgstr "Scanf ·Á¼° " #. Tool hint -#: gtkedit/editcmd.c:1481 +#: gtkedit/editcmd.c:1482 msgid "" "Allows entering of a C format string,\n" "see the scanf man page" @@ -2091,61 +2109,61 @@ "scanf ¤Î¥Þ¥Ë¥å¥¢¥ë¤ò»²¾È" #. Tool hint -#: gtkedit/editcmd.c:1506 +#: gtkedit/editcmd.c:1507 msgid "Begin search, Enter" msgstr "¸¡º÷¤Î³«»Ï, ENTER" -#: gtkedit/editcmd.c:1507 +#: gtkedit/editcmd.c:1508 msgid "Abort this dialog, Esc" msgstr "¤³¤Î¥À¥¤¥¢¥í¥°¤òÃæÃÇ, ESC" -#: gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1671 msgid "Replace" msgstr "ÃÖ´¹" -#: gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1671 msgid "Skip" msgstr "¥¹¥­¥Ã¥×" -#: gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1671 msgid "Replace all" msgstr "¤¹¤Ù¤ÆÃÖ´¹" -#: gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1671 msgid "Replace one" msgstr "°ì¤ÄÃÖ´¹" -#: gtkedit/editcmd.c:2030 +#: gtkedit/editcmd.c:2031 msgid "" " Invalid regular expression, or scanf expression with to many conversions " msgstr "¤ª¤«¤·¤ÊÀµµ¬É½¸½¡¢¤¢¤ë¤¤¤Ï scanf ·Á¼°¤Ç¤¹¡£ÊÑ´¹¤¬Â¿¤¹¤®¤Þ¤¹ " #. "Invalid regexp string or scanf string" -#: gtkedit/editcmd.c:2211 +#: gtkedit/editcmd.c:2212 msgid " Error in replacement format string. " msgstr "ÃÖ´¹·Á¼°Ê¸»úÎó¤Ë¥¨¥é¡¼" -#: gtkedit/editcmd.c:2239 +#: gtkedit/editcmd.c:2240 #, c-format msgid " %ld replacements made. " msgstr "%ld ¸ÄÃÖ´¹¤·¤Þ¤·¤¿" -#: gtkedit/editcmd.c:2242 gtkedit/editcmd.c:2310 gtkedit/editcmd.c:2338 +#: gtkedit/editcmd.c:2243 gtkedit/editcmd.c:2311 gtkedit/editcmd.c:2339 msgid " Search string not found. " msgstr "¸¡º÷ʸ»úÎ󤬸«ÉÕ¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿" #. in response to number of bookmarks added because of string being found %d times -#: gtkedit/editcmd.c:2307 +#: gtkedit/editcmd.c:2308 #, c-format msgid " %d finds made, %d bookmarks added " msgstr " %d ¸Äȯ¸«¤·¡¤ %d ¸Ä¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯¤òÄɲä·¤Þ¤·¤¿ " #. Confirm 'Quit' dialog box -#: gtkedit/editcmd.c:2363 gtkedit/editcmd.c:2378 gtkedit/editcmd.c:2381 +#: gtkedit/editcmd.c:2364 gtkedit/editcmd.c:2379 gtkedit/editcmd.c:2382 msgid " Quit " msgstr " ½ªÎ» " -#: gtkedit/editcmd.c:2364 gtkedit/editcmd.c:2382 +#: gtkedit/editcmd.c:2365 gtkedit/editcmd.c:2383 msgid "" " Current text was modified without a file save. \n" " Save with exit? " @@ -2153,155 +2171,165 @@ "¸½ºß¤Î¥Æ¥­¥¹¥È¤ËÊѹ¹¤¬²Ã¤¨¤é¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢Êݸ¤·¤Æ¤¤¤Þ¤»¤ó¡£\n" "Êݸ¤·¤Æ½ªÎ»¤·¤Þ¤¹¤«?" -#: gtkedit/editcmd.c:2378 +#: gtkedit/editcmd.c:2379 msgid " File was modified, Save with exit? " msgstr "¥Õ¥¡¥¤¥ë¤ËÊѹ¹¤¬²Ã¤¨¤é¤ì¤Æ¤¤¤Þ¤¹¡£Êݸ¤·¤Æ½ªÎ»¤·¤Þ¤¹¤«?" -#: gtkedit/editcmd.c:2378 +#: gtkedit/editcmd.c:2379 msgid "Cancel quit" msgstr "½ªÎ»¤òÃæ»ß" -#: gtkedit/editcmd.c:2378 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: gtkedit/editcmd.c:2379 src/cmd.c:246 src/file.c:1878 src/file.c:2249 #: src/filegui.c:603 src/hotlist.c:1035 src/main.c:863 src/screen.c:2165 #: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:406 msgid "&Yes" msgstr "¤Ï¤¤ (&Y)" -#: gtkedit/editcmd.c:2378 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: gtkedit/editcmd.c:2379 src/cmd.c:246 src/file.c:1878 src/file.c:2249 #: src/filegui.c:602 src/hotlist.c:1035 src/main.c:863 src/screen.c:2165 #: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:406 msgid "&No" msgstr "¤¤¤¤¤¨ (&N)" -#: gtkedit/editcmd.c:2382 +#: gtkedit/editcmd.c:2383 msgid " &Cancel quit " msgstr " ½ªÎ»¤òÃæ»ß (&C) " -#: gtkedit/editcmd.c:2382 +#: gtkedit/editcmd.c:2383 msgid " &Yes " msgstr " ¤Ï¤¤ (&Y) " -#: gtkedit/editcmd.c:2382 +#: gtkedit/editcmd.c:2383 msgid " &No " msgstr " ¤¤¤¤¤¨ (&N) " -#: gtkedit/editcmd.c:2614 gtkedit/editcmd.c:2689 +#: gtkedit/editcmd.c:2615 gtkedit/editcmd.c:2690 msgid " Copy to clipboard " msgstr " ¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼ " -#: gtkedit/editcmd.c:2614 gtkedit/editcmd.c:2636 gtkedit/editcmd.c:2689 -#: gtkedit/editcmd.c:2702 +#: gtkedit/editcmd.c:2615 gtkedit/editcmd.c:2637 gtkedit/editcmd.c:2690 +#: gtkedit/editcmd.c:2703 msgid " Unable to save to file. " msgstr " ¥Õ¥¡¥¤¥ëÊݸ¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿ " -#: gtkedit/editcmd.c:2636 gtkedit/editcmd.c:2702 +#: gtkedit/editcmd.c:2637 gtkedit/editcmd.c:2703 msgid " Cut to clipboard " msgstr " ¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤ØÀÚ¤ê½Ð¤· " -#: gtkedit/editcmd.c:2724 gtkedit/editcmd.c:2728 gtkedit/editcmd.c:2733 -#: gtkedit/editcmd.c:2736 src/view.c:1915 +#: gtkedit/editcmd.c:2725 gtkedit/editcmd.c:2729 gtkedit/editcmd.c:2734 +#: gtkedit/editcmd.c:2737 src/view.c:1915 msgid " Goto line " msgstr " »ØÄê¹Ô¤Ø°ÜÆ° " -#: gtkedit/editcmd.c:2724 gtkedit/editcmd.c:2728 gtkedit/editcmd.c:2733 -#: gtkedit/editcmd.c:2736 +#: gtkedit/editcmd.c:2725 gtkedit/editcmd.c:2729 gtkedit/editcmd.c:2734 +#: gtkedit/editcmd.c:2737 msgid " Enter line: " msgstr " ¹ÔÈÖ¹æ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: gtkedit/editcmd.c:2757 gtkedit/editcmd.c:2770 +#: gtkedit/editcmd.c:2758 gtkedit/editcmd.c:2771 msgid " Save Block " msgstr " ¥Ö¥í¥Ã¥¯¤òÊݸ " -#: gtkedit/editcmd.c:2784 +#: gtkedit/editcmd.c:2785 msgid " Insert File " msgstr " ¥Õ¥¡¥¤¥ë¤òÁÞÆþ " -#: gtkedit/editcmd.c:2797 +#: gtkedit/editcmd.c:2798 msgid " Insert file " msgstr " ¥Õ¥¡¥¤¥ë¤òÁÞÆþ " -#: gtkedit/editcmd.c:2797 +#: gtkedit/editcmd.c:2798 msgid " Error trying to insert file. " msgstr " ¥Õ¥¡¥¤¥ë¤òÁÞÆþ¤·¤è¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ " #. Not essential to translate -#: gtkedit/editcmd.c:2819 +#: gtkedit/editcmd.c:2820 msgid " Sort block " msgstr " ¥Ö¥í¥Ã¥¯¤ÇʤÙÂؤ¨ " #. Not essential to translate -#: gtkedit/editcmd.c:2819 gtkedit/editcmd.c:2873 +#: gtkedit/editcmd.c:2820 gtkedit/editcmd.c:2908 msgid " You must first highlight a block of text. " msgstr " ¤Þ¤º¥Æ¥­¥¹¥È¥Ö¥í¥Ã¥¯¤ò¥Ï¥¤¥é¥¤¥È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹ " -#: gtkedit/editcmd.c:2826 +#: gtkedit/editcmd.c:2827 msgid " Run Sort " msgstr "¥½¡¼¥È¤ò¼Â¹Ô " #. Not essential to translate -#: gtkedit/editcmd.c:2828 +#: gtkedit/editcmd.c:2829 msgid " Enter sort options (see manpage) separated by whitespace: " msgstr "" " ¥½¡¼¥È¤Î¥ª¥×¥·¥ç¥ó (¥Þ¥Ë¥å¥¢¥ë»²¾È) ¤ò¶õÇò¤Ç¶èÀڤäÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: gtkedit/editcmd.c:2839 gtkedit/editcmd.c:2845 +#: gtkedit/editcmd.c:2840 gtkedit/editcmd.c:2846 msgid " Sort " msgstr " ¥½¡¼¥È " #. Not essential to translate -#: gtkedit/editcmd.c:2841 +#: gtkedit/editcmd.c:2842 msgid " Error trying to execute sort command " msgstr " ¥½¡¼¥È¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤è¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ " #. Not essential to translate -#: gtkedit/editcmd.c:2847 +#: gtkedit/editcmd.c:2848 msgid " Sort returned non-zero: " msgstr " ¥½¡¼¥È¥³¥Þ¥ó¥É¤¬¥¼¥í°Ê³°¤ÎÊÖ¤êÃÍ: " -#. Not essential to translate -#: gtkedit/editcmd.c:2871 gtkedit/editcmd.c:2901 -msgid " Process block " -msgstr " ¥Ö¥í¥Ã¥¯¤ò½èÍý " - -#. Not essential to translate -#: gtkedit/editcmd.c:2903 -msgid " Error trying to stat file " -msgstr " ¥Õ¥¡¥¤¥ë¤Î stat ¤ò¤·¤è¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ " +#: gtkedit/editcmd.c:2881 +msgid "Error create script:" +msgstr "¥¹¥¯¥ê¥×¥ÈºîÀ®¤Ç¥¨¥é¡¼:" + +#: gtkedit/editcmd.c:2887 +msgid "Error read script:" +msgstr "¥¹¥¯¥ê¥×¥ÈÆɤ߹þ¤ß¤Ç¥¨¥é¡¼:" + +#: gtkedit/editcmd.c:2894 +msgid "Error close script:" +msgstr "¥¹¥¯¥ê¥×¥È¥¯¥í¡¼¥º¥¨¥é¡¼:" + +#: gtkedit/editcmd.c:2899 +msgid "Script created:" +msgstr "¥¹¥¯¥ê¥×¥È¤ÏºîÀ®¤µ¤ì¤Þ¤·¤¿:" + +#: gtkedit/editcmd.c:2906 +msgid "Process block" +msgstr "¥×¥í¥»¥¹¥Ö¥í¥Ã¥¯" -#: gtkedit/editcmd.c:2974 +#: gtkedit/editcmd.c:3018 msgid " Mail " msgstr " ¥á¥¤¥ë " -#: gtkedit/editcmd.c:2987 +#: gtkedit/editcmd.c:3031 msgid " Copies to" msgstr " ¥³¥Ô¡¼" -#: gtkedit/editcmd.c:2991 +#: gtkedit/editcmd.c:3035 msgid " Subject" msgstr " ·ï̾" -#: gtkedit/editcmd.c:2995 +#: gtkedit/editcmd.c:3039 msgid " To" msgstr " To" -#: gtkedit/editcmd.c:2997 +#: gtkedit/editcmd.c:3041 msgid " mail -s -c " msgstr " mail -s -c " -#: gtkedit/editmenu.c:61 +#: gtkedit/editmenu.c:62 msgid " Word wrap " msgstr " ñ¸ìÀÞ¤êÊÖ¤· " #. Not essential to translate -#: gtkedit/editmenu.c:63 +#: gtkedit/editmenu.c:64 msgid " Enter line length, 0 for off: " msgstr " ¹Ô¤ÎŤµ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ (0 ¤Ç¥ª¥Õ): " -#: gtkedit/editmenu.c:74 +#: gtkedit/editmenu.c:75 msgid " About " msgstr " Cooledit ¤Ë¤Ä¤¤¤Æ " -#: gtkedit/editmenu.c:75 +#: gtkedit/editmenu.c:76 msgid "" "\n" " Cooledit v3.11.5\n" @@ -2319,349 +2347,353 @@ " Midnight Commander ÍѤÎ\n" " ¥æ¡¼¥¶¤Ë¿ÆÀڤʥ¨¥Ç¥£¥¿¤Ç¤¹\n" -#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 +#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:147 msgid "&Open/load... C-o" msgstr "³«¤¯ (&O)... C-o" -#: gtkedit/editmenu.c:125 +#: gtkedit/editmenu.c:129 msgid "&New C-n" msgstr "¿·µ¬ºîÀ® (&N) C-n" -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +#: gtkedit/editmenu.c:131 gtkedit/editmenu.c:150 msgid "&Save F2" msgstr "Êݸ (&S) F2" -#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144 +#: gtkedit/editmenu.c:132 gtkedit/editmenu.c:151 msgid "save &As... F12" msgstr "ÊÌ̾¤ÇÊݸ (&A)... F12" -#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146 +#: gtkedit/editmenu.c:134 gtkedit/editmenu.c:153 msgid "&Insert file... F15" msgstr "¥Õ¥¡¥¤¥ëÁÞÆþ (&I)... F15" -#: gtkedit/editmenu.c:131 +#: gtkedit/editmenu.c:135 msgid "copy to &File... C-f" msgstr "¥Õ¥¡¥¤¥ë¤Ø¥³¥Ô¡¼ (&F)... C-f" -#: gtkedit/editmenu.c:133 gtkedit/editmenu.c:149 +#: gtkedit/editmenu.c:137 gtkedit/editmenu.c:156 +msgid "&User menu... F11" +msgstr "¥æ¡¼¥¶¥á¥Ë¥å¡¼ (&U)... F11" + +#: gtkedit/editmenu.c:140 gtkedit/editmenu.c:159 msgid "a&Bout... " msgstr "¾ðÊó (&B)... " -#: gtkedit/editmenu.c:135 gtkedit/editmenu.c:151 +#: gtkedit/editmenu.c:142 gtkedit/editmenu.c:161 msgid "&Quit F10" msgstr "½ªÎ» (&Q) F10" -#: gtkedit/editmenu.c:141 +#: gtkedit/editmenu.c:148 msgid "&New C-x k" msgstr "¿·µ¬ (&N) C-x k" -#: gtkedit/editmenu.c:147 +#: gtkedit/editmenu.c:154 msgid "copy to &File... " msgstr "¥Õ¥¡¥¤¥ë¤Ø¥³¥Ô¡¼ (&F)... " -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 msgid "&Toggle Mark F3" msgstr "¥Þ¡¼¥¯¤òÀÚÂؤ¨ (&T) F3" -#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 +#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 msgid "&Mark Columns S-F3" msgstr "Îó¤Ë¥Þ¡¼¥¯ (&M) S-F3" -#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 +#: gtkedit/editmenu.c:169 gtkedit/editmenu.c:186 msgid "toggle &Ins/overw Ins" msgstr "ÁÞÆþ¡¦¾å½ñ¤­¤òÀÚÂؤ¨(&I) Ins" -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +#: gtkedit/editmenu.c:171 gtkedit/editmenu.c:188 msgid "&Copy F5" msgstr "¥³¥Ô¡¼ (&C) F5" -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +#: gtkedit/editmenu.c:172 gtkedit/editmenu.c:189 msgid "&Move F6" msgstr "°ÜÆ° (&M) F6" -#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180 +#: gtkedit/editmenu.c:173 gtkedit/editmenu.c:190 msgid "&Delete F8" msgstr "ºï½ü (&D) F8" -#: gtkedit/editmenu.c:165 gtkedit/editmenu.c:182 +#: gtkedit/editmenu.c:175 gtkedit/editmenu.c:192 msgid "&Undo C-u" msgstr "¤ä¤ê¤Ê¤ª¤· (&U) C-u" -#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 +#: gtkedit/editmenu.c:177 gtkedit/editmenu.c:194 msgid "&Beginning C-PgUp" msgstr "ÀèƬ (&B) C-PgUp" -#: gtkedit/editmenu.c:168 gtkedit/editmenu.c:185 +#: gtkedit/editmenu.c:178 gtkedit/editmenu.c:195 msgid "&End C-PgDn" msgstr "ËöÈø (&E) C-PgDn" -#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 +#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:207 msgid "&Search... F7" msgstr "¸¡º÷ (&S)... F7" -#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 +#: gtkedit/editmenu.c:201 gtkedit/editmenu.c:208 msgid "search &Again F17" msgstr "ºÆ¸¡º÷ (&A) F17" -#: gtkedit/editmenu.c:192 gtkedit/editmenu.c:199 +#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:209 msgid "&Replace... F4" msgstr "ÃÖ´¹ (&R)... F4" -#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:227 +#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:237 msgid "&Goto line... M-l" msgstr "¹Ô°ÜÆ° (&G)... M-l" -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:228 +#: gtkedit/editmenu.c:215 gtkedit/editmenu.c:238 msgid "goto matching &Bracket M-b" msgstr "ÂФγç¸Ì¤Ø°ÜÆ° M-b" -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:230 +#: gtkedit/editmenu.c:217 gtkedit/editmenu.c:240 msgid "insert &Literal... C-q" msgstr "ʸ»ú¤òÁÞÆþ (&L)... C-q" -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:232 +#: gtkedit/editmenu.c:219 gtkedit/editmenu.c:242 msgid "&Refresh screen C-l" msgstr "²èÌ̤òºÆÉÁ²è (&R) C-l" -#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:234 +#: gtkedit/editmenu.c:221 gtkedit/editmenu.c:244 msgid "&Start record macro C-r" msgstr "¥Þ¥¯¥í¤Îµ­Ï¿¤ò³«»Ï (&S) C-r" -#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:235 +#: gtkedit/editmenu.c:222 gtkedit/editmenu.c:245 msgid "&Finish record macro... C-r" msgstr "¥Þ¥¯¥í¤Îµ­Ï¿¤ò½ªÎ» (&F)... C-r" -#: gtkedit/editmenu.c:213 +#: gtkedit/editmenu.c:223 msgid "&Execute macro... C-a, KEY" msgstr "¥Þ¥¯¥í¤ò¼Â¹Ô (&E)... C-a, KEY" -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:237 +#: gtkedit/editmenu.c:224 gtkedit/editmenu.c:247 msgid "delete macr&O... " msgstr "¥Þ¥¯¥í¤òºï½ü (&O) " -#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:239 +#: gtkedit/editmenu.c:226 gtkedit/editmenu.c:249 msgid "insert &Date/time " msgstr "ÆüÉÕ¡¦»þ´Ö¤òÁÞÆþ (&D) " -#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:241 +#: gtkedit/editmenu.c:228 gtkedit/editmenu.c:251 msgid "format p&Aragraph M-p" msgstr "ÃÊÍî¤òÀ°·Á (&A) M-p" -#: gtkedit/editmenu.c:219 +#: gtkedit/editmenu.c:229 msgid "'ispell' s&Pell check C-p" msgstr "'ispell' ¥¹¥Ú¥ë¥Á¥§¥Ã¥¯(&P) C-p" -#: gtkedit/editmenu.c:220 gtkedit/editmenu.c:243 +#: gtkedit/editmenu.c:230 gtkedit/editmenu.c:253 msgid "sor&T... M-t" msgstr "ʤÙÂؤ¨ (&T) M-t" -#: gtkedit/editmenu.c:221 gtkedit/editmenu.c:244 -msgid "'indent' &C Formatter F19" -msgstr "'indent' ¥×¥í¥°¥é¥àÀ°·Á (&C) F19" +#: gtkedit/editmenu.c:231 gtkedit/editmenu.c:254 +msgid "E&xternal Formatter F19" +msgstr "³°Éô¥Õ¥©¡¼¥Þ¥Ã¥¿(&x) F19" -#: gtkedit/editmenu.c:222 +#: gtkedit/editmenu.c:232 msgid "&Mail... " msgstr "¥á¥¤¥ë (&M)... " -#: gtkedit/editmenu.c:236 +#: gtkedit/editmenu.c:246 msgid "&Execute macro... C-x e, KEY" msgstr "¥Þ¥¯¥í¤ò¼Â¹Ô (&E)... C-x e, KEY" -#: gtkedit/editmenu.c:242 +#: gtkedit/editmenu.c:252 msgid "'ispell' s&Pell check M-$" msgstr "'ispell' ¥¹¥Ú¥ë¥Á¥§¥Ã¥¯(&P) M-$" -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 +#: gtkedit/editmenu.c:261 gtkedit/editmenu.c:270 msgid "&General... " msgstr "°ìÈÌ (&G)... " -#: gtkedit/editmenu.c:252 gtkedit/editmenu.c:261 +#: gtkedit/editmenu.c:262 gtkedit/editmenu.c:271 msgid "&Save mode..." msgstr "ÊݸÊýË¡(&S)..." -#: gtkedit/editmenu.c:254 gtkedit/editmenu.c:263 src/main.c:1355 +#: gtkedit/editmenu.c:264 gtkedit/editmenu.c:273 src/main.c:1357 msgid "&Layout..." msgstr "¥ì¥¤¥¢¥¦¥È(&L)..." #. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:273 gtkedit/editmenu.c:282 gtkedit/editmenu.c:399 +#: gtkedit/editmenu.c:283 gtkedit/editmenu.c:292 gtkedit/editmenu.c:409 #: src/chmod.c:164 src/chown.c:130 msgid " File " msgstr " ¥Õ¥¡¥¤¥ë " -#: gtkedit/editmenu.c:274 gtkedit/editmenu.c:283 gtkedit/editmenu.c:415 +#: gtkedit/editmenu.c:284 gtkedit/editmenu.c:293 gtkedit/editmenu.c:425 msgid " Edit " msgstr " ÊÔ½¸ " -#: gtkedit/editmenu.c:275 gtkedit/editmenu.c:284 +#: gtkedit/editmenu.c:285 gtkedit/editmenu.c:294 msgid " Sear/Repl " msgstr " ¸¡º÷¡¦ÃÖ´¹ " -#: gtkedit/editmenu.c:276 gtkedit/editmenu.c:285 gtkedit/editmenu.c:455 +#: gtkedit/editmenu.c:286 gtkedit/editmenu.c:295 gtkedit/editmenu.c:465 msgid " Command " msgstr " ¥³¥Þ¥ó¥É " -#: gtkedit/editmenu.c:277 gtkedit/editmenu.c:286 +#: gtkedit/editmenu.c:287 gtkedit/editmenu.c:296 msgid " Options " msgstr " ¥ª¥×¥·¥ç¥ó " -#: gtkedit/editmenu.c:400 +#: gtkedit/editmenu.c:410 msgid "Open...\tC-o" msgstr "³«¤¯...\tC-o" -#: gtkedit/editmenu.c:401 +#: gtkedit/editmenu.c:411 msgid "New\tC-n" msgstr "¿·µ¬\tC-n" -#: gtkedit/editmenu.c:403 +#: gtkedit/editmenu.c:413 msgid "Save\tF2" msgstr "Êݸ\tF2" -#: gtkedit/editmenu.c:404 +#: gtkedit/editmenu.c:414 msgid "Save as...\tF12" msgstr "ÊÌ̾Êݸ...\tF12" -#: gtkedit/editmenu.c:406 +#: gtkedit/editmenu.c:416 msgid "Insert file...\tF15" msgstr "¥Õ¥¡¥¤¥ëÁÞÆþ...\tF15" -#: gtkedit/editmenu.c:407 +#: gtkedit/editmenu.c:417 msgid "Copy to file...\tC-f" msgstr "¥Õ¥¡¥¤¥ë¤Ø¥³¥Ô¡¼...\tC-f" #. Tool hint -#: gtkedit/editmenu.c:410 +#: gtkedit/editmenu.c:420 msgid "Disk operations and file indexing/searching" msgstr "¥Ç¥£¥¹¥¯Áàºî¤ª¤è¤Ó¥Õ¥¡¥¤¥ë¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹ºîÀ®¡¦¸¡º÷" -#: gtkedit/editmenu.c:416 +#: gtkedit/editmenu.c:426 msgid "Toggle mark\tF3" msgstr "¥Þ¡¼¥¯¤Î¥È¥°¥ë\tF3" -#: gtkedit/editmenu.c:417 +#: gtkedit/editmenu.c:427 msgid "Toggle mark columns\tC-b" msgstr "Îó¤Î¥Þ¡¼¥¯¤ò¥È¥°¥ë\tC-b" -#: gtkedit/editmenu.c:419 +#: gtkedit/editmenu.c:429 msgid "Toggle book mark\tC-M-Ins" msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ò¥È¥°¥ë\tC-M-Ins" -#: gtkedit/editmenu.c:420 +#: gtkedit/editmenu.c:430 msgid "Previous book mark\tC-M-Up" msgstr "Á°¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯\tC-M-Up" -#: gtkedit/editmenu.c:421 +#: gtkedit/editmenu.c:431 msgid "Next book mark\tC-M-Down" msgstr "¼¡¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯\tC-M-Down" -#: gtkedit/editmenu.c:422 +#: gtkedit/editmenu.c:432 msgid "Flush book marks" msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ò¥¯¥ê¥¢" -#: gtkedit/editmenu.c:424 +#: gtkedit/editmenu.c:434 msgid "Toggle insert/overwrite\tIns" msgstr "ÁÞÆþ¡¦¾å½ñ¤­¤ÎÀÚÂؤ¨\tIns" -#: gtkedit/editmenu.c:426 +#: gtkedit/editmenu.c:436 msgid "Copy block to cursor\tF5" msgstr "¥Ö¥í¥Ã¥¯¤ò¥«¡¼¥½¥ë°ÌÃ֤إ³¥Ô¡¼\tF5" -#: gtkedit/editmenu.c:427 +#: gtkedit/editmenu.c:437 msgid "Move block to cursor\tF6" msgstr "¥Ö¥í¥Ã¥¯¤ò¥«¡¼¥½¥ë°ÌÃ֤ذÜÆ°\tF6" -#: gtkedit/editmenu.c:428 +#: gtkedit/editmenu.c:438 msgid "Delete block\tF8/C-Del" msgstr "¥Ö¥í¥Ã¥¯¤òºï½ü\tF8/C-Del" -#: gtkedit/editmenu.c:430 +#: gtkedit/editmenu.c:440 msgid "Copy block to clipbrd\tC-Ins" msgstr "¥Ö¥í¥Ã¥¯¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼\tC-Ins" -#: gtkedit/editmenu.c:431 +#: gtkedit/editmenu.c:441 msgid "Cut block to clipbrd\tS-Del" msgstr "¥Ö¥í¥Ã¥¯¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤ØÀÚ¤ê¤À¤·\tS-Del" -#: gtkedit/editmenu.c:432 +#: gtkedit/editmenu.c:442 msgid "Paste block from clipbrd\tS-Ins" msgstr "¥Ö¥í¥Ã¥¯¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤«¤éÄ¥¤êÉÕ¤±\tS-Ins" -#: gtkedit/editmenu.c:433 +#: gtkedit/editmenu.c:443 msgid "Selection history\tM-Ins" msgstr "ÁªÂò¤ÎÍúÎò\tM-Ins" -#: gtkedit/editmenu.c:435 +#: gtkedit/editmenu.c:445 msgid "Undo\tC-BackSpace" msgstr "¤ä¤ê¤Ê¤ª¤·\tC-BackSpace" #. Tool hint -#: gtkedit/editmenu.c:438 +#: gtkedit/editmenu.c:448 msgid "Manipulating blocks of text" msgstr "¥Æ¥­¥¹¥È¤Î¥Ö¥í¥Ã¥¯¤òÁàºî" -#: gtkedit/editmenu.c:443 +#: gtkedit/editmenu.c:453 msgid " Srch/Replce " msgstr " ¸¡º÷¡¦ÃÖ´¹ " -#: gtkedit/editmenu.c:444 +#: gtkedit/editmenu.c:454 msgid "Search...\tF7" msgstr "¸¡º÷...\tF7" -#: gtkedit/editmenu.c:445 +#: gtkedit/editmenu.c:455 msgid "Search again\tF17" msgstr "ºÆ¸¡º÷\tF17" -#: gtkedit/editmenu.c:446 +#: gtkedit/editmenu.c:456 msgid "Replace...\tF4" msgstr "ÃÖ´¹...\tF4" -#: gtkedit/editmenu.c:447 +#: gtkedit/editmenu.c:457 msgid "Replace again\tF14" msgstr "ºÆÃÖ´¹\tF14" #. Tool hint -#: gtkedit/editmenu.c:450 +#: gtkedit/editmenu.c:460 msgid "Search for and replace text" msgstr "¥Æ¥­¥¹¥È¤ò¸¡º÷¤·ÃÖ´¹¤¹¤ë" -#: gtkedit/editmenu.c:456 +#: gtkedit/editmenu.c:466 msgid "Goto line...\tM-l" msgstr "¹Ô°ÜÆ°...\tM-l" -#: gtkedit/editmenu.c:457 +#: gtkedit/editmenu.c:467 msgid "Goto matching bracket\tM-b" msgstr "ÂФγç¸Ì¤Ø°ÜÆ°\tM-b" -#: gtkedit/editmenu.c:459 +#: gtkedit/editmenu.c:469 msgid "Start record macro\tC-r" msgstr "¥Þ¥¯¥í¤Îµ­Ï¿³«»Ï\tC-r" -#: gtkedit/editmenu.c:460 +#: gtkedit/editmenu.c:470 msgid "Finish record macro...\tC-r" msgstr "¥Þ¥¯¥í¤Îµ­Ï¿½ªÎ»...\tC-r" -#: gtkedit/editmenu.c:461 +#: gtkedit/editmenu.c:471 msgid "Execute macro...\tC-a, KEY" msgstr "¥Þ¥¯¥í¼Â¹Ô...\tC-a, KEY" -#: gtkedit/editmenu.c:462 +#: gtkedit/editmenu.c:472 msgid "Delete macro...\t" msgstr "¥Þ¥¯¥íºï½ü...\t" -#: gtkedit/editmenu.c:464 +#: gtkedit/editmenu.c:474 msgid "Insert date/time\tC-d" msgstr "ÆüÉÕ¡¦»þ´Ö¤òÁÞÆþ\tC-d" -#: gtkedit/editmenu.c:465 +#: gtkedit/editmenu.c:475 msgid "Format paragraph\tM-p" msgstr "ÃÊÍî¤òÀ°·Á\tM-p" -#: gtkedit/editmenu.c:467 +#: gtkedit/editmenu.c:477 msgid "Refresh display\tC-l" msgstr "ɽ¼¨¤ò¥ê¥Õ¥ì¥Ã¥·¥å\tC-l" #. Tool hint -#: gtkedit/editmenu.c:470 +#: gtkedit/editmenu.c:480 msgid "Macros and internal commands" msgstr "¥Þ¥¯¥í¤ª¤è¤ÓÆâÉô¥³¥Þ¥ó¥É" @@ -2744,7 +2776,7 @@ msgstr "¥¨¥Ç¥£¥¿¤Î½é´ü²½¤Ë¥¨¥é¡¼¤¬µ¯¤³¤ê¤Þ¤·¤¿.\n" #: gtkedit/editwidget.c:1136 gtkedit/gtkedit.c:1246 src/help.c:806 -#: src/main.c:1721 src/screen.c:2394 src/screen.c:2424 src/tree.c:1008 +#: src/main.c:1723 src/screen.c:2396 src/screen.c:2426 src/tree.c:1008 #: src/view.c:2070 msgid "Help" msgstr "¥Ø¥ë¥×" @@ -2757,13 +2789,13 @@ msgid "Replac" msgstr "ÃÖ´¹" -#: gtkedit/editwidget.c:1145 src/main.c:1723 +#: gtkedit/editwidget.c:1145 src/main.c:1725 msgid "PullDn" msgstr "PullDn" #. gtk_edit_menu #: gtkedit/editwidget.c:1146 gtkedit/gtkedit.c:1256 src/help.c:818 -#: src/main.c:1724 src/view.c:2072 src/view.c:2094 +#: src/main.c:1726 src/view.c:2072 src/view.c:2094 msgid "Quit" msgstr "½ªÎ»" @@ -2830,7 +2862,7 @@ msgid "Delete highlighted text" msgstr "¥Ï¥¤¥é¥¤¥È¤·¤¿¥Æ¥­¥¹¥È¤òºï½ü" -#: gtkedit/gtkedit.c:1255 src/main.c:1722 src/screen.c:2395 src/screen.c:2425 +#: gtkedit/gtkedit.c:1255 src/main.c:1724 src/screen.c:2397 src/screen.c:2427 msgid "Menu" msgstr "¥á¥Ë¥å" @@ -2866,12 +2898,12 @@ msgid "Search/Replace" msgstr "¸¡º÷/ÃÖ´¹" -#: gtkedit/syntax.c:1069 gtkedit/syntax.c:1078 gtkedit/syntax.c:1087 -#: gtkedit/syntax.c:1096 +#: gtkedit/syntax.c:1072 gtkedit/syntax.c:1081 gtkedit/syntax.c:1090 +#: gtkedit/syntax.c:1099 msgid " Spelling Message " msgstr "¥¹¥Ú¥ë´ØÏ¢¥á¥Ã¥»¡¼¥¸" -#: gtkedit/syntax.c:1069 +#: gtkedit/syntax.c:1072 msgid "" " Fail trying to open ispell program. \n" " Check that it is in your path and works with the -a option. \n" @@ -2881,7 +2913,7 @@ "PATH ¤¬Ä̤äƤ¤¤ë¤«¤É¤¦¤«¡¢-a ¥ª¥×¥·¥ç¥ó¤¬»È¤¨¤ë¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£\n" "¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤Ç¥¹¥Ú¥ë¥Á¥§¥Ã¥¯¤ò̵¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£" -#: gtkedit/syntax.c:1078 +#: gtkedit/syntax.c:1081 msgid "" " Fail trying to open ispell pipes. \n" " Check that it is in your path and works with the -a option. \n" @@ -2891,7 +2923,7 @@ "PATH ¤¬Ä̤äƤ¤¤ë¤«¤É¤¦¤«¡¢-a ¥ª¥×¥·¥ç¥ó¤¬»È¤¨¤ë¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£\n" "¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤Ç¥¹¥Ú¥ë¥Á¥§¥Ã¥¯¤ò̵¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£" -#: gtkedit/syntax.c:1087 +#: gtkedit/syntax.c:1090 msgid "" " Fail trying to read ispell pipes. \n" " Check that it is in your path and works with the -a option. \n" @@ -2901,7 +2933,7 @@ "PATH ¤¬Ä̤äƤ¤¤ë¤«¤É¤¦¤«¡¢-a ¥ª¥×¥·¥ç¥ó¤¬»È¤¨¤ë¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£\n" "¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤Ç¥¹¥Ú¥ë¥Á¥§¥Ã¥¯¤ò̵¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£" -#: gtkedit/syntax.c:1096 +#: gtkedit/syntax.c:1099 msgid "" " Error reading from ispell. \n" " Ispell is being restarted. " @@ -2909,11 +2941,11 @@ "ispell ¤«¤é¤ÎÆɤߤÀ¤·Ãæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£\n" "ispell ¤òºÆµ¯Æ°¤·¤Þ¤¹" -#: gtkedit/syntax.c:1369 gtkedit/syntax.c:1371 +#: gtkedit/syntax.c:1372 gtkedit/syntax.c:1374 msgid " Load Syntax Rules " msgstr " ¹½Ê¸¥ë¡¼¥ë¤ò¥í¡¼¥É " -#: gtkedit/syntax.c:1369 gtkedit/syntax.c:1371 +#: gtkedit/syntax.c:1372 gtkedit/syntax.c:1374 msgid "" " Your syntax rule file is outdated \n" " A new rule file is being installed. \n" @@ -2923,15 +2955,15 @@ " ¿·¤·¤¤¥ë¡¼¥ë¥Õ¥¡¥¤¥ë¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹ \n" " ¸Å¤¤¥ë¡¼¥ë¥Õ¥¡¥¤¥ë¤Ï .OLD ³ÈÄ¥»Ò¤ò¤Ä¤±¤ÆÊݸ¤µ¤ì¤Æ¤¤¤Þ¤¹ " -#: gtkedit/syntax.c:1519 gtkedit/syntax.c:1526 +#: gtkedit/syntax.c:1517 gtkedit/syntax.c:1524 msgid " Load syntax file " msgstr " ʸˡ¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É " -#: gtkedit/syntax.c:1519 +#: gtkedit/syntax.c:1517 msgid " File access error " msgstr " ¥Õ¥¡¥¤¥ë¥¢¥¯¥»¥¹¥¨¥é¡¼ " -#: gtkedit/syntax.c:1525 +#: gtkedit/syntax.c:1523 #, c-format msgid " Error in file %s on line %d " msgstr " ¥Õ¥¡¥¤¥ë %s ¤Î %d ¹ÔÌܤǥ¨¥é¡¼ " @@ -2998,7 +3030,7 @@ " %s " #: src/achown.c:666 src/achown.c:670 src/chmod.c:320 src/chmod.c:324 -#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:621 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:669 msgid " Oops... " msgstr " ¤¢¤¦¤¦... " @@ -3340,129 +3372,129 @@ msgid " I can't run the Chown command on a tarfs " msgstr " tarfs ¤Ç¤Ï chown ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó " -#: src/cmd.c:198 +#: src/cmd.c:195 #, c-format msgid " Can not fetch a local copy of %s " msgstr " %s ¤Î¥í¡¼¥«¥ë¥³¥Ô¡¼¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó " -#: src/cmd.c:248 +#: src/cmd.c:245 msgid " CD " msgstr " CD " -#: src/cmd.c:248 +#: src/cmd.c:245 msgid "Files tagged, want to cd?" msgstr "¥Õ¥¡¥¤¥ë¤Ï¥¿¥°ÉÕ¤é¤ì¤Æ¤¤¤Þ¤¹¡£cd ¤·¤Þ¤¹¤«?" -#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:732 +#: src/cmd.c:251 src/cmd.c:712 src/cmd.c:731 msgid "Could not change directory" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó" -#: src/cmd.c:283 +#: src/cmd.c:280 msgid " View file " msgstr " ¥Õ¥¡¥¤¥ë¤ò¸«¤ë " -#: src/cmd.c:283 +#: src/cmd.c:280 msgid " Filename:" msgstr " ¥Õ¥¡¥¤¥ë̾:" -#: src/cmd.c:300 +#: src/cmd.c:297 msgid " Filtered view " msgstr " ¥Õ¥£¥ë¥¿¤µ¤ì¤¿°ìÍ÷ " -#: src/cmd.c:300 +#: src/cmd.c:297 msgid " Filter command and arguments:" msgstr " ¥Õ¥£¥ë¥¿¥³¥Þ¥ó¥É¤È°ú¿ô:" -#: src/cmd.c:388 +#: src/cmd.c:385 msgid "Create a new Directory" msgstr "¿·µ¬¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®" -#: src/cmd.c:388 +#: src/cmd.c:385 msgid " Enter directory name:" msgstr " ¥Ç¥£¥ì¥¯¥È¥ê̾¤òÆþÎÏ:" -#: src/cmd.c:449 +#: src/cmd.c:446 msgid " Filter " msgstr " ¥Õ¥£¥ë¥¿ " -#: src/cmd.c:449 +#: src/cmd.c:446 msgid " Set expression for filtering filenames" msgstr " ¥Õ¥¡¥¤¥ë̾¤Î¥Õ¥£¥ë¥¿¤Î·Á¼°¤òÀßÄê" -#: src/cmd.c:515 +#: src/cmd.c:512 msgid " Select " msgstr " ÁªÂò " -#: src/cmd.c:567 +#: src/cmd.c:564 msgid " Unselect " msgstr " ÁªÂò²ò½ü " -#: src/cmd.c:640 +#: src/cmd.c:637 msgid "Extension file edit" msgstr "³ÈÄ¥¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸" -#: src/cmd.c:641 +#: src/cmd.c:638 msgid " Which extension file you want to edit? " msgstr " ¤É¤Î³ÈÄ¥¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Þ¤¹¤«? " -#: src/cmd.c:642 +#: src/cmd.c:639 msgid "&User" msgstr "¥æ¡¼¥¶ (&U)" -#: src/cmd.c:642 src/cmd.c:668 +#: src/cmd.c:639 src/cmd.c:667 msgid "&System Wide" msgstr "¥·¥¹¥Æ¥àÁ´ÂÎ (&S)" -#: src/cmd.c:665 -msgid "Menu file edit" -msgstr "¥á¥Ë¥å¡¼¥Õ¥¡¥¤¥ë¤òÊÔ½¸" +#: src/cmd.c:664 +msgid " Menu edit " +msgstr " ¥á¥Ë¥å¡¼¤ÎÊÔ½¸ " -#: src/cmd.c:666 -msgid " Which menu file will you edit? " +#: src/cmd.c:665 +msgid " Which menu file will you edit ? " msgstr " ¤É¤Î¥á¥Ë¥å¡¼¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Þ¤¹¤«? " -#: src/cmd.c:668 +#: src/cmd.c:667 msgid "&Local" msgstr "¥í¡¼¥«¥ë (&L)" -#: src/cmd.c:668 +#: src/cmd.c:667 msgid "&Home" msgstr "¥Û¡¼¥à (&H)" -#: src/cmd.c:858 +#: src/cmd.c:857 msgid " Compare directories " msgstr " ¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó " -#: src/cmd.c:858 +#: src/cmd.c:857 msgid " Select compare method: " msgstr " Èæ³ÓÊýË¡¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤: " -#: src/cmd.c:859 +#: src/cmd.c:858 msgid "&Quick" msgstr "¥¯¥¤¥Ã¥¯ (&Q)" -#: src/cmd.c:859 +#: src/cmd.c:858 msgid "&Size only" msgstr "Â礭¤µ¤Î¤ß (&S)" -#: src/cmd.c:859 +#: src/cmd.c:858 msgid "&Thorough" msgstr "Ä̤·¤Ç (&T)" -#: src/cmd.c:869 +#: src/cmd.c:868 msgid " Both panels should be on the listing view mode to use this command " msgstr "" " ¤³¤Î¥³¥Þ¥ó¥É¤ò»È¤¦¤Ë¤Ï,ξ¥Ñ¥Í¥ë¤È¤â°ìÍ÷ɽ¼¨¥â¡¼¥É¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó " -#: src/cmd.c:883 +#: src/cmd.c:882 msgid " The command history is empty " msgstr " ¥³¥Þ¥ó¥É¤ÎÍúÎò¤Ï¶õ¤Ç¤¹ " -#: src/cmd.c:889 +#: src/cmd.c:888 msgid " Command history " msgstr " ¥³¥Þ¥ó¥É¤ÎÍúÎò " -#: src/cmd.c:931 +#: src/cmd.c:930 msgid "" " Not an xterm or Linux console; \n" " the panels cannot be toggled. " @@ -3470,11 +3502,11 @@ " xterm ¤Þ¤¿¤Ï Linux ¥³¥ó¥½¡¼¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó; \n" " ¥Ñ¥Í¥ë¤ò¥È¥°¥ë¤Ç¤­¤Þ¤»¤ó" -#: src/cmd.c:970 +#: src/cmd.c:969 msgid "Type `exit' to return to the Midnight Commander" msgstr "`exit' ¤ÈÆþÎϤ¹¤ì¤Ð Midnight Commander ¤ØÌá¤ê¤Þ¤¹" -#: src/cmd.c:1025 +#: src/cmd.c:1024 #, c-format msgid "" " Couldn't stat %s \n" @@ -3483,98 +3515,107 @@ " %s ¤ò stat ¤Ç¤­¤Þ¤»¤ó \n" " %s " -#: src/cmd.c:1034 src/cmd.c:1036 +#: src/cmd.c:1033 src/cmd.c:1035 msgid " Link " msgstr " ¥ê¥ó¥¯ " -#: src/cmd.c:1035 src/cmd.c:1174 src/file.c:1704 +#: src/cmd.c:1034 src/cmd.c:1173 src/file.c:1704 msgid " to:" msgstr " to:" -#: src/cmd.c:1046 +#: src/cmd.c:1045 #, c-format msgid " link: %s " msgstr " ¥ê¥ó¥¯: %s " -#: src/cmd.c:1079 +#: src/cmd.c:1078 #, c-format msgid " symlink: %s " msgstr " ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯: %s " -#: src/cmd.c:1133 +#: src/cmd.c:1132 #, c-format msgid " Symlink `%s' points to: " msgstr " ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯ `%s' ¤Î¥ê¥ó¥¯Àè: " -#: src/cmd.c:1138 +#: src/cmd.c:1137 msgid " Edit symlink " msgstr " ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ÎÊÔ½¸ " -#: src/cmd.c:1143 +#: src/cmd.c:1142 #, c-format msgid " edit symlink, unable to remove %s: %s " msgstr " ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ÎÊÔ½¸, %s¤òºï½ü¤Ç¤­¤Þ¤»¤ó: %s " -#: src/cmd.c:1147 +#: src/cmd.c:1146 #, c-format msgid " edit symlink: %s " msgstr " ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ÎÊÔ½¸: %s " -#: src/cmd.c:1174 +#: src/cmd.c:1173 msgid " Link symbolically " msgstr " ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òÄ¥¤ë " -#: src/cmd.c:1175 +#: src/cmd.c:1174 msgid " Relative symlink " msgstr " ÁêÂÐŪ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯ " -#: src/cmd.c:1186 +#: src/cmd.c:1185 #, c-format msgid " relative symlink: %s " msgstr " ÁêÂÐŪ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯: %s " -#: src/cmd.c:1336 +#: src/cmd.c:1260 +msgid "Using default locale" +msgstr "¥Ç¥Õ¥©¥ë¥È¥í¥«¡¼¥ë¤òÍøÍÑ" + +#: src/cmd.c:1262 +#, c-format +msgid "Using locale \"%s\" (from environment variable %s)" +msgstr "¥í¥«¡¼¥ë \"%s\" ¤òÍøÍѤ·¤Þ¤¹ (´Ä¶­ÊÑ¿ô %s ¤è¤ê)" + +#: src/cmd.c:1348 msgid " Enter machine name (F1 for details): " msgstr " ¥Þ¥·¥ó̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤(¾ÜºÙ¤ÏF1¥­¡¼): " -#: src/cmd.c:1363 +#: src/cmd.c:1375 #, c-format msgid " Could not chdir to %s " msgstr " ¥Ç¥£¥ì¥¯¥È¥ê¤ò%s¤ØÊѹ¹¤Ç¤­¤Þ¤»¤ó " -#: src/cmd.c:1370 src/widget.c:1163 +#: src/cmd.c:1382 src/widget.c:1163 msgid " Link to a remote machine " msgstr " ¥ê¥â¡¼¥È¡¦¥Þ¥·¥ó¤Ø¤Î¥ê¥ó¥¯ " -#: src/cmd.c:1376 src/widget.c:1164 +#: src/cmd.c:1388 src/widget.c:1164 msgid " FTP to machine " msgstr " ¥Þ¥·¥ó¤Ø¤ÎFTP " -#: src/cmd.c:1382 src/widget.c:1165 +#: src/cmd.c:1394 src/widget.c:1165 msgid " SMB link to machine " msgstr " ¥Þ¥·¥ó¤Ø¤ÎSMB¥ê¥ó¥¯ " -#: src/cmd.c:1392 +#: src/cmd.c:1404 msgid " Socket source routing setup " msgstr " ¥½¥±¥Ã¥È¤Î¥½¡¼¥¹¥ë¡¼¥Æ¥£¥ó¥°ÀßÄê " -#: src/cmd.c:1393 +#: src/cmd.c:1405 msgid " Enter host name to use as a source routing hop: " msgstr " ¥½¡¼¥¹¥ë¡¼¥Æ¥£¥ó¥°¤Î hop ¤Ë»È¤¦¥Û¥¹¥È¤Î̾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: src/cmd.c:1401 +#: src/cmd.c:1413 msgid " Host name " msgstr " ¥Û¥¹¥È̾ " -#: src/cmd.c:1401 +#: src/cmd.c:1413 msgid " Error while looking up IP address " msgstr " IP¥¢¥É¥ì¥¹¤ò¸«ÉÕ¤±¤ëºÝ¤Î¥¨¥é¡¼ " -#: src/cmd.c:1412 +#: src/cmd.c:1424 msgid " Undelete files on an ext2 file system " msgstr " ext2¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¤Î¥Õ¥¡¥¤¥ëºï½ü¤Î¤ä¤êľ¤· " -#: src/cmd.c:1413 +#: src/cmd.c:1425 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -3582,11 +3623,11 @@ " ¥Õ¥¡¥¤¥ë¤òÉü³è¤µ¤»¤ë¥Ç¥Ð¥¤¥¹¤Î¥Ç¥Ð¥¤¥¹Ì¾ (/dev/ ¤Ï¾Ê¤¯) ¤ò\n" " ÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: (F1 ¤Ç¾ÜºÙ)" -#: src/cmd.c:1463 +#: src/cmd.c:1475 msgid " Setup saved to ~/" msgstr " ÀßÄê¤Ï ~/ ¤ØÊݸ¤µ¤ì¤Þ¤·¤¿" -#: src/cmd.c:1468 +#: src/cmd.c:1480 msgid " Setup " msgstr " ÀßÄê " @@ -3685,7 +3726,7 @@ msgid "Unknown" msgstr "ÉÔÌÀ" -#: src/ext.c:143 src/user.c:499 +#: src/ext.c:143 src/user.c:542 #, c-format msgid "" " Can't generate unique filename \n" @@ -3694,7 +3735,7 @@ " °ì°Õ¤Ê¥Õ¥¡¥¤¥ë̾¤òÀ¸À®¤Ç¤­¤Þ¤»¤ó \n" " %s " -#: src/ext.c:150 src/user.c:511 +#: src/ext.c:150 src/user.c:554 #, c-format msgid "" " Can't create temporary command file \n" @@ -3703,7 +3744,7 @@ " °ì»þŪ¤Ê¥³¥Þ¥ó¥É¡¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤»¤ó \n" " %s " -#: src/ext.c:165 src/user.c:533 +#: src/ext.c:165 src/user.c:576 msgid " Parameter " msgstr " ¥Ñ¥é¥á¡¼¥¿ " @@ -4584,7 +4625,7 @@ msgid " Help " msgstr " ¥Ø¥ë¥× " -#: src/help.c:766 src/user.c:637 +#: src/help.c:766 src/user.c:687 #, c-format msgid "" " Can't open file %s \n" @@ -5252,71 +5293,75 @@ msgid "&Listing format edit" msgstr "°ìÍ÷·Á¼°ÊÔ½¸(&L)" -#: src/main.c:1348 +#: src/main.c:1349 msgid "&Extension file edit" msgstr "³ÈÄ¥¥Õ¥¡¥¤¥ë¤òÊÔ½¸(&E)" -#: src/main.c:1349 +#: src/main.c:1350 msgid "&Menu file edit" msgstr "¥á¥Ë¥å¡¼¥Õ¥¡¥¤¥ëÊÔ½¸(&M)" -#: src/main.c:1354 +#: src/main.c:1351 +msgid "Menu edi&Tor edit" +msgstr "¥á¥Ë¥å¡¼¥¨¥Ç¥£¥¿¤ÇÊÔ½¸(&T)" + +#: src/main.c:1356 msgid "&Configuration..." msgstr "ÀßÄê(&C)..." -#: src/main.c:1356 +#: src/main.c:1358 msgid "c&Onfirmation..." msgstr "³Îǧ(&O)..." -#: src/main.c:1357 +#: src/main.c:1359 msgid "&Display bits..." msgstr "ɽ¼¨¥Ó¥Ã¥È¿ô(&D)..." -#: src/main.c:1359 +#: src/main.c:1361 msgid "learn &Keys..." msgstr "¥­¡¼¤Î³Ø½¬(&K)..." -#: src/main.c:1362 +#: src/main.c:1364 msgid "&Virtual FS..." msgstr "²¾ÁÛFS(&V)..." -#: src/main.c:1365 +#: src/main.c:1367 msgid "&Save setup" msgstr "ÀßÄêÊݸ(&S)" -#: src/main.c:1381 src/main.c:1383 +#: src/main.c:1383 src/main.c:1385 msgid " &Left " msgstr "º¸(&L)" -#: src/main.c:1383 +#: src/main.c:1385 msgid " &Above " msgstr "¾å(&A)" -#: src/main.c:1386 +#: src/main.c:1388 msgid " &File " msgstr " ¥Õ¥¡¥¤¥ë(&F) " -#: src/main.c:1387 +#: src/main.c:1389 msgid " &Command " msgstr " ¥³¥Þ¥ó¥É(&C) " -#: src/main.c:1388 +#: src/main.c:1390 msgid " &Options " msgstr " ¥ª¥×¥·¥ç¥ó(&O) " -#: src/main.c:1390 src/main.c:1392 +#: src/main.c:1392 src/main.c:1394 msgid " &Right " msgstr " ±¦(&R) " -#: src/main.c:1392 +#: src/main.c:1394 msgid " &Below " msgstr " ²¼(&B) " -#: src/main.c:1447 +#: src/main.c:1449 msgid " Information " msgstr " ¾ðÊó " -#: src/main.c:1448 +#: src/main.c:1450 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -5328,24 +5373,23 @@ " ¥ì¥¯¥È¥ê¤ÎºÆÆɹþ¤ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¾Ü¤·¤¯¤Ï¥Þ¥Ë¥å\n" " ¥¢¥ë¤ò¸«¤Æ¤¯¤À¤µ¤¤" -#: src/main.c:1927 +#: src/main.c:1929 msgid "Thank you for using GNU Midnight Commander" msgstr " GNU Midnight Command ¤Î¤´ÍøÍÑ¡¢¤¢¤ê¤¬¤È¤´¤¶¤¤¤Þ¤·¤¿" -#: src/main.c:2284 -#, c-format -msgid "with mouse support on xterm%s.\n" -msgstr "xterm%s ¤Ë¤è¤ë¥Þ¥¦¥¹¥µ¥Ý¡¼¥ÈÍ­¤ê\n" - -#: src/main.c:2285 -msgid " and the Linux console" -msgstr "Linux console ¤Ç¤Î¥µ¥Ý¡¼¥È¤âÍ­¤ê" +#: src/main.c:2287 +msgid "with mouse support on xterm and the Linux console.\n" +msgstr "xterm ¤È Linux ¥³¥ó¥½¡¼¥ë¤Ë¤è¤ë¥Þ¥¦¥¹¥µ¥Ý¡¼¥ÈÍ­¤ê\n" + +#: src/main.c:2288 +msgid "with mouse support on xterm.\n" +msgstr "xterm ¤Ë¤è¤ë¥Þ¥¦¥¹¥µ¥Ý¡¼¥ÈÍ­¤ê\n" -#: src/main.c:2381 +#: src/main.c:2389 msgid "The TERM environment variable is unset!\n" msgstr "´Ä¶­ÊÑ¿ô TERM ¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: src/main.c:2487 +#: src/main.c:2495 msgid "" "Usage is:\n" "\n" @@ -5357,20 +5401,20 @@ "mc [flags] [this_dir] [other_panel_dir]\n" "\n" -#: src/main.c:2490 +#: src/main.c:2498 msgid "-a, --stickchars Force use of +, -, | for line drawing.\n" msgstr "-a, --stickchars ¶¯À©Åª¤Ë +, -, | ¤ò»È¤Ã¤Æ¥é¥¤¥óÉÁ²è¤ò¤¹¤ë\n" -#: src/main.c:2492 +#: src/main.c:2500 msgid "-b, --nocolor Force black and white display.\n" msgstr "-b, --nocolor ¶¯À©Åª¤Ë¥â¥Î¥¯¥íɽ¼¨¤¹¤ë\n" -#: src/main.c:2494 +#: src/main.c:2502 msgid "-B, --background [DEVEL-ONLY: Debug the background code]\n" msgstr "" "-B, --background [³«È¯¥Ð¡¼¥¸¥ç¥ó¤Î¤ß: ¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥³¡¼¥É¤Î¥Ç¥Ð¥Ã¥°]\n" -#: src/main.c:2496 +#: src/main.c:2504 msgid "" "-c, --color Force color mode.\n" "-C, --colors Specify colors (use --help-colors to get a list).\n" @@ -5380,11 +5424,11 @@ "-C, --colors ¿§¤ò»ØÄꤹ¤ë (--help-colors ¤ò»È¤Ã¤Æ¥ê¥¹¥È¤òÆÀ¤Ê¤µ¤¤)\n" "-d, --nomouse ¥Þ¥¦¥¹¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë\n" -#: src/main.c:2500 +#: src/main.c:2508 msgid "-e, --edit Startup the internal editor.\n" msgstr "-e, --edit ÆâÉô¥¨¥Ç¥£¥¿¤Îµ¯Æ°\n" -#: src/main.c:2502 +#: src/main.c:2510 msgid "" "-f, --libdir Print configured paths.\n" "-h, --help Shows this help message.\n" @@ -5398,17 +5442,17 @@ "terminfo/termcap ¤ò\n" " ¥Ç¥Õ¥©¥ë¥È¤Ë¤¹¤ë\n" -#: src/main.c:2507 +#: src/main.c:2515 msgid "-l, --ftplog file Log ftpfs commands to the file.\n" msgstr "-l, --ftplog file ftpfs ¥³¥Þ¥ó¥É¤Î¥í¥°¤ò¥Õ¥¡¥¤¥ë¤Ë½ÐÎϤ¹¤ë\n" -#: src/main.c:2510 +#: src/main.c:2518 msgid "-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n" msgstr "" "-M, --memory file [³«È¯¥Ð¡¼¥¸¥ç¥ó¤Î¤ß: MAD " "¥á¥Ã¥»¡¼¥¸¤Î¥í¥°¤ò¥Õ¥¡¥¤¥ë¤Ë½ÐÎϤ¹¤ë]\n" -#: src/main.c:2512 +#: src/main.c:2520 msgid "" "-P, --printwd At exit, print the last working directory.\n" "-s, --slow Disables verbose operation (for slow terminals).\n" @@ -5416,18 +5460,18 @@ "-P, --printwd ½ªÎ»»þ¡¤ºÇ¸å¤Îºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤òɽ¼¨¤¹¤ë\n" "-s, --slow ¤¯¤É¤¤Áàºî¤ò̵»ë¤¹¤ë (¥¿¡¼¥ß¥Ê¥ë¤Î®ÅÙ¤òÍî¤È¤¹¤¿¤á)\n" -#: src/main.c:2515 +#: src/main.c:2523 msgid "-t, --termcap Activate support for the TERMCAP variable.\n" msgstr "-t, --termcap ´Ä¶­ÊÑ¿ô TERMCAP ¤ËÂФ¹¤ë¥µ¥Ý¡¼¥È¤ò³èÀ­²½¤¹¤ë\n" -#: src/main.c:2518 +#: src/main.c:2526 msgid "" "-S, --createcmdile Create command file to set default directory upon exit.\n" msgstr "" "-S, --createcmdile " "¥Ç¥Õ¥©¥ë¥È¥Ç¥£¥ì¥¯¥È¥ê¤ò½ªÎ»»þ¤ËÀßÄꤹ¤ë¤¿¤á¤Ë¥³¥Þ¥ó¥É¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë\n" -#: src/main.c:2521 +#: src/main.c:2529 msgid "" "-u, --nosubshell Disable the concurrent subshell mode.\n" "-U, --subshell Force the concurrent subshell mode.\n" @@ -5437,21 +5481,23 @@ "-U, --subshell Ʊ»þ¤Ë¥µ¥Ö¥·¥§¥ë¥â¡¼¥É¤ò¶¯À©»ÈÍѤ¹¤ë\n" "-r, --forceexec ¶¯À©Åª¤Ë¥µ¥Ö¥·¥§¥ë¤ò¼Â¹Ô¤¹¤ë\n" -#: src/main.c:2525 +#: src/main.c:2533 msgid "" "-v, --view fname Start up into the viewer mode.\n" "-V, --version Report version and configuration options.\n" "-x, --xterm Force xterm mouse support and screen save/restore.\n" +"+number number it is the start line number of file for `mcedit'.\n" msgstr "" "-v, --view fname ¥Ó¥å¡¼¥¢¥â¡¼¥É¤ÎÃæ¤ØΩ¤Á¾å¤²¤ë\n" "-V, --version ¥Ð¡¼¥¸¥ç¥ó¤È¥³¥ó¥Õ¥£¥°¥ª¥×¥·¥ç¥ó¤òɽ¼¨\n" "-x, --xterm ¶¯À©Åª¤Ë xterm ¤Ç¥Þ¥¦¥¹¤ò¥µ¥Ý¡¼¥È¤·²èÌ̤ÎÊݸ/Éü¸µ¤ò¤¹¤ë\n" +"+number number ¤¬ 'mcedit' ¤Î¤¿¤á¤Î¥Õ¥¡¥¤¥ë¤Î³«»Ï¹ÔÈÖ¹æ¤Ë¤Ê¤ë\n" -#: src/main.c:2529 +#: src/main.c:2538 msgid "-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n" msgstr "-X, --dbgsubshell [³«È¯¥Ð¡¼¥¸¥ç¥ó¤Î¤ß: ¥µ¥Ö¥·¥§¥ë¤Î¥Ç¥Ð¥Ã¥°\n" -#: src/main.c:2531 +#: src/main.c:2540 msgid "" "\n" "Please send any bug reports (including the output of `mc -V')\n" @@ -5461,7 +5507,7 @@ "ÉÔ¶ñ¹çÊó¹ð¤ò ('mc -V' ¤Î½ÐÎϤò´Þ¤á¤Æ) mc-bugs@nuclecu.unam.mx\n" "¤Þ¤ÇÁ÷¤Ã¤Æ¤¯¤À¤µ¤¤\n" -#: src/main.c:2547 +#: src/main.c:2556 msgid "" "--colors KEYWORD={FORE},{BACK}\n" "\n" @@ -5500,123 +5546,123 @@ " brightcyan, lightgray and white\n" "\n" -#: src/main.c:2596 +#: src/main.c:2605 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Midnight Commander ¤Î¥é¥¤¥Ö¥é¥ê¥Ç¥£¥ì¥¯¥È¥ê: %s\n" -#: src/main.c:2610 +#: src/main.c:2619 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" "¥ª¥×¥·¥ç¥ó -m " "¤ÏÇѻߤµ¤ì¤Þ¤·¤¿¡£¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤Î¡Öɽ¼¨¥Ó¥Ã¥È¿ô...¡×¤ò¤´Í÷¤¯¤À¤µ¤¤\n" -#: src/main.c:2687 +#: src/main.c:2696 msgid "Use to debug the background code" msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤Î¥³¡¼¥É¤Î¥Ç¥Ð¥Ã¥°¤Ë»ÈÍÑ" -#: src/main.c:2693 +#: src/main.c:2702 msgid "Request to run in color mode" msgstr "¥«¥é¡¼¥â¡¼¥É¤Ç¤Î¼Â¹Ô¤òÍ×µá" -#: src/main.c:2695 +#: src/main.c:2704 msgid "Specifies a color configuration" msgstr "¥«¥é¡¼ÀßÄê¤ò»ØÄê" -#: src/main.c:2700 +#: src/main.c:2709 msgid "Edits one file" msgstr "¥Õ¥¡¥¤¥ë¤òÊÔ½¸" -#: src/main.c:2704 +#: src/main.c:2713 msgid "Displays this help message" msgstr "¤³¤Î¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸¤òɽ¼¨" -#: src/main.c:2707 +#: src/main.c:2716 msgid "Displays a help screen on how to change the color scheme" msgstr "¥«¥é¡¼¥¹¥­¡¼¥à¤ÎÊѹ¹ÊýË¡¤ò²èÌ̤Ëɽ¼¨" -#: src/main.c:2710 +#: src/main.c:2719 msgid "Log ftp dialog to specified file" msgstr "ftp ¤ÎÂÐÏõ­Ï¿¤ò»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤ËÊݸ" -#: src/main.c:2717 +#: src/main.c:2726 msgid "Obsolete" msgstr "ÇÑ»ß" -#: src/main.c:2719 +#: src/main.c:2728 msgid "Requests to run in black and white" msgstr "Çò¹õ¥â¡¼¥É¤Ç¤Î¼Â¹Ô¤òÍ×µá" -#: src/main.c:2721 +#: src/main.c:2730 msgid "Disable mouse support in text version" msgstr "¥Æ¥­¥¹¥ÈÈǤǤΥޥ¦¥¹¤Î¥µ¥Ý¡¼¥È¤ò̵¸ú²½" -#: src/main.c:2724 +#: src/main.c:2733 msgid "Disables subshell support" msgstr "¥µ¥Ö¥·¥§¥ë¤Î¥µ¥Ý¡¼¥È¤ò̵¸ú²½" -#: src/main.c:2728 +#: src/main.c:2737 msgid "Prints working directory at program exit" msgstr "¥×¥í¥°¥é¥à½ªÎ»»þ¤Ëºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤òɽ¼¨" -#: src/main.c:2730 +#: src/main.c:2739 msgid "Resets soft keys on HP terminals" msgstr "HP¥¿¡¼¥ß¥Ê¥ë¤Ç¥½¥Õ¥È¥¦¥§¥¢¥­¡¼¥Ü¡¼¥É¤òÍ×µá" -#: src/main.c:2732 +#: src/main.c:2741 msgid "To run on slow terminals" msgstr "ÃÙ¤¤Ã¼Ëö¤Ç¼Â¹Ô" -#: src/main.c:2735 +#: src/main.c:2744 msgid "Use stickchars to draw" msgstr "stickchars ¤ÇÉÁ²è" -#: src/main.c:2739 +#: src/main.c:2748 msgid "Enables subshell support (default)" msgstr "¥µ¥Ö¥·¥§¥ë¤Î¥µ¥Ý¡¼¥È (¥Ç¥Õ¥©¥ë¥È)" -#: src/main.c:2744 +#: src/main.c:2753 msgid "Tries to use termcap instead of terminfo" msgstr "terminfo¤ÎÂå¤ï¤ê¤Ëtermcap¤ò»î¤¹" -#: src/main.c:2748 +#: src/main.c:2757 msgid "Displays the current version" msgstr "¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨" -#: src/main.c:2750 +#: src/main.c:2759 msgid "Launches the file viewer on a file" msgstr "¥Õ¥¡¥¤¥ë¥Ó¥å¡¼¥¢¤òµ¯Æ°" -#: src/main.c:2752 +#: src/main.c:2761 msgid "Forces xterm features" msgstr "¶¯À©Åª¤Ë xterm µ¡Ç½¤ò»È¤¦" -#: src/main.c:2754 +#: src/main.c:2763 msgid "Geometry for the window" msgstr "¥¦¥¤¥ó¥É¥¦¤Î¥¸¥ª¥á¥È¥ê" -#: src/main.c:2754 +#: src/main.c:2763 msgid "GEOMETRY" msgstr "GEOMETRY" -#: src/main.c:2755 +#: src/main.c:2764 msgid "No windows opened at startup" msgstr "µ¯Æ°»þ¤Ë¥¦¥¤¥ó¥É¥¦¤òɽ¼¨¤·¤Ê¤¤" -#: src/main.c:2756 +#: src/main.c:2765 msgid "No desktop icons" msgstr "¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥¤¥³¥ó¤¬¤Ê¤¤" -#: src/main.c:2757 +#: src/main.c:2766 msgid "Look more like traditional gmc" msgstr "ÅÁÅýŪ¤Ê gmc ¤Ë¶á¤¤³°´Ñ" -#: src/main.c:2759 +#: src/main.c:2768 msgid "Display the directory that holds the .links startup files and exit" msgstr ".links µ¯Æ°¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤òɽ¼¨¤·, ½ªÎ»" -#: src/main.c:3071 +#: src/main.c:3081 msgid "" "Couldn't open tty line. You have to run mc without the -P flag.\n" "On some systems you may want to run # `which mc`\n" @@ -5624,11 +5670,11 @@ "tty ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó. -P ¥Õ¥é¥°¤òÉÕ¤±¤º¤Ëµ¯Æ°¤·¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó.\n" "¤¤¤¯¤Ä¤«¤Î¥·¥¹¥Æ¥à¤Ç¤Ï # `which mc` ¤ò¼Â¹Ô¤·¤¿¤Û¤¦¤¬Îɤ¤¤«¤â¤·¤ì¤Þ¤»¤ó\n" -#: src/main.c:3149 +#: src/main.c:3159 msgid " Notice " msgstr " Ãí°Õ " -#: src/main.c:3150 +#: src/main.c:3160 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -5860,15 +5906,15 @@ msgid " No action taken " msgstr " ²¿¤â¼Â¹Ô¤·¤Þ¤»¤ó¤Ç¤·¤¿ " -#: src/screen.c:2399 src/screen.c:2429 src/tree.c:1016 +#: src/screen.c:2401 src/screen.c:2431 src/tree.c:1016 msgid "RenMov" msgstr "RenMov" -#: src/screen.c:2400 src/screen.c:2430 src/tree.c:1020 +#: src/screen.c:2402 src/screen.c:2432 src/tree.c:1020 msgid "Mkdir" msgstr "MkDir" -#: src/screen.c:2416 src/tree.c:866 +#: src/screen.c:2418 src/tree.c:866 #, c-format msgid "" " Can't chdir to \"%s\" \n" @@ -5961,32 +6007,32 @@ "¥Õ¥¡¥¤¥ë %s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó:\n" "%s\n" -#: src/user.c:250 +#: src/user.c:271 #, c-format msgid " Invalid shell pattern definition \"%c\". " msgstr " ÉÔÀµ¤Ê¥·¥§¥ë¥Ñ¥¿¡¼¥óÄêµÁ¤Ç¤¹ \"%c\". " -#: src/user.c:383 +#: src/user.c:424 msgid " Debug " msgstr " ¥Ç¥Ð¥Ã¥° " -#: src/user.c:392 +#: src/user.c:433 msgid " ERROR: " msgstr " ¥¨¥é¡¼: " -#: src/user.c:396 +#: src/user.c:437 msgid " True: " msgstr " ¿¿: " -#: src/user.c:398 +#: src/user.c:439 msgid " False: " msgstr " µ¶: " -#: src/user.c:602 +#: src/user.c:645 msgid " Warning -- ignoring file " msgstr " ·Ù¹ð -- ¥Õ¥¡¥¤¥ë¤ò̵»ë " -#: src/user.c:603 +#: src/user.c:646 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" @@ -5995,18 +6041,18 @@ "¥Õ¥¡¥¤¥ë %s ¤Ï root ¤ä¤¢¤Ê¤¿¤Î½êͭʪ¤Ç¤Ï¤Ê¤¤¤Î¤Ëï¤Ç¤â½ñ¤­¹þ¤ß\n" "²Äǽ¤Ç¤¹.ÍøÍѤ¹¤ë¤È¤¢¤Ê¤¿¤Î¥»¥­¥å¥ê¥Æ¥£¤ò¿¯³²¤¹¤ë¶²¤ì¤¬¤¢¤ê¤Þ¤¹" -#: src/user.c:622 +#: src/user.c:670 msgid " I can't run programs while logged on a non local directory " msgstr " ¥í¡¼¥«¥ë¤Ç¤Ê¤¤¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¤¤ë»þ¤Ë¥×¥í¥°¥é¥à¤Î¼Â¹Ô¤Ï¤Ç¤­¤Þ¤»¤ó " #. FIXME: this message is not quite right -#: src/user.c:720 +#: src/user.c:770 #, c-format msgid " Empty file %s " msgstr " ¶õ¤Î¥Õ¥¡¥¤¥ë %s " #. Create listbox -#: src/user.c:730 +#: src/user.c:779 msgid " User menu " msgstr " ¥æ¡¼¥¶¡¼¡¦¥á¥Ë¥å¡¼ " @@ -6464,29 +6510,29 @@ "ͽ´ü¤·¤Ê¤¤ EOF ¤Ç¤¹\n" "%s" -#: vfs/direntry.c:310 +#: vfs/direntry.c:300 #, c-format msgid "Dir cache expired for %s" msgstr "'%s' ¤Î Dir ¥­¥ã¥Ã¥·¥å¤¬½ªÎ»¤·¤Þ¤·¤¿" -#: vfs/direntry.c:440 vfs/direntry.c:443 +#: vfs/direntry.c:430 vfs/direntry.c:433 msgid " Direntry warning " msgstr "Direntry ¤Î·Ù¹ð" -#: vfs/direntry.c:440 +#: vfs/direntry.c:430 #, c-format msgid "Super ino_usage is %d, memory leak" msgstr "Super ino_usage ¤Ï %d ¤Ç¡¤¤³¤ì¤Ï¥á¥â¥ê¥ê¡¼¥¯¤Ç¤¹" -#: vfs/direntry.c:443 +#: vfs/direntry.c:433 msgid "Super has want_stale set" msgstr "Super has want_stable set" -#: vfs/direntry.c:823 +#: vfs/direntry.c:811 msgid "Starting linear transfer..." msgstr "¥ê¥Ë¥¢Å¾Á÷¤ò³«»Ï¤·¤Þ¤¹..." -#: vfs/direntry.c:968 +#: vfs/direntry.c:956 msgid "Getting file" msgstr "¥Õ¥¡¥¤¥ë¼èÆÀÃæ" @@ -6702,20 +6748,20 @@ msgid "(chdir first)" msgstr "(½é¤á¤Ë chdir)" -#: vfs/ftpfs.c:1286 +#: vfs/ftpfs.c:1287 msgid "ftpfs: failed" msgstr "ftpfs: ¼ºÇÔ¤·¤Þ¤·¤¿" -#: vfs/ftpfs.c:1296 +#: vfs/ftpfs.c:1297 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: ¼ºÇÔ¤·¤Þ¤·¤¿¡£¥Õ¥©¡¼¥ë¥Ð¥Ã¥¯¤Ç¤­¤Þ¤»¤ó" -#: vfs/ftpfs.c:1359 +#: vfs/ftpfs.c:1360 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: ¥Õ¥¡¥¤¥ë¤ÎÊݸÃæ %d (%d)" -#: vfs/ftpfs.c:1774 +#: vfs/ftpfs.c:1775 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6863,31 +6909,31 @@ "%s\n" "¤³¤ì¤Ïtar¥¢¡¼¥«¥¤¥Ö¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹" -#: vfs/vfs.c:1152 +#: vfs/vfs.c:1151 msgid "Changes to file lost" msgstr "ʶ¼º¤·¤¿¥Õ¥¡¥¤¥ë¤ËÊѹ¹¤·¤Þ¤¹" -#: vfs/vfs.c:1795 +#: vfs/vfs.c:1794 msgid "Could not parse:" msgstr "¹½Ê¸²òÀϤ¬½ÐÍè¤Þ¤»¤ó:" -#: vfs/vfs.c:1797 +#: vfs/vfs.c:1796 msgid "More parsing errors will be ignored." msgstr "¿¤¯¤Î¹½Ê¸²òÀÏ¥¨¥é¡¼¤¬¤Ç¤Þ¤·¤¿¤¬Ìµ»ë¤·¤Þ¤¹" -#: vfs/vfs.c:1797 +#: vfs/vfs.c:1796 msgid "(sorry)" msgstr "(sorry)" -#: vfs/vfs.c:1808 +#: vfs/vfs.c:1807 msgid "Internal error:" msgstr "ÆâÉô¥¨¥é¡¼:" -#: vfs/vfs.c:1818 +#: vfs/vfs.c:1817 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld ¥Ð¥¤¥ÈžÁ÷)" -#: vfs/vfs.c:1819 +#: vfs/vfs.c:1818 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld ¥Ð¥¤¥ÈžÁ÷¤·¤Þ¤·¤¿" Binary files old/mc-4.5.45/po/ko.gmo and new/mc-4.5.46/po/ko.gmo differ diff -ruN old/mc-4.5.45/po/mc.pot new/mc-4.5.46/po/mc.pot --- old/mc-4.5.45/po/mc.pot Tue May 9 18:52:10 2000 +++ new/mc-4.5.46/po/mc.pot Wed May 10 18:58:04 2000 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-05-09 18:42-0400\n" +"POT-Creation-Date: 2000-05-10 18:40-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -6203,29 +6203,29 @@ "%s" msgstr "" -#: vfs/direntry.c:300 +#: vfs/direntry.c:301 #, c-format msgid "Dir cache expired for %s" msgstr "" -#: vfs/direntry.c:430 vfs/direntry.c:433 +#: vfs/direntry.c:431 vfs/direntry.c:434 msgid " Direntry warning " msgstr "" -#: vfs/direntry.c:430 +#: vfs/direntry.c:431 #, c-format msgid "Super ino_usage is %d, memory leak" msgstr "" -#: vfs/direntry.c:433 +#: vfs/direntry.c:434 msgid "Super has want_stale set" msgstr "" -#: vfs/direntry.c:811 +#: vfs/direntry.c:812 msgid "Starting linear transfer..." msgstr "" -#: vfs/direntry.c:956 +#: vfs/direntry.c:957 msgid "Getting file" msgstr "" Binary files old/mc-4.5.45/po/nl.gmo and new/mc-4.5.46/po/nl.gmo differ Binary files old/mc-4.5.45/po/no.gmo and new/mc-4.5.46/po/no.gmo differ Binary files old/mc-4.5.45/po/pl.gmo and new/mc-4.5.46/po/pl.gmo differ Binary files old/mc-4.5.45/po/pt_BR.gmo and new/mc-4.5.46/po/pt_BR.gmo differ Binary files old/mc-4.5.45/po/ro.gmo and new/mc-4.5.46/po/ro.gmo differ Binary files old/mc-4.5.45/po/ru.gmo and new/mc-4.5.46/po/ru.gmo differ Binary files old/mc-4.5.45/po/sk.gmo and new/mc-4.5.46/po/sk.gmo differ Binary files old/mc-4.5.45/po/sv.gmo and new/mc-4.5.46/po/sv.gmo differ Binary files old/mc-4.5.45/po/tr.gmo and new/mc-4.5.46/po/tr.gmo differ Binary files old/mc-4.5.45/po/uk.gmo and new/mc-4.5.46/po/uk.gmo differ Binary files old/mc-4.5.45/po/wa.gmo and new/mc-4.5.46/po/wa.gmo differ Binary files old/mc-4.5.45/po/zh_CN.GB2312.gmo and new/mc-4.5.46/po/zh_CN.GB2312.gmo differ Binary files old/mc-4.5.45/po/zh_TW.Big5.gmo and new/mc-4.5.46/po/zh_TW.Big5.gmo differ diff -ruN old/mc-4.5.45/vfs/ChangeLog new/mc-4.5.46/vfs/ChangeLog --- old/mc-4.5.45/vfs/ChangeLog Tue May 9 18:52:01 2000 +++ new/mc-4.5.46/vfs/ChangeLog Wed May 10 18:58:00 2000 @@ -1,3 +1,7 @@ +2000-05-10 Pavel Machek + + * direntry.c (vfs_s_new_inode): Do not leave st_nlink uninitialized. + 2000-05-08 Valery Kornienkov vfs/extfs/uha.in: add HSC type archives diff -ruN old/mc-4.5.45/vfs/direntry.c new/mc-4.5.46/vfs/direntry.c --- old/mc-4.5.45/vfs/direntry.c Tue May 9 18:52:01 2000 +++ new/mc-4.5.46/vfs/direntry.c Wed May 10 18:58:00 2000 @@ -3,7 +3,7 @@ * * Written at 1998 by Pavel Machek , distribute under LGPL. * - * $Id: direntry.c,v 1.32 2000/05/03 19:10:52 pavel Exp $ + * $Id: direntry.c,v 1.33 2000/05/10 10:19:00 pavel Exp $ * * Very loosely based on tar.c from midnight and archives.[ch] from * avfs by Miklos Szeredi (mszeredi@inf.bme.hu) @@ -46,6 +46,7 @@ if (initstat) ino->st = *initstat; ino->super = super; + ino->st.st_nlink = 0; ino->st.st_ino = MEDATA->inode_counter++; ino->st.st_dev = MEDATA->rdev;