+2004-11-09 Jan Rafaj
+ * README:
+ - removed reference to HARDWARE-NOTES, that didnt made it into
+ previous ap-utils versions by accident
+ - added WARNING 1 and WARNING 2 sections (originally intended to be
+ in HARDWARE-NOTES, but the magnitude of their importance deserves
+ to put them straight into README)
+ * TODO: updated
+ * lib/ap-utils.h:
+ - added "(valid)" to the ERR_RET message, which more accurately
+ reflects what may actually happen (AP actually _may_ return
+ data, but in an unexpected format)
+ - enhanced WirelessStatistics structure for TransmittedPackets_11Mbps,
+ TransmittedPackets_55Mbps, TransmittedPackets_2Mbps, and
+ TransmittedPackets_1Mbps so that we can support functionally
+ enhanced firmware from VERNET WISP.
+ * lib/ap_search.c:
+ - in third column, display operAccessPointName OUI using label
+ "Name" instead of Wireless OUI. Makes more sense.
+ - made the number of APs per screen, as well as the offset at which
+ the info about whats actually scanned, is printed, relative
+ to the actual screen height (so to increase maximum hard-coded
+ amount of APs displayed, just switch from 80x25 console font
+ to a bigger one, or use X terminal window)
+ * lib/aps.c:
+ - reverted displaying back to RSSI & LQ both in % in screen 1.
+ This is becouse a) we want to keep as close to the view of the
+ original ATMEL utility as possible here, and b) huge dispersion
+ in dBm versus raw value of RSSI exists among different flavours
+ of APs, and the dBm formula unfortunately often gives results
+ very far from real values. So we want to display something thats
+ less jittering in the scope of inter-AP comparison.
+ - cosmetic fixes (2-line legend instead of 3-line)
+ - rebound the 'refresh' from 's' key to otherwise unused keys,
+ in favour of keyboard interface unification
+ * lib/common.c:
+ - created get_mib_details() to provide vendor-specific private
+ ATMEL MIB detection
+ - fixed a bug introduced by the 'name' patch, resulting in
+ omission to clear screen properly when user has given
+ insufficient credentials (bad password) to detect new AP type
+ - made the 'name'-patch code malloc-free (and memleak #2 free).
+ There's no point to use malloc()d space here since we dont
+ reuse it elsewhere (contrary to char *community).
+ - fixed bad variable boundary-handling introduced by 'name'-patch
+ that might result in crash of utility under circumstance
+ when ~/.ap-config didnt previously exist and user attempted
+ to add new AP with name of length >= 7 characters
+ - added possibility to skip name definition if user wants to
+ (useful for example when the newly added AP's IP will be used
+ solely for testing purposes :)
+ * vendor-specific private ATMEL MIB detection is now referred to
+ get_mib_details() everywhere
+ * lib/file.c:
+ - a lot of indentation fixes
+ - in get_opts(): fixed couple of bugs:
+ - it was possible to issue 'Connect' command when the AP list
+ was empty (was leading to endless loop)
+ - 'Delete' command failed to remove last remaining AP from the
+ list, ending up in endless loop (as get_value() doesnt do
+ sanity checking on its input paremeters)
+ - fixed a memleak #1 possibly introduced by 'name' patch - we need
+ to free char *name after its use
+ - in _scroll_rows(), fixed the AP MIB TYPE cutoff-by-format-string,
+ introduced by 'name' patch, and enhanced message size to accomodate
+ the true max. row size instead
+ - in get_opts() appended '(in ~/.ap-config)' behind the user-defined
+ APs list banner, to better reflect the real meaning of 'NAME'
+ (and other fields), to prevent someone from f.e. thinking
+ that the NAME here is the name stored in AP's configuration
+ (which it is NOT, of course).
+ * lib/oui.c: added OUIs:
+ - 000B46 (Cisco)
+ - 000D54 (3Com Europe Ltd)
+ - 000D88 (D-Link Corporation)
+ - 000EA6 (ASUSTEK COMPUTER INC.)
+ * lib/radio.c:
+ - fixed non-working radio menu with ATMEL12350 APs by merging the
+ initial TestModeRadioConfiguration and operAntennaSettings OID
+ modifications when ap_type == ATMEL12350
+ * lib/stat.c:
+ - replaced ERR_RET_PRESS with ERR_RET
+ - simplified; no more forking, goto's reduced, no need of
+ pipe(), alarm() or sig*jmp(); use select() for waiting -
+ it is now possible to quit (by pressing 'q' or 'Q') immediately.
+ Also, the counters now get updated immediately after pressing
+ whatever key != q.
+ - fixed a bug that, due to previous use of sig*jmp(), resulted
+ in lockup when attempting to quit ap-config after it has received
+ invalid packet, by pressing 'q' key several times
+ - WirelessStat(): implemented support of ATMEL 12350 functionally
+ enhanced MIB by VERNET WISP.
+ * lib/sysinfo.c:
+ - enhanced atmel_sysinfo() for displaying system uptime using
+ UpTime OID from ATMEL12350 VERNET MIB.
+ * lib/wlan.c:
+ - fixed showing/setting of BeaconPeriod value for ATMEL12350_TELLUS -
+ acceptable value range is now 0 - 65535 as originally intended
+ - new: implemented showing/setting of 'SIFS time' parameter, specific
+ to APs with ATMEL12350_VERNET firmware/MIB
+ * spelling & indentation fixes
+ * lib/scr.c, src/stations.c:
+ - implemented support for viewing statistics
+ produced by enhanced ATMEL 12350 firmware by VERNET
+ - implemented toggling of RSSI between 'dBm' view, '%' view, and
+ raw view - added new functions print_viewtype_rssi(), conv_rssi().
+ [TODO: update ap-gl/stations.c, too]
+ - pressing other than the selected keys will now result in refresh
+ of all values
+
+2004-10-24 Roman Festchook
+ * lib/common.c: fix to clear display before displaying AP type
+ * configure.in: version 1.4.2pre1
+
+2004-10-24 Przemyslaw Stanislaw Knycz
+ * po/pl.po: translation updated
+
+2004-10-18 Roman Festchook
+ * lib/common.c: fix to use get_value instead of get_pass for input AP name
+ * po/uk.po: translation updated
+
+2004-10-18 Teemu Kiviniemi
+ * src/ap-auth.c: command line utility to change the list of authorised MAC addresses added
+ * Documentation/README.ap-auth: some docs for ap-auth utility
+
+2004-10-18 Aleksey Korenkov
+ * lib/common.c, lib/file.c, src/ap-config.c: patch that adds name to list of APs
+
+2004-08-08 Dan Pelleg
+ * lib/ap_search.c: fix error when build ap-utils on freebsd.
+
2004-06-22 Elif Bilge Maden
* po/tr.po: Turkish translation added
* lib/ap_search.c: Compiler Error for ap-utils on Darwin 7.3 (Mac OS X 10.3.3) fix
2004-03-20 Roman Festchook
- * ap-gl/bridge.c: Isolate wireless clients status displaying fixed
+ * ap-gl/bridge.c: Isolate wireless clients status displaying fixed
* lib/snmp.c: decreased timeout waiting for snmp reply packet to 1 second
* src/ap-mrtg.c: to decrease usage of network and AP CPU AP name only requested if -n option specified
## Process this file with automake to produce Makefile.in
man_MANS = ap-trapd.8 ap-mrtg.8 ap-config.8
-EXTRA_DIST = $(man_MANS) FAQ Ukrainian/* Ovislink-HOWTO.html HARDWARE-NOTES README.RPM README.ap-gl
+EXTRA_DIST = $(man_MANS) FAQ Ukrainian/* Ovislink-HOWTO.html HARDWARE-NOTES README.* ap-auth.html
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.7.8 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
target_alias = @target_alias@
man_MANS = ap-trapd.8 ap-mrtg.8 ap-config.8
-EXTRA_DIST = $(man_MANS) FAQ Ukrainian/* Ovislink-HOWTO.html HARDWARE-NOTES README.RPM README.ap-gl
+EXTRA_DIST = $(man_MANS) FAQ Ukrainian/* Ovislink-HOWTO.html HARDWARE-NOTES README.* ap-auth.html
subdir = Documentation
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
--- /dev/null
+Subject: [ap-utils] mac auth updates from command line (patch)
+Date: Monday 19 July 2004 18:06
+From: Teemu Kiviniemi <teemuki AT fotokone DOT fi>
+To: ap-utils AT lists DOT polesye DOT net
+
+
+Hi,
+
+I couldn't find a command line utility to change the list of authorised MAC
+addresses, so I did one myself. I combined some of the existing code found in
+ap-mrtg.c and auth_mac.c to make ap-auth.c.
+
+Usage:
+ap-auth -i ip -c community -d filename
+or
+ap-auth -i ip -c community -u filename
+
+
+-i ip - AP ip address
+-c community - SNMP community string
+-d filename - download list of authorised MAC addresses from AP to a file
+-u filename - upload list of authorised MAC addresses from a file to AP
+
+
+Here is a patch against ap-utils 1.4.1:
+http://teemuki.fotokone.fi/ap-utils/ap-utils-1.4.1-ap-auth.patch
+
+
+It has only support for ATMEL410, because I can't test the code on other
+accesspoints. I've tested it and it works with smartBridges Airpoint Pro.
--- /dev/null
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+ <HEAD>
+ <TITLE> [ap-utils] mac auth updates from command line (patch)
+ </TITLE>
+ <LINK REL="Index" HREF="index.html" >
+ <LINK REL="made" HREF="mailto:ap-utils%40lists.polesye.net?Subject=%5Bap-utils%5D%20mac%20auth%20updates%20from%20command%20line%20%28patch%29&In-Reply-To=">
+ <META NAME="robots" CONTENT="index,nofollow">
+ <META http-equiv="Content-Type" content="text/html; charset=us-ascii">
+
+
+ </HEAD>
+ <BODY BGCOLOR="#ffffff">
+ <H1>[ap-utils] mac auth updates from command line (patch)</H1>
+ <B>Teemu Kiviniemi</B>
+ <A HREF="mailto:ap-utils%40lists.polesye.net?Subject=%5Bap-utils%5D%20mac%20auth%20updates%20from%20command%20line%20%28patch%29&In-Reply-To="
+ TITLE="[ap-utils] mac auth updates from command line (patch)">teemuki at fotokone.fi
+ </A><BR>
+ <I>Mon Jul 19 18:06:50 EEST 2004</I>
+ <P><UL>
+
+
+ <LI> <B>Messages sorted by:</B>
+ <a href="date.html#424">[ date ]</a>
+ <a href="thread.html#424">[ thread ]</a>
+ <a href="subject.html#424">[ subject ]</a>
+ <a href="author.html#424">[ author ]</a>
+ </LI>
+ </UL>
+ <HR>
+<!--beginarticle-->
+<PRE>Hi,
+
+I couldn't find a command line utility to change the list of authorised MAC
+addresses, so I did one myself. I combined some of the existing code found in
+ap-mrtg.c and auth_mac.c to make ap-auth.c.
+
+Usage:
+ap-auth -i ip -c community -d filename
+or
+ap-auth -i ip -c community -u filename
+
+-i ip - AP ip address
+-c community - SNMP community string
+-d filename - download list of authorised MAC addresses from AP to a file
+-u filename - upload list of authorised MAC addresses from a file to AP
+
+Here is a patch against ap-utils 1.4.1:
+<A HREF="http://teemuki.fotokone.fi/ap-utils/ap-utils-1.4.1-ap-auth.patch">http://teemuki.fotokone.fi/ap-utils/ap-utils-1.4.1-ap-auth.patch</A>
+
+It has only support for ATMEL410, because I can't test the code on other
+accesspoints. I've tested it and it works with smartBridges Airpoint Pro.
+
+Teemu
+
+</PRE>
+
+<!--endarticle-->
+ <HR>
+ <P><UL>
+ <!--threads-->
+
+
+ <LI> <B>Messages sorted by:</B>
+ <a href="date.html#424">[ date ]</a>
+ <a href="thread.html#424">[ thread ]</a>
+ <a href="subject.html#424">[ subject ]</a>
+ <a href="author.html#424">[ author ]</a>
+ </LI>
+ </UL>
+
+<hr>
+<a href="http://lists.polesye.net/mailman/listinfo/ap-utils">More information about the ap-utils
+mailing list</a><br>
+</body></html>
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.7.8 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
About
-----
Wireless Access Point Utilites for Unix - it's a set of utilites to configure
-and monitor Wireless Access Points under Unix using SNMP protocol. Utilites
+and monitor Wireless Access Points in Unix using SNMP protocol. Utilites
are known to compile and run under Linux, FreeBSD, NetBSD, MacOS-X, AIX,
QNX and OpenBSD.
Supported Hardware
------------------
-ap-utils support Atmel chipset based Access Points with ATMEL Private MIB
-with enterprises ID 410 (ATMEL410), Access Points with newer ATMEL Private
-MIB with enterprises ID 12350 (ATMEL12350) such as Netgear ME102,
-and No Wires Needed APs with IEEE 802.11 MIB and NWN DOT11EXT MIB
+ap-utils support Atmel chipset based Access Points with ATMEL private MIB
+with enterprises ID 410 (ATMEL410), Access Points with newer ATMEL private
+MIB with enterprises ID 12350 (ATMEL12350) such as Netgear ME102 and Tellus
+A14, and No Wires Needed APs with IEEE 802.11 MIB and NWN DOT11EXT MIB
(NWN).
You can find Known/Reported-to-work hardware in the table below.
If you have had success with ap-utils working with a hardware thats
| Wline | W-2000 | ATMEL410 |
+-------------------------------+-----------------------+----------------------+
-Please read also HARDWARE-NOTES about hardware-specific information!
-
Please note that although many of these devices may use the same MIB enterprise
identification, the actual MIBs may slightly differ, depending on whether
the manufacturer has decided upon hardware modifications.
ID. If you have qualms, then please send us the MIB file that came
with your device!
+WARNING 1: There actually exist two different kinds of ATMEL private MIBs,
+regardless of its enterprise ID - each with a different set of operational
+modes.
+One type the private MIB comes with is often referred to as "Access Point"
+firmware, often marked with shortcut "AP". Another one is referred to as
+"Wireless Adapter firmware", marked with shortcut "WA".
+"WA" firmware has questionable advantage that it is claimed to allow APs
+equipped with this firmware to connect with non-ATMEL-based APs of other
+manufacturers using "AP-client (Infrastructure)" mode (in reality, this is,
+unfortunately, often false), at cost of supporting no true "AP" mode
+(only Ad-Hoc and AP-client modes are available).
+
+Whenever you can, use firmware labelled as "AP" and not "WA".
+"AP" version supports most networking modes, compared to "WA" version.
+MIBs AND FIRMWARES WITH "WA" LABEL ARE NOT SUPPORTED WITH AP-UTILS!
+They may appear to _partially_ work with ap-utils, but you
+can cause harm to your AP if you use ap-utils with such firmware.
+Do not complain if you use ap-utils with such firmware and it damages
+your AP!
+
+WARNING 2: Users of Tellus A14 and its OEM versions (Wline A14, Veriplus
+WL-A14, etc. - ATMEL12350 AP "types"): Beware. Firmwares up to (including)
+version 0.2.2.19 for these APs contain a SERIOUS BUG that may
+result in unpredictable and persistent lock-up of your AP, when configured
+over SNMP or even via its web interface. There's unfortunately no way
+of how to "resurrect" such a locked-up AP - the only option is to return
+the AP to its supplier for replacement.
+To be on the safe side, we recommend everyone to upgrade to any firmware
+version above 0.2.2.19. At the time of this writing,
+you should be able to download firmware v. 0.2.2.21 including
+the corresponding TFTP utility for example from the following link:
+
+http://www.sparklan.com/download.htm
+
+or send your AP to its supplier for firmware replacement in case
+he's able to supply you with customarily enhanced firmware version
+above 0.2.2.19.
+
+Frequently Asked Questions
+--------------------------
+
I got an AP and I would like ap-utils to support it (it is not on the
---------------------------------------------------------------------
list above)
* porting to other Unix'es and platforms (ALWAYS)
* support new AP's (ALWAYS)
+* implement displaying of 'NetworkSettings' OID structure in place of
+ 'Stations' submenu, if the target AP using VERNET ATMEL12350 MIB
+ is in STA mode. This would finally bring us client-mode diagnostics
+ (client-side RSSI and wireless connection status), that has been
+ been missing so badly for a long time (for other ATMEL12350 MIBs
+ and ATMEL410 non-SB MIBs, it will apparently stay missing forever,
+ unfortunately)
+* switch the 'Status' field in 'Stations' from numeric to verbose representation
+* adding access for editing feature values in sysinfo.c [by a hidden key,
+ with a big warning, since this would be a _very_ dangerous option]
+* add 802.1X support for ATMEL12350 APs
+* patch test.c so that it works with ATMEL12350 devices
+* update src/ap-gl.c to reflect changes made in src/stations.c during 1.4.1pre*
+ transition
* try to not rely on actually configured subnet information on each
network interface in ap scan
* perhaps implement better way to distinguish between ATMEL410 and
ATMEL12350 APs - see TODO comment in ap_search.c
-* patch test.c so that it works with ATMEL12350 devices
-* adding access for editing feature values in sysinfo.c [by a hidden key,
- with a big warning, since this would be a _very_ dangerous option]
-* add 802.1X support for ATMEL12350 Tellus APs
* update manpages
* add S Search key in get_opts that would allow - instead of connecting - searching for APs first
* move updates from ap-gl to ap-config
* increase/disable knownAPs limit
* use iptraf like ethernet.desc file to store stations description
-* add per client LQ and RSSI stats to ap-mrtg
\ No newline at end of file
+* add per client LQ and RSSI stats to ap-mrtg
-# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.8 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.7.9])])
+ [AM_AUTOMAKE_VERSION([1.7.8])])
# Helper functions for option handling. -*- Autoconf -*-
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-# gettext.m4 serial 28 (gettext-0.13)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
+# gettext.m4 serial 13 (gettext-0.11.1)
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl Authors:
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002.
dnl Macro to add for using GNU gettext.
dnl $(top_builddir)/intl/libintl.a will be created.
dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
dnl implementations (in libc or libintl) without the ngettext() function
-dnl will be ignored. If NEEDSYMBOL is specified and is
-dnl 'need-formatstring-macros', then GNU gettext implementations that don't
-dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl will be ignored.
dnl INTLDIR is used to find the intl libraries. If empty,
dnl the value `$(top_builddir)/intl/' is used.
dnl
ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
[errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
])])])])])
- ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], ,
[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
+])])])
define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
AC_REQUIRE([AC_LIB_RPATH])
- dnl Sometimes libintl requires libiconv, so first search for libiconv.
- dnl Ideally we would do this search only after the
- dnl if test "$USE_NLS" = "yes"; then
- dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
- dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
- dnl the configure script would need to contain the same shell code
- dnl again, outside any 'if'. There are two solutions:
- dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
- dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
- dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
- dnl documented, we avoid it.
- ifelse(gt_included_intl, yes, , [
- AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
- ])
-
- dnl Set USE_NLS.
- AM_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)
ifelse(gt_included_intl, yes, [
BUILD_INCLUDED_LIBINTL=no
dnl to fall back to GNU NLS library.
dnl Add a version number to the cache macros.
- define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
+ define([gt_api_version], ifelse([$2], [need-ngettext], 2, 1))
define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
[AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
+extern int _nl_msg_cat_cntr;
extern int *_nl_domain_bindings;],
[bindtextdomain ("", "");
return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
LIBS="$LIBS $LIBINTL"
dnl Now see whether libintl exists and does not depend on libiconv.
AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
extern
#ifdef __cplusplus
"C"
#endif
const char *_nl_expand_alias ();],
[bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
gt_cv_func_gnugettext_libintl=yes,
gt_cv_func_gnugettext_libintl=no)
dnl Now see whether libintl exists and depends on libiconv.
if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
LIBS="$LIBS $LIBICONV"
AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
extern
#ifdef __cplusplus
"C"
#endif
const char *_nl_expand_alias ();],
[bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
[LIBINTL="$LIBINTL $LIBICONV"
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
gt_cv_func_gnugettext_libintl=yes
dnl libintl. (Cf. the install rule in intl/Makefile.in.)
if test "$gt_cv_func_gnugettext_libc" = "yes" \
|| { test "$gt_cv_func_gnugettext_libintl" = "yes" \
- && test "$PACKAGE" != gettext-runtime \
- && test "$PACKAGE" != gettext-tools; }; then
+ && test "$PACKAGE" != gettext; }; then
gt_use_preinstalled_gnugettext=yes
else
dnl Reset the values set by searching for libintl.
if test "$nls_cv_use_gnu_gettext" = "yes"; then
dnl Mark actions used to generate GNU NLS library.
+ INTLOBJS="\$(GETTOBJS)"
BUILD_INCLUDED_LIBINTL=yes
USE_INCLUDED_LIBINTL=yes
LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
fi
fi
- AC_MSG_CHECKING([whether to use NLS])
- AC_MSG_RESULT([$USE_NLS])
- if test "$USE_NLS" = "yes"; then
- AC_MSG_CHECKING([where the gettext function comes from])
- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
- if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
- gt_source="external libintl"
- else
- gt_source="libc"
- fi
- else
- gt_source="included intl directory"
- fi
- AC_MSG_RESULT([$gt_source])
- fi
-
if test "$USE_NLS" = "yes"; then
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
ifelse(gt_included_intl, yes, [
dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
dnl to 'yes' because some of the testsuite requires it.
- if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+ if test "$PACKAGE" = gettext; then
BUILD_INCLUDED_LIBINTL=yes
fi
AC_SUBST(BUILD_INCLUDED_LIBINTL)
AC_SUBST(USE_INCLUDED_LIBINTL)
AC_SUBST(CATOBJEXT)
+ AC_SUBST(INTLOBJS)
dnl For backward compatibility. Some configure.ins may be using this.
nls_cv_header_intl=
GENCAT=gencat
AC_SUBST(GENCAT)
- dnl For backward compatibility. Some Makefiles may be using this.
- if test "$USE_INCLUDED_LIBINTL" = yes; then
- INTLOBJS="\$(GETTOBJS)"
- fi
- AC_SUBST(INTLOBJS)
-
dnl Enable libtool support if the surrounding package wishes it.
INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
])
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
-[
- AC_REQUIRE([AC_PROG_INSTALL])dnl
- AC_REQUIRE([AM_MKINSTALLDIRS])dnl
- AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_CANONICAL_HOST])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([bh_C_SIGNED])dnl
- AC_REQUIRE([AC_C_INLINE])dnl
- AC_REQUIRE([AC_TYPE_OFF_T])dnl
- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
- AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
- AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
- AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
- AC_REQUIRE([gt_TYPE_WINT_T])dnl
- AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
- AC_REQUIRE([jm_AC_HEADER_STDINT_H])
- AC_REQUIRE([gt_TYPE_INTMAX_T])
- AC_REQUIRE([gt_PRINTF_POSIX])
- AC_REQUIRE([AC_FUNC_ALLOCA])dnl
- AC_REQUIRE([AC_FUNC_MMAP])dnl
- AC_REQUIRE([jm_GLIBC21])dnl
- AC_REQUIRE([gt_INTDIV0])dnl
- AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
- AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
- AC_REQUIRE([gt_INTTYPES_PRI])dnl
- AC_REQUIRE([gl_XSIZE])dnl
-
- AC_CHECK_TYPE([ptrdiff_t], ,
- [AC_DEFINE([ptrdiff_t], [long],
- [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
- ])
- AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h])
- AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
-mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
-strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
-__fsetlocking])
-
- dnl Use the _snprintf function only if it is declared (because on NetBSD it
- dnl is defined as a weak alias of snprintf; we prefer to use the latter).
- gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
- gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
-
- dnl Use the *_unlocked functions only if they are declared.
- dnl (because some of them were defined without being declared in Solaris
- dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
- dnl on Solaris 2.5.1 to run on Solaris 2.6).
- dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
- gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
- gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
- gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
-
- case $gt_cv_func_printf_posix in
- *yes) HAVE_POSIX_PRINTF=1 ;;
- *) HAVE_POSIX_PRINTF=0 ;;
- esac
- AC_SUBST([HAVE_POSIX_PRINTF])
- if test "$ac_cv_func_asprintf" = yes; then
- HAVE_ASPRINTF=1
- else
- HAVE_ASPRINTF=0
- fi
- AC_SUBST([HAVE_ASPRINTF])
- if test "$ac_cv_func_snprintf" = yes; then
- HAVE_SNPRINTF=1
- else
- HAVE_SNPRINTF=0
- fi
- AC_SUBST([HAVE_SNPRINTF])
- if test "$ac_cv_func_wprintf" = yes; then
- HAVE_WPRINTF=1
- else
- HAVE_WPRINTF=0
- fi
- AC_SUBST([HAVE_WPRINTF])
-
- AM_ICONV
- AM_LANGINFO_CODESET
- if test $ac_cv_header_locale_h = yes; then
- AM_LC_MESSAGES
- fi
-
- dnl intl/plural.c is generated from intl/plural.y. It requires bison,
- dnl because plural.y uses bison specific features. It requires at least
- dnl bison-1.26 because earlier versions generate a plural.c that doesn't
- dnl compile.
- dnl bison is only needed for the maintainer (who touches plural.y). But in
- dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
- dnl the rule in general Makefile. Now, some people carelessly touch the
- dnl files or have a broken "make" program, hence the plural.c rule will
- dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
- dnl present or too old.
- AC_CHECK_PROGS([INTLBISON], [bison])
- if test -z "$INTLBISON"; then
- ac_verc_fail=yes
- else
- dnl Found it, now check the version.
- AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
- case $ac_prog_version in
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- esac
- AC_MSG_RESULT([$ac_prog_version])
- fi
- if test $ac_verc_fail = yes; then
- INTLBISON=:
- fi
-])
-
-
-dnl gt_CHECK_DECL(FUNC, INCLUDES)
-dnl Check whether a function is declared.
-AC_DEFUN([gt_CHECK_DECL],
-[
- AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
- [AC_TRY_COMPILE([$2], [
-#ifndef $1
- char *p = (char *) $1;
-#endif
-], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
- if test $ac_cv_have_decl_$1 = yes; then
- gt_value=1
- else
- gt_value=0
- fi
- AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
- [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-
-# po.m4 serial 3 (gettext-0.14)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-dnl Checks for all prerequisites of the po subdirectory.
+dnl Checks for all prerequisites of the po subdirectory,
+dnl except for USE_NLS.
AC_DEFUN([AM_PO_SUBDIRS],
[
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
AC_REQUIRE([AM_MKINSTALLDIRS])dnl
- AC_REQUIRE([AM_NLS])dnl
dnl Perform the following tests also if --disable-nls has been given,
dnl because they are needed for "make dist" to work.
:)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- dnl Search for GNU xgettext 0.12 or newer in the PATH.
+ dnl Search for GNU xgettext 0.11 or newer in the PATH.
dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
dnl The second test excludes FreeBSD xgettext.
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
- (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+ [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
:)
dnl Remove leftover from FreeBSD xgettext call.
rm -f messages.po
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 --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
- (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
+ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
: ;
else
AC_MSG_RESULT(
rm -f "$ac_dir/POTFILES"
test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
- POMAKEFILEDEPS="POTFILES.in"
- # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+ # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
# on $ac_dir but don't depend on user-specified configuration
# parameters.
if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
# The LINGUAS file contains the set of available languages.
- if test -n "$OBSOLETE_ALL_LINGUAS"; then
+ if test -n "$ALL_LINGUAS"; then
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
fi
ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
# Hide the ALL_LINGUAS assigment from automake.
eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
- POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
- else
- # The set of available languages was given in configure.in.
- eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
fi
- # Compute POFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
- # Compute UPDATEPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
- # Compute DUMMYPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
- # Compute GMOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
case "$ac_given_srcdir" in
.) srcdirpre= ;;
*) srcdirpre='$(srcdir)/' ;;
esac
POFILES=
+ GMOFILES=
UPDATEPOFILES=
DUMMYPOFILES=
- GMOFILES=
for lang in $ALL_LINGUAS; do
POFILES="$POFILES $srcdirpre$lang.po"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
done
# CATALOGS depends on both $ac_dir and the user's LINGUAS
# environment variable.
done
fi
test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
if test -f "$f"; then
case "$f" in
;;
esac
done],
- [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+ [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
+ # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
# from automake.
- eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
# Capture the value of LINGUAS because we need it to compute CATALOGS.
LINGUAS="${LINGUAS-%UNSET%}"
])
])
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
-[
- # When this code is run, in config.status, two variables have already been
- # set:
- # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
- # - LINGUAS is the value of the environment variable LINGUAS at configure
- # time.
-
-changequote(,)dnl
- # Adjust a relative srcdir.
- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
- # In autoconf-2.13 it is called $ac_given_srcdir.
- # In autoconf-2.50 it is called $srcdir.
- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
- case "$ac_given_srcdir" in
- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
- /*) top_srcdir="$ac_given_srcdir" ;;
- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
- # Find a way to echo strings without interpreting backslash.
- if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
- gt_echo='echo'
- else
- if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
- gt_echo='printf %s\n'
- else
- echo_func () {
- cat <<EOT
-$*
-EOT
- }
- gt_echo='echo_func'
- fi
- fi
+dnl Checks for all prerequisites of the intl subdirectory,
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
+dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+AC_DEFUN([AM_INTL_SUBDIR],
+[
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])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_REQUIRE([jm_GLIBC21])dnl
- # A sed script that extracts the value of VARIABLE from a Makefile.
- sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^[ ]*VARIABLE[ ]*=/{
- # Seen the first line of the variable definition.
- s/^[ ]*VARIABLE[ ]*=//
- ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote([,])dnl
+ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h unistd.h sys/param.h])
+ AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
+geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
+strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
- # Set POTFILES to the value of the Makefile variable POTFILES.
- sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
- POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
- # Compute POTFILES_DEPS as
- # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
- POTFILES_DEPS=
- for file in $POTFILES; do
- POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
- done
- POMAKEFILEDEPS=""
+ AM_ICONV
+ AM_LANGINFO_CODESET
+ AM_LC_MESSAGES
- if test -n "$OBSOLETE_ALL_LINGUAS"; then
- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
- fi
- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
- # The LINGUAS file contains the set of available languages.
- ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+ dnl because plural.y uses bison specific features. It requires at least
+ dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+ dnl compile.
+ dnl bison is only needed for the maintainer (who touches plural.y). But in
+ dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+ dnl the rule in general Makefile. Now, some people carelessly touch the
+ dnl files or have a broken "make" program, hence the plural.c rule will
+ dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+ dnl present or too old.
+ AC_CHECK_PROGS([INTLBISON], [bison])
+ if test -z "$INTLBISON"; then
+ ac_verc_fail=yes
else
- # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
- sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
- ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
- fi
- # Hide the ALL_LINGUAS assigment from automake.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
- # Compute POFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
- # Compute UPDATEPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
- # Compute DUMMYPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
- # Compute GMOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
- # Compute PROPERTIESFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
- # Compute CLASSFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
- # Compute QMFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
- # Compute MSGFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
- # Compute RESOURCESDLLFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
- case "$ac_given_srcdir" in
- .) srcdirpre= ;;
- *) srcdirpre='$(srcdir)/' ;;
- esac
- POFILES=
- UPDATEPOFILES=
- DUMMYPOFILES=
- GMOFILES=
- PROPERTIESFILES=
- CLASSFILES=
- QMFILES=
- MSGFILES=
- RESOURCESDLLFILES=
- for lang in $ALL_LINGUAS; do
- POFILES="$POFILES $srcdirpre$lang.po"
- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
- DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
- PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
- CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
- QMFILES="$QMFILES $srcdirpre$lang.qm"
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
- frobbedlang=`echo $lang | sed -e 's/_/-/g'`
- RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
- done
- # CATALOGS depends on both $ac_dir and the user's LINGUAS
- # environment variable.
- INST_LINGUAS=
- if test -n "$ALL_LINGUAS"; then
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "$LINGUAS"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- INST_LINGUAS="$INST_LINGUAS $presentlang"
- fi
- done
- fi
- CATALOGS=
- JAVACATALOGS=
- QTCATALOGS=
- TCLCATALOGS=
- CSHARPCATALOGS=
- if test -n "$INST_LINGUAS"; then
- for lang in $INST_LINGUAS; do
- CATALOGS="$CATALOGS $lang.gmo"
- JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
- QTCATALOGS="$QTCATALOGS $lang.qm"
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
- frobbedlang=`echo $lang | sed -e 's/_/-/g'`
- CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
- done
- fi
-
- sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
- if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
- # Add dependencies that cannot be formulated as a simple suffix rule.
- for lang in $ALL_LINGUAS; do
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
- @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
- \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
- done
- fi
- if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
- # Add dependencies that cannot be formulated as a simple suffix rule.
- for lang in $ALL_LINGUAS; do
- frobbedlang=`echo $lang | sed -e 's/_/-/g'`
- cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
- @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
- \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
- done
+ dnl Found it, now check the version.
+ AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+ case $ac_prog_version in
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+ esac
+ AC_MSG_RESULT([$ac_prog_version])
fi
- if test -n "$POMAKEFILEDEPS"; then
- cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
+ if test $ac_verc_fail = yes; then
+ INTLBISON=:
fi
- mv "$ac_file.tmp" "$ac_file"
])
-# nls.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_DEFUN([AM_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_DEFUN([AM_MKINSTALLDIRS],
[
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 it.
+ dnl Try to locate is.
MKINSTALLDIRS=
if test -n "$ac_aux_dir"; then
- case "$ac_aux_dir" in
- /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
- *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
- esac
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
fi
if test -z "$MKINSTALLDIRS"; then
MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
AC_SUBST(MKINSTALLDIRS)
])
-# progtest.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+# lib-prefix.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
-# Search path for a program which passes the given test.
+dnl From Bruno Haible.
-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],
-[
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- ac_executable_p="test -x"
-else
- ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# 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.
- ;;
- *)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- IFS="$ac_save_IFS"
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
- if [$3]; then
- ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
- fi
- done
- 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 ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
- AC_MSG_RESULT([$]$1)
-else
- AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# lib-prefix.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
[
AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
AC_REQUIRE([AC_PROG_CC])
eval additional_includedir=\"$includedir\"
eval additional_libdir=\"$libdir\"
])
- AC_LIB_ARG_WITH([lib-prefix],
+ AC_ARG_WITH([lib-prefix],
[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
--without-lib-prefix don't search for libraries in includedir and libdir],
[
prefix="$acl_save_prefix"
])
-# lib-link.m4 serial 4 (gettext-0.12)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+# lib-link.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl Determine the platform dependent parameters needed to use rpath:
dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L.
+dnl hardcode_direct, hardcode_minus_L,
+dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
AC_DEFUN([AC_LIB_RPATH],
[
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
hardcode_direct="$acl_cv_hardcode_direct"
hardcode_minus_L="$acl_cv_hardcode_minus_L"
- dnl Determine whether the user wants rpath handling at all.
- AC_ARG_ENABLE(rpath,
- [ --disable-rpath do not hardcode runtime library paths],
- :, enable_rpath=yes)
+ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
])
dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
eval additional_includedir=\"$includedir\"
eval additional_libdir=\"$libdir\"
])
- AC_LIB_ARG_WITH([lib$1-prefix],
+ AC_ARG_WITH([lib$1-prefix],
[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
--without-lib$1-prefix don't search for lib$1 in includedir and libdir],
[
dnl Linking with a shared library. We attempt to hardcode its
dnl directory into the executable's runpath, unless it's the
dnl standard /usr/lib.
- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+ if test "X$found_dir" = "X/usr/lib"; then
dnl No hardcoding is needed.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
else
fi
fi
;;
- -R*)
- dir=`echo "X$dep" | sed -e 's/^X-R//'`
- if test "$enable_rpath" != no; then
- dnl Potentially add DIR to rpathdirs.
- dnl The rpathdirs will be appended to $LIBNAME at the end.
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $dir"
- fi
- dnl Potentially add DIR to ltrpathdirs.
- dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $dir"
- fi
- fi
- ;;
-l*)
dnl Handle this in the next round.
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
done
])
-# lib-ld.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+# lib-ld.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
AC_DEFUN([AC_LIB_PROG_LD_GNU],
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- acl_cv_prog_gnu_ld=yes ;;
-*)
- acl_cv_prog_gnu_ld=no ;;
-esac])
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+ acl_cv_prog_gnu_ld=yes
+else
+ acl_cv_prog_gnu_ld=no
+fi])
with_gnu_ld=$acl_cv_prog_gnu_ld
])
test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some GNU ld's only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
- *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break ;;
- *)
- test "$with_gnu_ld" != yes && break ;;
- esac
+ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+ test "$with_gnu_ld" != no && break
+ else
+ test "$with_gnu_ld" != yes && break
+ fi
fi
done
IFS="$ac_save_ifs"
AC_LIB_PROG_LD_GNU
])
-# iconv.m4 serial AM4 (gettext-0.11.3)
+# iconv.m4 serial AM3 (gettext-0.11)
dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl From Bruno Haible.
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
+AC_DEFUN([AM_ICONV_LINK],
[
+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+ dnl those with the standalone portable GNU libiconv installed).
+
dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
AC_REQUIRE([AC_LIB_RPATH])
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
dnl accordingly.
AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
- dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
- dnl those with the standalone portable GNU libiconv installed).
-
- dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
- dnl accordingly.
- AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
dnl Add $INCICONV to CPPFLAGS before performing the following checks,
dnl because if the user has installed libiconv and not disabled its use
AC_DEFUN([AM_ICONV],
[
- AM_ICONV_LINK
+ AC_REQUIRE([AM_ICONV_LINK])
if test "$am_cv_func_iconv" = yes; then
AC_MSG_CHECKING([for iconv declaration])
AC_CACHE_VAL(am_cv_proto_iconv, [
fi
])
-# isc-posix.m4 serial 2 (gettext-0.11.2)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# progtest.m4 serial 2 (gettext-0.10.40)
+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
-# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
+# Search path for a program which passes the given test.
+
+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 ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+ AC_MSG_RESULT([$]$1)
+else
+ AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
+
+# isc-posix.m4 serial 1 (gettext-0.10.40)
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
# This test replaces the one in autoconf.
# Currently this macro should have the same name as the autoconf macro
]
)
-# signed.m4 serial 1 (gettext-0.10.40)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([bh_C_SIGNED],
-[
- AC_CACHE_CHECK([for signed], bh_cv_c_signed,
- [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
- if test $bh_cv_c_signed = no; then
- AC_DEFINE(signed, ,
- [Define to empty if the C compiler doesn't support this keyword.])
- fi
-])
-
-# longlong.m4 serial 4
-dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_LONG_LONG if 'long long' works.
-
-AC_DEFUN([jm_AC_TYPE_LONG_LONG],
-[
- AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
- [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
- [long long llmax = (long long) -1;
- return ll << i | ll >> i | llmax / ll | llmax % ll;],
- ac_cv_type_long_long=yes,
- ac_cv_type_long_long=no)])
- if test $ac_cv_type_long_long = yes; then
- AC_DEFINE(HAVE_LONG_LONG, 1,
- [Define if you have the 'long long' type.])
- fi
-])
-
-# longdouble.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether the compiler supports the 'long double' type.
-dnl Prerequisite: AC_PROG_CC
-
-AC_DEFUN([gt_TYPE_LONGDOUBLE],
-[
- AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
- [if test "$GCC" = yes; then
- gt_cv_c_long_double=yes
- else
- AC_TRY_COMPILE([
- /* The Stardent Vistra knows sizeof(long double), but does not support it. */
- long double foo = 0.0;
- /* On Ultrix 4.3 cc, long double is 4 and double is 8. */
- int array [2*(sizeof(long double) >= sizeof(double)) - 1];
- ], ,
- gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
- fi])
- if test $gt_cv_c_long_double = yes; then
- AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
- fi
-])
-
-# wchar_t.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether <stddef.h> has the 'wchar_t' type.
-dnl Prerequisite: AC_PROG_CC
-
-AC_DEFUN([gt_TYPE_WCHAR_T],
-[
- AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
- [AC_TRY_COMPILE([#include <stddef.h>
- wchar_t foo = (wchar_t)'\0';], ,
- gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
- if test $gt_cv_c_wchar_t = yes; then
- AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
- fi
-])
-
-# wint_t.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether <wchar.h> has the 'wint_t' type.
-dnl Prerequisite: AC_PROG_CC
-
-AC_DEFUN([gt_TYPE_WINT_T],
-[
- AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
- [AC_TRY_COMPILE([#include <wchar.h>
- wint_t foo = (wchar_t)'\0';], ,
- gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
- if test $gt_cv_c_wint_t = yes; then
- AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
- fi
-])
-
-# inttypes_h.m4 serial 5 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
-[
- AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
- [AC_TRY_COMPILE(
- [#include <sys/types.h>
-#include <inttypes.h>],
- [uintmax_t i = (uintmax_t) -1;],
- jm_ac_cv_header_inttypes_h=yes,
- jm_ac_cv_header_inttypes_h=no)])
- if test $jm_ac_cv_header_inttypes_h = yes; then
- AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
- [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
- and declares uintmax_t. ])
- fi
-])
-
-# stdint_h.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([jm_AC_HEADER_STDINT_H],
-[
- AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
- [AC_TRY_COMPILE(
- [#include <sys/types.h>
-#include <stdint.h>],
- [uintmax_t i = (uintmax_t) -1;],
- jm_ac_cv_header_stdint_h=yes,
- jm_ac_cv_header_stdint_h=no)])
- if test $jm_ac_cv_header_stdint_h = yes; then
- AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
- [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
- and declares uintmax_t. ])
- fi
-])
-
-# intmax.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether the system has the 'intmax_t' type, but don't attempt to
-dnl find a replacement if it is lacking.
-
-AC_DEFUN([gt_TYPE_INTMAX_T],
-[
- AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
- AC_REQUIRE([jm_AC_HEADER_STDINT_H])
- AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
- [AC_TRY_COMPILE([
-#include <stddef.h>
-#include <stdlib.h>
-#if HAVE_STDINT_H_WITH_UINTMAX
-#include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-#include <inttypes.h>
-#endif
-], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
- if test $gt_cv_c_intmax_t = yes; then
- AC_DEFINE(HAVE_INTMAX_T, 1,
- [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
- fi
-])
-
-# printf-posix.m4 serial 2 (gettext-0.13.1)
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether the printf() function supports POSIX/XSI format strings with
-dnl positions.
-
-AC_DEFUN([gt_PRINTF_POSIX],
-[
- AC_REQUIRE([AC_PROG_CC])
- AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
- gt_cv_func_printf_posix,
- [
- AC_TRY_RUN([
-#include <stdio.h>
-#include <string.h>
-/* The string "%2$d %1$d", with dollar characters protected from the shell's
- dollar expansion (possibly an autoconf bug). */
-static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
-static char buf[100];
-int main ()
-{
- sprintf (buf, format, 33, 55);
- return (strcmp (buf, "55 33") != 0);
-}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
- [
- AC_EGREP_CPP(notposix, [
-#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
- notposix
-#endif
- ], gt_cv_func_printf_posix="guessing no",
- gt_cv_func_printf_posix="guessing yes")
- ])
- ])
- case $gt_cv_func_printf_posix in
- *yes)
- AC_DEFINE(HAVE_POSIX_PRINTF, 1,
- [Define if your printf() function supports format strings with positions.])
- ;;
- esac
-])
-
# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
]
)
-# intdiv0.m4 serial 1 (gettext-0.11.3)
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gt_INTDIV0],
-[
- AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
- AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
- gt_cv_int_divbyzero_sigfpe,
- [
- AC_TRY_RUN([
-#include <stdlib.h>
-#include <signal.h>
-
-static void
-#ifdef __cplusplus
-sigfpe_handler (int sig)
-#else
-sigfpe_handler (sig) int sig;
-#endif
-{
- /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
- exit (sig != SIGFPE);
-}
-
-int x = 1;
-int y = 0;
-int z;
-int nan;
-
-int main ()
-{
- signal (SIGFPE, sigfpe_handler);
-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
- signal (SIGTRAP, sigfpe_handler);
-#endif
-/* Linux/SPARC yields signal SIGILL. */
-#if defined (__sparc__) && defined (__linux__)
- signal (SIGILL, sigfpe_handler);
-#endif
-
- z = x / y;
- nan = y / y;
- exit (1);
-}
-], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
- [
- # Guess based on the CPU.
- case "$host_cpu" in
- alpha* | i[34567]86 | m68k | s390*)
- gt_cv_int_divbyzero_sigfpe="guessing yes";;
- *)
- gt_cv_int_divbyzero_sigfpe="guessing no";;
- esac
- ])
- ])
- case "$gt_cv_int_divbyzero_sigfpe" in
- *yes) value=1;;
- *) value=0;;
- esac
- AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
- [Define if integer division by zero raises signal SIGFPE.])
-])
-
-# uintmax_t.m4 serial 7 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-AC_PREREQ(2.13)
-
-# Define uintmax_t to 'unsigned long' or 'unsigned long long'
-# if it is not already defined in <stdint.h> or <inttypes.h>.
-
-AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
-[
- AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
- AC_REQUIRE([jm_AC_HEADER_STDINT_H])
- if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
- AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
- test $ac_cv_type_unsigned_long_long = yes \
- && ac_type='unsigned long long' \
- || ac_type='unsigned long'
- AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
- [Define to unsigned long or unsigned long long
- if <stdint.h> and <inttypes.h> don't define.])
- else
- AC_DEFINE(HAVE_UINTMAX_T, 1,
- [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
- fi
-])
-
-# ulonglong.m4 serial 3
-dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
-
-AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
-[
- AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
- [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
- [unsigned long long ullmax = (unsigned long long) -1;
- return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
- ac_cv_type_unsigned_long_long=yes,
- ac_cv_type_unsigned_long_long=no)])
- if test $ac_cv_type_unsigned_long_long = yes; then
- AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
- [Define if you have the 'unsigned long long' type.])
- fi
-])
-
-# inttypes.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-# <sys/types.h>.
-
-AC_DEFUN([gt_HEADER_INTTYPES_H],
-[
- AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
- [
- AC_TRY_COMPILE(
- [#include <sys/types.h>
-#include <inttypes.h>],
- [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
- ])
- if test $gt_cv_header_inttypes_h = yes; then
- AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
- [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
- fi
-])
-
-# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-# macros to non-string values. This is the case on AIX 4.3.3.
-
-AC_DEFUN([gt_INTTYPES_PRI],
-[
- AC_REQUIRE([gt_HEADER_INTTYPES_H])
- if test $gt_cv_header_inttypes_h = yes; then
- AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
- gt_cv_inttypes_pri_broken,
- [
- AC_TRY_COMPILE([#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
-], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
- ])
- fi
- if test "$gt_cv_inttypes_pri_broken" = yes; then
- AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
- [Define if <inttypes.h> exists and defines unusable PRI* macros.])
- fi
-])
-
-# xsize.m4 serial 2
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-AC_DEFUN([gl_XSIZE],
-[
- dnl Prerequisites of lib/xsize.h.
- AC_REQUIRE([gl_SIZE_MAX])
- AC_CHECK_HEADERS(stdint.h)
-])
-
-# size_max.m4 serial 2
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gl_SIZE_MAX],
-[
- AC_CHECK_HEADERS(stdint.h)
- dnl First test whether the system already has SIZE_MAX.
- AC_MSG_CHECKING([for SIZE_MAX])
- result=
- AC_EGREP_CPP([Found it], [
-#include <limits.h>
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef SIZE_MAX
-Found it
-#endif
-], result=yes)
- if test -z "$result"; then
- dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
- dnl than the type 'unsigned long'.
- dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
- dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
- _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
- [#include <stddef.h>], result=?)
- _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
- [#include <stddef.h>], result=?)
- _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
- [#include <stddef.h>], result=?)
- if test "$fits_in_uint" = 1; then
- dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
- dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
- AC_TRY_COMPILE([#include <stddef.h>
- extern size_t foo;
- extern unsigned long foo;
- ], [], fits_in_uint=0)
- fi
- if test -z "$result"; then
- if test "$fits_in_uint" = 1; then
- result="$res_hi$res_lo"U
- else
- result="$res_hi$res_lo"UL
- fi
- else
- dnl Shouldn't happen, but who knows...
- result='~(size_t)0'
- fi
- fi
- AC_MSG_RESULT([$result])
- if test "$result" != yes; then
- AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
- [Define as the maximum value of type 'size_t', if the system doesn't define it.])
- fi
-])
-
# codeset.m4 serial AM1 (gettext-0.10.40)
dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
fi
])
-# lcmessage.m4 serial 3 (gettext-0.11.3)
+# lcmessage.m4 serial 2 (gettext-0.10.40)
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
# Check whether LC_MESSAGES is available in <locale.h>.
AC_DEFUN([AM_LC_MESSAGES],
-[
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
- [AC_TRY_LINK([#include <locale.h>], [return 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 <locale.h>], [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, 1,
- [Define if your <locale.h> file defines LC_MESSAGES.])
- fi
-])
+ if test $am_cv_val_LC_MESSAGES = yes; then
+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
+ [Define if your <locale.h> file defines LC_MESSAGES.])
+ fi
+ fi])
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.7.8 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
WINDOW *win_for_menu, *sub_for_menu, *win_for_help, *main_win, *main_sub;
short ap_type;
-char *community;
+char *community, *name;
int sockfd, atmel410_filter=1;
struct in_addr ap_ip;
choose_view:
clear_main(2);
if (auth_mac == 1) {
- mvwaddstr(main_sub, 2, 5, MAC_HEADER);
+ mvwaddstr(main_sub, 2, 1, MAC_HEADER);
begin = 1;
end = (MAX_LINES < mac_num) ? MAX_LINES : mac_num;
scroll_rows(first, begin, end, 3, 0);
void stations()
{
+ char StasNum[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x05, 0x01, 0x00
+ };
+ char StasMac[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x05, 0x02, 0x00
+ };
+ char bridgeOperationalMode[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x04, 0x01, 0x00
+ };
+
struct AssociatedSTAsInfo {
unsigned short Num;
unsigned char MacAddress[6];
unsigned char IP[4];
unsigned char Reserved[2];
} *mac = NULL, get;
- char StasNum[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x05, 0x01,
- 0x00
- };
-
- char StasMac[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x05, 0x02,
- 0x00
- };
- char bridgeOperationalMode[] = {
- 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x04, 0x01, 0x00
- };
-
struct MacListStat *first = NULL, *curr = NULL;
char message[1024];
int mac_num, begin, end, total_mac;
}
if (*(varbinds[0].value) == 3) {
- mvwaddstr(main_sub, 3, 1, _("AP now in AP Client Mode and don't has any associated stations"));
- print_help(ANY_KEY);
- wrefresh(main_sub);
- getch();
- goto exit;
- }
+ mvwaddstr(main_sub, 3, 1, _("AP is currently in AP Client Mode => "
+ "no associated STAtions."));
+ print_help(ANY_KEY);
+ wrefresh(main_sub);
+ getch();
+ goto exit;
+ }
-
-
varbinds[0].oid = StasNum;
varbinds[0].len_oid = sizeof(StasNum);
varbinds[0].value = StasNum;
sprintf(message, "%s: %d", STAS, total_mac);
print_title(message);
- mvwaddstr(main_sub, 0, 1, _("# MAC LQ RSSI Status Port IP"));
+ mvwaddstr(main_sub, 0, 1, _("# MAC LQ RSSI Status Port IP"));
noecho();
while (mac_num <= total_mac) {
/* Define to 1 if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
-
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
#undef HAVE_DCGETTEXT
-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
- don't. */
-#undef HAVE_DECL_FEOF_UNLOCKED
-
-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
- you don't. */
-#undef HAVE_DECL_FGETS_UNLOCKED
-
-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
- don't. */
-#undef HAVE_DECL_GETC_UNLOCKED
-
-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
- don't. */
-#undef HAVE_DECL__SNPRINTF
-
-/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
- don't. */
-#undef HAVE_DECL__SNWPRINTF
-
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
+/* Define to 1 if you have the `feof_unlocked' function. */
+#undef HAVE_FEOF_UNLOCKED
+
+/* Define to 1 if you have the `fgets_unlocked' function. */
+#undef HAVE_FGETS_UNLOCKED
+
/* Define to 1 if you have the `fork' function. */
#undef HAVE_FORK
/* Define to 1 if you have the `free' function. */
#undef HAVE_FREE
-/* Define to 1 if you have the `fwprintf' function. */
-#undef HAVE_FWPRINTF
-
/* Define to 1 if you have the `getcwd' function. */
#undef HAVE_GETCWD
+/* Define to 1 if you have the `getc_unlocked' function. */
+#undef HAVE_GETC_UNLOCKED
+
/* Define to 1 if you have the `getegid' function. */
#undef HAVE_GETEGID
/* Define to 1 if you have the `inet_ntoa' function. */
#undef HAVE_INET_NTOA
-/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_INTMAX_T
-
-/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
+/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
- declares uintmax_t. */
-#undef HAVE_INTTYPES_H_WITH_UINTMAX
-
/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
#undef HAVE_LANGINFO_CODESET
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
-/* Define if you have the 'long double' type. */
-#undef HAVE_LONG_DOUBLE
-
-/* Define if you have the 'long long' type. */
-#undef HAVE_LONG_LONG
-
/* Define to 1 if you have the `malloc' function. */
#undef HAVE_MALLOC
/* Define to 1 if you have the <nl_types.h> header file. */
#undef HAVE_NL_TYPES_H
-/* Define if your printf() function supports format strings with positions. */
-#undef HAVE_POSIX_PRINTF
-
/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
/* Define to 1 if you have the `setlocale' function. */
#undef HAVE_SETLOCALE
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
/* Define to 1 if you have the `socket' function. */
#undef HAVE_SOCKET
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
- uintmax_t. */
-#undef HAVE_STDINT_H_WITH_UINTMAX
-
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the `tsearch' function. */
#undef HAVE_TSEARCH
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_UINTMAX_T
-
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define if you have the 'unsigned long long' type. */
-#undef HAVE_UNSIGNED_LONG_LONG
-
-/* Define if you have the 'wchar_t' type. */
-#undef HAVE_WCHAR_T
-
-/* Define to 1 if you have the `wcslen' function. */
-#undef HAVE_WCSLEN
-
-/* Define if you have the 'wint_t' type. */
-#undef HAVE_WINT_T
-
/* Define to 1 if you have the `__argz_count' function. */
#undef HAVE___ARGZ_COUNT
/* Define to 1 if you have the `__argz_stringify' function. */
#undef HAVE___ARGZ_STRINGIFY
-/* Define to 1 if you have the `__fsetlocking' function. */
-#undef HAVE___FSETLOCKING
-
/* Define as const if the declaration of iconv() needs const. */
#undef ICONV_CONST
-/* Define if integer division by zero raises signal SIGFPE. */
-#undef INTDIV0_RAISES_SIGFPE
-
/* Define for no regulation domain restrictions */
#undef NO_REG_DOMAIN
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-#undef PRI_MACROS_BROKEN
-
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
-/* Define as the maximum value of type 'size_t', if the system doesn't define
- it. */
-#undef SIZE_MAX
-
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown */
#undef STACK_DIRECTION
/* Define to 1 if you have the ANSI C header files. */
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+ if it is not supported. */
#undef inline
-#endif
/* Define to `long' if <sys/types.h> does not define. */
#undef off_t
/* Define to `int' if <sys/types.h> does not define. */
#undef pid_t
-/* Define as the type of the result of subtracting two pointers, if the system
- doesn't define it. */
-#undef ptrdiff_t
-
-/* Define to empty if the C compiler doesn't support this keyword. */
-#undef signed
-
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
-
-/* Define to unsigned long or unsigned long long if <stdint.h> and
- <inttypes.h> don't define. */
-#undef uintmax_t
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.57.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
-DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
as_unset=unset
else
as_unset=false
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
else
- test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
# IFS
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP EGREP LIBOBJS MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP EGREP LIBOBJS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
# Be sure to have absolute paths.
for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
+ localstatedir libdir includedir oldincludedir infodir mandir
do
eval ac_val=$`echo $ac_var`
case $ac_val in
# Try the directory containing this script, then its parent.
ac_confdir=`(dirname "$0") 2>/dev/null ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$0" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
--disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors
--disable-nls do not use Native Language Support
- --disable-rpath do not hardcode runtime library paths
--disable-regdomain disable regulation domain channel restrictions
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-gnu-ld assume the C compiler uses GNU ld default=no
- --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
+ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib
--without-libiconv-prefix don't search for libiconv in includedir and libdir
--with-included-gettext use the GNU gettext library included here
- --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
+ --with-libintl-prefix=DIR search for libintl in DIR/include and DIR/lib
--without-libintl-prefix don't search for libintl in includedir and libdir
Some influential environment variables:
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
cd $ac_dir
# Check for guested configure; otherwise get Cygnus style configure.
echo
$SHELL $ac_srcdir/configure --help=recursive
elif test -f $ac_srcdir/configure.ac ||
- test -f $ac_srcdir/configure.in; then
+ test -f $ac_srcdir/configure.in; then
echo
$ac_configure --help
else
if $ac_init_version; then
cat <<\_ACEOF
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+generated by GNU Autoconf 2.57. Invocation command line was
$ $0 $@
2)
ac_configure_args1="$ac_configure_args1 '$ac_arg'"
if test $ac_must_keep_next = true; then
- ac_must_keep_next=false # Got value, back to normal.
+ ac_must_keep_next=false # Got value, back to normal.
else
- case $ac_arg in
- *=* | --config-cache | -C | -disable-* | --disable-* \
- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
- | -with-* | --with-* | -without-* | --without-* | --x)
- case "$ac_configure_args0 " in
- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
- esac
- ;;
- -* ) ac_must_keep_next=true ;;
- esac
+ case $ac_arg in
+ *=* | --config-cache | -C | -disable-* | --disable-* \
+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+ | -with-* | --with-* | -without-* | --without-* | --x)
+ case "$ac_configure_args0 " in
+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+ esac
+ ;;
+ -* ) ac_must_keep_next=true ;;
+ esac
fi
ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
# Get rid of the leading space.
case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
*ac_space=\ *)
sed -n \
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
;;
*)
sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
;;
esac;
}
for ac_var in $ac_subst_files
do
eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ echo "$ac_var='"'"'$ac_val'"'"'"
done | sort
echo
fi
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core *.core &&
+ rm -f core core.* *.core &&
rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
' 0
# value.
ac_cache_corrupted=false
for ac_var in `(set) 2>&1 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
eval ac_old_set=\$ac_cv_env_${ac_var}_set
eval ac_new_set=\$ac_env_${ac_var}_set
eval ac_old_val="\$ac_cv_env_${ac_var}_value"
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ ac_cache_corrupted=:
fi;;
esac
# Pass precious variables to config.status.
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
case $as_dir/ in
./ | .// | /cC/* | \
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
done
done
;;
echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# Define the identity of the package.
PACKAGE=ap-utils
- VERSION=1.4.2-pre1a
+ VERSION=1.4.2pre2a
cat >>confdefs.h <<_ACEOF
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C compiler default output" >&5
+echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
test -f "$ac_file" || continue
case $ac_file in
*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
- ;;
+ ;;
conftest.$ac_ext )
- # This is the source file.
- ;;
+ # This is the source file.
+ ;;
[ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
+ # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
*.* )
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
- break;;
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ # FIXME: I believe we export ac_cv_exeext for Libtool,
+ # but it would be cool to find out if it's true. Does anybody
+ # maintain Libtool? --akim.
+ export ac_cv_exeext
+ break;;
* )
- break;;
+ break;;
esac
done
else
case $ac_file in
*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
- break;;
+ export ac_cv_exeext
+ break;;
* ) break;;
esac
done
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_cv_prog_cc_g=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
ac_cv_prog_cc_stdc=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
va_end (v);
return s;
}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std1 is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext
+rm -f conftest.$ac_objext
done
rm -f conftest.$ac_ext conftest.$ac_objext
CC=$ac_save_CC
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
- '' \
+ ''\
+ '#include <stdlib.h>' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_declaration
#include <stdlib.h>
+$ac_declaration
int
main ()
{
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
continue
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
done
rm -f conftest*
if test -n "$ac_declaration"; then
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
#else
# include <assert.h>
#endif
- Syntax error
+ Syntax error
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
#else
# include <assert.h>
#endif
- Syntax error
+ Syntax error
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_cv_header_stdc=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
:
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
#else
# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
#endif
int i;
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
+ || toupper (i) != TOUPPER (i))
exit(2);
exit (0);
}
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_cv_header_sys_wait_h=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
+ inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
eval "$as_ac_Header=no"
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
+case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
;;
- no:yes:* )
+ no:yes )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- eval "$as_ac_Header=\$ac_header_preproc"
+ eval "$as_ac_Header=$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_cv_c_const=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
echo "${ECHO_T}$ac_cv_c_const" >&6
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_cv_type_pid_t=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
echo "${ECHO_T}$ac_cv_type_pid_t" >&6
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_cv_type_size_t=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
echo "${ECHO_T}$ac_cv_type_size_t" >&6
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_cv_member_struct_sockaddr_sa_len=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6
ac_cv_func_memcmp_working=no
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
+
int
main ()
{
int i;
for (i = 0; i < 4; i++)
{
- char *a = foo + i;
- char *b = bar + i;
- strcpy (a, "--------01111111");
- strcpy (b, "--------10000000");
- if (memcmp (a, b, 16) >= 0)
- exit (1);
+ char *a = foo + i;
+ char *b = bar + i;
+ strcpy (a, "--------01111111");
+ strcpy (b, "--------10000000");
+ if (memcmp (a, b, 16) >= 0)
+ exit (1);
}
exit (0);
}
( exit $ac_status )
ac_cv_func_memcmp_working=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
-test $ac_cv_func_memcmp_working = no && case $LIBOBJS in
- "memcmp.$ac_objext" | \
- *" memcmp.$ac_objext" | \
- "memcmp.$ac_objext "* | \
- *" memcmp.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;;
-esac
-
+test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext"
echo "$as_me:$LINENO: checking return type of signal handlers" >&5
echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_cv_type_signal=int
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
echo "${ECHO_T}$ac_cv_type_signal" >&6
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
-
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
-
-#undef $ac_func
-
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
MKINSTALLDIRS=
if test -n "$ac_aux_dir"; then
- case "$ac_aux_dir" in
- /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
- *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
- esac
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
fi
if test -z "$MKINSTALLDIRS"; then
MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
- # Check whether --enable-nls or --disable-nls was given.
-if test "${enable_nls+set}" = set; then
- enableval="$enable_nls"
- USE_NLS=$enableval
-else
- USE_NLS=yes
-fi;
- echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6
-
-
-
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- ac_executable_p="test -x"
-else
- ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-# Extract the first word of "msgfmt", so it can be a program name with args.
+ # Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case "$MSGFMT" in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
- ;;
+ /*)
+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+ ;;
*)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$ac_save_IFS"
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
- if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
(if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
- fi
- done
- done
- IFS="$ac_save_IFS"
+ ac_cv_path_MSGFMT="$ac_dir/$ac_word"
+ break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
- ;;
+ ;;
esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
fi
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- ac_executable_p="test -x"
-else
- ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "xgettext", so it can be a program name with args.
+ # Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case "$XGETTEXT" in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
- ;;
+ /*)
+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+ ;;
*)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$ac_save_IFS"
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
- if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
- (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
- fi
- done
- done
- IFS="$ac_save_IFS"
- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
- ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+ break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+ ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
echo "$as_me:$LINENO: result: $XGETTEXT" >&5
echo "${ECHO_T}$XGETTEXT" >&6
else
rm -f messages.po
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- ac_executable_p="test -x"
-else
- ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "msgmerge", so it can be a program name with args.
+ # Extract the first word of "msgmerge", so it can be a program name with args.
set dummy msgmerge; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case "$MSGMERGE" in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
- ;;
+ /*)
+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+ ;;
*)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$ac_save_IFS"
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
- if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
- ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
- fi
- done
- done
- IFS="$ac_save_IFS"
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
+ ac_cv_path_MSGMERGE="$ac_dir/$ac_word"
+ break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
- ;;
+ ;;
esac
fi
MSGMERGE="$ac_cv_path_MSGMERGE"
fi
if test "$XGETTEXT" != ":"; then
- if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
- (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
+ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
: ;
else
echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcposix $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_cv_lib_cposix_strerror=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
-
- echo "$as_me:$LINENO: checking for signed" >&5
-echo $ECHO_N "checking for signed... $ECHO_C" >&6
-if test "${bh_cv_c_signed+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-signed char x;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- bh_cv_c_signed=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-bh_cv_c_signed=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5
-echo "${ECHO_T}$bh_cv_c_signed" >&6
- if test $bh_cv_c_signed = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define signed
-_ACEOF
-
- fi
-
echo "$as_me:$LINENO: checking for inline" >&5
echo $ECHO_N "checking for inline... $ECHO_C" >&6
if test "${ac_cv_c_inline+set}" = set; then
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
echo "${ECHO_T}$ac_cv_c_inline" >&6
-
-
case $ac_cv_c_inline in
inline | yes) ;;
- *)
- case $ac_cv_c_inline in
- no) ac_val=;;
- *) ac_val=$ac_cv_c_inline;;
- esac
- cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
+ no)
+cat >>confdefs.h <<\_ACEOF
+#define inline
_ACEOF
- ;;
+ ;;
+ *) cat >>confdefs.h <<_ACEOF
+#define inline $ac_cv_c_inline
+_ACEOF
+ ;;
esac
echo "$as_me:$LINENO: checking for off_t" >&5
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_cv_type_off_t=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
echo "${ECHO_T}$ac_cv_type_off_t" >&6
fi
-
- echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6
-if test "${ac_cv_type_long_long+set}" = set; then
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments. Useless!
+echo "$as_me:$LINENO: checking for working alloca.h" >&5
+echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
+if test "${ac_cv_working_alloca_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-long long ll = 1LL; int i = 63;
+#include <alloca.h>
int
main ()
{
-long long llmax = (long long) -1;
- return ll << i | ll >> i | llmax / ll | llmax % ll;
+char *p = (char *) alloca (2 * sizeof (int));
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_type_long_long=yes
+ ac_cv_working_alloca_h=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_long_long=no
+ac_cv_working_alloca_h=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6
- if test $ac_cv_type_long_long = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
+if test $ac_cv_working_alloca_h = yes; then
cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_LONG 1
+#define HAVE_ALLOCA_H 1
_ACEOF
- fi
-
+fi
- echo "$as_me:$LINENO: checking for long double" >&5
-echo $ECHO_N "checking for long double... $ECHO_C" >&6
-if test "${gt_cv_c_long_double+set}" = set; then
+echo "$as_me:$LINENO: checking for alloca" >&5
+echo $ECHO_N "checking for alloca... $ECHO_C" >&6
+if test "${ac_cv_func_alloca_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$GCC" = yes; then
- gt_cv_c_long_double=yes
- else
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
- /* The Stardent Vistra knows sizeof(long double), but does not support it. */
- long double foo = 0.0;
- /* On Ultrix 4.3 cc, long double is 4 and double is 8. */
- int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+# include <malloc.h>
+# define alloca _alloca
+# else
+# if HAVE_ALLOCA_H
+# include <alloca.h>
+# else
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+# endif
+# endif
+# endif
+# endif
+#endif
int
main ()
{
-
+char *p = (char *) alloca (1);
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- gt_cv_c_long_double=yes
+ ac_cv_func_alloca_works=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-gt_cv_c_long_double=no
+ac_cv_func_alloca_works=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $gt_cv_c_long_double" >&5
-echo "${ECHO_T}$gt_cv_c_long_double" >&6
- if test $gt_cv_c_long_double = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_DOUBLE 1
-_ACEOF
-
- fi
+echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
+if test $ac_cv_func_alloca_works = yes; then
- echo "$as_me:$LINENO: checking for wchar_t" >&5
-echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
-if test "${gt_cv_c_wchar_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
- wchar_t foo = (wchar_t)'\0';
-int
-main ()
-{
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- gt_cv_c_wchar_t=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+# that cause trouble. Some versions do not even contain alloca or
+# contain a buggy version. If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
-gt_cv_c_wchar_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
-echo "${ECHO_T}$gt_cv_c_wchar_t" >&6
- if test $gt_cv_c_wchar_t = yes; then
+ALLOCA=alloca.$ac_objext
cat >>confdefs.h <<\_ACEOF
-#define HAVE_WCHAR_T 1
+#define C_ALLOCA 1
_ACEOF
- fi
-
- echo "$as_me:$LINENO: checking for wint_t" >&5
-echo $ECHO_N "checking for wint_t... $ECHO_C" >&6
-if test "${gt_cv_c_wint_t+set}" = set; then
+echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
+if test "${ac_cv_os_cray+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <wchar.h>
- wint_t foo = (wchar_t)'\0';
-int
-main ()
-{
+#if defined(CRAY) && ! defined(CRAY2)
+webecray
+#else
+wenotbecray
+#endif
- ;
- return 0;
-}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- gt_cv_c_wint_t=yes
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "webecray" >/dev/null 2>&1; then
+ ac_cv_os_cray=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_c_wint_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_os_cray=no
fi
-echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
-echo "${ECHO_T}$gt_cv_c_wint_t" >&6
- if test $gt_cv_c_wint_t = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WINT_T 1
-_ACEOF
-
- fi
-
+rm -f conftest*
- echo "$as_me:$LINENO: checking for inttypes.h" >&5
-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
-if test "${jm_ac_cv_header_inttypes_h+set}" = set; then
+fi
+echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+echo "${ECHO_T}$ac_cv_os_cray" >&6
+if test $ac_cv_os_cray = yes; then
+ for ac_func in _getb67 GETB67 getb67; do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <inttypes.h>
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
int
main ()
{
-uintmax_t i = (uintmax_t) -1;
+return f != $ac_func;
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- jm_ac_cv_header_inttypes_h=yes
+ eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-jm_ac_cv_header_inttypes_h=no
+eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $jm_ac_cv_header_inttypes_h" >&5
-echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6
- if test $jm_ac_cv_header_inttypes_h = yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_INTTYPES_H_WITH_UINTMAX 1
+#define CRAY_STACKSEG_END $ac_func
_ACEOF
- fi
+ break
+fi
+ done
+fi
- echo "$as_me:$LINENO: checking for stdint.h" >&5
-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
-if test "${jm_ac_cv_header_stdint_h+set}" = set; then
+echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
+if test "${ac_cv_c_stack_direction+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$cross_compiling" = yes; then
+ ac_cv_c_stack_direction=0
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <stdint.h>
+int
+find_stack_direction ()
+{
+ static char *addr = 0;
+ auto char dummy;
+ if (addr == 0)
+ {
+ addr = &dummy;
+ return find_stack_direction ();
+ }
+ else
+ return (&dummy > addr) ? 1 : -1;
+}
+
int
main ()
{
-uintmax_t i = (uintmax_t) -1;
- ;
- return 0;
+ exit (find_stack_direction () < 0);
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- jm_ac_cv_header_stdint_h=yes
+ ac_cv_c_stack_direction=1
else
- echo "$as_me: failed program was:" >&5
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-jm_ac_cv_header_stdint_h=no
+( exit $ac_status )
+ac_cv_c_stack_direction=-1
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $jm_ac_cv_header_stdint_h" >&5
-echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6
- if test $jm_ac_cv_header_stdint_h = yes; then
+fi
+echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
cat >>confdefs.h <<_ACEOF
-#define HAVE_STDINT_H_WITH_UINTMAX 1
+#define STACK_DIRECTION $ac_cv_c_stack_direction
_ACEOF
- fi
+fi
- echo "$as_me:$LINENO: checking for intmax_t" >&5
-echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6
-if test "${gt_cv_c_intmax_t+set}" = set; then
+for ac_header in stdlib.h unistd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
-#include <stddef.h>
-#include <stdlib.h>
-#if HAVE_STDINT_H_WITH_UINTMAX
-#include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-#include <inttypes.h>
-#endif
-
-int
-main ()
-{
-intmax_t x = -1;
- ;
- return 0;
-}
+$ac_includes_default
+#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- gt_cv_c_intmax_t=yes
+ ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-gt_cv_c_intmax_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_header_compiler=no
fi
-echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5
-echo "${ECHO_T}$gt_cv_c_intmax_t" >&6
- if test $gt_cv_c_intmax_t = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INTMAX_T 1
-_ACEOF
-
- fi
-
-
-
- echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5
-echo $ECHO_N "checking whether printf() supports POSIX/XSI format strings... $ECHO_C" >&6
-if test "${gt_cv_func_printf_posix+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- if test "$cross_compiling" = yes; then
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
- cat >conftest.$ac_ext <<_ACEOF
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
-#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
- notposix
-#endif
-
+#include <$ac_header>
_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "notposix" >/dev/null 2>&1; then
- gt_cv_func_printf_posix="guessing no"
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
else
- gt_cv_func_printf_posix="guessing yes"
+ ac_cpp_err=yes
fi
-rm -f conftest*
-
-
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <stdio.h>
-#include <string.h>
-/* The string "%2$d %1$d", with dollar characters protected from the shell's
- dollar expansion (possibly an autoconf bug). */
-static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
-static char buf[100];
-int main ()
-{
- sprintf (buf, format, 33, 55);
- return (strcmp (buf, "55 33") != 0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- gt_cv_func_printf_posix=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gt_cv_func_printf_posix=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_header_preproc=no
fi
-echo "$as_me:$LINENO: result: $gt_cv_func_printf_posix" >&5
-echo "${ECHO_T}$gt_cv_func_printf_posix" >&6
- case $gt_cv_func_printf_posix in
- *yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSIX_PRINTF 1
-_ACEOF
-
- ;;
- esac
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments. Useless!
-echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-if test "${ac_cv_working_alloca_h+set}" = set; then
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ no:yes )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_working_alloca_h=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_working_alloca_h=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+ eval "$as_ac_Header=$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
-if test $ac_cv_working_alloca_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
fi
-
-echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-if test "${ac_cv_func_alloca_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-# else
-# if HAVE_ALLOCA_H
-# include <alloca.h>
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-# endif
-# endif
-# endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
- ;
- return 0;
-}
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_alloca_works=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_alloca_works=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
-
-if test $ac_cv_func_alloca_works = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
-
-else
- # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble. Some versions do not even contain alloca or
-# contain a buggy version. If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
-
-ALLOCA=alloca.$ac_objext
-
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
-
-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-if test "${ac_cv_os_cray+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if defined(CRAY) && ! defined(CRAY2)
-webecray
-#else
-wenotbecray
-#endif
+done
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "webecray" >/dev/null 2>&1; then
- ac_cv_os_cray=yes
-else
- ac_cv_os_cray=no
-fi
-rm -f conftest*
-fi
-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6
-if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+for ac_func in getpagesize
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
-
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
-
-#undef $ac_func
-
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
- break
-fi
-
- done
fi
+done
-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-if test "${ac_cv_c_stack_direction+set}" = set; then
+echo "$as_me:$LINENO: checking for working mmap" >&5
+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
- ac_cv_c_stack_direction=0
+ ac_cv_func_mmap_fixed_mapped=no
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-int
-find_stack_direction ()
-{
- static char *addr = 0;
- auto char dummy;
- if (addr == 0)
- {
- addr = &dummy;
- return find_stack_direction ();
- }
- else
- return (&dummy > addr) ? 1 : -1;
-}
+$ac_includes_default
+/* malloc might have been renamed as rpl_malloc. */
+#undef malloc
+
+/* Thanks to Mike Haertel and Jim Avera for this test.
+ Here is a matrix of mmap possibilities:
+ mmap private not fixed
+ mmap private fixed at somewhere currently unmapped
+ mmap private fixed at somewhere already mapped
+ mmap shared not fixed
+ mmap shared fixed at somewhere currently unmapped
+ mmap shared fixed at somewhere already mapped
+ For private mappings, we should verify that changes cannot be read()
+ back from the file, nor mmap's back from the file at a different
+ address. (There have been systems where private was not correctly
+ implemented like the infamous i386 svr4.0, and systems where the
+ VM page cache was not coherent with the file system buffer cache
+ like early versions of FreeBSD and possibly contemporary NetBSD.)
+ For shared mappings, we should conversely verify that changes get
+ propagated back to all the places they're supposed to be.
+
+ Grep wants private fixed already mapped.
+ The main things grep needs to know about mmap are:
+ * does it exist and is it safe to write into the mmap'd area
+ * how to use it (BSD variants) */
+
+#include <fcntl.h>
+#include <sys/mman.h>
+
+#if !STDC_HEADERS && !HAVE_STDLIB_H
+char *malloc ();
+#endif
+
+/* This mess was copied from the GNU getpagesize.h. */
+#if !HAVE_GETPAGESIZE
+/* Assume that all systems that can run configure have sys/param.h. */
+# if !HAVE_SYS_PARAM_H
+# define HAVE_SYS_PARAM_H 1
+# endif
+
+# ifdef _SC_PAGESIZE
+# define getpagesize() sysconf(_SC_PAGESIZE)
+# else /* no _SC_PAGESIZE */
+# if HAVE_SYS_PARAM_H
+# include <sys/param.h>
+# ifdef EXEC_PAGESIZE
+# define getpagesize() EXEC_PAGESIZE
+# else /* no EXEC_PAGESIZE */
+# ifdef NBPG
+# define getpagesize() NBPG * CLSIZE
+# ifndef CLSIZE
+# define CLSIZE 1
+# endif /* no CLSIZE */
+# else /* no NBPG */
+# ifdef NBPC
+# define getpagesize() NBPC
+# else /* no NBPC */
+# ifdef PAGESIZE
+# define getpagesize() PAGESIZE
+# endif /* PAGESIZE */
+# endif /* no NBPC */
+# endif /* no NBPG */
+# endif /* no EXEC_PAGESIZE */
+# else /* no HAVE_SYS_PARAM_H */
+# define getpagesize() 8192 /* punt totally */
+# endif /* no HAVE_SYS_PARAM_H */
+# endif /* no _SC_PAGESIZE */
+
+#endif /* no HAVE_GETPAGESIZE */
int
main ()
{
- exit (find_stack_direction () < 0);
+ char *data, *data2, *data3;
+ int i, pagesize;
+ int fd;
+
+ pagesize = getpagesize ();
+
+ /* First, make a file with some known garbage in it. */
+ data = (char *) malloc (pagesize);
+ if (!data)
+ exit (1);
+ for (i = 0; i < pagesize; ++i)
+ *(data + i) = rand ();
+ umask (0);
+ fd = creat ("conftest.mmap", 0600);
+ if (fd < 0)
+ exit (1);
+ if (write (fd, data, pagesize) != pagesize)
+ exit (1);
+ close (fd);
+
+ /* Next, try to mmap the file at a fixed address which already has
+ something else allocated at it. If we can, also make sure that
+ we see the same garbage. */
+ fd = open ("conftest.mmap", O_RDWR);
+ if (fd < 0)
+ exit (1);
+ data2 = (char *) malloc (2 * pagesize);
+ if (!data2)
+ exit (1);
+ data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
+ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_FIXED, fd, 0L))
+ exit (1);
+ for (i = 0; i < pagesize; ++i)
+ if (*(data + i) != *(data2 + i))
+ exit (1);
+
+ /* Finally, make sure that changes to the mapped area do not
+ percolate back to the file as seen by read(). (This is a bug on
+ some variants of i386 svr4.0.) */
+ for (i = 0; i < pagesize; ++i)
+ *(data2 + i) = *(data2 + i) + 1;
+ data3 = (char *) malloc (pagesize);
+ if (!data3)
+ exit (1);
+ if (read (fd, data3, pagesize) != pagesize)
+ exit (1);
+ for (i = 0; i < pagesize; ++i)
+ if (*(data + i) != *(data3 + i))
+ exit (1);
+ close (fd);
+ exit (0);
}
_ACEOF
rm -f conftest$ac_exeext
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_c_stack_direction=1
+ ac_cv_func_mmap_fixed_mapped=yes
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-ac_cv_c_stack_direction=-1
+ac_cv_func_mmap_fixed_mapped=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
+echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
+if test $ac_cv_func_mmap_fixed_mapped = yes; then
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MMAP 1
_ACEOF
-
fi
+rm -f conftest.mmap
-
-for ac_header in stdlib.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
+echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
+if test "${ac_cv_gnu_library_2_1+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
+
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+ Lucky GNU user
+ #endif
+#endif
+
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "Lucky GNU user" >/dev/null 2>&1; then
+ ac_cv_gnu_library_2_1=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_gnu_library_2_1=no
+fi
+rm -f conftest*
+
+
-ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
+echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ GLIBC21="$ac_cv_gnu_library_2_1"
+
+
+
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
else
- ac_cpp_err=
+ acl_final_prefix="$prefix"
fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
+# Check whether --with-gnu-ld or --without-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+ withval="$with_gnu_ld"
+ test "$withval" = no || with_gnu_ld=yes
+else
+ with_gnu_ld=no
+fi;
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [\\/]* | [A-Za-z]:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ esac
+elif test "$with_gnu_ld" = yes; then
+ echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+else
+ echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+fi
+if test "${acl_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- eval "$as_ac_Header=\$ac_header_preproc"
+ if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ acl_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+ test "$with_gnu_ld" != no && break
+ else
+ test "$with_gnu_ld" != yes && break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+else
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+ echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+ acl_cv_prog_gnu_ld=yes
+else
+ acl_cv_prog_gnu_ld=no
+fi
fi
+echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
+with_gnu_ld=$acl_cv_prog_gnu_ld
-done
-for ac_func in getpagesize
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+if test "${acl_cv_rpath+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+ rm -f ./conftest.sh
+ acl_cv_rpath=done
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+fi
+echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6
+ wl="$acl_cv_wl"
+ libext="$acl_cv_libext"
+ shlibext="$acl_cv_shlibext"
+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+ hardcode_direct="$acl_cv_hardcode_direct"
+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
-#undef $ac_func
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-int
-main ()
-{
-return f != $ac_func;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-fi
-done
-echo "$as_me:$LINENO: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_mmap_fixed_mapped=no
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-/* malloc might have been renamed as rpl_malloc. */
-#undef malloc
-/* Thanks to Mike Haertel and Jim Avera for this test.
- Here is a matrix of mmap possibilities:
- mmap private not fixed
- mmap private fixed at somewhere currently unmapped
- mmap private fixed at somewhere already mapped
- mmap shared not fixed
- mmap shared fixed at somewhere currently unmapped
- mmap shared fixed at somewhere already mapped
- For private mappings, we should verify that changes cannot be read()
- back from the file, nor mmap's back from the file at a different
- address. (There have been systems where private was not correctly
- implemented like the infamous i386 svr4.0, and systems where the
- VM page cache was not coherent with the file system buffer cache
- like early versions of FreeBSD and possibly contemporary NetBSD.)
- For shared mappings, we should conversely verify that changes get
- propagated back to all the places they're supposed to be.
- Grep wants private fixed already mapped.
- The main things grep needs to know about mmap are:
- * does it exist and is it safe to write into the mmap'd area
- * how to use it (BSD variants) */
+ use_additional=yes
-#include <fcntl.h>
-#include <sys/mman.h>
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
-#if !STDC_HEADERS && !HAVE_STDLIB_H
-char *malloc ();
-#endif
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
-/* This mess was copied from the GNU getpagesize.h. */
-#if !HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h. */
-# if !HAVE_SYS_PARAM_H
-# define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-# define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-# if HAVE_SYS_PARAM_H
-# include <sys/param.h>
-# ifdef EXEC_PAGESIZE
-# define getpagesize() EXEC_PAGESIZE
-# else /* no EXEC_PAGESIZE */
-# ifdef NBPG
-# define getpagesize() NBPG * CLSIZE
-# ifndef CLSIZE
-# define CLSIZE 1
-# endif /* no CLSIZE */
-# else /* no NBPG */
-# ifdef NBPC
-# define getpagesize() NBPC
-# else /* no NBPC */
-# ifdef PAGESIZE
-# define getpagesize() PAGESIZE
-# endif /* PAGESIZE */
-# endif /* no NBPC */
-# endif /* no NBPG */
-# endif /* no EXEC_PAGESIZE */
-# else /* no HAVE_SYS_PARAM_H */
-# define getpagesize() 8192 /* punt totally */
-# endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
-#endif /* no HAVE_GETPAGESIZE */
-int
-main ()
-{
- char *data, *data2, *data3;
- int i, pagesize;
- int fd;
+# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then
+ withval="$with_libiconv_prefix"
- pagesize = getpagesize ();
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
- /* First, make a file with some known garbage in it. */
- data = (char *) malloc (pagesize);
- if (!data)
- exit (1);
- for (i = 0; i < pagesize; ++i)
- *(data + i) = rand ();
- umask (0);
- fd = creat ("conftest.mmap", 0600);
- if (fd < 0)
- exit (1);
- if (write (fd, data, pagesize) != pagesize)
- exit (1);
- close (fd);
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
- /* Next, try to mmap the file at a fixed address which already has
- something else allocated at it. If we can, also make sure that
- we see the same garbage. */
- fd = open ("conftest.mmap", O_RDWR);
- if (fd < 0)
- exit (1);
- data2 = (char *) malloc (2 * pagesize);
- if (!data2)
- exit (1);
- data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_FIXED, fd, 0L))
- exit (1);
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data2 + i))
- exit (1);
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
- /* Finally, make sure that changes to the mapped area do not
- percolate back to the file as seen by read(). (This is a bug on
- some variants of i386 svr4.0.) */
- for (i = 0; i < pagesize; ++i)
- *(data2 + i) = *(data2 + i) + 1;
- data3 = (char *) malloc (pagesize);
- if (!data3)
- exit (1);
- if (read (fd, data3, pagesize) != pagesize)
- exit (1);
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data3 + i))
- exit (1);
- close (fd);
- exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_mmap_fixed_mapped=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
-( exit $ac_status )
-ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/lib"
+ fi
+ fi
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMAP 1
-_ACEOF
+fi;
+ LIBICONV=
+ LTLIBICONV=
+ INCICONV=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='iconv '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ if test $use_additional = yes; then
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+ found_dir="$additional_libdir"
+ found_so="$additional_libdir/lib$name.$shlibext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ else
+ if test -f "$additional_libdir/lib$name.$libext"; then
+ found_dir="$additional_libdir"
+ found_a="$additional_libdir/lib$name.$libext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBICONV; do
-fi
-rm -f conftest.mmap
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+ found_dir="$dir"
+ found_so="$dir/lib$name.$shlibext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ else
+ if test -f "$dir/lib$name.$libext"; then
+ found_dir="$dir"
+ found_a="$dir/lib$name.$libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "X$found_dir" = "X/usr/lib"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$hardcode_direct" = yes; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
- echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
-echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
-if test "${ac_cv_gnu_library_2_1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
- Lucky GNU user
- #endif
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "Lucky GNU user" >/dev/null 2>&1; then
- ac_cv_gnu_library_2_1=yes
-else
- ac_cv_gnu_library_2_1=no
-fi
-rm -f conftest*
-
-
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
-echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
-
- GLIBC21="$ac_cv_gnu_library_2_1"
-
-
-
-
- echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5
-echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6
-if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- if test "$cross_compiling" = yes; then
-
- # Guess based on the CPU.
- case "$host_cpu" in
- alpha* | i3456786 | m68k | s390*)
- gt_cv_int_divbyzero_sigfpe="guessing yes";;
- *)
- gt_cv_int_divbyzero_sigfpe="guessing no";;
- esac
-
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <stdlib.h>
-#include <signal.h>
-
-static void
-#ifdef __cplusplus
-sigfpe_handler (int sig)
-#else
-sigfpe_handler (sig) int sig;
-#endif
-{
- /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
- exit (sig != SIGFPE);
-}
-
-int x = 1;
-int y = 0;
-int z;
-int nan;
-
-int main ()
-{
- signal (SIGFPE, sigfpe_handler);
-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
- signal (SIGTRAP, sigfpe_handler);
-#endif
-/* Linux/SPARC yields signal SIGILL. */
-#if defined (__sparc__) && defined (__linux__)
- signal (SIGILL, sigfpe_handler);
-#endif
-
- z = x / y;
- nan = y / y;
- exit (1);
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- gt_cv_int_divbyzero_sigfpe=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gt_cv_int_divbyzero_sigfpe=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-fi
-echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5
-echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6
- case "$gt_cv_int_divbyzero_sigfpe" in
- *yes) value=1;;
- *) value=0;;
- esac
-
-cat >>confdefs.h <<_ACEOF
-#define INTDIV0_RAISES_SIGFPE $value
-_ACEOF
-
-
-
- echo "$as_me:$LINENO: checking for unsigned long long" >&5
-echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6
-if test "${ac_cv_type_unsigned_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-unsigned long long ull = 1ULL; int i = 63;
-int
-main ()
-{
-unsigned long long ullmax = (unsigned long long) -1;
- return ull << i | ull >> i | ullmax / ull | ullmax % ull;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_type_unsigned_long_long=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_unsigned_long_long=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6
- if test $ac_cv_type_unsigned_long_long = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UNSIGNED_LONG_LONG 1
-_ACEOF
-
- fi
-
-
-
-
- if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-
- test $ac_cv_type_unsigned_long_long = yes \
- && ac_type='unsigned long long' \
- || ac_type='unsigned long'
-
-cat >>confdefs.h <<_ACEOF
-#define uintmax_t $ac_type
-_ACEOF
-
- else
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UINTMAX_T 1
-_ACEOF
-
- fi
-
-
- echo "$as_me:$LINENO: checking for inttypes.h" >&5
-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
-if test "${gt_cv_header_inttypes_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <inttypes.h>
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- gt_cv_header_inttypes_h=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_header_inttypes_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5
-echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6
- if test $gt_cv_header_inttypes_h = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INTTYPES_H 1
-_ACEOF
-
- fi
-
-
-
- if test $gt_cv_header_inttypes_h = yes; then
- echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
-echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6
-if test "${gt_cv_inttypes_pri_broken+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- gt_cv_inttypes_pri_broken=no
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_inttypes_pri_broken=yes
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
-echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6
- fi
- if test "$gt_cv_inttypes_pri_broken" = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define PRI_MACROS_BROKEN 1
-_ACEOF
-
- fi
-
-
-
-for ac_header in stdint.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
- echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
-echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6
- result=
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <limits.h>
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef SIZE_MAX
-Found it
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "Found it" >/dev/null 2>&1; then
- result=yes
-fi
-rm -f conftest*
-
- if test -z "$result"; then
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) >= 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) < 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) >= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_lo=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_hi=$ac_mid
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) res_hi=$ac_lo;;
-'') result=? ;;
-esac
-else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-long longval () { return ~(size_t)0 / 10; }
-unsigned long ulongval () { return ~(size_t)0 / 10; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- exit (1);
- if ((~(size_t)0 / 10) < 0)
- {
- long i = longval ();
- if (i != (~(size_t)0 / 10))
- exit (1);
- fprintf (f, "%ld\n", i);
- }
- else
- {
- unsigned long i = ulongval ();
- if (i != (~(size_t)0 / 10))
- exit (1);
- fprintf (f, "%lu\n", i);
- }
- exit (ferror (f) || fclose (f) != 0);
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- res_hi=`cat conftest.val`
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-result=?
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) >= 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) < 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) >= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_lo=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_hi=$ac_mid
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) res_lo=$ac_lo;;
-'') result=? ;;
-esac
-else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-long longval () { return ~(size_t)0 % 10; }
-unsigned long ulongval () { return ~(size_t)0 % 10; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- exit (1);
- if ((~(size_t)0 % 10) < 0)
- {
- long i = longval ();
- if (i != (~(size_t)0 % 10))
- exit (1);
- fprintf (f, "%ld\n", i);
- }
- else
- {
- unsigned long i = ulongval ();
- if (i != (~(size_t)0 % 10))
- exit (1);
- fprintf (f, "%lu\n", i);
- }
- exit (ferror (f) || fclose (f) != 0);
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- res_lo=`cat conftest.val`
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-result=?
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_lo=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_hi=$ac_mid
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) fits_in_uint=$ac_lo;;
-'') result=? ;;
-esac
-else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-long longval () { return sizeof (size_t) <= sizeof (unsigned int); }
-unsigned long ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- exit (1);
- if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
- {
- long i = longval ();
- if (i != (sizeof (size_t) <= sizeof (unsigned int)))
- exit (1);
- fprintf (f, "%ld\n", i);
- }
- else
- {
- unsigned long i = ulongval ();
- if (i != (sizeof (size_t) <= sizeof (unsigned int)))
- exit (1);
- fprintf (f, "%lu\n", i);
- }
- exit (ferror (f) || fclose (f) != 0);
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- fits_in_uint=`cat conftest.val`
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-result=?
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
- if test "$fits_in_uint" = 1; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
- extern size_t foo;
- extern unsigned long foo;
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- fits_in_uint=0
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test -z "$result"; then
- if test "$fits_in_uint" = 1; then
- result="$res_hi$res_lo"U
- else
- result="$res_hi$res_lo"UL
- fi
- else
- result='~(size_t)0'
- fi
- fi
- echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6
- if test "$result" != yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define SIZE_MAX $result
-_ACEOF
-
- fi
-
-
-
-
-for ac_header in stdint.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
- if test "X$prefix" = "XNONE"; then
- acl_final_prefix="$ac_default_prefix"
- else
- acl_final_prefix="$prefix"
- fi
- if test "X$exec_prefix" = "XNONE"; then
- acl_final_exec_prefix='${prefix}'
- else
- acl_final_exec_prefix="$exec_prefix"
- fi
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
- prefix="$acl_save_prefix"
-
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
- withval="$with_gnu_ld"
- test "$withval" = no || with_gnu_ld=yes
-else
- with_gnu_ld=no
-fi;
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [\\/]* | [A-Za-z]:[\\/]*)
- re_direlt='/[^/][^/]*/\.\./'
- # Canonicalize the path of ld
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-else
- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-fi
-if test "${acl_cv_path_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -z "$LD"; then
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- acl_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
- *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break ;;
- *)
- test "$with_gnu_ld" != yes && break ;;
- esac
- fi
- done
- IFS="$ac_save_ifs"
-else
- acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
- echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${acl_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- acl_cv_prog_gnu_ld=yes ;;
-*)
- acl_cv_prog_gnu_ld=no ;;
-esac
-fi
-echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
-with_gnu_ld=$acl_cv_prog_gnu_ld
-
-
-
- echo "$as_me:$LINENO: checking for shared library run path origin" >&5
-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
-if test "${acl_cv_rpath+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
- . ./conftest.sh
- rm -f ./conftest.sh
- acl_cv_rpath=done
-
-fi
-echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-echo "${ECHO_T}$acl_cv_rpath" >&6
- wl="$acl_cv_wl"
- libext="$acl_cv_libext"
- shlibext="$acl_cv_shlibext"
- hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
- hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
- hardcode_direct="$acl_cv_hardcode_direct"
- hardcode_minus_L="$acl_cv_hardcode_minus_L"
- # Check whether --enable-rpath or --disable-rpath was given.
-if test "${enable_rpath+set}" = set; then
- enableval="$enable_rpath"
- :
-else
- enable_rpath=yes
-fi;
-
-
-
-
-
-
-
- use_additional=yes
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
-
-# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then
- withval="$with_libiconv_prefix"
-
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/lib"
- fi
- fi
-
-fi;
- LIBICONV=
- LTLIBICONV=
- INCICONV=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
- names_next_round='iconv '
- while test -n "$names_next_round"; do
- names_this_round="$names_next_round"
- names_next_round=
- for name in $names_this_round; do
- already_handled=
- for n in $names_already_handled; do
- if test "$n" = "$name"; then
- already_handled=yes
- break
- fi
- done
- if test -z "$already_handled"; then
- names_already_handled="$names_already_handled $name"
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
- eval value=\"\$HAVE_LIB$uppername\"
- if test -n "$value"; then
- if test "$value" = yes; then
- eval value=\"\$LIB$uppername\"
- test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
- eval value=\"\$LTLIB$uppername\"
- test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
- else
- :
- fi
- else
- found_dir=
- found_la=
- found_so=
- found_a=
- if test $use_additional = yes; then
- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
- found_dir="$additional_libdir"
- found_so="$additional_libdir/lib$name.$shlibext"
- if test -f "$additional_libdir/lib$name.la"; then
- found_la="$additional_libdir/lib$name.la"
- fi
- else
- if test -f "$additional_libdir/lib$name.$libext"; then
- found_dir="$additional_libdir"
- found_a="$additional_libdir/lib$name.$libext"
- if test -f "$additional_libdir/lib$name.la"; then
- found_la="$additional_libdir/lib$name.la"
- fi
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIBICONV; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
- found_dir="$dir"
- found_so="$dir/lib$name.$shlibext"
- if test -f "$dir/lib$name.la"; then
- found_la="$dir/lib$name.la"
- fi
- else
- if test -f "$dir/lib$name.$libext"; then
- found_dir="$dir"
- found_a="$dir/lib$name.$libext"
- if test -f "$dir/lib$name.la"; then
- found_la="$dir/lib$name.la"
- fi
- fi
- fi
- ;;
- esac
- if test "X$found_dir" != "X"; then
- break
- fi
- done
- fi
- if test "X$found_dir" != "X"; then
- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
- if test "X$found_so" != "X"; then
- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
- else
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $found_dir"
- fi
- if test "$hardcode_direct" = yes; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
- else
- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
- fi
- else
- haveit=
- for x in $LDFLAGS $LIBICONV; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
- fi
- if test "$hardcode_minus_L" != no; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
- else
- LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
- fi
- fi
- fi
- fi
- else
- if test "X$found_a" != "X"; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
- else
- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
- fi
- fi
- additional_includedir=
- case "$found_dir" in
- */lib | */lib/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
- additional_includedir="$basedir/include"
- ;;
- esac
- if test "X$additional_includedir" != "X"; then
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- for x in $CPPFLAGS $INCICONV; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- fi
- if test -n "$found_la"; then
- save_libdir="$libdir"
- case "$found_la" in
- */* | *\\*) . "$found_la" ;;
- *) . "./$found_la" ;;
- esac
- libdir="$save_libdir"
- for dep in $dependency_libs; do
- case "$dep" in
- -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- if test "X$additional_libdir" != "X/usr/lib"; then
- haveit=
- if test "X$additional_libdir" = "X/usr/local/lib"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- haveit=
- for x in $LDFLAGS $LIBICONV; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
- fi
- fi
- haveit=
- for x in $LDFLAGS $LTLIBICONV; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- ;;
- -R*)
- dir=`echo "X$dep" | sed -e 's/^X-R//'`
- if test "$enable_rpath" != no; then
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $dir"
- fi
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $dir"
- fi
- fi
- ;;
- -l*)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
- ;;
- *.la)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
- ;;
- *)
- LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
- ;;
- esac
- done
- fi
- else
- LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
- fi
- fi
- fi
- done
- done
- if test "X$rpathdirs" != "X"; then
- if test -n "$hardcode_libdir_separator"; then
- alldirs=
- for found_dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
- done
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
- else
- for found_dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$found_dir"
- eval flag=\"$hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
- done
- fi
- fi
- if test "X$ltrpathdirs" != "X"; then
- for found_dir in $ltrpathdirs; do
- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
- done
- fi
-
-
-
-
-
-
-
-
- echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
-echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6
-if test "${ac_cv_type_ptrdiff_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if ((ptrdiff_t *) 0)
- return 0;
-if (sizeof (ptrdiff_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_type_ptrdiff_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_ptrdiff_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
-echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6
-if test $ac_cv_type_ptrdiff_t = yes; then
- :
-else
-
-cat >>confdefs.h <<\_ACEOF
-#define ptrdiff_t long
-_ACEOF
-
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in asprintf fwprintf getcwd getegid geteuid getgid getuid \
-mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
-strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
-__fsetlocking
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
-fi
-done
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCICONV; do
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/lib"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
- echo "$as_me:$LINENO: checking whether _snprintf is declared" >&5
-echo $ECHO_N "checking whether _snprintf is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl__snprintf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
-#ifndef _snprintf
- char *p = (char *) _snprintf;
-#endif
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBICONV; do
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_have_decl__snprintf=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
-ac_cv_have_decl__snprintf=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl__snprintf" >&5
-echo "${ECHO_T}$ac_cv_have_decl__snprintf" >&6
- if test $ac_cv_have_decl__snprintf = yes; then
- gt_value=1
- else
- gt_value=0
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+ done
fi
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__SNPRINTF $gt_value
-_ACEOF
+ am_save_CPPFLAGS="$CPPFLAGS"
+
+ for element in $INCICONV; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
- echo "$as_me:$LINENO: checking whether _snwprintf is declared" >&5
-echo $ECHO_N "checking whether _snwprintf is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl__snwprintf+set}" = set; then
+ echo "$as_me:$LINENO: checking for iconv" >&5
+echo $ECHO_N "checking for iconv... $ECHO_C" >&6
+if test "${am_cv_func_iconv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
+#include <stdlib.h>
+#include <iconv.h>
int
main ()
{
-
-#ifndef _snwprintf
- char *p = (char *) _snwprintf;
-#endif
-
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_have_decl__snwprintf=yes
+ am_cv_func_iconv=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_have_decl__snwprintf=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl__snwprintf" >&5
-echo "${ECHO_T}$ac_cv_have_decl__snwprintf" >&6
- if test $ac_cv_have_decl__snwprintf = yes; then
- gt_value=1
- else
- gt_value=0
- fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__SNWPRINTF $gt_value
-_ACEOF
-
-
-
-
- echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5
-echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
+#include <stdlib.h>
+#include <iconv.h>
int
main ()
{
-
-#ifndef feof_unlocked
- char *p = (char *) feof_unlocked;
-#endif
-
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_have_decl_feof_unlocked=yes
+ am_cv_lib_iconv=yes
+ am_cv_func_iconv=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_have_decl_feof_unlocked=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS="$am_save_LIBS"
+ fi
+
fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6
- if test $ac_cv_have_decl_feof_unlocked = yes; then
- gt_value=1
+echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+echo "${ECHO_T}$am_cv_func_iconv" >&6
+ if test "$am_cv_func_iconv" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ICONV 1
+_ACEOF
+
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
+ echo "$as_me:$LINENO: result: $LIBICONV" >&5
+echo "${ECHO_T}$LIBICONV" >&6
else
- gt_value=0
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
fi
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FEOF_UNLOCKED $gt_value
-_ACEOF
- echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5
-echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then
+
+
+
+
+
+
+
+
+
+
+
+for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h unistd.h sys/param.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-
-#ifndef fgets_unlocked
- char *p = (char *) fgets_unlocked;
-#endif
-
- ;
- return 0;
-}
+$ac_includes_default
+#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_have_decl_fgets_unlocked=yes
+ ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_have_decl_fgets_unlocked=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_header_compiler=no
fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6
- if test $ac_cv_have_decl_fgets_unlocked = yes; then
- gt_value=1
- else
- gt_value=0
- fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FGETS_UNLOCKED $gt_value
-_ACEOF
-
-
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
- echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
-echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-
-#ifndef getc_unlocked
- char *p = (char *) getc_unlocked;
-#endif
-
- ;
- return 0;
-}
+#include <$ac_header>
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_have_decl_getc_unlocked=yes
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_have_decl_getc_unlocked=no
+ ac_header_preproc=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ no:yes )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6
- if test $ac_cv_have_decl_getc_unlocked = yes; then
- gt_value=1
- else
- gt_value=0
- fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETC_UNLOCKED $gt_value
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
+fi
+done
- case $gt_cv_func_printf_posix in
- *yes) HAVE_POSIX_PRINTF=1 ;;
- *) HAVE_POSIX_PRINTF=0 ;;
- esac
- if test "$ac_cv_func_asprintf" = yes; then
- HAVE_ASPRINTF=1
- else
- HAVE_ASPRINTF=0
- fi
- if test "$ac_cv_func_snprintf" = yes; then
- HAVE_SNPRINTF=1
- else
- HAVE_SNPRINTF=0
- fi
- if test "$ac_cv_func_wprintf" = yes; then
- HAVE_WPRINTF=1
- else
- HAVE_WPRINTF=0
- fi
- am_save_CPPFLAGS="$CPPFLAGS"
- for element in $INCICONV; do
- haveit=
- for x in $CPPFLAGS; do
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
- fi
- done
- echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6
-if test "${am_cv_func_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- am_cv_func_iconv="no, consider installing GNU libiconv"
- am_cv_lib_iconv=no
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <iconv.h>
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- am_cv_func_iconv=yes
+
+
+
+
+
+for ac_func in feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
+geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
+strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- if test "$am_cv_func_iconv" != yes; then
- am_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBICONV"
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdlib.h>
-#include <iconv.h>
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
int
main ()
{
-iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);
+return f != $ac_func;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- am_cv_lib_iconv=yes
- am_cv_func_iconv=yes
+ eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$am_save_LIBS"
- fi
-
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6
- if test "$am_cv_func_iconv" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
- fi
- if test "$am_cv_lib_iconv" = yes; then
- echo "$as_me:$LINENO: checking how to link with libiconv" >&5
-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: $LIBICONV" >&5
-echo "${ECHO_T}$LIBICONV" >&6
- else
- CPPFLAGS="$am_save_CPPFLAGS"
- LIBICONV=
- LTLIBICONV=
- fi
+fi
+done
+
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
am_cv_proto_iconv_arg1="const"
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
fi
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
am_cv_langinfo_codeset=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
fi
if test $ac_cv_header_locale_h = yes; then
-
- echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+ echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
if test "${am_cv_val_LC_MESSAGES+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
am_cv_val_LC_MESSAGES=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
- if test $am_cv_val_LC_MESSAGES = yes; then
+ if test $am_cv_val_LC_MESSAGES = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LC_MESSAGES 1
_ACEOF
- fi
-
+ fi
fi
for ac_prog in bison
-
-
-
echo "$as_me:$LINENO: checking whether NLS is requested" >&5
echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
# Check whether --enable-nls or --disable-nls was given.
-
BUILD_INCLUDED_LIBINTL=no
USE_INCLUDED_LIBINTL=no
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
gt_cv_func_gnugettext1_libc=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
if test "X$found_dir" != "X"; then
LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
if test "X$found_so" != "X"; then
- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+ if test "X$found_dir" = "X/usr/lib"; then
LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
else
haveit=
fi
fi
;;
- -R*)
- dir=`echo "X$dep" | sed -e 's/^X-R//'`
- if test "$enable_rpath" != no; then
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $dir"
- fi
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $dir"
- fi
- fi
- ;;
-l*)
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
;;
gt_save_LIBS="$LIBS"
LIBS="$LIBS $LIBINTL"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
/* end confdefs.h. */
#include <libintl.h>
extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
extern
#ifdef __cplusplus
"C"
main ()
{
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
gt_cv_func_gnugettext1_libintl=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
LIBS="$LIBS $LIBICONV"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
/* end confdefs.h. */
#include <libintl.h>
extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
extern
#ifdef __cplusplus
"C"
main ()
{
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
CPPFLAGS="$gt_save_CPPFLAGS"
LIBS="$gt_save_LIBS"
if test "$gt_cv_func_gnugettext1_libc" = "yes" \
|| { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
- && test "$PACKAGE" != gettext-runtime \
- && test "$PACKAGE" != gettext-tools; }; then
+ && test "$PACKAGE" != gettext; }; then
gt_use_preinstalled_gnugettext=yes
else
LIBINTL=
fi
if test "$nls_cv_use_gnu_gettext" = "yes"; then
- BUILD_INCLUDED_LIBINTL=yes
+ INTLOBJS="\$(GETTOBJS)"
+ BUILD_INCLUDED_LIBINTL=yes
USE_INCLUDED_LIBINTL=yes
LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
fi
fi
- echo "$as_me:$LINENO: checking whether to use NLS" >&5
-echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6
- if test "$USE_NLS" = "yes"; then
- echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
-echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6
- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
- if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
- gt_source="external libintl"
- else
- gt_source="libc"
- fi
- else
- gt_source="included intl directory"
- fi
- echo "$as_me:$LINENO: result: $gt_source" >&5
-echo "${ECHO_T}$gt_source" >&6
- fi
-
if test "$USE_NLS" = "yes"; then
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
fi
- if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+ if test "$PACKAGE" = gettext; then
BUILD_INCLUDED_LIBINTL=yes
fi
+
nls_cv_header_intl=
nls_cv_header_libgt=
GENCAT=gencat
- if test "$USE_INCLUDED_LIBINTL" = yes; then
- INTLOBJS="\$(GETTOBJS)"
- fi
-
-
INTL_LIBTOOL_SUFFIX_PREFIX=
ac_check_lib_save_LIBS=$LIBS
LIBS="-lncurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_cv_lib_ncurses_initscr=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_initscr" >&5
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_cv_lib_curses_initscr=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_curses_initscr" >&5
else
# See if sys/param.h defines the BYTE_ORDER macro.
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
(exit $ac_status); }; }; then
# It does; now see whether it defined to BIG_ENDIAN or not.
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
ac_cv_c_bigendian=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
echo "${ECHO_T}$ac_cv_c_bigendian" >&6
# `set' does not quote correctly, so add quotes (double-quote
# substitution turns \\\\ into \\, and sed turns \\ into \).
sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+ "s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
;;
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
;;
esac;
} |
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
s/:*\$(srcdir):*/:/;
s/:*\${srcdir}:*/:/;
s/:*@srcdir@:*/:/;
-s/^\([^=]*=[ ]*\):*/\1/;
+s/^\([^=]*=[ ]*\):*/\1/;
s/:*$//;
-s/^[^=]*=[ ]*$//;
+s/^[^=]*=[ ]*$//;
}'
fi
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_i=`echo "$ac_i" |
- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
# 2. Add them.
ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
-DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
as_unset=unset
else
as_unset=false
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
else
- test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
# IFS
cat >&5 <<_CSEOF
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+generated by GNU Autoconf 2.57. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
+ instantiate the configuration file FILE
--header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
+ instantiate the configuration header FILE
Configuration files:
$config_files
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.59,
+configured by $0, generated by GNU Autoconf 2.57,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
srcdir=$srcdir
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-# Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
+ # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
# from automake.
- eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
# Capture the value of LINGUAS because we need it to compute CATALOGS.
LINGUAS="${LINGUAS-%UNSET%}"
s,@EGREP@,$EGREP,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
-s,@USE_NLS@,$USE_NLS,;t t
s,@MSGFMT@,$MSGFMT,;t t
s,@GMSGFMT@,$GMSGFMT,;t t
s,@XGETTEXT@,$XGETTEXT,;t t
s,@host_os@,$host_os,;t t
s,@ALLOCA@,$ALLOCA,;t t
s,@GLIBC21@,$GLIBC21,;t t
-s,@HAVE_POSIX_PRINTF@,$HAVE_POSIX_PRINTF,;t t
-s,@HAVE_ASPRINTF@,$HAVE_ASPRINTF,;t t
-s,@HAVE_SNPRINTF@,$HAVE_SNPRINTF,;t t
-s,@HAVE_WPRINTF@,$HAVE_WPRINTF,;t t
s,@LIBICONV@,$LIBICONV,;t t
s,@LTLIBICONV@,$LTLIBICONV,;t t
s,@INTLBISON@,$INTLBISON,;t t
+s,@USE_NLS@,$USE_NLS,;t t
s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t
s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t
s,@CATOBJEXT@,$CATOBJEXT,;t t
+s,@INTLOBJS@,$INTLOBJS,;t t
s,@DATADIRNAME@,$DATADIRNAME,;t t
s,@INSTOBJEXT@,$INSTOBJEXT,;t t
s,@GENCAT@,$GENCAT,;t t
-s,@INTLOBJS@,$INTLOBJS,;t t
s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
s,@INTLLIBS@,$INTLLIBS,;t t
s,@LIBINTL@,$LIBINTL,;t t
(echo ':t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
else
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
fi
ac_sed_frag=`expr $ac_sed_frag + 1`
ac_beg=$ac_end
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case $ac_file in
- | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ cat >$tmp/stdin
+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
*:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
* ) ac_file_in=$ac_file.in ;;
esac
# Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
ac_dir=`(dirname "$ac_file") 2>/dev/null ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
as_dirs="$as_dir $as_dirs"
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
case $INSTALL in
configure_input="$ac_file. "
fi
configure_input=$configure_input"Generated from `echo $ac_file_in |
- sed 's,.*/,,'` by configure."
+ sed 's,.*/,,'` by configure."
# First look for the input files in the build tree, otherwise in the
# src tree.
case $f in
-) echo $tmp/stdin ;;
[\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ # Absolute (can't be DOS-style, as IFS=:)
+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- echo "$f";;
+ echo $f;;
*) # Relative
- if test -f "$f"; then
- # Build tree
- echo "$f"
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo "$srcdir/$f"
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ if test -f "$f"; then
+ # Build tree
+ echo $f
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- fi;;
+ fi;;
esac
done` || { (exit 1); exit 1; }
_ACEOF
# NAME is the cpp macro being defined and VALUE is the value it is being given.
#
# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-ac_dB='[ ].*$,\1#\2'
+ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
+ac_dB='[ ].*$,\1#\2'
ac_dC=' '
ac_dD=',;t'
# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
ac_uB='$,\1#\2define\3'
ac_uC=' '
ac_uD=',;t'
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case $ac_file in
- | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ cat >$tmp/stdin
+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
*:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
* ) ac_file_in=$ac_file.in ;;
esac
case $f in
-) echo $tmp/stdin ;;
[\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ # Absolute (can't be DOS-style, as IFS=:)
+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- # Do quote $f, to prevent DOS paths from being IFS'd.
- echo "$f";;
+ echo $f;;
*) # Relative
- if test -f "$f"; then
- # Build tree
- echo "$f"
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo "$srcdir/$f"
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ if test -f "$f"; then
+ # Build tree
+ echo $f
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- fi;;
+ fi;;
esac
done` || { (exit 1); exit 1; }
# Remove the trailing spaces.
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
_ACEOF
s,[\\$`],\\&,g
t clear
: clear
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
t end
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
: end
_ACEOF
# If some macros were called several times there might be several times
# example, in the case of _POSIX_SOURCE, which is predefined and required
# on some systems where configure will not decide to define it.
cat >>conftest.undefs <<\_ACEOF
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
_ACEOF
# Break up conftest.defines because some shells have a limit on the size
# of here documents, and old seds have small limits too (100 cmds).
echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
echo ' :' >>$CONFIG_STATUS
rm -f conftest.tail
# Write a limited-size here document to $tmp/defines.sed.
echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
# Speed up: don't consider the non `#define' lines.
- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
# Work around the forget-to-reset-the-flag bug.
echo 't clr' >>$CONFIG_STATUS
echo ': clr' >>$CONFIG_STATUS
# Write a limited-size here document to $tmp/undefs.sed.
echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
# Speed up: don't consider the non `#undef'
- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
# Work around the forget-to-reset-the-flag bug.
echo 't clr' >>$CONFIG_STATUS
echo ': clr' >>$CONFIG_STATUS
else
ac_dir=`(dirname "$ac_file") 2>/dev/null ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
as_dirs="$as_dir $as_dirs"
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
done
echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X$ac_file : 'X\(//\)[^/]' \| \
+ X$ac_file : 'X\(//\)$' \| \
+ X$ac_file : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X$ac_file |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_dest" : 'X\(//\)[^/]' \| \
- X"$ac_dest" : 'X\(//\)$' \| \
- X"$ac_dest" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_dest" : 'X\(//\)[^/]' \| \
+ X"$ac_dest" : 'X\(//\)$' \| \
+ X"$ac_dest" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_dest" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
/^X\(\/\/\)$/{ s//\1/; q; }
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-
ac_builddir=.
if test "$ac_dir" != .; then
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
{ echo "$as_me:$LINENO: executing $ac_dest commands" >&5
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
dirpart=`(dirname "$mf") 2>/dev/null ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+ X"$mf" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
test -f "$dirpart/$file" && continue
fdir=`(dirname "$file") 2>/dev/null ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+ X"$file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
as_dirs="$as_dir $as_dirs"
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
rm -f "$ac_dir/POTFILES"
test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
- POMAKEFILEDEPS="POTFILES.in"
- # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+ # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
# on $ac_dir but don't depend on user-specified configuration
# parameters.
if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
# The LINGUAS file contains the set of available languages.
- if test -n "$OBSOLETE_ALL_LINGUAS"; then
+ if test -n "$ALL_LINGUAS"; then
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
fi
ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
# Hide the ALL_LINGUAS assigment from automake.
eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
- POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
- else
- # The set of available languages was given in configure.in.
- eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
fi
- # Compute POFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
- # Compute UPDATEPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
- # Compute DUMMYPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
- # Compute GMOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
case "$ac_given_srcdir" in
.) srcdirpre= ;;
*) srcdirpre='$(srcdir)/' ;;
esac
POFILES=
+ GMOFILES=
UPDATEPOFILES=
DUMMYPOFILES=
- GMOFILES=
for lang in $ALL_LINGUAS; do
POFILES="$POFILES $srcdirpre$lang.po"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
done
# CATALOGS depends on both $ac_dir and the user's LINGUAS
# environment variable.
done
fi
test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
if test -f "$f"; then
case "$f" in
#
AC_INIT([lib/snmp.c])
AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(ap-utils, 1.4.2-pre1a)
+AM_INIT_AUTOMAKE(ap-utils, 1.4.2pre2a)
AM_CONFIG_HEADER(config.h)
ac_aux_dir=config
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.7.8 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
#define ANY_KEY _("Press any key to continue.")
#define ERR_SET _("Unable to write data to AP. Press any key to continue.")
-#define ERR_RET _("Unable to retrieve data from AP. Press any key to continue.")
+#define ERR_RET _("Unable to retrieve (valid) data from AP. Press any key to continue.")
#define WAIT_RET _("Retrieving data from AP. Please wait...")
#define WAIT_SET _("Writing data to AP. Please wait...")
#define DONE_SET _("Configuration written to the AP. Press any key to continue.")
uint32_t AgedPackets;
uint32_t FCSError;
uint32_t InvalidPLCP;
+ /* following 4 are specific for ATMEL 12350 MIB enhanced by VERNET */
+ uint32_t TransmittedPackets_11Mbps;
+ uint32_t TransmittedPackets_55Mbps;
+ uint32_t TransmittedPackets_2Mbps;
+ uint32_t TransmittedPackets_1Mbps;
};
struct SysDeviceInfo_ATMEL410 {
int quality;
int idle;
int rssi;
- unsigned char Status;
- unsigned char Port;
- unsigned char ParentMacAddress[6];
- struct in_addr IP;
+ unsigned char Status;
+ unsigned char Port;
+ unsigned char ParentMacAddress[6];
+ struct in_addr IP;
};
-/* Function prototypes specific/common for both utilites */
+/* function prototypes specific/common for both utilites */
/* service */
extern char * oui2manufacturer(char *);
extern int ch_list(int, char **);
extern void connect_options(unsigned long int, int);
+extern int get_mib_details(void);
extern void about(void);
extern void draw_menu_win(void);
extern void main_menu(void);
extern void print_title(char *);
-extern void print_viewtype(int);
+extern void print_viewtype(char *);
+extern void print_viewtype_rssi(void);
extern void print_menusel(int, int, char *, char *);
extern void print_bottom(char *);
extern void print_help(char *);
extern void print_helperr(char *);
extern void clear_main(int);
extern void clear_main_new(int, int);
+extern int conv_rssi(int);
extern void get_mac(char *, int, int);
extern void get_ip(struct in_addr *, int, int, char *);
extern void get_mask(struct in_addr *, int, int, char *);
extern int snmp(varbind *, int, int);
extern int ber(char *, varbind *, int, int);
-/* Function prototypes specific for ATMEL utility */
+/* function prototypes specific for ATMEL utility */
extern void reset(void);
extern void defaults(void);
extern void upload(void);
extern void atmel_wireless(void);
extern void atmel_auth_mac(void);
-/* Function prototypes specific for NWN utility */
+/* function prototypes specific for NWN utility */
extern void latest(void);
extern int get_RegDomain(void);
extern void advanced(void);
#include <sys/socket.h>
#endif
+#include <sys/socket.h>
#include <net/if.h>
#include <sys/time.h>
#include <errno.h>
#endif
-#define MAX_APS 10
-#define SEARCH_HEADER _("# Type IP Description")
+#define SEARCH_HEADER _(" # Type IP Name")
+
+#define MAX_APS LAST_ROW-7
extern int atmel410_filter;
-char q_press = 0;
+char q_pressed = 0;
int i, f_ifctr;
struct faps {
struct in_addr ip;
int type;
-} fapsa[MAX_APS];
+} *fapsa;
void scan_local_segment (struct sockaddr_in *from, struct sockaddr_in *to,
char *ifname)
extern WINDOW *main_sub;
extern char *ap_types[];
unsigned char message[1024], *start;
- /*
- * sysDescr OIDs used to detect AP type [in order of appearance
- * according to the 'for' loop below: ATMEL410, NWN, ATMEL12350
- */
+/*
char Wireless[3][12] = {
{0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x01, 0x01, 0x00},
{0x2B, 0x06, 0x01, 0x02, 0x01, 0x01, 0x01, 0x00},
{0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x01, 0x01, 0x01, 0x00}
};
+*/
+ /*
+ * operAccessPointName OIDs used to detect AP type [in order of appearance
+ * according to the 'for' loop below: ATMEL410, NWN, ATMEL12350]
+ */
+ char operAccessPointName[3][12] = {
+ {0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x0A, 0x00},
+ {0x2B, 0x06, 0x01, 0x02, 0x01, 0x01, 0x05, 0x00},
+ {0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x02, 0x01, 0x0A, 0x00}
+ };
+
int scd_ap_type, last_searched_type=ATMEL12350;
int c, s2, errno, len, client_len = SIZE;
struct in_addr to_addr_reserv;
goto close_ret;
}
- mvwaddstr(main_sub, 15, 1, _("Scanning via network interface:"));
+ mvwaddstr(main_sub, LAST_ROW - 5, 1,
+ _("Scanning via network interface:"));
sprintf(message, _(" Index: %i"), f_ifctr);
- mvwaddstr(main_sub, 16, 1, message);
+ mvwaddstr(main_sub, LAST_ROW - 4, 1, message);
sprintf(message, _(" Name: %s"), ifname);
- mvwaddstr(main_sub, 17, 1, message);
+ mvwaddstr(main_sub, LAST_ROW - 3, 1, message);
sprintf(message, _(" IP: %s"), inet_ntoa(from->sin_addr));
- mvwaddstr(main_sub, 18, 1, message);
+ mvwaddstr(main_sub, LAST_ROW - 2, 1, message);
if(atmel410_filter) {
last_searched_type=ATMEL410;
}
for (scd_ap_type = ATMEL410; scd_ap_type <= last_searched_type; scd_ap_type++) {
- clear_main_new(19, 20);
+ clear_main_new(LAST_ROW - 1, LAST_ROW);
sprintf(message, _("Scanning for AP type: %s"), ap_types[scd_ap_type]);
- mvwaddstr(main_sub, 19, 1, message);
+ mvwaddstr(main_sub, LAST_ROW - 1, 1, message);
wrefresh(main_sub);
- varbinds[0].oid = Wireless[scd_ap_type];
+ varbinds[0].oid = operAccessPointName[scd_ap_type];
varbinds[0].len_oid =
(scd_ap_type == ATMEL410 || scd_ap_type == ATMEL12350) ?
- sizeof(Wireless[scd_ap_type]) : 8;
+ sizeof(operAccessPointName[scd_ap_type]) : 8;
varbinds[0].len_val = 0;
varbinds[0].type = NULL_VALUE;
len = ber(message, varbinds, 1, GET);
if (FD_ISSET(0, &rds)) {
c = getc(stdin);
if (c == 'q' || c == 'Q') {
- q_press = 1;
+ q_pressed = 1;
goto close_ret;
}
}
/* new AP (unique IP/APtype pair) found */
+ fapsa = realloc(fapsa, (i + 1) * sizeof(struct faps));
+
fapsa[i].ip = from->sin_addr;
fapsa[i].type = scd_ap_type;
- sprintf(message, "%2X %11s %15s", i, ap_types[fapsa[i].type],
+ sprintf(message, "%2i %11s %15s", i, ap_types[fapsa[i].type],
inet_ntoa(fapsa[i].ip));
i++;
mvwaddstr(main_sub, i, 0, message);
- for (len = 0; len < varbinds[0].len_val && start[len]; len++)
- mvwaddch(main_sub, i, len + 31, start[len]);
+
+ for (len = 0; len < 32 && start[len]; len++);
+ start[len + 1] = '\0';
+ mvwaddstr(main_sub, i, 30 + ((32 - len) / 2), start);
wrefresh(main_sub);
/* Bail out if the number of found devices exceeds sane limit. */
}
i = f_ifctr = 0;
+ fapsa = NULL;
/*
* Find all IPs of locally available IPv4 interfaces and corresponding
from.sin_port = INADDR_ANY;
to.sin_port = htons(161);
scan_local_segment(&from, &to, ifr->ifr_name);
- clear_main_new(15, 20);
+ clear_main_new(LAST_ROW - 5, LAST_ROW);
}
ifrec_ptr += ilen;
/* No need to process next interfaces if the table is already full, */
break;
/* or if someone pressed 'Q'. */
- if (q_press) {
- q_press = 0;
+ if (q_pressed) {
+ q_pressed = 0;
break;
}
}
"Press any key."));
} else {
if (i == MAX_APS)
- mvwaddstr(main_sub, 19, 1, _("Program-hardcoded maximum number "
- "of APs found."));
+ mvwaddstr(main_sub, LAST_ROW - 1, 1,
+ _("Single-screen maximum number of APs found."));
wrefresh(main_sub);
print_help(_("# - connect to AP; Q - quit"));
clear_main(0);
connect_options(fapsa[ac-'0'].ip.s_addr,
fapsa[ac-'0'].type + 1);
+ free(fapsa);
return;
}
}
if (ifbuf_ptr)
free(ifbuf_ptr);
+ if (fapsa)
+ free(fapsa);
+
print_help("");
print_title("");
clear_main(0);
show_stats:
print_title(_("Known Access Points"));
- print_viewtype(ap_viewtype);
+ message[0] = ap_viewtype + '0';
+ message[1] = '\0';
+ print_viewtype(message);
/* display column info in main_sub */
mvwin(main_sub, 0, 0);
/* display RSSI and LQ indicators */
switch (ap_viewtype) {
case 1:
- sprintf(message, "%3d", -96 + app->q1);
- mvwaddstr(main_sub, aps_num+1, 56, message);
+ sprintf(message, "%3d%%",
+ (int)((minimum (app->q1, 40)) * (float)2.5));
+ mvwaddstr(main_sub, aps_num+1, 55, message);
if (ap_type == ATMEL410) {
- sprintf(message, "%3d", (int)(100 - (minimum (app->q2, 40)) * (float)2.5) );
- mvwaddstr(main_sub, aps_num+1, 61, message);
+ sprintf(message, "%3d%%",
+ (int)(100 - (minimum (app->q2, 40)) * (float)2.5) );
+ mvwaddstr(main_sub, aps_num+1, 60, message);
}
break;
case 2:
- sprintf(message, "%3d%%",
- (int)((minimum (app->q1, 40)) * (float)2.5));
- mvwaddstr(main_sub, aps_num+1, 55, message);
+ sprintf(message, "%3d", -96 + app->q1);
+ mvwaddstr(main_sub, aps_num+1, 56, message);
if (ap_type == ATMEL410) {
sprintf(message, "%3d%%",
(int)(100 - (minimum (app->q2, 40)) * (float)2.5) );
/* display legend in main_sub */
switch (ap_viewtype) {
- case 2:
- mvwaddstr(main_sub, LINES - 7, 0,
- _("CN: Channel Name; P: Preambule Type (S: Short; L: Long);"));
+ case 1:
mvwaddstr(main_sub, LINES - 6, 0,
- _("RSSI: Radio Signal Strength Indicator [%];"));
+ _("CN: Channel Name; P: Preambule Type (S: Short; L: Long);"));
+ mvwaddstr(main_sub, LINES - 5, 0,
+ _("RSSI: Radio Signal Strength Indicator [%]"));
if (ap_type == ATMEL410)
- mvwaddstr(main_sub, LINES - 5, 0, _("LQ: Link Quality [%]"));
+ waddstr(main_sub, _("; LQ: Link Quality [%]"));
break;
- case 1:
- mvwaddstr(main_sub, LINES - 7, 0,
- _("CN: Channel Name; P: Preambule Type (S: Short; L: Long);"));
+ case 2:
mvwaddstr(main_sub, LINES - 6, 0,
- _("RSSI: Radio Signal Strength Indicator [dBm];"));
+ _("CN: Channel Name; P: Preambule Type (S: Short; L: Long);"));
+ mvwaddstr(main_sub, LINES - 5, 0,
+ _("RSSI: Radio Signal Strength Indicator [dBm]"));
if (ap_type == ATMEL410)
- mvwaddstr(main_sub, LINES - 5, 0, _("LQ: Link Quality [%]"));
+ waddstr(main_sub, _("; LQ: Link Quality [%]"));
break;
case 3:
- mvwaddstr(main_sub, LINES - 7, 0,
- _("CN: Channel Name; P: Preambule Type (S: Short; L: Long);"));
mvwaddstr(main_sub, LINES - 6, 0,
- _("RSSI: Radio Signal Strength Indicator [raw];"));
+ _("CN: Channel Name; P: Preambule Type (S: Short; L: Long);"));
+ mvwaddstr(main_sub, LINES - 5, 0,
+ _("RSSI: Radio Signal Strength Indicator [raw]"));
if (ap_type == ATMEL410)
- mvwaddstr(main_sub, LINES - 5, 0, _("LQ: Link Quality [raw]"));
+ waddstr(main_sub, _("; LQ: Link Q. [raw]"));
break;
}
wrefresh(main_sub);
if (ap_type == ATMEL410)
- print_help(_("# con. to this AP; R refresh with reset; S refresh w/o reset; T toggle; Q quit"));
+ print_help(_("# con. to AP #; R refresh with reset; T toggle; Q quit; Other = refr. w/o reset"));
else /* ATMEL12350 */
- print_help(_("# con. to this AP; R initiate AP scan; S refresh view; T toggle view; Q quit"));
+ print_help(_("# con. to AP #; R initiate AP scan; T toggle view; Q quit; Other = refresh view"));
while (1)
switch (i = getch()) {
getch();
}
goto get_stats;
- case 'S':
- case 's':
- print_help(WAIT_RET);
- clear_main(0);
- goto get_stats;
case 'T':
case 't':
ap_viewtype += 1;
ap_viewtype = 1;
clear_main(0);
goto show_stats;
+ default:
+ print_help(WAIT_RET);
+ clear_main(0);
+ goto get_stats;
}
restore_before_exit:
#define AUTODETECT _("Autodetect AP type? ")
#define APIP _("Access Point IP-address: ")
#define APPASS _("Password (community): ")
+#define APNAME _("Access Point name: ")
+#define WANT_APNAME _("Do you want to define name for this AP? ")
#define APTYPE _("AP type: ")
#define SAVESETTINGS _("Save connect-settings: ")
+char IS_ATMEL410_SBRIDGES;
+char IS_ATMEL12350_TELLUS;
+char IS_ATMEL12350_VERNET;
+
extern WINDOW *main_sub;
extern char *community, *prog_title;
extern short ap_type;
{
int i;
struct sockaddr_in client;
- unsigned char message[16];
+ unsigned char message[256];
+ unsigned char name[17];
int fd;
char *home_dir;
char save_settings=1;
- char sysDescr_NWN[] = { 0x2B, 0x06, 0x01, 0x02, 0x01, 0x01, 0x01, 0x00 };
- char sysDescr_ATMEL410[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A,
- 0x01, 0x01, 0x01, 0x01, 0x00 };
- char sysDescr_ATMEL12350[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E,
- 0x01, 0x01, 0x01, 0x01, 0x00 };
- varbind varbinds[1];
-
memset(&client, 0, sizeof client);
client.sin_family = AF_INET;
community = (char *) malloc(i);
strncpy(community, message, i);
+ print_help(_("Display name for the Access point "
+ "(NOT the name defined inside the AP!)"));
+ mvwaddstr(main_sub, 3, 1, WANT_APNAME);
+ wrefresh(main_sub);
+ i = yes_no(3, 1 + strlen(WANT_APNAME));
+ if (i == 2) { /* NO */
+ name[0] = '\0';
+ mvwaddstr(main_sub, 3, 1 + strlen(WANT_APNAME), "No");
+ } else { /* YES */
+ clear_main_new(3, 4);
+ mvwaddstr(main_sub, 3, 1, APNAME);
+ get_value(message, 3, 1 + strlen(APNAME), sizeof(name),
+ ANY_STRING, 0, 0, NULL);
+ strncpy(name, message, strlen(message) + 1);
+ }
+
print_help("");
if (type) {
ap_type = --type;
- mvwaddstr(main_sub, 3, 1, APTYPE);
+ mvwaddstr(main_sub, 4, 1, APTYPE);
} else {
- mvwaddstr(main_sub, 3, 1, AUTODETECT);
+ mvwaddstr(main_sub, 4, 1, AUTODETECT);
wrefresh(main_sub);
- i = yes_no(3, 1 + strlen(AUTODETECT));
- clear_main_new(3, 4);
- mvwaddstr(main_sub, 3, 1, APTYPE);
+ i = yes_no(4, 1 + strlen(AUTODETECT));
+ clear_main_new(4, 5);
+ mvwaddstr(main_sub, 4, 1, APTYPE);
if (i == 2) { /* NO */
wrefresh(main_sub);
- ap_type = menu_choose(3, 1 + strlen(APTYPE), ap_types, 3);
+ ap_type = menu_choose(4, 1 + strlen(APTYPE), ap_types, 3);
} else { /* YES */
print_help(_("Determining AP type. Please wait..."));
- varbinds[0].oid = sysDescr_NWN;
- varbinds[0].len_oid = sizeof(sysDescr_NWN);
- varbinds[0].value = NULL;
- varbinds[0].len_val = 0;
- varbinds[0].type = NULL_VALUE;
- if (snmp(varbinds, 1, GET) > 0) {
- ap_type = NWN;
- } else {
- varbinds[0].oid = sysDescr_ATMEL410;
- varbinds[0].len_oid = sizeof(sysDescr_ATMEL410);
- varbinds[0].value = NULL;
- varbinds[0].len_val = 0;
- varbinds[0].type = NULL_VALUE;
- if (snmp(varbinds, 1, GET) > 0) {
- ap_type = ATMEL410;
- } else {
- varbinds[0].oid = sysDescr_ATMEL12350;
- varbinds[0].len_oid = sizeof(sysDescr_ATMEL12350);
- varbinds[0].value = NULL;
- varbinds[0].len_val = 0;
- varbinds[0].type = NULL_VALUE;
- if (snmp(varbinds, 1, GET) > 0) {
- ap_type = ATMEL12350;
- } else {
- print_helperr(_("Unable to determine AP type "
- "(no response). Press any key."));
- getch();
- clear_main_new(1, 4);
- goto get_all_again;
- }
- }
+ if (get_mib_details() == -1) {
+ clear_main_new(1, 5);
+ goto get_all_again;
}
- }
+ }
wattrset(main_sub, A_BOLD);
}
waddstr(main_sub, ap_types[ap_type]);
wattrset(main_sub, A_NORMAL);
- mvwaddstr(main_sub, 4, 1, SAVESETTINGS);
+ mvwaddstr(main_sub, 5, 1, SAVESETTINGS);
wrefresh(main_sub);
- save_settings = on_off(4, 1 + strlen(SAVESETTINGS));
+ save_settings = on_off(5, 1 + strlen(SAVESETTINGS));
print_bottom(inet_ntoa(ap_ip));
if ((home_dir = getenv("HOME"))) {
sprintf(message, "%s/.ap-config", home_dir);
if ((fd = open(message, O_CREAT | O_WRONLY | O_APPEND, 0600)) != -1) {
- sprintf(message, "%s:%s:%d\n", inet_ntoa(ap_ip),
- community, ap_type);
+ sprintf(message, "%s:%s:%s:%d\n", inet_ntoa(ap_ip),
+ community, name, ap_type);
write(fd, message, strlen(message));
close(fd);
}
return;
}
+/*
+ * Determines AP MIB type (fills ap_type), and AP MIB vendor extensions
+ * (changes values of IS_ATMEL* globals). Returns with -1 on error or 0
+ * if everything is OK.
+ */
+int get_mib_details()
+{
+ char sysDescr_NWN[] = {
+ 0x2B, 0x06, 0x01, 0x02, 0x01, 0x01, 0x01, 0x00
+ };
+ char sysDescr_ATMEL[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x01, 0x01, 0x00
+ };
+ char operEthernetAddress_ATMEL[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x02, 0x03, 0x00
+ };
+ char Wireless_ATMEL[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x03, 0x01, 0x00
+ };
+ varbind varbinds[2];
+ char oui_sbridges[3] = { 0x00, 0x30, 0x1A };
+ char oui_tellus[3] = { 0x00, 0x04, 0xDB };
+
+ /* first, determine the private MIB types according to enterprises ID */
+ varbinds[0].oid = sysDescr_NWN;
+ varbinds[0].len_oid = sizeof(sysDescr_NWN);
+ varbinds[0].value = NULL;
+ varbinds[0].len_val = 0;
+ varbinds[0].type = NULL_VALUE;
+ if (snmp(varbinds, 1, GET) > 0) {
+ ap_type = NWN;
+ } else {
+ varbinds[0].oid = sysDescr_ATMEL;
+ varbinds[0].len_oid = sizeof(sysDescr_ATMEL);
+ varbinds[0].value = NULL;
+ varbinds[0].len_val = 0;
+ varbinds[0].type = NULL_VALUE;
+ if (snmp(varbinds, 1, GET) > 0) {
+ ap_type = ATMEL410;
+ } else {
+ sysDescr_ATMEL[5] = 0xE0;
+ sysDescr_ATMEL[6] = 0x3E;
+ varbinds[0].oid = sysDescr_ATMEL;
+ varbinds[0].len_oid = sizeof(sysDescr_ATMEL);
+ varbinds[0].value = NULL;
+ varbinds[0].len_val = 0;
+ varbinds[0].type = NULL_VALUE;
+ if (snmp(varbinds, 1, GET) > 0) {
+ ap_type = ATMEL12350;
+ } else {
+ print_helperr(_("Unable to determine AP type "
+ "(no response). Press any key."));
+ getch();
+ return -1;
+ }
+ }
+ }
+
+ /*
+ * It is best to do the following HERE and FOR ONCE ONLY: find out more
+ * about specific MIB modifications - we'll use them on different places
+ * later.
+ */
+ IS_ATMEL410_SBRIDGES = 0;
+ IS_ATMEL12350_TELLUS = 0;
+ IS_ATMEL12350_VERNET = 0;
+
+ varbinds[0].type = NULL_VALUE;
+ varbinds[0].oid = operEthernetAddress_ATMEL;
+ varbinds[0].len_oid = sizeof(operEthernetAddress_ATMEL);
+ varbinds[0].len_val = 0;
+ varbinds[1].type = NULL_VALUE;
+ varbinds[1].oid = Wireless_ATMEL;
+ varbinds[1].len_oid = sizeof(Wireless_ATMEL);
+ varbinds[1].len_val = 0;
+ if (ap_type == ATMEL12350) {
+ operEthernetAddress_ATMEL[5] = 0xE0;
+ operEthernetAddress_ATMEL[6] = 0x3E;
+ Wireless_ATMEL[5] = 0xE0;
+ Wireless_ATMEL[6] = 0x3E;
+ }
+ if (snmp(varbinds, 2, GET) <= 0) {
+ print_helperr(ERR_RET);
+ getch();
+ return -1;
+ }
+
+ /* detection of different vendor-modified ATMEL private MIBs */
+ if (ap_type == ATMEL410 && (memcmp(oui_sbridges, varbinds[0].value, 3) ==0))
+ IS_ATMEL410_SBRIDGES = 1;
+
+ if (ap_type == ATMEL12350 && (memcmp(oui_tellus, varbinds[0].value, 3) ==0))
+ IS_ATMEL12350_TELLUS = 1;
+
+ if (ap_type == ATMEL12350 && varbinds[1].len_val == 104)
+ IS_ATMEL12350_VERNET = 1;
+
+ return 0;
+}
+
void exit_program()
{
endwin();
#define MAX_LINES LINES-6
struct APList {
- char *ip;
- char *passwd;
- int type;
- struct APList * next;
+ char *ip;
+ char *passwd;
+ int type;
+ char *name;
+
+ struct APList * next;
};
void
{
int i = 1;
struct APList *curr = first;
- char message[50];
+ char message[56];
clear_main(3);
while (i++ < begin)
curr = curr->next;
- i = 0;
+
+ i = 0;
while (end-- > begin) {
- sprintf(message, "%5u %15s %s", begin + i, curr->ip, ap_types[curr->type]);
+ sprintf(message, "%5u %15s %s %s", begin + i, curr->ip,
+ ap_types[curr->type], curr->name);
mvwaddstr(main_sub, 2 + i, 1, message);
- i++;
- curr = curr->next;
+ i++;
+ curr = curr->next;
}
wrefresh(main_sub);
}
struct APList *parse_db_str(char *str)
{
- struct APList *curr=NULL;
- char *ip=NULL, *passwd=NULL, mess[1024];
- int i=0, pos=0, j=0;
-
- while(str[i] != '\0') {
- if(str[i] == ':') {
- switch (pos) {
- case 0:
- ip = (char *) malloc(j+1);
- memcpy(ip, mess, j+1);
- ip[j] = '\0';
- break;
- case 1:
- passwd = (char *) malloc(j+1);
- memcpy(passwd, mess, j+1);
- passwd[j] = '\0';
- break;
- }
- i++;
- j=0;
- pos++;
-
- }
- else
- mess[j++] = str[i++];
- }
-
- mess[j]='\0';
- if (pos==2 && ip && passwd && ((atmel410_filter && atoi(mess)== ATMEL410) || !atmel410_filter)) {
- curr = (struct APList *) malloc(sizeof(struct APList));
- curr->type = atoi(mess);
- curr->next = NULL;
- curr->ip = (char *) malloc(strlen(ip)+1);
- strcpy(curr->ip, ip);
- curr->passwd = (char *) malloc(strlen(passwd)+1);
- strcpy(curr->passwd, passwd);
- }
+ struct APList *curr=NULL;
+ char *ip=NULL, *passwd=NULL, *name=NULL, mess[1024];
+ int i=0, pos=0, j=0;
+
+ while(str[i] != '\0') {
+ if(str[i] == ':') {
+ switch (pos) {
+ case 0:
+ ip = (char *) malloc(j+1);
+ memcpy(ip, mess, j+1);
+ ip[j] = '\0';
+ break;
+ case 1:
+ passwd = (char *) malloc(j+1);
+ memcpy(passwd, mess, j+1);
+ passwd[j] = '\0';
+ break;
+ case 2:
+ name = (char *) malloc(j+1);
+ memcpy(name, mess, j+1);
+ name[j] = '\0';
+ break;
+ }
+ i++;
+ j=0;
+ pos++;
+ } else
+ mess[j++] = str[i++];
+
+ }
+
+ mess[j]='\0';
+ if (pos==3 && ip && passwd && ((atmel410_filter && atoi(mess) == ATMEL410)
+ || !atmel410_filter)) {
+ curr = (struct APList *) malloc(sizeof(struct APList));
+ curr->type = atoi(mess);
+ curr->next = NULL;
+ curr->ip = (char *) malloc(strlen(ip) + 1);
+ strcpy(curr->ip, ip);
+ curr->passwd = (char *) malloc(strlen(passwd) + 1);
+ strcpy(curr->passwd, passwd);
+ curr->name = (char *) malloc(strlen(name) + 1);
+ strcpy(curr->name, name);
+ }
- if(passwd)
- free(passwd);
- if(ip)
- free(ip);
-
- return curr;
-}
+ if (ip)
+ free(ip);
+ if (passwd)
+ free(passwd);
+
+ if (name)
+ free(name);
+
+ return curr;
+}
int get_opts()
{
- extern char *community;
- extern struct in_addr ap_ip;
- extern int sockfd;
+ extern char *community;
+ extern struct in_addr ap_ip;
+ extern int sockfd;
- char *home_dir, buf[1024], mess[64];
- int c;
- int fd, rval=0, pos;
- signed int j, i, begin, end, record_num=0;
- char message[50];
- struct APList *first=NULL, *curr=NULL, *pmac;
+ char *home_dir, buf[1024], mess[64];
+ char message[50];
+ int c, fd, rval=0, pos;
+ signed int j, i, begin, end, record_num=0;
+ struct APList *first=NULL, *curr=NULL, *pmac;
struct sockaddr_in client;
+
memset(&client, 0, sizeof client);
client.sin_family = AF_INET;
client.sin_port = INADDR_ANY;
client.sin_addr.s_addr = INADDR_ANY;
-
- if ((home_dir = getenv("HOME")) == NULL)
+ if ((home_dir = getenv("HOME")) == NULL)
return 0;
+
sprintf(buf, "%s/.ap-config", home_dir);
if ((fd = open(buf, O_RDONLY)) == -1)
return 0;
+
pos=0;
- while((j = read(fd, buf, sizeof(buf)))>0)
- for(i=0; i < j; i++) {
- if (buf[i] == 0x0a){
+ while((j = read(fd, buf, sizeof(buf))) > 0)
+ for(i=0; i < j; i++) {
+ if (buf[i] == 0x0a) {
mess[pos]='\0';
- if (first == NULL) {
- if ((first = parse_db_str(mess))!=NULL) {
- curr=first;
- record_num=1;
- }
- } else {
- if ((curr->next = parse_db_str(mess)) != NULL) {
- curr = curr->next;
- record_num++;
+ if (first == NULL) {
+ if ((first = parse_db_str(mess)) != NULL) {
+ curr=first;
+ record_num=1;
+ }
+ } else {
+ if ((curr->next = parse_db_str(mess)) != NULL) {
+ curr = curr->next;
+ record_num++;
+ }
}
- }
pos=0;
- } else
+ } else
mess[pos++] = buf[i];
- }
- mess[pos]='\0';
- if (first == NULL) {
- if ((first = parse_db_str(mess))!=NULL) {
- curr=first;
- record_num=1;
- }
- } else {
- if ((curr->next = parse_db_str(mess)) != NULL)
- curr = curr->next;
- record_num++;
- }
+ }
+
+ mess[pos]='\0';
+ if (first == NULL) {
+ if ((first = parse_db_str(mess)) != NULL) {
+ curr=first;
+ record_num=1;
+ }
+ } else {
+ if ((curr->next = parse_db_str(mess)) != NULL)
+ curr = curr->next;
+
+ record_num++;
+ }
close(fd);
- if(!record_num)
- return 0;
-
- mvwaddstr(main_sub, 0, 3, _("NUM IP ADDRESS TYPE"));
- print_title(_("Choose an AP to connect to"));
+ if (!record_num)
+ return 0;
+
+ mvwaddstr(main_sub, 0, 3,
+ _("NUM IP ADDRESS TYPE NAME (in ~/.ap-config)"));
+ print_title(_("Choose an AP to connect to"));
begin = 1;
end = (MAX_LINES < record_num) ? MAX_LINES : record_num;
_scroll_rows(first, begin, end);
- noecho();
- print_help(_("1-9,C: connect; N: new; D: delete; W: save; Q: quit; arrows: scroll"));
- while (1) {
- switch (c = getch()) {
- case 'q':
- case 'Q':
- exit_program();
- case 'n':
- case 'N':
- goto quit;
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- i = c - '0';
- if (record_num <= i || i <= 0)
- goto wrong_num;
- curr = first;
- while (--i > 0)
- curr = curr->next;
- inet_aton(curr->ip, &ap_ip);
- if (community)
- free(community);
- i = strlen(curr->passwd) + 1;
- community = (char *) malloc(i);
- strncpy(community, curr->passwd, i);
- ap_type = curr->type;
- rval=1;
- if (sockfd)
- close(sockfd);
- if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
- rval=0;
- if (bind(sockfd, (struct sockaddr *) &client, SIZE) == -1)
- rval=0;
- print_bottom(inet_ntoa(ap_ip));
- goto quit;
- case 'c':
- case 'C':
- mvwaddstr(main_sub, 1, 1, _("Connect to AP num:"));
- get_value(message, 1, 20, 6, INT_STRING,
- 1, record_num - 1, NULL);
- i = atoi(message);
- curr = first;
- while (--i > 0)
- curr = curr->next;
- inet_aton(curr->ip, &ap_ip);
- if (community)
- free(community);
- i = strlen(curr->passwd) + 1;
- community = (char *) malloc(i);
- strncpy(community, curr->passwd, i);
- ap_type = curr->type;
- rval=1;
- if (sockfd)
- close(sockfd);
- if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
- rval=0;
- if (bind(sockfd, (struct sockaddr *) &client, SIZE) == -1)
- rval=0;
- print_bottom(inet_ntoa(ap_ip));
- goto quit;
- case 'd':
- case 'D':
- mvwaddstr(main_sub, 1, 0, _("Delete num:"));
- get_value(message, 1, 15, 6, INT_STRING,
- 1, record_num - 1, NULL);
- i = atoi(message);
- if (i == 1) {
- curr = first;
- first = first->next;
- free(curr);
- } else {
- curr = first;
- while (--i > 1)
- curr = curr->next;
- pmac = curr->next;
- curr->next = pmac->next;
- free(pmac);
- }
- record_num--;
- begin = 1;
- end = (MAX_LINES < record_num) ? MAX_LINES : record_num;
- _scroll_rows(first, begin, end);
- wrong_num:
- clear_main_new(1, 2);
- continue;
- case KEY_DOWN:
- case KEY_RIGHT:
- if (end < record_num) {
- begin++;
- end++;
- _scroll_rows(first, begin, end);
- }
-
- continue;
- case KEY_UP:
- case KEY_LEFT:
- if (begin > 1) {
- begin--;
- end--;
- _scroll_rows(first, begin, end);
- }
- continue;
-
- case 'w':
- case 'W':
+ noecho();
+ print_help(_("1-9,C: connect; N: new; D: delete; W: save; Q: quit; arrows: scroll"));
+ while (1) {
+ switch (c = getch()) {
+ case 'q':
+ case 'Q':
+ exit_program();
+
+ case 'n':
+ case 'N':
+ goto quit;
+
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ i = c - '0';
+ if (record_num <= i || i <= 0)
+ goto wrong_num;
+
+ curr = first;
+ while (--i > 0)
+ curr = curr->next;
+
+ inet_aton(curr->ip, &ap_ip);
+ if (community)
+ free(community);
+
+ i = strlen(curr->passwd) + 1;
+ community = (char *) malloc(i);
+ strncpy(community, curr->passwd, i);
+ ap_type = curr->type;
+ rval=1;
+ if (sockfd)
+ close(sockfd);
+
+ if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
+ rval=0;
+
+ if (bind(sockfd, (struct sockaddr *) &client, SIZE) == -1)
+ rval=0;
+
+ print_bottom(inet_ntoa(ap_ip));
+ get_mib_details();
+ goto quit;
+
+ case 'c':
+ case 'C':
+ /* Nothing to connect */
+ if (record_num == 1)
+ continue;
+
+ mvwaddstr(main_sub, 1, 1, _("Connect to AP num:"));
+ get_value(message, 1, 20, 6, INT_STRING, 1, record_num - 1,
+ NULL);
+ i = atoi(message);
+ curr = first;
+ while (--i > 0)
+ curr = curr->next;
+
+ inet_aton(curr->ip, &ap_ip);
+ if (community)
+ free(community);
+
+ i = strlen(curr->passwd) + 1;
+ community = (char *) malloc(i);
+ strncpy(community, curr->passwd, i);
+ ap_type = curr->type;
+ rval=1;
+ if (sockfd)
+ close(sockfd);
+
+ if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
+ rval=0;
+
+ if (bind(sockfd, (struct sockaddr *) &client, SIZE) == -1)
+ rval=0;
+
+ print_bottom(inet_ntoa(ap_ip));
+ get_mib_details();
+ goto quit;
+
+ case 'd':
+ case 'D':
+ /* Nothing to delete */
+ if (record_num == 1)
+ continue;
+
+ mvwaddstr(main_sub, 1, 0, _("Delete num:"));
+ get_value(message, 1, 15, 6, INT_STRING,
+ 1, (record_num == 1 ? 1 : record_num - 1), NULL);
+ i = atoi(message);
+ if (i == 1) {
+ curr = first;
+ first = first->next;
+ free(curr);
+ } else {
+ curr = first;
+ while (--i > 1)
+ curr = curr->next;
+
+ pmac = curr->next;
+ curr->next = pmac->next;
+ free(pmac);
+ }
+ record_num--;
+ /* Clear incl. line with last AP record */
+ if (record_num == 1) {
+ clear_main_new(1, 3);
+ continue;
+ }
+
+ begin = 1;
+ end = (MAX_LINES < record_num) ? MAX_LINES : record_num;
+ _scroll_rows(first, begin, end);
+wrong_num:
+ clear_main_new(1, 2);
+ continue;
+
+ case KEY_DOWN:
+ case KEY_RIGHT:
+ if (end < record_num) {
+ begin++;
+ end++;
+ _scroll_rows(first, begin, end);
+ }
+ continue;
+
+ case KEY_UP:
+ case KEY_LEFT:
+ if (begin > 1) {
+ begin--;
+ end--;
+ _scroll_rows(first, begin, end);
+ }
+ continue;
+
+ case 'w':
+ case 'W':
sprintf(buf, "%s/.ap-config", home_dir);
- if ((fd = creat(buf, 0600)) != -1) {
- curr=first;
- while (curr) {
- sprintf(buf, "%s:%s:%d\n", curr->ip, curr->passwd, curr->type);
- write(fd, buf, strlen(buf));
- curr = curr->next;
- }
- close(fd);
- }
- continue;
+ if ((fd = creat(buf, 0600)) != -1) {
+ curr=first;
+ while (curr) {
+ sprintf(buf, "%s:%s:%d\n", curr->ip, curr->passwd,
+ curr->type);
+ write(fd, buf, strlen(buf));
+ curr = curr->next;
+ }
+ close(fd);
+ }
+ continue;
+
}
-}
+ }
/*
print_help(ANY_KEY);
getch();
*/ quit:
while ((curr = first)) {
- first = curr->next;
- free(curr->ip);
- free(curr->passwd);
- free(curr);
- }
- print_help("");
- print_title("");
- wclear(main_sub);
- wrefresh(main_sub);
- return rval;
+ first = curr->next;
+ free(curr->ip);
+ free(curr->passwd);
+ free(curr);
+ }
+ print_help("");
+ print_title("");
+ wclear(main_sub);
+ wrefresh(main_sub);
+ return rval;
}
void save_Stations(struct MacListStat *curr)
char *home_dir;
char message[1024];
if ((home_dir = getenv("HOME"))) {
- sprintf(message, "%s/ap-%s.stations", home_dir,
- ap_types[ap_type]);
+ sprintf(message, "%s/ap-%s.stations", home_dir, ap_types[ap_type]);
if ((fd = creat(message, 0600)) != -1) {
while (curr) {
sprintf(message, "%02X%02X%02X%02X%02X%02X\n",
- curr->addr[0] & 0xFF, curr->addr[1] & 0xFF,
- curr->addr[2] & 0xFF, curr->addr[3] & 0xFF,
- curr->addr[4] & 0xFF, curr->addr[5] & 0xFF);
+ curr->addr[0] & 0xFF, curr->addr[1] & 0xFF,
+ curr->addr[2] & 0xFF, curr->addr[3] & 0xFF,
+ curr->addr[4] & 0xFF, curr->addr[5] & 0xFF);
write(fd, message, 13);
curr = curr->next;
}
0x00, 0x0A, 0xC4, "Daewoo Teletech Co., Ltd"}, {
0x00, 0x0A, 0xC5, "Color Kinetics"}, {
0x00, 0x0A, 0xC7, "Unication Group"}, {
+ 0x00, 0x0B, 0x46, "Cisco"}, {
0x00, 0x0C, 0x30, "Cisco"}, {
0x00, 0x0C, 0x41, "The Linksys Group, Inc."}, {
0x00, 0x0C, 0xCE, "Cisco Systems"}, {
+ 0x00, 0x0D, 0x54, "3Com Europe Ltd"}, {
+ 0x00, 0x0D, 0x88, "D-Link Corporation"}, {
+ 0x00, 0x0E, 0xA6, "ASUSTEK COMPUTER INC."}, {
0x00, 0x10, 0x00, "CABLE TELEVISION LABORATIES, INC."}, {
0x00, 0x10, 0x01, "MCK COMMUNICATIONS"}, {
0x00, 0x10, 0x02, "ACTIA"}, {
varbind varbinds[2];
int i, c = 0, antenna_vlen;
+ if (ap_type == ATMEL12350) {
+ TestModeRadioConfiguration[5] = 0xE0;
+ TestModeRadioConfiguration[6] = 0x3E;
+ operAntennaSettings[5] = 0xE0;
+ operAntennaSettings[6] = 0x3E;
+ }
+
varbinds[0].oid = TestModeRadioConfiguration;
varbinds[0].len_oid = sizeof(TestModeRadioConfiguration);
varbinds[0].value = TestModeRadioConfiguration;
extern WINDOW *main_sub, *win_for_help, *main_win;
+enum { dBm, percentage, rawval } sts_viewtype = dBm;
+
void
scroll_rows(struct MacListStat *first, int begin, int end, int row,
int stat)
curr = curr->next;
i = 0;
while (end-- > begin) {
- if (stat==1) {
+ if (stat == 1) {
+ /* NWN view */
+ sprintf(message,
+ (sts_viewtype == dBm) ?
+ "%4u %02X%02X%02X%02X%02X%02X %3u%5u %3udBm"
+ :
+ (sts_viewtype == percentage) ?
+ "%4u %02X%02X%02X%02X%02X%02X %3u%5u %3u%%"
+ :
+ "%4u %02X%02X%02X%02X%02X%02X %3u%5u %3u",
+ begin + i, curr->addr[0] & 0xFF, curr->addr[1] & 0xFF,
+ curr->addr[2] & 0xFF, curr->addr[3] & 0xFF,
+ curr->addr[4] & 0xFF, curr->addr[5] & 0xFF,
+ curr->quality,
+ curr->idle,
+ conv_rssi(curr->rssi)
+ );
+ } else if (stat == 2) {
+ /* ATMEL410_SBRIDGES (firmware 1.4k.1) view */
sprintf(message,
- "%4u %02X%02X%02X%02X%02X%02X %3u%5u %3u",
- begin + i, curr->addr[0] & 0xFF, curr->addr[1] & 0xFF,
- curr->addr[2] & 0xFF, curr->addr[3] & 0xFF,
- curr->addr[4] & 0xFF, curr->addr[5] & 0xFF,
- curr->quality, curr->idle, curr->rssi);
- } else if(stat==2) {
+ (sts_viewtype == dBm) ?
+ "%2u %02X%02X%02X%02X%02X%02X %3d%% %4ddBm %3u %2u %s"
+ :
+ (sts_viewtype == percentage) ?
+ "%2u %02X%02X%02X%02X%02X%02X %3d%% %3u%% %3u %2u %s"
+ :
+ "%2u %02X%02X%02X%02X%02X%02X %3d%% %3u %3u %2u %s",
+ begin + i,
+ curr->addr[0] & 0xFF, curr->addr[1] & 0xFF,
+ curr->addr[2] & 0xFF, curr->addr[3] & 0xFF,
+ curr->addr[4] & 0xFF, curr->addr[5] & 0xFF,
+ curr->quality,
+ conv_rssi(curr->rssi),
+ curr->Status,
+ curr->Port,
+ inet_ntoa(curr->IP)
+ );
+ } else if (stat == 3) {
+ /* ATMEL12350_VERNET view */
sprintf(message,
- "%2u %02X%02X%02X%02X%02X%02X %3d%% %4ddBm %3u %2u %s",
- begin + i,
- curr->addr[0] & 0xFF, curr->addr[1] & 0xFF,
- curr->addr[2] & 0xFF, curr->addr[3] & 0xFF,
- curr->addr[4] & 0xFF, curr->addr[5] & 0xFF,
- curr->quality, curr->rssi, curr->Status, curr->Port, inet_ntoa(curr->IP));
+ (sts_viewtype == dBm) ?
+ "%2u %02X%02X%02X%02X%02X%02X %02X%02X%02X%02X%02X%02X "
+ "%4ddBm %3u %2u %s"
+ :
+ (sts_viewtype == percentage) ?
+ "%2u %02X%02X%02X%02X%02X%02X %02X%02X%02X%02X%02X%02X "
+ " %3u%% %3u %2u %s"
+ :
+ "%2u %02X%02X%02X%02X%02X%02X %02X%02X%02X%02X%02X%02X "
+ " %3u %3u %2u %s",
+ begin + i,
+ curr->addr[0] & 0xFF, curr->addr[1] & 0xFF,
+ curr->addr[2] & 0xFF, curr->addr[3] & 0xFF,
+ curr->addr[4] & 0xFF, curr->addr[5] & 0xFF,
+ curr->ParentMacAddress[0] & 0xFF,
+ curr->ParentMacAddress[1] & 0xFF,
+ curr->ParentMacAddress[2] & 0xFF,
+ curr->ParentMacAddress[3] & 0xFF,
+ curr->ParentMacAddress[4] & 0xFF,
+ curr->ParentMacAddress[5] & 0xFF,
+ conv_rssi(curr->rssi),
+ curr->Status,
+ curr->Port,
+ inet_ntoa(curr->IP)
+ );
} else {
- sprintf(message, "%4u %02X%02X%02X%02X%02X%02X",
- begin + i, curr->addr[0] & 0xFF, curr->addr[1] & 0xFF,
- curr->addr[2] & 0xFF, curr->addr[3] & 0xFF,
- curr->addr[4] & 0xFF, curr->addr[5] & 0xFF);
+ /* generic ATMEL view */
+ sprintf(message, "%2u %02X%02X%02X%02X%02X%02X",
+ begin + i, curr->addr[0] & 0xFF, curr->addr[1] & 0xFF,
+ curr->addr[2] & 0xFF, curr->addr[3] & 0xFF,
+ curr->addr[4] & 0xFF, curr->addr[5] & 0xFF
+ );
}
mvwaddstr(main_sub, row + i, 0, message);
i++;
curr = curr->next;
}
wrefresh(main_sub);
-
}
void print_help(char *mess)
wrefresh(main_win);
}
-void print_viewtype(int v)
+void print_viewtype(char *mess)
{
- char message[7];
-
- sprintf(message, "View: %c", v + '0');
+ /*
+ * note: when used to update with different strlen(mess) than previous one,
+ * call print_title() before this one so that the top line gets updated !
+ */
wattrset(main_win, A_BOLD);
- mvwaddstr(main_win, 0, 1, message);
+ mvwaddstr(main_win, 0, 1, "View: ");
+ waddstr(main_win, mess);
wattrset(main_win, A_NORMAL);
wrefresh(main_win);
}
+void print_viewtype_rssi()
+{
+ switch (sts_viewtype) {
+ case dBm:
+ print_viewtype("RSSI in dBm");
+ return;
+ case percentage:
+ print_viewtype("RSSI in percentage");
+ return;
+ case rawval:
+ print_viewtype("RSSI in raw values");
+ }
+}
+
void print_menusel(int y, int x, char *mess1, char *mess2)
{
mvwaddstr(main_sub, y, x, mess1);
waddch(main_sub, ' ');
wrefresh(main_sub);
}
+
+int conv_rssi(int raw_rssi)
+{
+ switch (sts_viewtype) {
+ case dBm:
+ return (-96 + raw_rssi);
+ case percentage:
+ return ((int)((minimum (raw_rssi, 40)) * (float)2.5));
+ case rawval:
+ return raw_rssi;
+ }
+ /* Should never happen */
+ return -1;
+}
+
#include <fcntl.h>
#include <signal.h>
#include <string.h>
+#include <sys/time.h>
#include <sys/wait.h>
#include "ap-utils.h"
#include "ap-curses.h"
-#define ERR_RET_PRESS _("Unable to get data from AP. Press Q to continue.")
-#define QHELP _("Q - quit to menu.")
-#define PIPE _("pipe error. Press any key.")
-#define FCNTL _("fcntl error. Press any key.")
-#define FORK _("fork error. Press any key.")
+#define QHELP _("Q - quit to menu. Other key - force update.")
+#define SELECT _("select() function error. Press any key.")
extern WINDOW *main_sub;
extern short ap_type;
char EthTx[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01,
0x07, 0x02, 0x00
};
- char c;
char message[1024];
- pid_t pid;
- int j, child_pipe[2];
+ int j;
varbind varbinds[2];
+ fd_set rds;
+ struct timeval timeout;
if (ap_type == ATMEL12350) {
EthRx[5] = 0xE0;
EthTx[6] = 0x3E;
}
- if (pipe(child_pipe) == -1) {
- print_helperr(PIPE);
- goto exit;
- }
-
- if (fcntl(child_pipe[0], F_SETFL, O_NONBLOCK) == -1) {
- print_helperr(FCNTL);
- goto exit;
- }
print_title(_("Ethernet Statistics"));
print_help(QHELP);
noecho();
- switch (pid = fork()) {
- case -1:
- print_helperr(FORK);
- goto exit;
- case 0:
- close(child_pipe[1]);
- varbinds[0].oid = EthRx;
- varbinds[0].len_oid = sizeof(EthRx);
- varbinds[1].oid = EthTx;
- varbinds[1].len_oid = sizeof(EthTx);
-
- start:
- varbinds[0].value = EthTx;
+ varbinds[0].oid = EthRx;
+ varbinds[0].len_oid = sizeof(EthRx);
+ varbinds[1].oid = EthTx;
+ varbinds[1].len_oid = sizeof(EthTx);
+
+ while (1) {
+// varbinds[0].value = EthTx;
varbinds[0].len_val = 0;
varbinds[0].type = NULL_VALUE;
- varbinds[1].value = EthTx;
+// varbinds[1].value = EthTx;
varbinds[1].len_val = 0;
varbinds[1].type = NULL_VALUE;
if (snmp(varbinds, 2, GET) <= 0) {
- print_helperr(ERR_RET_PRESS);
- goto exit_child;
+ print_helperr(ERR_RET);
+ getch();
+ goto quit;
}
if (varbinds[0].len_val == 64) {
len_val);
memcpy(EthRxStat, varbinds[0].value, varbinds[0].len_val);
} else {
- print_helperr(_("EthRxStat packet error. Press Q to continue."));
- goto exit_child;
+ print_helperr(_("EthRxStat packet error. Press any key."));
+ getch();
+ goto quit;
}
if (varbinds[1].len_val == 56) {
len_val);
memcpy(EthTxStat, varbinds[1].value, varbinds[1].len_val);
} else {
- print_helperr(_("EthTxStat packet error. Press Q to continue."));
- goto exit_child;
+ print_helperr(_("EthTxStat packet error. Press any key."));
+ getch();
+ goto quit;
}
mvwaddstr(main_sub, 1, 2, _("Received:"));
mvwaddstr(main_sub, 1, 30, _("Transmitted:"));
swap4(EthTxStat->TotalCollisionsTx));
mvwaddstr(main_sub, 18, 2, message);
wrefresh(main_sub);
- exit_child:
- switch (j = read(child_pipe[0], &c, 1)) {
- case -1:
+
+ timeout.tv_sec = 1;
+ timeout.tv_usec = 0;
+ FD_ZERO(&rds);
+ FD_SET(0, &rds);
+
+ /* wait up to timeout until anything is avail. for reading on stdin */
+ j = select(1, &rds, NULL, NULL, &timeout);
+
+ /* error occured */
+ if (j == -1) {
+ print_helperr(SELECT);
+ getch();
break;
- default:
- exit(0);
}
- sleep(1);
- goto start;
- default:
- close(child_pipe[0]);
- while (getch() != 'q');
- write(child_pipe[1], "0", 1);
- wait((int *) 0);
- close(child_pipe[1]);
- goto quit;
+
+ /* not timed out => anything avail. for reading in &rds */
+ if (j != 0) {
+ j = getc(stdin);
+ if (j == 'q' || j == 'Q')
+ break;
+
+ }
+
+ /* j = 0 => timeout => continue looping */
}
- exit:
- getch();
quit:
if (EthRxStat)
free(EthRxStat);
{ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x03, 0x01,
0x00
};
- char message[80], c;
- pid_t pid;
- int j, child_pipe[2];
-
+ char message[80];
+ int j;
varbind varbinds[1];
+ fd_set rds;
+ struct timeval timeout;
if (ap_type == ATMEL12350) {
Wireless[5] = 0xE0;
Wireless[6] = 0x3E;
}
- if (pipe(child_pipe) == -1) {
- print_helperr(PIPE);
- goto exit;
- }
-
- if (fcntl(child_pipe[0], F_SETFL, O_NONBLOCK) == -1) {
- print_helperr(FCNTL);
- goto exit;
- }
print_title(_("Wireless Statistics"));
print_help(QHELP);
noecho();
- switch (pid = fork()) {
- case -1:
- print_helperr(FORK);
- goto exit_child;
- case 0:
- close(child_pipe[1]);
- varbinds[0].oid = Wireless;
- varbinds[0].len_oid = sizeof(Wireless);
+ varbinds[0].oid = Wireless;
+ varbinds[0].len_oid = sizeof(Wireless);
- start:
+ while (1) {
varbinds[0].value = Wireless;
varbinds[0].len_val = 0;
varbinds[0].type = NULL_VALUE;
if (snmp(varbinds, 1, GET) <= 0) {
- print_helperr(ERR_RET_PRESS);
- goto exit_child;
+ print_helperr(ERR_RET);
+ getch();
+ goto quit;
}
- if (varbinds[0].len_val == 88) {
+ if (varbinds[0].len_val == 88 || varbinds[0].len_val == 104) {
+ /*
+ * 88 ... using traditional ATMEL 12350 MIB
+ * 104 .. using functionally enhanced ATMEL 12350 MIB by VERNET
+ */
if (WirelessStat)
free(WirelessStat);
WirelessStat =
memcpy(WirelessStat, varbinds[0].value, varbinds[0].len_val);
} else {
print_helperr
- (_("WirelessStat packet error. Press Q to continue."));
- goto exit;
+ (_("WirelessStat packet error. Press any key."));
+ getch();
+ goto quit;
}
sprintf(message,
sprintf(message, "InvalidPLCP %10u",
swap4(WirelessStat->InvalidPLCP));
mvwaddstr(main_sub, 15, 1, message);
-
+ /* ATMEL12350 MIB 'VERNET' modification has in addition the following */
+ if (varbinds[0].len_val == 104) {
+ mvwaddstr(main_sub, 16, 1, "TransmittedPackets:");
+ sprintf(message, "* at 11 Mbps %10u",
+ swap4(WirelessStat->TransmittedPackets_11Mbps));
+ mvwaddstr(main_sub, 17, 1, message);
+ sprintf(message, "* at 5.5 Mbps %10u",
+ swap4(WirelessStat->TransmittedPackets_55Mbps));
+ mvwaddstr(main_sub, 18, 1, message);
+ sprintf(message, "* at 2 Mbps %10u",
+ swap4(WirelessStat->TransmittedPackets_2Mbps));
+ mvwaddstr(main_sub, 19, 1, message);
+ sprintf(message, "* at 1 Mbps %10u",
+ swap4(WirelessStat->TransmittedPackets_1Mbps));
+ mvwaddstr(main_sub, 20, 1, message);
+ }
wrefresh(main_sub);
- exit_child:
- switch (j = read(child_pipe[0], &c, 1)) {
- case -1:
+
+ timeout.tv_sec = 1;
+ timeout.tv_usec = 0;
+ FD_ZERO(&rds);
+ FD_SET(0, &rds);
+
+ /* wait up to timeout until anything is avail. for reading on stdin */
+ j = select(1, &rds, NULL, NULL, &timeout);
+
+ /* error occured */
+ if (j == -1) {
+ print_helperr(SELECT);
+ getch();
break;
- default:
- exit(0);
}
- sleep(1);
- goto start;
- default:
- close(child_pipe[0]);
- while (getch() != 'q');
- write(child_pipe[1], "0", 1);
- wait((int *) 0);
- close(child_pipe[1]);
- goto quit;
+
+ /* not timed out => anything avail. for reading in &rds */
+ if (j != 0) {
+ j = getc(stdin);
+ if (j == 'q' || j == 'Q')
+ break;
+
+ }
+
+ /* j = 0 => timeout => continue looping */
}
- exit:
- getch();
quit:
if (WirelessStat)
free(WirelessStat);
char oid_dot11WEPExcludedCount[] =
{ 0x2a, 0x86, 0x48, 0xce, 0x34, 0x01, 0x05, 0x01, 0x06, 0x01 };
- char message[80], c;
- pid_t pid;
- int j, child_pipe[2], i;
+ char message[80];
+ int j;
+ fd_set rds;
+ struct timeval timeout;
varbind varbinds[16];
curs_set(0);
- if (pipe(child_pipe) == -1) {
- print_helperr(_("pipe error. Press any key"));
- goto exit;
- }
-
- if (fcntl(child_pipe[0], F_SETFL, O_NONBLOCK) == -1) {
- print_helperr(_("fcntl error. Press any key"));
- goto exit;
- }
print_title(_("Wireless Statistics"));
- print_help(_("Q - quit to menu."));
+ print_help(QHELP);
noecho();
- switch (pid = fork()) {
- case -1:
- print_helperr(_("fork error. Press any key"));
- goto exit_child;
- case 0:
- close(child_pipe[1]);
- varbinds[0].oid = oid_dot11TransmittedFragmentCount;
- varbinds[0].len_oid = sizeof(oid_dot11TransmittedFragmentCount);
- varbinds[1].oid = oid_dot11MulticastTransmittedFrameCount;
- varbinds[1].len_oid =
- sizeof(oid_dot11MulticastTransmittedFrameCount);
- varbinds[2].oid = oid_dot11FailedCount;
- varbinds[2].len_oid = sizeof(oid_dot11FailedCount);
- varbinds[3].oid = oid_dot11RetryCount;
- varbinds[3].len_oid = sizeof(oid_dot11RetryCount);
- varbinds[4].oid = oid_dot11MultipleRetryCount;
- varbinds[4].len_oid = sizeof(oid_dot11MultipleRetryCount);
- varbinds[5].oid = oid_dot11FrameDuplicateCount;
- varbinds[5].len_oid = sizeof(oid_dot11FrameDuplicateCount);
- varbinds[6].oid = oid_dot11RTSSuccessCount;
- varbinds[6].len_oid = sizeof(oid_dot11RTSSuccessCount);
- varbinds[7].oid = oid_dot11RTSFailureCount;
- varbinds[7].len_oid = sizeof(oid_dot11RTSFailureCount);
- varbinds[8].oid = oid_dot11ACKFailureCount;
- varbinds[8].len_oid = sizeof(oid_dot11ACKFailureCount);
- varbinds[9].oid = oid_dot11ReceivedFragmentCount;
- varbinds[9].len_oid = sizeof(oid_dot11ReceivedFragmentCount);
- varbinds[10].oid = oid_dot11MulticastReceivedFrameCount;
- varbinds[10].len_oid =
- sizeof(oid_dot11MulticastReceivedFrameCount);
- varbinds[11].oid = oid_dot11FCSErrorCount;
- varbinds[11].len_oid = sizeof(oid_dot11FCSErrorCount);
- varbinds[12].oid = oid_dot11TransmittedFrameCount;
- varbinds[12].len_oid = sizeof(oid_dot11TransmittedFrameCount);
- varbinds[13].oid = oid_dot11WEPUndecryptableCount;
- varbinds[13].len_oid = sizeof(oid_dot11WEPUndecryptableCount);
- varbinds[14].oid = oid_dot11WEPICVErrorCount;
- varbinds[14].len_oid = sizeof(oid_dot11WEPICVErrorCount);
- varbinds[15].oid = oid_dot11WEPExcludedCount;
- varbinds[15].len_oid = sizeof(oid_dot11WEPExcludedCount);
-
- start:
- for (i = 0; i < 16; i++) {
- varbinds[i].value = oid_dot11TransmittedFragmentCount;
- varbinds[i].len_val = 0;
- varbinds[i].type = 0x05;
+ varbinds[0].oid = oid_dot11TransmittedFragmentCount;
+ varbinds[0].len_oid = sizeof(oid_dot11TransmittedFragmentCount);
+ varbinds[1].oid = oid_dot11MulticastTransmittedFrameCount;
+ varbinds[1].len_oid = sizeof(oid_dot11MulticastTransmittedFrameCount);
+ varbinds[2].oid = oid_dot11FailedCount;
+ varbinds[2].len_oid = sizeof(oid_dot11FailedCount);
+ varbinds[3].oid = oid_dot11RetryCount;
+ varbinds[3].len_oid = sizeof(oid_dot11RetryCount);
+ varbinds[4].oid = oid_dot11MultipleRetryCount;
+ varbinds[4].len_oid = sizeof(oid_dot11MultipleRetryCount);
+ varbinds[5].oid = oid_dot11FrameDuplicateCount;
+ varbinds[5].len_oid = sizeof(oid_dot11FrameDuplicateCount);
+ varbinds[6].oid = oid_dot11RTSSuccessCount;
+ varbinds[6].len_oid = sizeof(oid_dot11RTSSuccessCount);
+ varbinds[7].oid = oid_dot11RTSFailureCount;
+ varbinds[7].len_oid = sizeof(oid_dot11RTSFailureCount);
+ varbinds[8].oid = oid_dot11ACKFailureCount;
+ varbinds[8].len_oid = sizeof(oid_dot11ACKFailureCount);
+ varbinds[9].oid = oid_dot11ReceivedFragmentCount;
+ varbinds[9].len_oid = sizeof(oid_dot11ReceivedFragmentCount);
+ varbinds[10].oid = oid_dot11MulticastReceivedFrameCount;
+ varbinds[10].len_oid = sizeof(oid_dot11MulticastReceivedFrameCount);
+ varbinds[11].oid = oid_dot11FCSErrorCount;
+ varbinds[11].len_oid = sizeof(oid_dot11FCSErrorCount);
+ varbinds[12].oid = oid_dot11TransmittedFrameCount;
+ varbinds[12].len_oid = sizeof(oid_dot11TransmittedFrameCount);
+ varbinds[13].oid = oid_dot11WEPUndecryptableCount;
+ varbinds[13].len_oid = sizeof(oid_dot11WEPUndecryptableCount);
+ varbinds[14].oid = oid_dot11WEPICVErrorCount;
+ varbinds[14].len_oid = sizeof(oid_dot11WEPICVErrorCount);
+ varbinds[15].oid = oid_dot11WEPExcludedCount;
+ varbinds[15].len_oid = sizeof(oid_dot11WEPExcludedCount);
+
+ while (1) {
+ for (j = 0; j < 16; j++) {
+ varbinds[j].value = oid_dot11TransmittedFragmentCount;
+ varbinds[j].len_val = 0;
+ varbinds[j].type = 0x05;
}
if (snmp(varbinds, 16, GET) <= 0) {
- print_helperr(ERR_RET_PRESS);
- goto exit_child;
+ print_helperr(ERR_RET);
+ getch();
+ goto quit;
}
sprintf(message, "FragmentTx %10lu FragmentRx %10lu",
(long) swap4(*(varbinds[14].value)));
mvwaddstr(main_sub, 10, 1, message);
wrefresh(main_sub);
- exit_child:
- switch (j = read(child_pipe[0], &c, 1)) {
- case -1:
+
+ timeout.tv_sec = 1;
+ timeout.tv_usec = 0;
+ FD_ZERO(&rds);
+ FD_SET(0, &rds);
+
+ /* wait up to timeout until anything is avail. for reading on stdin */
+ j = select(1, &rds, NULL, NULL, &timeout);
+
+ /* error occured */
+ if (j == -1) {
+ print_helperr(SELECT);
+ getch();
break;
- default:
- exit(0);
}
- sleep(1);
- goto start;
- default:
- close(child_pipe[0]);
- while (getch() != 'q');
- write(child_pipe[1], "0", 1);
- wait((int *) 0);
- close(child_pipe[1]);
- goto quit;
+
+ /* not timed out => anything avail. for reading in &rds */
+ if (j != 0) {
+ j = getc(stdin);
+ if (j == 'q' || j == 'Q')
+ break;
+
+ }
+
+ /* j = 0 => timeout => continue looping */
}
- exit:
- getch();
quit:
wclear(main_sub);
print_title("");
void atmel_sysinfo()
{
- char sysDescr[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01,
- 0x01, 0x01, 0x00
+ char sysDescr[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x01, 0x01, 0x00
};
- char sysDeviceInfo[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01,
- 0x01, 0x05, 0x00
+ char sysDeviceInfo[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x01, 0x05, 0x00
+ };
+ /* This one is ATMEL12350 VERNET MIB specific. */
+ char UpTime[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x02, 0x09, 0x01, 0x00
};
char message[200];
int i;
- varbind varbinds[2];
+ varbind varbinds[3];
+ struct SysDeviceInfo_ATMEL410 ptr410;
+ struct SysDeviceInfo_ATMEL12350 ptr12350;
extern short ap_type;
- struct SysDeviceInfo_ATMEL410 ptr410;
- struct SysDeviceInfo_ATMEL12350 ptr12350;
+ extern char IS_ATMEL12350_VERNET;
/*
* These have to represent used SysDeviceInfo_{ATMEL410,ATMEL12350} members
sysDeviceInfo[6] = 0x3E;
}
+ i = 0;
+
varbinds[0].oid = sysDescr;
varbinds[0].len_oid = sizeof(sysDescr);
varbinds[0].value = sysDescr;
varbinds[0].type = NULL_VALUE;
varbinds[0].len_val = 0;
+ i++;
varbinds[1].oid = sysDeviceInfo;
varbinds[1].len_oid = sizeof(sysDeviceInfo);
- varbinds[1].value = sysDescr;
+ varbinds[1].value = sysDeviceInfo;
varbinds[1].len_val = 0;
varbinds[1].type = NULL_VALUE;
+ i++;
+
+ if (IS_ATMEL12350_VERNET) {
+ varbinds[2].oid = UpTime;
+ varbinds[2].len_oid = sizeof(UpTime);
+ varbinds[2].value = UpTime;
+ varbinds[2].len_val = 0;
+ varbinds[2].type = NULL_VALUE;
+ i++;
+ }
print_help(WAIT_RET);
- if (snmp(varbinds, 2, GET) <= 0) {
+ if (snmp(varbinds, i, GET) <= 0) {
print_helperr(ERR_RET);
goto exit;
}
} else { /* ATMEL12350 */
memcpy(&ptr12350, varbinds[1].value, sizeof(struct SysDeviceInfo_ATMEL12350));
- ap_regdomain=ptr12350.RegulationDomain;
+ ap_regdomain = ptr12350.RegulationDomain;
ap_sversion = ptr12350.StructVersion;
ap_macaddr = ptr12350.MacAddress;
ap_prodtype = ptr12350.ProductType;
oui2manufacturer(ap_macaddr));
mvwaddstr(main_sub, 10, 0, message);
+ if (IS_ATMEL12350_VERNET) {
+ i = varbinds[2].len_val == 2 ?
+ (varbinds[2].value[0] << 8) | varbinds[2].value[1] :
+ varbinds[2].value[0] < 0x80 ?
+ varbinds[2].value[0] : 0xff00 | varbinds[2].value[0];
+ sprintf(message, _("Uptime: %u days, %02u:%02u:%02u hours:mins:secs"),
+ i / 60 / 60 / 24, i / 60 / 60 % 24, i / 60 % 60, i % 60);
+ mvwaddstr(main_sub, 11, 0, message);
+ }
+
wrefresh(main_sub);
print_help(ANY_KEY);
exit:
goto exit;
}
- sprintf(message, _("WEP inplemented: %s"),
+ sprintf(message, _("WEP implemented: %s"),
(*(varbinds[0].value) == 1) ? ON : OFF);
mvwaddstr(main_sub, 13, 0, message);
sprintf(message, _("Diversity: %s"),
#define INT_ROAMING _("[I] International roaming: ")
#define BEACON_PER _("[B] Beacon period (msec): ")
#define DTIM_I _("[D] DTIM sending interval (beacons): ")
+#define SIFS_T _("[T] SIFS time (msec): ")
#define WLAN_HELP _("[key] - set option; W - write conf; Q - quit to menu")
extern short ap_type;
+extern char IS_ATMEL12350_TELLUS;
+extern char IS_ATMEL12350_VERNET;
void atmel_wireless()
{
- char sysDeviceInfo[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x01, 0x05,
- 0x00
- };
- char operEthernetAddress[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x02, 0x03,
- 0x00
+ char sysDeviceInfo[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x01, 0x05, 0x00
};
- char operChannelID[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x01,
- 0x00
+ char operChannelID[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x01, 0x00
};
- char operESSIDLength[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x02,
- 0x00
+ char operESSIDLength[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x02, 0x00
};
- char operESSID[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x03,
- 0x00
+ char operESSID[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x03, 0x00
};
- char operRTSThreshold[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x04,
- 0x00
+ char operRTSThreshold[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x04, 0x00
};
- char operFragmentationThreshold[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x05,
- 0x00
+ char operFragmentationThreshold[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x05, 0x00
};
- char operPreambleType[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x06,
- 0x00
+ char operPreambleType[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x06, 0x00
};
- char operAuthenticationType[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x07,
- 0x00
+ char operAuthenticationType[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x07, 0x00
};
- char operBasicRates[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x08,
- 0x00
+ char operBasicRates[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x08, 0x00
};
- char operAutoRateFallBack[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x09,
- 0x00
+ char operAutoRateFallBack[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x09, 0x00
};
- char operAccessPointName[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x0A,
- 0x00
+ char operAccessPointName[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x0A, 0x00
};
- char operSSIDBroadcasting[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x0B,
- 0x00
+ char operSSIDBroadcasting[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x01, 0x0B, 0x00
};
/* This one is ATMEL12350 MIB specific. */
- char operInterRoaming[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x02, 0x01, 0x0D,
- 0x00
+ char operInterRoaming[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x02, 0x01, 0x0D, 0x00
};
/* These two are ATMEL12350 TELLUS MIB specific. */
- char operBeaconPeriod[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x02, 0x01, 0x0E,
- 0x00
+ char operBeaconPeriod[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x02, 0x01, 0x0E, 0x00
};
- char operDTIM[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x02, 0x01, 0x0F,
- 0x00
+ char operDTIM[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x02, 0x01, 0x0F, 0x00
+ };
+ /* This one is ATMEL12350 VERNET MIB specific. */
+ char operSIFSTIME[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x02, 0x01, 0x10, 0x00
};
extern WINDOW *main_sub;
- varbind varbinds[15];
+ varbind varbinds[16];
unsigned short int RTSThreshold, FragmentationThreshold,
- InterRoaming, m_basic_rates = 0, first_channel = 1;
- unsigned int BeaconPeriod = 0;
+ InterRoaming, m_basic_rates = 0, first_channel = 1, BeaconPeriod = 0,
+ sifs = 0;
unsigned char dtim, ch;
char *AuthenticationTypes[3] = { OSYS, SH_KEY, BOTH_TYPE },
- message[1024],
- oui_tellus[3] = { 0x00, 0x04, 0xDB },
- IS_ATMEL12350_TELLUS = 0; /* ATMEL12350 Tellus uses different MIB */
+ message[1024];
char domain[32], basic_rates[4], AutoRateFallBack, SSIDBroadcasting,
ap_name[32], ch_num = 0, PreambleType, AuthenticationType, channel;
char m_channel = 0, m_essid = 0, m_broadcast = 0, m_rts = 0,
m_fragment = 0, m_auth = 0, m_ap_name = 0, m_preambule = 0,
- m_auto_rate = 0, m_inter_roaming = 0, m_beacon = 0, m_dtim = 0;
+ m_auto_rate = 0, m_inter_roaming = 0, m_beacon = 0, m_dtim = 0,
+ m_sifs = 0;
char *item_name[14], *rates[3] = { ON, OFF, BASIC }, *preambules[2] = {
_("Short"), _("Long")};
short __rates[4] = { 2, 4, 11, 22 };
struct SysDeviceInfo_ATMEL410 ptr410;
struct SysDeviceInfo_ATMEL12350 ptr12350;
-
+
if (ap_type == ATMEL12350) {
sysDeviceInfo[5] = 0xE0;
sysDeviceInfo[6] = 0x3E;
- operEthernetAddress[5] = 0xE0;
- operEthernetAddress[6] = 0x3E;
operChannelID[5] = 0xE0;
operChannelID[6] = 0x3E;
operESSIDLength[5] = 0xE0;
operSSIDBroadcasting[6] = 0x3E;
}
-
- /* Find out whether the device uses enhanced ATMEL12350 TELLUS MIB. */
- varbinds[0].type = NULL_VALUE;
- varbinds[0].oid = operEthernetAddress;
- varbinds[0].len_oid = sizeof(operEthernetAddress);
- varbinds[0].len_val = 0;
-
- print_help(WAIT_RET);
- if (snmp(varbinds, 1, GET) <= 0) {
- print_helperr(ERR_RET);
- goto exit;
- }
-
- if (ap_type == ATMEL12350 && (memcmp(oui_tellus, varbinds[0].value, 3) ==0))
- IS_ATMEL12350_TELLUS = 1;
-
-
- for (i = 1; i < 15; i++) {
+ for (i = 0; i < 16; i++) {
varbinds[i].type = NULL_VALUE;
varbinds[i].len_val = 0;
varbinds[i].len_oid = sizeof(operChannelID);
varbinds[i++].oid = operBeaconPeriod;
varbinds[i++].oid = operDTIM;
}
+ if (IS_ATMEL12350_VERNET)
+ varbinds[i++].oid = operSIFSTIME;
}
if (snmp(varbinds, i, GET) <= 0) {
if (ap_type == ATMEL12350) {
InterRoaming = *(varbinds[12].value);
if (IS_ATMEL12350_TELLUS) {
- for (i = 0; i < varbinds[13].len_val;
- BeaconPeriod += varbinds[13].value[i] *
- (1 << ((varbinds[13].len_val - i - 1) * 8)), i++);
+ BeaconPeriod = varbinds[13].len_val == 2 ?
+ (varbinds[13].value[0] << 8) | varbinds[13].value[1] :
+ varbinds[13].value[0] < 0x80 ?
+ varbinds[13].value[0] : 0xff00 | varbinds[13].value[0];
dtim = *(varbinds[14].value);
}
+ if (IS_ATMEL12350_VERNET)
+ sifs = varbinds[15].len_val == 2 ?
+ (varbinds[15].value[0] << 8) | varbinds[15].value[1] :
+ varbinds[15].value[0] < 0x80 ?
+ varbinds[15].value[0] : 0xff00 | varbinds[15].value[0];
}
if (ap_type == ATMEL12350) {
- memcpy(&ptr12350, varbinds[11].value, sizeof(struct SysDeviceInfo_ATMEL12350));
- ap_regdomain=ptr12350.RegulationDomain;
+ memcpy(&ptr12350, varbinds[11].value,
+ sizeof(struct SysDeviceInfo_ATMEL12350));
+ ap_regdomain=ptr12350.RegulationDomain;
} else /* ATMEL410 */{
- memcpy(&ptr410, varbinds[11].value, sizeof(struct SysDeviceInfo_ATMEL410));
- ap_regdomain = swap4(ptr410.RegulationDomain);
- }
-
+ memcpy(&ptr410, varbinds[11].value,
+ sizeof(struct SysDeviceInfo_ATMEL410));
+ ap_regdomain = swap4(ptr410.RegulationDomain);
+ }
+
if ((ch_num = ch_list(ap_regdomain, item_name)) == 0) {
print_helperr(ERR_RET);
goto exit;
sprintf(message, "%s%u", DTIM_I, dtim);
mvwaddstr(main_sub, 17, 0, message);
}
+ if (IS_ATMEL12350_VERNET) {
+ sprintf(message, "%s%u", SIFS_T, sifs);
+ mvwaddstr(main_sub, 18, 0, message);
+ }
}
wrefresh(main_sub);
dtim = atoi(message);
m_dtim = 1;
continue;
+ case 'T':
+ case 't':
+ if (!IS_ATMEL12350_VERNET)
+ continue;
+ get_value(message, 18, strlen(SIFS_T), 6, INT_STRING, 0, 65535,
+ WLAN_HELP);
+ sifs = atoi(message);
+ m_sifs = 1;
+ continue;
case 'w':
case 'W':
i = 0;
i++;
}
if (m_beacon) {
- int len_val;
-
- len_val = (BeaconPeriod > 0x7fff) ? 3 :
- (BeaconPeriod > 0x7f) ? 2 : 1;
varbinds[i].oid = operBeaconPeriod;
varbinds[i].len_oid = sizeof(operBeaconPeriod);
+ BeaconPeriod = htons(BeaconPeriod);
varbinds[i].value = (char *) &BeaconPeriod;
- varbinds[i].len_val = len_val;
- varbinds[i].type = STRING_VALUE;
+ varbinds[i].len_val = 2;
+ varbinds[i].type = INT_VALUE;
i++;
}
if (m_dtim) {
varbinds[i].type = INT_VALUE;
i++;
}
+ if (m_sifs) {
+ varbinds[i].oid = operSIFSTIME;
+ varbinds[i].len_oid = sizeof(operSIFSTIME);
+ sifs = htons(sifs);
+ varbinds[i].value = (char *) &sifs;
+ varbinds[i].len_val = 2;
+ varbinds[i].type = INT_VALUE;
+ i++;
+ }
print_help(WAIT_SET);
if (snmp(varbinds, i, SET) <= 0) {
--- /dev/null
+--- ap-utils-1.4.1/po/pl.po.orig 2004-10-17 19:17:25.000000000 +0200
++++ ap-utils-1.4.1/po/pl.po 2004-10-17 20:43:38.000000000 +0200
+@@ -17,12 +17,12 @@
+ # src/ap-config.c:42 src/bridge.c:166
+ #: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:46 src/bridge.c:222
+ msgid "Bridging"
+-msgstr "Bridge'owanie"
++msgstr "Most"
+
+ # src/ap-config.c:42
+ #: ap-gl/ap-gl.c:47 src/ap-config.c:46
+ msgid "Set bridging and IP-related options"
+-msgstr "Ustawinaie opcji bridge'a i IP"
++msgstr "Ustawianie opcji mostu i IP"
+
+ # src/ap-config.c:44 src/ap-config.c:112 src/ap-config.c:121 src/bridge.c:90
+ #: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:48
+@@ -33,23 +33,22 @@
+ # src/ap-config.c:44
+ #: ap-gl/ap-gl.c:49 src/ap-config.c:48
+ msgid "Set wireless options"
+-msgstr "Ustawianie opcji radiowych"
++msgstr "Opcje radiowe"
+
+ # src/ap-config.c:45 src/ap-config.c:57
+ #: ap-gl/ap-gl.c:50 src/ap-config.c:49 src/ap-config.c:61
+ msgid "Privacy"
+-msgstr "Bezpieczeñstwo"
++msgstr "Klucze"
+
+ # src/ap-config.c:46 src/ap-config.c:58
+ #: ap-gl/ap-gl.c:51 src/ap-config.c:50 src/ap-config.c:62
+-#, fuzzy
+ msgid "MAC auth"
+-msgstr "Dostêp w/g MAC"
++msgstr "Blokuj MAC"
+
+ # src/ap-config.c:47 src/ap-config.c:59
+ #: ap-gl/ap-gl.c:52 src/ap-config.c:51 src/ap-config.c:63
+ msgid "Community"
+-msgstr "Prawa dostêpu"
++msgstr "Dostêp"
+
+ # src/ap-config.c:48
+ #: ap-gl/ap-gl.c:53 src/ap-config.c:52
+@@ -64,12 +63,12 @@
+ # src/ap-config.c:78
+ #: ap-gl/ap-gl.c:66 src/ap-config.c:83
+ msgid "Upload"
+-msgstr "Za³aduj do AP"
++msgstr "Wy¶lij"
+
+ # src/ap-config.c:78
+ #: ap-gl/ap-gl.c:66 src/ap-config.c:83
+ msgid "Make current configuration active"
+-msgstr "Zapisuje aktualn± konfiguracje na sta³e"
++msgstr "Uczyñ konfiguracjê aktywn±"
+
+ # src/ap-config.c:79
+ #: ap-gl/ap-gl.c:67 src/ap-config.c:84
+@@ -79,7 +78,7 @@
+ # src/ap-config.c:79
+ #: ap-gl/ap-gl.c:67 src/ap-config.c:84
+ msgid "Restore factory default settings"
+-msgstr "Ustaw opcje standardowe producenta"
++msgstr "Przywróæ ustawienia producenta"
+
+ # src/ap-config.c:81 src/ap-config.c:89
+ #: ap-gl/ap-gl.c:69 src/ap-config.c:86 src/ap-config.c:94
+@@ -89,12 +88,12 @@
+ # src/ap-config.c:82
+ #: ap-gl/ap-gl.c:70 src/ap-config.c:87
+ msgid "Reset AP. All not uploaded configuration will be lost"
+-msgstr "Reset Access-pointa. Wszystkie nie za³adowane opcje bêd± utracone"
++msgstr "Reset. Wszystkie nie za³adowane opcje bêd± utracone"
+
+ # src/ap-config.c:84
+ #: ap-gl/ap-gl.c:72 src/ap-config.c:89
+ msgid "TestMode"
+-msgstr "Tryb testowy"
++msgstr "TrybTest"
+
+ # src/ap-config.c:84
+ #: ap-gl/ap-gl.c:72 src/ap-config.c:89
+@@ -115,7 +114,7 @@
+ # src/ap-config.c:111
+ #: ap-gl/ap-gl.c:84 src/ap-config.c:117
+ msgid "Get ethernet port statistics"
+-msgstr "Pobiera statystyki portu ethernet"
++msgstr "Pobierz statystyki ethernetu"
+
+ # src/ap-config.c:113 src/ap-config.c:122
+ #: ap-gl/ap-gl.c:86 src/ap-config.c:119 src/ap-config.c:128
+@@ -125,22 +124,22 @@
+ # src/ap-config.c:115
+ #: ap-gl/ap-gl.c:88 src/ap-config.c:121
+ msgid "KnownAPs"
+-msgstr "Znane access-pointy"
++msgstr "Znane AP"
+
+ # src/ap-config.c:115
+ #: ap-gl/ap-gl.c:88 src/ap-config.c:121
+ msgid "Get info about known Access Points"
+-msgstr "Podaje informacje o znanych access-pointach"
++msgstr "Podaj informacje o Access Pointach"
+
+ # src/ap-config.c:141
+ #: ap-gl/ap-gl.c:105 src/ap-config.c:154
+ msgid "Info"
+-msgstr "Informacja"
++msgstr "Info"
+
+ # src/ap-config.c:142
+ #: ap-gl/ap-gl.c:106 src/ap-config.c:155
+ msgid "Config"
+-msgstr "Konfiguracja"
++msgstr "Konfig"
+
+ # src/ap-config.c:143
+ #: ap-gl/ap-gl.c:107 src/ap-config.c:156
+@@ -150,7 +149,7 @@
+ # src/ap-config.c:143
+ #: ap-gl/ap-gl.c:107 src/ap-config.c:156
+ msgid "Execute commands on Access Point"
+-msgstr "Wykonuje operacje w Access-poincie"
++msgstr "Wykonaj operacje w AP"
+
+ # src/ap-config.c:145
+ #: ap-gl/ap-gl.c:109 src/ap-config.c:158
+@@ -165,12 +164,12 @@
+ # lib/common.c:50 src/ap-config.c:147
+ #: ap-gl/ap-gl.c:111 lib/common.c:52 src/ap-config.c:160
+ msgid "About"
+-msgstr "Informacja"
++msgstr "O..."
+
+ # src/ap-config.c:148
+ #: ap-gl/ap-gl.c:112 src/ap-config.c:161
+ msgid "Shell"
+-msgstr "Linia komend"
++msgstr "Shell"
+
+ # src/ap-config.c:149
+ #: ap-gl/ap-gl.c:113 src/ap-config.c:162
+@@ -190,31 +189,26 @@
+
+ # lib/ap-utils.h:117
+ #: ap-gl/auth_mac.c:30 src/auth_mac.c:30
+-#, fuzzy
+ msgid "[A] MAC authorization: "
+-msgstr "[A] Ograniczenie dostêpu dla wybranych MAC: %s"
++msgstr "[A] Ograniczenie dostêpu dla wybranych MAC: "
+
+ # lib/ap-utils.h:122
+ #: ap-gl/auth_mac.c:31 src/auth_mac.c:31
+-#, fuzzy
+ msgid "Enter MAC: "
+-msgstr "Adres fizyczny:"
++msgstr "Adres fizyczny: "
+
+ # lib/ap-utils.h:121
+ #: ap-gl/auth_mac.c:32 src/auth_mac.c:32
+-#, fuzzy
+ msgid "Delete Num: "
+-msgstr "Skasuj pozycje:"
++msgstr "Skasuj pozycjê: "
+
+ # lib/ap-utils.h:118
+ #: ap-gl/auth_mac.c:33 src/auth_mac.c:33
+-#, fuzzy
+ msgid "Authorized MAC addresses"
+ msgstr "Dostêp w/g MAC"
+
+ # lib/ap-utils.h:119
+ #: ap-gl/auth_mac.c:34 src/auth_mac.c:34
+-#, fuzzy
+ msgid "NUM MAC address"
+ msgstr "Numer adres fizyczny (MAC)"
+
+@@ -222,17 +216,15 @@
+ #: ap-gl/auth_mac.c:35 src/auth_mac.c:35
+ msgid "A - auth; N - new; D - del; arrows - scroll; W - write conf; Q - quit"
+ msgstr ""
+-"A W³/Wy³; N - nowe; D - kasuj; strza³ki - przewijanie; W - zapis; Q - Wyj¶cie"
++"A W³/Wy³; N - nowe; D - kasuj; strza³ki - przewijanie; W - zapis; Q - Wyjd¼"
+
+ # src/nwn_advanced.c:70
+ #: ap-gl/auth_mac.c:36
+-#, fuzzy
+ msgid "A - auth; IPSTF - set; W - write conf; Q - quit"
+ msgstr "DA - opcje; W - zapis; Q - powrót"
+
+ # src/nwn_advanced.c:70
+ #: ap-gl/auth_mac.c:37
+-#, fuzzy
+ msgid "A - auth; W - write conf; Q - quit"
+ msgstr "DA - opcje; W - zapis; Q - powrót"
+
+@@ -258,7 +250,6 @@
+
+ # src/ap-config.c:55
+ #: ap-gl/auth_mac.c:88
+-#, fuzzy
+ msgid "Internal"
+ msgstr "Ogólne"
+
+@@ -272,67 +263,58 @@
+
+ # src/bridge.c:169
+ #: ap-gl/bridge.c:28 src/bridge.c:28
+-#, fuzzy
+ msgid "[N] Netmask: "
+-msgstr "[N] Maska: %s"
++msgstr "[N] Maska: "
+
+ # src/bridge.c:171
+ #: ap-gl/bridge.c:29 src/bridge.c:29
+-#, fuzzy
+ msgid "[G] Gateway: "
+-msgstr "[G] Bramka %s"
++msgstr "[G] Bramka: "
+
+ # src/bridge.c:32
+ #: ap-gl/bridge.c:30 src/bridge.c:30
+-#, fuzzy
+ msgid "[F] Filter non-IP traffic: "
+-msgstr "[F] Wycinaj ruch nie-IP: %s"
++msgstr "[F] Wycinaj ruch nie-IP: "
+
+ # src/bridge.c:33
+ #: ap-gl/bridge.c:31 src/bridge.c:31
+-#, fuzzy
+ msgid "[P] Primary port: "
+-msgstr "[P] Port podstawowy: %s"
++msgstr "[P] Port podstawowy: "
+
+ # src/bridge.c:144
+ #: ap-gl/bridge.c:32 src/bridge.c:32
+-#, fuzzy
+ msgid "Attached station MAC: "
+-msgstr "MAC do³±czonej stacji: %02X:%02X:%02X:%02X:%02X:%02X"
++msgstr "MAC do³±czonej stacji:"
+
+ # src/bridge.c:34
+ #: ap-gl/bridge.c:33 src/bridge.c:33
+-#, fuzzy
+ msgid "[D] DHCP client: "
+-msgstr "[D] DHCP: %s"
++msgstr "[D] Klient DHCP: "
+
+ # src/bridge.c:35
+ #: ap-gl/bridge.c:34 src/bridge.c:34
+-#, fuzzy
+ msgid "[O] Operational mode: "
+-msgstr "[O] Tryb pracy: %s"
++msgstr "[O] Tryb pracy: "
+
+ # src/bridge.c:36
+ #: ap-gl/bridge.c:35 src/bridge.c:35
+-#, fuzzy
+ msgid "[M] Preferred BSSID (remote MAC addr.): "
+-msgstr "[R] Zdalny adres fizyczny: %02X%02X%02X%02X%02X%02X"
++msgstr "[M] Zdalny adres fizyczny: "
+
+ #: ap-gl/bridge.c:37 src/bridge.c:37
+ msgid "[T] Trap-sending port(s): "
+-msgstr ""
++msgstr "[T] SNMP-Trap na porty: "
+
+ #: ap-gl/bridge.c:38 src/bridge.c:38
+ msgid "[R] Forward broadcast traffic: "
+-msgstr ""
++msgstr "[R] Przesy³aj ruch rozg³oszeniowy: "
+
+ #: ap-gl/bridge.c:40
+ msgid "[U] Isolate wireless clients: "
+-msgstr ""
++msgstr "[U] Izoluj klientó³ radiowych: "
+
+ # src/bridge.c:30
+ #: ap-gl/bridge.c:41 src/bridge.c:41
+-#, fuzzy
+ msgid "INGFPDOMSCTRBU - set; W - write conf; Q - quit to menu"
+ msgstr "BPGINFDRT - ustaw; W - Zapisz; Q - powrót"
+
+@@ -359,16 +341,16 @@
+ # src/bridge.c:88
+ #: ap-gl/bridge.c:129 src/bridge.c:131
+ msgid "Repeater"
+-msgstr "Regenerator"
++msgstr "Repeater"
+
+ # src/stations.c:29
+ #: ap-gl/stations.c:31 src/stations.c:29
+ msgid "Associated Stations"
+-msgstr "Przynale¿ne stacje"
++msgstr "Pod³±czonych stacji"
+
+ #: ap-gl/stations.c:83 src/stations.c:87
+ msgid "AP now in AP Client Mode and don't has any associated stations"
+-msgstr ""
++msgstr "AP jest teraz w trybie klienta i nie ma stacji pod³±czonych"
+
+ #: ap-gl/stations.c:109
+ msgid "# MAC LQ RSSI Status Port IP"
+@@ -386,7 +368,7 @@
+
+ #: lib/aps.c:128
+ msgid "Your Access Point is not in \"AP client\" mode => getting"
+-msgstr ""
++msgstr "Twój AP nie jest w trybie \"klient AP\""
+
+ #: lib/aps.c:131
+ msgid "up-to-date \"Known APs\" info requires your AP to be"
+@@ -394,7 +376,7 @@
+
+ #: lib/aps.c:134
+ msgid "temporarily configured into \"AP client\" mode and rebooted."
+-msgstr ""
++msgstr "tymczasowo skonfigurowano w tryb klienta AP i zrestartowano."
+
+ #: lib/aps.c:137
+ msgid "Your AP will be reconfigured back to original mode by this"
+@@ -406,7 +388,6 @@
+
+ # src/ap-config.c:78
+ #: lib/aps.c:143
+-#, fuzzy
+ msgid "cause loss of Access Point's current configuration."
+ msgstr "Zapisuje aktualn± konfiguracje na sta³e"
+
+@@ -416,18 +397,16 @@
+
+ # src/ap-config.c:44
+ #: lib/aps.c:150
+-#, fuzzy
+ msgid "via its wireless port."
+-msgstr "Ustawianie opcji radiowych"
++msgstr "poprzez port radiowy"
+
+ # src/aps.c:91 src/cmd.c:41 src/cmd.c:85 src/cmd.c:141 src/test.c:82
+ #: lib/aps.c:152 lib/cmd.c:49 lib/cmd.c:92 lib/test.c:93
+ msgid "Do you want to continue? "
+-msgstr "Jeste¶ pewien?"
++msgstr "Czesz kontynuowaæ?"
+
+ # src/aps.c:93
+ #: lib/aps.c:154
+-#, fuzzy
+ msgid "(Y - Yes; N - No (it's safer to answer No)"
+ msgstr "(Y - Tak; N - Nie (lepiej Nie)"
+
+@@ -448,9 +427,8 @@
+
+ # src/aps.c:191
+ #: lib/aps.c:352 lib/aps.c:360 lib/aps.c:368
+-#, fuzzy
+ msgid "CN: Channel Name; P: Preambule Type (S: Short; L: Long);"
+-msgstr "P: Typ nag³ówka; S: Krótki; L: D³ugi"
++msgstr "P: Typ nag³ówka; P: Preambu³a (S: Krótki; L: D³ugi)"
+
+ #: lib/aps.c:354
+ msgid "RSSI: Radio Signal Strength Indicator [%];"
+@@ -474,7 +452,6 @@
+
+ # src/aps.c:194
+ #: lib/aps.c:378
+-#, fuzzy
+ msgid ""
+ "# con. to this AP; R refresh with reset; S refresh w/o reset; T toggle; Q "
+ "quit"
+@@ -483,7 +460,6 @@
+
+ # src/aps.c:194
+ #: lib/aps.c:380
+-#, fuzzy
+ msgid ""
+ "# con. to this AP; R initiate AP scan; S refresh view; T toggle view; Q quit"
+ msgstr ""
+@@ -491,7 +467,6 @@
+
+ # lib/ap_search.c:134
+ #: lib/aps.c:509 lib/ap_search.c:153
+-#, fuzzy, c-format
+ msgid "Failure in sendto(): %s. Press any key."
+ msgstr "B³±d sendto() : %s. Wci¶nij dowolny klawisz."
+
+@@ -501,7 +476,7 @@
+
+ #: lib/aps.c:521
+ msgid "take a few seconds for your Access Point to find out some"
+-msgstr ""
++msgstr "potrwa chwilkê, zanim twój AP znajdzie cokolwiek"
+
+ #: lib/aps.c:524
+ msgid "values, so expect finishing the scan in about 5 seconds."
+@@ -525,11 +500,11 @@
+
+ #: lib/aps.c:539
+ msgid "wireless port, you need to wait a bit longer"
+-msgstr ""
++msgstr "port radiowy, musisz poczekaæ trochê d³u¿ej"
+
+ #: lib/aps.c:542
+ msgid "after pressing 'S'."
+-msgstr ""
++msgstr "po naci¶niêciu 'S'."
+
+ #: lib/ap_search.c:50
+ msgid "# Type IP Description"
+@@ -537,34 +512,31 @@
+
+ #: lib/ap_search.c:89
+ msgid "Please wait while scanning, or press 'Q' to quit."
+-msgstr ""
++msgstr "Trwa skanowanie, poczekaj chwilê, by przerwaæ wci¶nij 'Q'"
+
+ # lib/ap_search.c:110
+ #: lib/ap_search.c:105
+-#, fuzzy
+ msgid "Can't set broadcast option on socket. Press any key."
+ msgstr "Nie moge ustawiæ trybu BROADCAST. Wci¶nij dowolny klawisz."
+
+ # lib/ap_search.c:117
+ #: lib/ap_search.c:114
+-#, fuzzy
+ msgid "Can't set multicast membership on socket. Press any key."
+ msgstr "Nie moge ustawiæ przynale¿no¶ci multicast. Wci¶nij dowolny klawisz."
+
+ #: lib/ap_search.c:120
+ msgid "Scanning via network interface:"
+-msgstr ""
++msgstr "Szukam poprzez interfejs sieciowy"
+
+ #: lib/ap_search.c:121
+ #, c-format
+ msgid " Index: %i"
+-msgstr ""
++msgstr " Indeks: %i"
+
+ # lib/ap-utils.h:78
+ #: lib/ap_search.c:123
+-#, fuzzy, c-format
+ msgid " Name: %s"
+-msgstr "[N] Nazwa urz±dzenia:"
++msgstr " Nazwa: %s"
+
+ #: lib/ap_search.c:125
+ #, c-format
+@@ -574,7 +546,7 @@
+ #: lib/ap_search.c:134
+ #, c-format
+ msgid "Scanning for AP type: %s"
+-msgstr ""
++msgstr "Szukam typu AP: %s"
+
+ # lib/ap_search.c:128
+ #: lib/ap_search.c:312
+@@ -583,7 +555,6 @@
+
+ # src/ap-mrtg.c:178
+ #: lib/ap_search.c:329
+-#, fuzzy
+ msgid "realloc() error."
+ msgstr "B³±d otwarcia socket'a"
+
+@@ -593,9 +564,8 @@
+
+ # src/stat.c:41
+ #: lib/ap_search.c:416
+-#, fuzzy
+ msgid "No local network interfaces found. Press any key."
+-msgstr "B³±d tworzenia procesu (fork). Wci¶nij dowolny klawisz."
++msgstr "Nie znaleziono interfejsu sieci lokalnej. Wci¶nij dowolny klawisz."
+
+ #: lib/ap_search.c:418
+ msgid "No directly reachable Access Points found. Press any key."
+@@ -607,105 +577,90 @@
+
+ # lib/common.c:118
+ #: lib/ap_search.c:426
+-#, fuzzy
+ msgid "# - connect to AP; Q - quit"
+ msgstr "Wybór Access-pointa"
+
+ # src/sysinfo.c:402
+ #: lib/ap-utils.h:74
+-#, fuzzy
+ msgid "MAC address: "
+-msgstr "Adres IP: %s"
++msgstr "Adres MAC: "
+
+ # lib/ap-utils.h:80
+ #: lib/ap-utils.h:75
+-#, fuzzy
+ msgid "[S] SNMP traps: "
+ msgstr "[S] Sygnalizacja SNMP: %s"
+
+ # lib/ap-utils.h:68
+ #: lib/ap-utils.h:77
+-#, fuzzy
+ msgid "[C] Frequency channel: "
+ msgstr "[C] Czêstotliwo¶æ fali: %02u (%u MHz)"
+
+ # src/stat.c:123
+ #: lib/ap-utils.h:79
+-#, fuzzy
+ msgid "Receive antenna:"
+ msgstr "Odebrane:"
+
+ # src/test.c:70
+ #: lib/ap-utils.h:80
+-#, fuzzy
+ msgid "[U] Left"
+-msgstr "Lewa"
++msgstr "[U] Lewa"
+
+ # src/test.c:70
+ #: lib/ap-utils.h:81
+-#, fuzzy
+ msgid "[I] Right"
+-msgstr "Prawa"
++msgstr "[I] Prawa"
+
+ # src/stat.c:124
+ #: lib/ap-utils.h:82
+-#, fuzzy
+ msgid "Transmit antenna:"
+-msgstr "Wys³ane:"
++msgstr "Antena nadawcza:"
+
+ # src/test.c:70
+ #: lib/ap-utils.h:83
+-#, fuzzy
+ msgid "[O] Left"
+-msgstr "Lewa"
++msgstr "[O] Lewa"
+
+ # src/test.c:70
+ #: lib/ap-utils.h:84
+-#, fuzzy
+ msgid "[P] Right"
+-msgstr "Prawa"
++msgstr "[P] Prawa"
+
+ # src/sysinfo.c:358
+ #: lib/ap-utils.h:85
+-#, fuzzy
+ msgid "Diversity select:"
+-msgstr "Wiêksza moc: %s"
++msgstr "Naprzemian:"
+
+ # src/test.c:70
+ #: lib/ap-utils.h:86
+-#, fuzzy
+ msgid "[T] Left"
+-msgstr "Lewa"
++msgstr "[T] Lewa"
+
+ # src/test.c:70
+ #: lib/ap-utils.h:87
+-#, fuzzy
+ msgid "[Y] Right"
+-msgstr "Prawa"
++msgstr "[Y] Prawa"
+
+ #: lib/ap-utils.h:89
+ msgid "Yes"
+-msgstr ""
++msgstr "Tak"
+
+ #: lib/ap-utils.h:90
+ msgid "No"
+-msgstr ""
++msgstr "Nie"
+
+ #: lib/ap-utils.h:92
+ msgid "On"
+-msgstr ""
++msgstr "W³±"
+
+ # lib/ap-utils.h:55
+ #: lib/ap-utils.h:93
+-#, fuzzy
+ msgid "Off"
+-msgstr "wy³"
++msgstr "Wy³"
+
+ # lib/ap-utils.h:56
+ #: lib/ap-utils.h:95
+-#, fuzzy
+ msgid "Basic"
+-msgstr "podstawowy"
++msgstr "Podstawowy"
+
+ # lib/ap-utils.h:58
+ #: lib/ap-utils.h:97
+@@ -734,9 +689,8 @@
+
+ # lib/ap-utils.h:86
+ #: lib/ap-utils.h:103
+-#, fuzzy
+ msgid "Configuration written to the AP. Press any key to continue."
+-msgstr "Nie moge wys³aæ danych do AP. Wci¶nij dowolny klawisz."
++msgstr "Konfiguracja zapisana do AP. Wci¶nij dowolny klawisz."
+
+ # lib/ap-utils.h:92
+ #: lib/ap-utils.h:105
+@@ -760,9 +714,8 @@
+
+ # lib/ap-utils.h:104
+ #: lib/ap-utils.h:110
+-#, fuzzy
+ msgid "Run subshell. To return type 'exit'."
+-msgstr "Uruchomienie shella. Wpisz 'exit' aby wróciæ"
++msgstr "Uruchomienie shella. Wpisz 'exit' aby wróciæ."
+
+ # lib/ap-utils.h:105
+ #: lib/ap-utils.h:111
+@@ -781,55 +734,46 @@
+
+ # lib/ap-utils.h:108
+ #: lib/ap-utils.h:114
+-#, fuzzy
+ msgid "Set encryption; edit WEP keys"
+ msgstr "Ustawianie szyfracji, zmiana kluczy"
+
+ # lib/ap-utils.h:109
+ #: lib/ap-utils.h:115
+-#, fuzzy
+ msgid "Set MAC authorization; edit MAC authorization table"
+ msgstr "Ustawianie praw dostêpu w/g MAC i listy MAC"
+
+ # lib/ap-utils.h:110
+ #: lib/ap-utils.h:116
+-#, fuzzy
+ msgid "Set SNMP community/password for access to the AP"
+ msgstr "Ustawianie hase³/praw SNMP dla AP"
+
+ # lib/ap-utils.h:111
+ #: lib/ap-utils.h:117
+-#, fuzzy
+ msgid "Get info about AP hardware and firmware"
+ msgstr "Informacja o sprzêcie i oprogramowaniu AP"
+
+ # lib/ap-utils.h:112
+ #: lib/ap-utils.h:118
+-#, fuzzy
+ msgid "Get wireless port statistics"
+ msgstr "Statystyki portu radiowego"
+
+ # lib/ap-utils.h:113
+ #: lib/ap-utils.h:119
+-#, fuzzy
+ msgid "Get list of currently associated stations (Access Point clients)"
+ msgstr "Lista aktualnie przy³±czonych stacji"
+
+ # lib/ap-utils.h:114
+ #: lib/ap-utils.h:120
+-#, fuzzy
+ msgid "Get info and statistics from AP"
+ msgstr "Pobieram informacje i statystyki z AP"
+
+ # lib/ap-utils.h:115
+ #: lib/ap-utils.h:121
+-#, fuzzy
+ msgid "Set various configuration options"
+ msgstr "Ustawianie opcji - ró¿ne"
+
+ # src/cmd.c:24
+ #: lib/cmd.c:25
+-#, fuzzy
+ msgid ""
+ "(Y - Yes; N - No (it's safer to answer No, unless you really need this.)"
+ msgstr "(Y - Tak; N - Nie (lepiej nie)"
+@@ -841,7 +785,6 @@
+
+ # src/cmd.c:40
+ #: lib/cmd.c:47
+-#, fuzzy
+ msgid "After restoring factory defaults your current configuration."
+ msgstr "Po odtworzeniu ustawieñ fabrycznych CA£O¦Æ ustawien zostanie stracona."
+
+@@ -851,7 +794,6 @@
+
+ # src/cmd.c:71
+ #: lib/cmd.c:79
+-#, fuzzy
+ msgid "Factory default settings loaded. Press any key to continue."
+ msgstr "Ustawiono konfiguracje domy¶ln±. Wci¶nij dowolny klawisz."
+
+@@ -862,7 +804,6 @@
+
+ # src/cmd.c:84
+ #: lib/cmd.c:91
+-#, fuzzy
+ msgid "By reset you'll lose all non-uploaded configuration."
+ msgstr "Przy resecie stracisz wszystkie nie za³adowane informacje."
+
+@@ -878,7 +819,6 @@
+
+ # src/cmd.c:137
+ #: lib/cmd.c:149
+-#, fuzzy
+ msgid "You need to upload the configuration only if you've changed"
+ msgstr "Musisz za³adowaæ konfiguracje tylko je¶li co¶ zmieni³e¶."
+
+@@ -888,43 +828,37 @@
+
+ # src/ap-config.c:78
+ #: lib/cmd.c:153
+-#, fuzzy
+ msgid "of your current configuration."
+ msgstr "Zapisuje aktualn± konfiguracje na sta³e"
+
+ # src/cmd.c:163
+ #: lib/cmd.c:176
+-#, fuzzy
+ msgid "Configuration uploaded. Press any key to continue."
+ msgstr "Konfiguracja za³adowana. Wci¶nij dowolny klawisz."
+
+ #: lib/common.c:30
+ msgid "Autodetect AP type? "
+-msgstr ""
++msgstr "Wykryæ typ AP? "
+
+ # lib/common.c:120
+ #: lib/common.c:31
+-#, fuzzy
+ msgid "Access Point IP-address: "
+-msgstr "Adres IP:"
++msgstr "Adres IP Access Pointa:"
+
+ # lib/common.c:121
+ #: lib/common.c:32
+-#, fuzzy
+ msgid "Password (community): "
+-msgstr "Has³o (prawa dostêpu):"
++msgstr "Has³o (community): "
+
+ # lib/common.c:122
+ #: lib/common.c:33
+-#, fuzzy
+ msgid "AP type: "
+-msgstr "Typ Access-pointa"
++msgstr "Typ AP: "
+
+ # lib/common.c:159
+ #: lib/common.c:34
+-#, fuzzy
+ msgid "Save connect-settings: "
+-msgstr "Zapisaæ na sta³e:"
++msgstr "Zapisz na sta³e: "
+
+ # lib/common.c:67
+ #: lib/common.c:69
+@@ -945,9 +879,8 @@
+
+ # lib/common.c:74
+ #: lib/common.c:76
+-#, fuzzy
+ msgid "Copyright (c) Roman Festchook 2001-2004"
+-msgstr "Prawa autorskie © Roman Festchook 2001-2002"
++msgstr "Prawa autorskie - Roman Festchook 2001-2004"
+
+ # lib/common.c:77
+ #: lib/common.c:79
+@@ -981,13 +914,11 @@
+
+ # lib/ap-utils.h:88
+ #: lib/common.c:171
+-#, fuzzy
+ msgid "Determining AP type. Please wait..."
+ msgstr "Pobieram dane z AP. Proszê czekaæ..."
+
+ # lib/ap-utils.h:87
+ #: lib/common.c:196
+-#, fuzzy
+ msgid "Unable to determine AP type (no response). Press any key."
+ msgstr "Nie moge pobraæ danych z AP. Wci¶nij dowolny klawisz."
+
+@@ -1005,9 +936,8 @@
+
+ # lib/common.c:118
+ #: lib/file.c:225
+-#, fuzzy
+ msgid "Connect to AP num:"
+-msgstr "Wybór Access-pointa"
++msgstr "Nr AP do pod³. :"
+
+ # lib/ap-utils.h:121
+ #: lib/file.c:250
+@@ -1016,15 +946,13 @@
+
+ # src/bridge.c:31
+ #: lib/input.c:31
+-#, fuzzy
+ msgid "Invalid value. Press any key to continue."
+ msgstr "B³êdny adres IP. Wci¶nij dowolny klawisz."
+
+ # lib/ap-utils.h:86
+ #: lib/input.c:32
+-#, fuzzy, c-format
+ msgid "Value must be in range %i - %i. Press any key to continue."
+-msgstr "Nie moge wys³aæ danych do AP. Wci¶nij dowolny klawisz."
++msgstr "Warto¶æ musi byæ od %i do %i. Wci¶nij dowolny klawisz."
+
+ # lib/oui.c:6048
+ #: lib/oui.c:6052
+@@ -1033,28 +961,24 @@
+
+ # src/radio.c:93
+ #: lib/radio.c:27
+-#, fuzzy
+ msgid ""
+ "[key] - power level; UIOP or LR - antenna; W - write config; Q - quit to menu"
+ msgstr "Kl. - moc sygna³y; UIOP - antena; W - Zapis.; Q - Koniec"
+
+ # src/test.c:28
+ #: lib/radio.c:29
+-#, fuzzy
+ msgid "Antenna:"
+-msgstr "[A] Antena: %s"
++msgstr "Antena:"
+
+ # src/test.c:70
+ #: lib/radio.c:30
+-#, fuzzy
+ msgid "[L] Left:"
+-msgstr "Lewa"
++msgstr "[L] Lewa"
+
+ # src/test.c:70
+ #: lib/radio.c:31
+-#, fuzzy
+ msgid "[R] Right:"
+-msgstr "Prawa"
++msgstr "[R] Prawa:"
+
+ # src/radio.c:100
+ #: lib/radio.c:114
+@@ -1067,13 +991,11 @@
+
+ # src/radio.c:103
+ #: lib/radio.c:117
+-#, fuzzy
+ msgid "Key Channel Level"
+ msgstr "Kl. kana³ poziom"
+
+ # src/radio.c:225
+ #: lib/radio.c:273
+-#, fuzzy
+ msgid ""
+ "You can't disable both antennas; unable to save antenna-config. Press any "
+ "key."
+@@ -1092,7 +1014,6 @@
+
+ # lib/ap-utils.h:96
+ #: lib/set_community.c:29
+-#, fuzzy
+ msgid "Key Access level"
+ msgstr "Kl. Prawa dostêpu"
+
+@@ -1113,7 +1034,6 @@
+
+ # lib/ap-utils.h:100
+ #: lib/set_community.c:33
+-#, fuzzy
+ msgid ""
+ "[key] - set community/password; W - write config to AP; Q - quit to menu"
+ msgstr "Kl. - ustaw has³o; W - zapisz konfiguracje; Q - wyj¶cie"
+@@ -1170,7 +1090,6 @@
+
+ # src/stat.c:124
+ #: lib/stat.c:124
+-#, fuzzy
+ msgid "Transmitted:"
+ msgstr "Wys³ane:"
+
+@@ -1215,33 +1134,28 @@
+
+ # src/sysinfo.c:103 src/sysinfo.c:285
+ #: lib/sysinfo.c:130
+-#, fuzzy
+ msgid "Product name:"
+ msgstr "Nazwa produktu:"
+
+ # src/sysinfo.c:108
+ #: lib/sysinfo.c:135
+-#, fuzzy, c-format
+ msgid "Product type: %u"
+ msgstr "Typ produktu: %u"
+
+ # src/sysinfo.c:111
+ #: lib/sysinfo.c:138
+-#, fuzzy, c-format
+ msgid "Hardware revision: %u"
+-msgstr "Wersja sprzêtu/uk³adu: %u"
++msgstr "Wersja sprzêtu: %u"
+
+ # src/sysinfo.c:116
+ #: lib/sysinfo.c:141
+-#, fuzzy
+ msgid "OEM name:"
+ msgstr "Nazwa OEM:"
+
+ # src/sysinfo.c:316
+ #: lib/sysinfo.c:149
+-#, fuzzy, c-format
+ msgid "Regulation domain: %s [%d]"
+-msgstr "Regulacje dot. kana³ów: %s"
++msgstr "Regulacje: %s [%d]"
+
+ # src/sysinfo.c:126 src/sysinfo.c:317
+ #: lib/sysinfo.c:150 lib/sysinfo.c:337
+@@ -1280,7 +1194,6 @@
+
+ # src/sysinfo.c:134
+ #: lib/sysinfo.c:158
+-#, fuzzy, c-format
+ msgid "Info structure version: %u"
+ msgstr "StructVersion: %u"
+
+@@ -1405,43 +1318,36 @@
+
+ # src/test.c:32
+ #: lib/test.c:27
+-#, fuzzy
+ msgid "[T] Test mode: "
+-msgstr "[T] Tryb testowy: %s"
++msgstr "[T] Tryb testowy: "
+
+ # src/test.c:28
+ #: lib/test.c:28
+-#, fuzzy
+ msgid "[A] Antenna: "
+-msgstr "[A] Antena: %s"
++msgstr "[A] Antena: "
+
+ # src/test.c:117
+ #: lib/test.c:29
+-#, fuzzy
+ msgid "[S] Signal level: "
+-msgstr "[S] Poziom sygna³u: %03u"
++msgstr "[S] Poziom sygna³u: "
+
+ # src/test.c:29
+ #: lib/test.c:30
+-#, fuzzy
+ msgid "[R] Rate: "
+-msgstr "[R] Prêdko¶æ: %.1f Mbit/s"
++msgstr "[R] Prêdko¶æ: "
+
+ # src/test.c:31
+ #: lib/test.c:31
+-#, fuzzy
+ msgid "[F] TxFiler: "
+-msgstr "[F] TxFiler: %s"
++msgstr "[F] TxFiler: "
+
+ # src/test.c:30
+ #: lib/test.c:32
+-#, fuzzy
+ msgid "[O] Command: "
+-msgstr "[O] Komenda: %s"
++msgstr "[O] Komenda: "
+
+ # src/test.c:33
+ #: lib/test.c:33
+-#, fuzzy
+ msgid "T - Test mode On/Off; CASRFO - set options; Q - quit to menu"
+ msgstr "T - Test W³/Wy³; CASRFO - ustawianie; Q - koniecmenu"
+
+@@ -1457,32 +1363,28 @@
+
+ # src/test.c:78
+ #: lib/test.c:88
+-#, fuzzy
+ msgid "Test mode"
+ msgstr "Tryb testowy"
+
+ # src/test.c:81
+ #: lib/test.c:91
+-#, fuzzy
+ msgid "Using the \"Test mode\" may cause loss of your current"
+-msgstr "U¿ycie trybu testowego mo¿e spowodowaæ utrate konfiguracji."
++msgstr "U¿ycie trybu testowego mo¿e spowodowaæ utratê konfiguracji."
+
+ # src/cmd.c:134
+ #: lib/test.c:92
+-#, fuzzy
+ msgid "configuration."
+-msgstr "Za³aduj konfiguracje"
++msgstr "konfiguracja."
+
+ # src/test.c:84
+ #: lib/test.c:95
+-#, fuzzy
+ msgid "(Y - Yes; N - No (it's safer to answer No.)"
+-msgstr "(Y - Tak; N - Nie (lepiej nie)"
++msgstr "(Y - Tak; N - Nie (bezpieczny wybór)"
+
+ # src/test.c:106
+ #: lib/test.c:118
+ msgid "Options:"
+-msgstr "Opcje"
++msgstr "Opcje:"
+
+ # src/test.c:132
+ #: lib/test.c:144
+@@ -1502,27 +1404,23 @@
+
+ # lib/ap-utils.h:62
+ #: lib/wep.c:29
+-#, fuzzy
+ msgid "[E] Standard encryption mechanism: "
+-msgstr "[E] Tryb szyfrowania: %s"
++msgstr "[E] Tryb szyfrowania: "
+
+ # src/wep.c:29
+ #: lib/wep.c:30
+-#, fuzzy
+ msgid "[A] Allow unencrypted: "
+-msgstr "[A] Dopu¶æ bez szyfracji: %s"
++msgstr "[A] Dopu¶æ bez szyfracji: "
+
+ # src/wep.c:31
+ #: lib/wep.c:31
+-#, fuzzy
+ msgid "[K] Default WEP key: "
+-msgstr "[K] U¿ywany klucz nr: %d"
++msgstr "[K] U¿ywany klucz nr: "
+
+ # src/wep.c:30
+ #: lib/wep.c:32
+-#, fuzzy
+ msgid "[P] Public key: "
+-msgstr "[P] Klucz publiczny: %s"
++msgstr "[P] Klucz publiczny: "
+
+ # src/wep.c:73
+ #: lib/wep.c:85
+@@ -1554,92 +1452,78 @@
+
+ # lib/ap-utils.h:78
+ #: lib/wlan.c:29
+-#, fuzzy
+ msgid "[N] AP name: "
+-msgstr "[N] Nazwa urz±dzenia:"
++msgstr "[N] Nazwa AP: "
+
+ # src/wlan.c:579
+ #: lib/wlan.c:31
+-#, fuzzy
+ msgid "[K] AP contact: "
+-msgstr "[E] Osoba kontaktowa: %s"
++msgstr "[K] Osoba kontaktowa: "
+
+ # src/wlan.c:577
+ #: lib/wlan.c:32
+-#, fuzzy
+ msgid "[L] AP location: "
+-msgstr "[L] Lokalizacja: %s"
++msgstr "[L] Lokalizacja: "
+
+ # lib/ap-utils.h:71
+ #: lib/wlan.c:34
+-#, fuzzy
+ msgid "[R] RTS threshold: "
+-msgstr "[R] Min. bajtów do RTS: %d"
++msgstr ""
+
+ # lib/ap-utils.h:72
+ #: lib/wlan.c:35
+-#, fuzzy
+ msgid "[F] Fragmentation threshold: "
+-msgstr "[F] Min. bajtów do fragmentacji: %d"
++msgstr ""
+
+ # src/wlan.c:33
+ #: lib/wlan.c:36
+-#, fuzzy
+ msgid "[P] Preambule type: "
+-msgstr "[P] Typ nag³ówka: %s"
++msgstr "[P] Preambu³a: "
+
+ # lib/ap-utils.h:69
+ #: lib/wlan.c:37
+-#, fuzzy
+ msgid "[A] Auth type: "
+-msgstr "[A] Tryb autoryzacji: %s"
++msgstr "[A] Tryb autoryzacji: "
+
+ # lib/ap-utils.h:64
+ #: lib/wlan.c:38
+-#, fuzzy
+ msgid "Open system"
+-msgstr "Bez kluczy (Open System)"
++msgstr "Bez kluczy"
+
+ # lib/ap-utils.h:65
+ #: lib/wlan.c:39
+-#, fuzzy
+ msgid "Shared key"
+ msgstr "Wspólny klucz"
+
+ # lib/ap-utils.h:66
+ #: lib/wlan.c:40
+-#, fuzzy
+ msgid "Both types"
+ msgstr "Oba"
+
+ # src/wlan.c:32
+ #: lib/wlan.c:41
+-#, fuzzy
+ msgid "[U] Auto rate fallback: "
+-msgstr "[U] Automatyczne spowalnianie: %s"
++msgstr "[U] Auto. ustawianie prêdko¶ci: "
+
+ # src/wlan.c:31
+ #: lib/wlan.c:42
+-#, fuzzy
+ msgid "[S] Insert ESSID in broadcast packets: "
+-msgstr "[S] Wysy³aæ ESSID w pakietach rozg³oszeniowych (broadcast): %s"
++msgstr "[S] Wysy³aæ ESSID w pakietach rozg³oszeniowych (broadcast): "
+
+ # lib/ap-utils.h:74
+ #: lib/wlan.c:43
+-#, fuzzy
+ msgid "Basic and Supported rates:"
+ msgstr "Podstawowe i obs³ugiwane prêdko¶ci:"
+
+ # lib/ap-utils.h:75
+ #: lib/wlan.c:44
+ msgid "Key Rate Status"
+-msgstr "Klaw. Prêd. Stan"
++msgstr "Klu Prêd Stan"
+
+ # src/bridge.c:35
+ #: lib/wlan.c:46
+-#, fuzzy
+ msgid "[I] International roaming: "
+-msgstr "[O] Tryb pracy: %s"
++msgstr ""
+
+ #: lib/wlan.c:47
+ msgid "[B] Beacon period (msec): "
+@@ -1652,7 +1536,7 @@
+ # src/wlan.c:185
+ #: lib/wlan.c:49
+ msgid "[key] - set option; W - write conf; Q - quit to menu"
+-msgstr "[kl] - ustaw opcje; W - zapis; Q - wyj¶ciele menu"
++msgstr "[kl] - ustaw opcje; W - zapis; Q - wyj¶cie do menu"
+
+ # src/wlan.c:100
+ #: lib/wlan.c:140
+@@ -1732,7 +1616,6 @@
+
+ # src/ap-mrtg.c:47
+ #: src/ap-mrtg.c:44
+-#, fuzzy
+ msgid ""
+ "\tap-mrtg -i ip -c community -t type [-b bssid] [-n name] [-a aptype] [-v] [-"
+ "h] [-r]\n"
+@@ -1809,12 +1692,11 @@
+
+ # src/ap-mrtg.c:60
+ #: src/ap-mrtg.c:59
+-#, fuzzy, c-format
+ msgid ""
+ "ap-mrtg %s Copyright (c) 2002-2003 Roman Festchook\n"
+ "\n"
+ msgstr ""
+-"ap-mrtg %s Prawa autorskie © 2002 Roman Festchook\n"
++"ap-mrtg %s Prawa autorskie © 2002-2003 Roman Festchook\n"
+ "\n"
+
+ # src/ap-mrtg.c:142
+@@ -1908,7 +1790,6 @@
+
+ # lib/ap-utils.h:66
+ #: src/bridge.c:137
+-#, fuzzy
+ msgid "Both"
+ msgstr "Oba"
+
+@@ -1957,7 +1838,6 @@
+
+ # src/nwn_latest.c:104
+ #: src/nwn_latest.c:104
+-#, fuzzy
+ msgid "Authenticate Fail:"
+ msgstr "B³±d autoryzacji:"
+
+@@ -1973,9 +1853,8 @@
+
+ # src/stations.c:84
+ #: src/stations.c:113
+-#, fuzzy
+ msgid "Id MAC address"
+-msgstr "Id Adres fizyczny"
++msgstr "Id Adres fizyczny"
+
+ # src/stations.c:194 src/stations.c:278
+ #: src/stations.c:223 src/stations.c:307
+@@ -1984,9 +1863,8 @@
+
+ # src/stations.c:196
+ #: src/stations.c:225
+-#, fuzzy
+ msgid "Id MAC address Quality Age RSSI"
+-msgstr "Id Adres fizyczny Jako¶æ Wiek RSSI"
++msgstr "Id Adres fizyczny Jako¶æ Wiek RSSI"
+
+ # lib/common.c:66
+ #~ msgid "Wireless Access Point Configurator"
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-22 15:06+0300\n"
+"POT-Creation-Date: 2004-11-14 22:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:46 src/bridge.c:222
+#: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:50 src/bridge.c:184
msgid "Bridging"
msgstr ""
-#: ap-gl/ap-gl.c:47 src/ap-config.c:46
+#: ap-gl/ap-gl.c:47 src/ap-config.c:50
msgid "Set bridging and IP-related options"
msgstr ""
-#: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:48
-#: src/ap-config.c:118 src/ap-config.c:127 src/bridge.c:135 src/bridge.c:139
+#: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:52
+#: src/ap-config.c:120 src/ap-config.c:129 src/bridge.c:120 src/bridge.c:124
msgid "Wireless"
msgstr ""
-#: ap-gl/ap-gl.c:49 src/ap-config.c:48
+#: ap-gl/ap-gl.c:49 src/ap-config.c:52
msgid "Set wireless options"
msgstr ""
-#: ap-gl/ap-gl.c:50 src/ap-config.c:49 src/ap-config.c:61
+#: ap-gl/ap-gl.c:50 src/ap-config.c:53 src/ap-config.c:65
msgid "Privacy"
msgstr ""
-#: ap-gl/ap-gl.c:51 src/ap-config.c:50 src/ap-config.c:62
+#: ap-gl/ap-gl.c:51 src/ap-config.c:54 src/ap-config.c:66
msgid "MAC auth"
msgstr ""
-#: ap-gl/ap-gl.c:52 src/ap-config.c:51 src/ap-config.c:63
+#: ap-gl/ap-gl.c:52 src/ap-config.c:55 src/ap-config.c:67
msgid "Community"
msgstr ""
-#: ap-gl/ap-gl.c:53 src/ap-config.c:52
+#: ap-gl/ap-gl.c:53 src/ap-config.c:56
msgid "Radio"
msgstr ""
-#: ap-gl/ap-gl.c:53 src/ap-config.c:52
+#: ap-gl/ap-gl.c:53 src/ap-config.c:56
msgid "Set radio signal power and antenna options"
msgstr ""
-#: ap-gl/ap-gl.c:66 src/ap-config.c:83
+#: ap-gl/ap-gl.c:66 src/ap-config.c:87
msgid "Upload"
msgstr ""
-#: ap-gl/ap-gl.c:66 src/ap-config.c:83
+#: ap-gl/ap-gl.c:66 src/ap-config.c:87
msgid "Make current configuration active"
msgstr ""
-#: ap-gl/ap-gl.c:67 src/ap-config.c:84
+#: ap-gl/ap-gl.c:67 src/ap-config.c:88
msgid "Defaults"
msgstr ""
-#: ap-gl/ap-gl.c:67 src/ap-config.c:84
+#: ap-gl/ap-gl.c:67 src/ap-config.c:88
msgid "Restore factory default settings"
msgstr ""
-#: ap-gl/ap-gl.c:69 src/ap-config.c:86 src/ap-config.c:94
+#: ap-gl/ap-gl.c:69 src/ap-config.c:89 src/ap-config.c:97
msgid "Reset"
msgstr ""
-#: ap-gl/ap-gl.c:70 src/ap-config.c:87
+#: ap-gl/ap-gl.c:70 src/ap-config.c:90
msgid "Reset AP. All not uploaded configuration will be lost"
msgstr ""
-#: ap-gl/ap-gl.c:72 src/ap-config.c:89
+#: ap-gl/ap-gl.c:72 src/ap-config.c:92
msgid "TestMode"
msgstr ""
-#: ap-gl/ap-gl.c:72 src/ap-config.c:89
+#: ap-gl/ap-gl.c:72 src/ap-config.c:92
msgid "Put Access Point in test mode"
msgstr ""
-#: ap-gl/ap-gl.c:83 src/ap-config.c:116 src/ap-config.c:126
+#: ap-gl/ap-gl.c:83 src/ap-config.c:118 src/ap-config.c:128
msgid "SysInfo"
msgstr ""
-#: ap-gl/ap-gl.c:84 ap-gl/bridge.c:132 src/ap-config.c:117 src/bridge.c:134
-#: src/bridge.c:138
+#: ap-gl/ap-gl.c:84 ap-gl/bridge.c:132 src/ap-config.c:119 src/bridge.c:119
+#: src/bridge.c:123
msgid "Ethernet"
msgstr ""
-#: ap-gl/ap-gl.c:84 src/ap-config.c:117
+#: ap-gl/ap-gl.c:84 src/ap-config.c:119
msgid "Get ethernet port statistics"
msgstr ""
-#: ap-gl/ap-gl.c:86 src/ap-config.c:119 src/ap-config.c:128
+#: ap-gl/ap-gl.c:86 src/ap-config.c:121 src/ap-config.c:130
msgid "Stations"
msgstr ""
-#: ap-gl/ap-gl.c:88 src/ap-config.c:121
+#: ap-gl/ap-gl.c:88 src/ap-config.c:123
msgid "KnownAPs"
msgstr ""
-#: ap-gl/ap-gl.c:88 src/ap-config.c:121
+#: ap-gl/ap-gl.c:88 src/ap-config.c:123
msgid "Get info about known Access Points"
msgstr ""
-#: ap-gl/ap-gl.c:105 src/ap-config.c:154
+#: ap-gl/ap-gl.c:105 src/ap-config.c:156
msgid "Info"
msgstr ""
-#: ap-gl/ap-gl.c:106 src/ap-config.c:155
+#: ap-gl/ap-gl.c:106 src/ap-config.c:157
msgid "Config"
msgstr ""
-#: ap-gl/ap-gl.c:107 src/ap-config.c:156
+#: ap-gl/ap-gl.c:107 src/ap-config.c:158
msgid "Commands"
msgstr ""
-#: ap-gl/ap-gl.c:107 src/ap-config.c:156
+#: ap-gl/ap-gl.c:107 src/ap-config.c:158
msgid "Execute commands on Access Point"
msgstr ""
-#: ap-gl/ap-gl.c:109 src/ap-config.c:158
+#: ap-gl/ap-gl.c:109 src/ap-config.c:160
msgid "Connect"
msgstr ""
-#: ap-gl/ap-gl.c:110 src/ap-config.c:159
+#: ap-gl/ap-gl.c:110 src/ap-config.c:161
msgid "Search"
msgstr ""
-#: ap-gl/ap-gl.c:111 lib/common.c:52 src/ap-config.c:160
+#: ap-gl/ap-gl.c:111 lib/common.c:58 src/ap-config.c:162
msgid "About"
msgstr ""
-#: ap-gl/ap-gl.c:112 src/ap-config.c:161
+#: ap-gl/ap-gl.c:112 src/ap-config.c:163
msgid "Shell"
msgstr ""
-#: ap-gl/ap-gl.c:113 src/ap-config.c:162
+#: ap-gl/ap-gl.c:113 src/ap-config.c:164
msgid "Exit"
msgstr ""
-#: ap-gl/ap-gl.c:162 src/ap-config.c:211
+#: ap-gl/ap-gl.c:162 src/ap-config.c:212
#, c-format
msgid "Wireless Access Point Configurator ver. %s"
msgstr ""
msgid "Authorized MAC addresses"
msgstr ""
-#: ap-gl/auth_mac.c:34 src/auth_mac.c:34
+#: ap-gl/auth_mac.c:34
msgid "NUM MAC address"
msgstr ""
msgid "INGFPDOMSCTRBU - set; W - write conf; Q - quit to menu"
msgstr ""
-#: ap-gl/bridge.c:125 src/bridge.c:127
+#: ap-gl/bridge.c:125 src/bridge.c:112
msgid "Wireless Bridge Point to MultiPoint"
msgstr ""
-#: ap-gl/bridge.c:126 src/bridge.c:128
+#: ap-gl/bridge.c:126 src/bridge.c:113
msgid "Access Point"
msgstr ""
-#: ap-gl/bridge.c:127 src/bridge.c:129
+#: ap-gl/bridge.c:127 src/bridge.c:114
msgid "Access Point client"
msgstr ""
-#: ap-gl/bridge.c:128 src/bridge.c:130
+#: ap-gl/bridge.c:128 src/bridge.c:115
msgid "Wireless Bridge Point to Point"
msgstr ""
-#: ap-gl/bridge.c:129 src/bridge.c:131
+#: ap-gl/bridge.c:129 src/bridge.c:116
msgid "Repeater"
msgstr ""
msgid "Associated Stations"
msgstr ""
-#: ap-gl/stations.c:83 src/stations.c:87
-msgid "AP now in AP Client Mode and don't has any associated stations"
+#: ap-gl/stations.c:80 src/stations.c:96
+msgid "AP is currently in AP Client Mode => no associated STAtions."
msgstr ""
-#: ap-gl/stations.c:109
-msgid "# MAC LQ RSSI Status Port IP"
+#: ap-gl/stations.c:105
+msgid "# MAC LQ RSSI Status Port IP"
msgstr ""
-#: ap-gl/stations.c:135 src/stations.c:139
+#: ap-gl/stations.c:131 src/stations.c:155
msgid "AssociatedSTAsInfo packet error"
msgstr ""
-#: ap-gl/stations.c:164 src/stations.c:161 src/stations.c:313
+#: ap-gl/stations.c:160 src/stations.c:364
msgid "Arrows - scroll; S - save to file; Q - quit to menu."
msgstr ""
msgid "Known Access Points"
msgstr ""
-#: lib/aps.c:217
+#: lib/aps.c:219
msgid "NetworkType"
msgstr ""
-#: lib/aps.c:293
+#: lib/aps.c:295
msgid "Infrastructure"
msgstr ""
-#: lib/aps.c:352 lib/aps.c:360 lib/aps.c:368
+#: lib/aps.c:355 lib/aps.c:363 lib/aps.c:371
msgid "CN: Channel Name; P: Preambule Type (S: Short; L: Long);"
msgstr ""
-#: lib/aps.c:354
-msgid "RSSI: Radio Signal Strength Indicator [%];"
+#: lib/aps.c:357
+msgid "RSSI: Radio Signal Strength Indicator [%]"
msgstr ""
-#: lib/aps.c:356 lib/aps.c:364
-msgid "LQ: Link Quality [%]"
+#: lib/aps.c:359 lib/aps.c:367
+msgid "; LQ: Link Quality [%]"
msgstr ""
-#: lib/aps.c:362
-msgid "RSSI: Radio Signal Strength Indicator [dBm];"
+#: lib/aps.c:365
+msgid "RSSI: Radio Signal Strength Indicator [dBm]"
msgstr ""
-#: lib/aps.c:370
-msgid "RSSI: Radio Signal Strength Indicator [raw];"
+#: lib/aps.c:373
+msgid "RSSI: Radio Signal Strength Indicator [raw]"
msgstr ""
-#: lib/aps.c:372
-msgid "LQ: Link Quality [raw]"
+#: lib/aps.c:375
+msgid "; LQ: Link Q. [raw]"
msgstr ""
-#: lib/aps.c:378
+#: lib/aps.c:381
msgid ""
-"# con. to this AP; R refresh with reset; S refresh w/o reset; T toggle; Q "
-"quit"
+"# con. to AP #; R refresh with reset; T toggle; Q quit; Other = refr. w/o "
+"reset"
msgstr ""
-#: lib/aps.c:380
+#: lib/aps.c:383
msgid ""
-"# con. to this AP; R initiate AP scan; S refresh view; T toggle view; Q quit"
+"# con. to AP #; R initiate AP scan; T toggle view; Q quit; Other = refresh "
+"view"
msgstr ""
-#: lib/aps.c:509 lib/ap_search.c:153
+#: lib/aps.c:512 lib/ap_search.c:164
#, c-format
msgid "Failure in sendto(): %s. Press any key."
msgstr ""
-#: lib/aps.c:518
+#: lib/aps.c:521
msgid "You have just initiated the AP scan. Be advised that it may"
msgstr ""
-#: lib/aps.c:521
+#: lib/aps.c:524
msgid "take a few seconds for your Access Point to find out some"
msgstr ""
-#: lib/aps.c:524
+#: lib/aps.c:527
msgid "values, so expect finishing the scan in about 5 seconds."
msgstr ""
-#: lib/aps.c:527
+#: lib/aps.c:530
msgid "Also note that your Access Point stops forwarding the network"
msgstr ""
-#: lib/aps.c:530
+#: lib/aps.c:533
msgid "traffic while the scan is in progress, but restores itself"
msgstr ""
-#: lib/aps.c:533
+#: lib/aps.c:536
msgid "to normal operation in time ranging up to 1 minute."
msgstr ""
-#: lib/aps.c:536
+#: lib/aps.c:539
msgid "Hence, if you are connected to target Access Point via its"
msgstr ""
-#: lib/aps.c:539
+#: lib/aps.c:542
msgid "wireless port, you need to wait a bit longer"
msgstr ""
-#: lib/aps.c:542
+#: lib/aps.c:545
msgid "after pressing 'S'."
msgstr ""
#: lib/ap_search.c:50
-msgid "# Type IP Description"
+msgid " # Type IP Name"
msgstr ""
-#: lib/ap_search.c:89
+#: lib/ap_search.c:99
msgid "Please wait while scanning, or press 'Q' to quit."
msgstr ""
-#: lib/ap_search.c:105
+#: lib/ap_search.c:115
msgid "Can't set broadcast option on socket. Press any key."
msgstr ""
-#: lib/ap_search.c:114
+#: lib/ap_search.c:124
msgid "Can't set multicast membership on socket. Press any key."
msgstr ""
-#: lib/ap_search.c:120
+#: lib/ap_search.c:131
msgid "Scanning via network interface:"
msgstr ""
-#: lib/ap_search.c:121
+#: lib/ap_search.c:132
#, c-format
msgid " Index: %i"
msgstr ""
-#: lib/ap_search.c:123
+#: lib/ap_search.c:134
#, c-format
msgid " Name: %s"
msgstr ""
-#: lib/ap_search.c:125
+#: lib/ap_search.c:136
#, c-format
msgid " IP: %s"
msgstr ""
-#: lib/ap_search.c:134
+#: lib/ap_search.c:145
#, c-format
msgid "Scanning for AP type: %s"
msgstr ""
-#: lib/ap_search.c:312
+#: lib/ap_search.c:327
msgid "Access Points Search"
msgstr ""
-#: lib/ap_search.c:329
+#: lib/ap_search.c:345
msgid "realloc() error."
msgstr ""
-#: lib/ap_search.c:341
+#: lib/ap_search.c:357
msgid "Network interface discovery error."
msgstr ""
-#: lib/ap_search.c:416
+#: lib/ap_search.c:432
msgid "No local network interfaces found. Press any key."
msgstr ""
-#: lib/ap_search.c:418
+#: lib/ap_search.c:434
msgid "No directly reachable Access Points found. Press any key."
msgstr ""
-#: lib/ap_search.c:422
-msgid "Program-hardcoded maximum number of APs found."
+#: lib/ap_search.c:439
+msgid "Single-screen maximum number of APs found."
msgstr ""
-#: lib/ap_search.c:426
+#: lib/ap_search.c:442
msgid "# - connect to AP; Q - quit"
msgstr ""
msgstr ""
#: lib/ap-utils.h:100
-msgid "Unable to retrieve data from AP. Press any key to continue."
+msgid "Unable to retrieve (valid) data from AP. Press any key to continue."
msgstr ""
#: lib/ap-utils.h:101
msgstr ""
#: lib/common.c:33
-msgid "AP type: "
+msgid "Access Point name: "
msgstr ""
#: lib/common.c:34
+msgid "Do you want to define name for this AP? "
+msgstr ""
+
+#: lib/common.c:35
+msgid "AP type: "
+msgstr ""
+
+#: lib/common.c:36
msgid "Save connect-settings: "
msgstr ""
-#: lib/common.c:69
+#: lib/common.c:75
#, c-format
msgid "From %s"
msgstr ""
-#: lib/common.c:71
+#: lib/common.c:77
#, c-format
msgid "Version %s"
msgstr ""
-#: lib/common.c:74
+#: lib/common.c:80
msgid "Written by Roman Festchook roma@polesye.net"
msgstr ""
-#: lib/common.c:76
+#: lib/common.c:82
msgid "Copyright (c) Roman Festchook 2001-2004"
msgstr ""
-#: lib/common.c:79
+#: lib/common.c:85
msgid "This program is distributed under the terms"
msgstr ""
-#: lib/common.c:81
+#: lib/common.c:87
msgid "of the GNU General Public License version 2."
msgstr ""
-#: lib/common.c:83
+#: lib/common.c:89
msgid "See the included COPYING file for details."
msgstr ""
msgid "Entered characters will not be displayed for security reason."
msgstr ""
-#: lib/common.c:171
+#: lib/common.c:157
+msgid "Display name for the Access point (NOT the name defined inside the AP!)"
+msgstr ""
+
+#: lib/common.c:187
msgid "Determining AP type. Please wait..."
msgstr ""
-#: lib/common.c:196
+#: lib/common.c:272
msgid "Unable to determine AP type (no response). Press any key."
msgstr ""
-#: lib/file.c:176
-msgid "NUM IP ADDRESS TYPE"
+#: lib/file.c:194
+msgid "NUM IP ADDRESS TYPE NAME (in ~/.ap-config)"
msgstr ""
-#: lib/file.c:177
+#: lib/file.c:195
msgid "Choose an AP to connect to"
msgstr ""
-#: lib/file.c:182
+#: lib/file.c:200
msgid "1-9,C: connect; N: new; D: delete; W: save; Q: quit; arrows: scroll"
msgstr ""
-#: lib/file.c:225
+#: lib/file.c:257
msgid "Connect to AP num:"
msgstr ""
-#: lib/file.c:250
+#: lib/file.c:293
msgid "Delete num:"
msgstr ""
msgid "Value must be in range %i - %i. Press any key to continue."
msgstr ""
-#: lib/oui.c:6052
+#: lib/oui.c:6056
msgid "Unknown or Private"
msgstr ""
msgid "[R] Right:"
msgstr ""
-#: lib/radio.c:114
+#: lib/radio.c:121
msgid "Radio Configuration"
msgstr ""
-#: lib/radio.c:115
+#: lib/radio.c:122
msgid "Output RF signal power level (CR31 register values)"
msgstr ""
-#: lib/radio.c:117
+#: lib/radio.c:124
msgid "Key Channel Level"
msgstr ""
-#: lib/radio.c:273
+#: lib/radio.c:280
msgid ""
"You can't disable both antennas; unable to save antenna-config. Press any "
"key."
msgstr ""
-#: lib/scr.c:134
+#: lib/scr.c:203
#, c-format
msgid "Current AP: %s Type: %s"
msgstr ""
msgid "[M] Manufacturer"
msgstr ""
-#: lib/stat.c:29
-msgid "Unable to get data from AP. Press Q to continue."
-msgstr ""
-
-#: lib/stat.c:30 lib/stat.c:428
-msgid "Q - quit to menu."
+#: lib/stat.c:30
+msgid "Q - quit to menu. Other key - force update."
msgstr ""
#: lib/stat.c:31
-msgid "pipe error. Press any key."
-msgstr ""
-
-#: lib/stat.c:32
-msgid "fcntl error. Press any key."
+msgid "select() function error. Press any key."
msgstr ""
-#: lib/stat.c:33
-msgid "fork error. Press any key."
-msgstr ""
-
-#: lib/stat.c:72
+#: lib/stat.c:61
msgid "Ethernet Statistics"
msgstr ""
-#: lib/stat.c:108
-msgid "EthRxStat packet error. Press Q to continue."
+#: lib/stat.c:92
+msgid "EthRxStat packet error. Press any key."
msgstr ""
-#: lib/stat.c:120
-msgid "EthTxStat packet error. Press Q to continue."
+#: lib/stat.c:105
+msgid "EthTxStat packet error. Press any key."
msgstr ""
-#: lib/stat.c:123
+#: lib/stat.c:109
msgid "Received:"
msgstr ""
-#: lib/stat.c:124
+#: lib/stat.c:110
msgid "Transmitted:"
msgstr ""
-#: lib/stat.c:251 lib/stat.c:427
+#: lib/stat.c:235 lib/stat.c:425
msgid "Wireless Statistics"
msgstr ""
-#: lib/stat.c:282
-msgid "WirelessStat packet error. Press Q to continue."
-msgstr ""
-
-#: lib/stat.c:419
-msgid "pipe error. Press any key"
-msgstr ""
-
-#: lib/stat.c:424
-msgid "fcntl error. Press any key"
-msgstr ""
-
-#: lib/stat.c:433
-msgid "fork error. Press any key"
+#: lib/stat.c:265
+msgid "WirelessStat packet error. Press any key."
msgstr ""
#: lib/sysinfo.c:31
msgid "System Description: "
msgstr ""
-#: lib/sysinfo.c:93 lib/sysinfo.c:277
+#: lib/sysinfo.c:109 lib/sysinfo.c:303
msgid "System Info"
msgstr ""
-#: lib/sysinfo.c:95
+#: lib/sysinfo.c:111
msgid "Device hardware/software/name info:"
msgstr ""
-#: lib/sysinfo.c:130
+#: lib/sysinfo.c:146
msgid "Product name:"
msgstr ""
-#: lib/sysinfo.c:135
+#: lib/sysinfo.c:151
#, c-format
msgid "Product type: %u"
msgstr ""
-#: lib/sysinfo.c:138
+#: lib/sysinfo.c:154
#, c-format
msgid "Hardware revision: %u"
msgstr ""
-#: lib/sysinfo.c:141
+#: lib/sysinfo.c:157
msgid "OEM name:"
msgstr ""
-#: lib/sysinfo.c:149
+#: lib/sysinfo.c:165
#, c-format
msgid "Regulation domain: %s [%d]"
msgstr ""
-#: lib/sysinfo.c:150 lib/sysinfo.c:337
+#: lib/sysinfo.c:166 lib/sysinfo.c:363
msgid "FCC (USA)"
msgstr ""
-#: lib/sysinfo.c:151 lib/sysinfo.c:338
+#: lib/sysinfo.c:167 lib/sysinfo.c:364
msgid "DOC (Canada)"
msgstr ""
-#: lib/sysinfo.c:152 lib/sysinfo.c:339
+#: lib/sysinfo.c:168 lib/sysinfo.c:365
msgid "ETSI (Europe)"
msgstr ""
-#: lib/sysinfo.c:153 lib/sysinfo.c:340
+#: lib/sysinfo.c:169 lib/sysinfo.c:366
msgid "Spain"
msgstr ""
-#: lib/sysinfo.c:154 lib/sysinfo.c:341
+#: lib/sysinfo.c:170 lib/sysinfo.c:367
msgid "France"
msgstr ""
-#: lib/sysinfo.c:155 lib/sysinfo.c:342
+#: lib/sysinfo.c:171 lib/sysinfo.c:368
msgid "MKK (Japan)"
msgstr ""
-#: lib/sysinfo.c:155 lib/sysinfo.c:236 lib/sysinfo.c:342
+#: lib/sysinfo.c:171 lib/sysinfo.c:262 lib/sysinfo.c:368
msgid "unknown"
msgstr ""
-#: lib/sysinfo.c:158
+#: lib/sysinfo.c:174
#, c-format
msgid "Info structure version: %u"
msgstr ""
-#: lib/sysinfo.c:161 lib/sysinfo.c:299
+#: lib/sysinfo.c:177 lib/sysinfo.c:325
#, c-format
msgid "Manufacturer OUI: %02X %02X %02X (%s)"
msgstr ""
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:187
+#, c-format
+msgid "Uptime: %u days, %02u:%02u:%02u hours:mins:secs"
+msgstr ""
+
+#: lib/sysinfo.c:259
msgid "FHSS 2.4 GHz"
msgstr ""
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:259
msgid "DSSS 2.4 GHz"
msgstr ""
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:259
msgid "IR Baseband"
msgstr ""
-#: lib/sysinfo.c:234
+#: lib/sysinfo.c:260
msgid "Commercial range 0..40 C"
msgstr ""
-#: lib/sysinfo.c:235
+#: lib/sysinfo.c:261
msgid "Industrial range -30..70 C"
msgstr ""
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "manual"
msgstr ""
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "notsupported"
msgstr ""
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "dynamic"
msgstr ""
-#: lib/sysinfo.c:287
+#: lib/sysinfo.c:313
msgid "Manufacturer:"
msgstr ""
-#: lib/sysinfo.c:293
+#: lib/sysinfo.c:319
msgid "Manufacturer ID:"
msgstr ""
-#: lib/sysinfo.c:305
-#, c-format
+#: lib/sysinfo.c:331
msgid "Product Name:"
msgstr ""
-#: lib/sysinfo.c:312
-#, c-format
+#: lib/sysinfo.c:338
msgid "Product ID:"
msgstr ""
-#: lib/sysinfo.c:318
-#, c-format
+#: lib/sysinfo.c:344
msgid "Product Version:"
msgstr ""
-#: lib/sysinfo.c:326
+#: lib/sysinfo.c:352
#, c-format
msgid "PHYType: %s"
msgstr ""
-#: lib/sysinfo.c:329
+#: lib/sysinfo.c:355
#, c-format
msgid "Temperature: %s"
msgstr ""
-#: lib/sysinfo.c:336
+#: lib/sysinfo.c:362
#, c-format
msgid "Regulation Domain: %s"
msgstr ""
-#: lib/sysinfo.c:345
+#: lib/sysinfo.c:371
#, c-format
msgid "Transmit Power: %u mW"
msgstr ""
-#: lib/sysinfo.c:375
+#: lib/sysinfo.c:401
#, c-format
-msgid "WEP inplemented: %s"
+msgid "WEP implemented: %s"
msgstr ""
-#: lib/sysinfo.c:378
+#: lib/sysinfo.c:404
#, c-format
msgid "Diversity: %s"
msgstr ""
-#: lib/sysinfo.c:406
+#: lib/sysinfo.c:432
#, c-format
msgid "Uptime: %u:%02u:%02u.%02u"
msgstr ""
-#: lib/sysinfo.c:422
+#: lib/sysinfo.c:448
#, c-format
msgid "IP Address: %s"
msgstr ""
msgstr ""
#: lib/wlan.c:49
+msgid "[T] SIFS time (msec): "
+msgstr ""
+
+#: lib/wlan.c:50
msgid "[key] - set option; W - write conf; Q - quit to menu"
msgstr ""
-#: lib/wlan.c:140
+#: lib/wlan.c:127
msgid "Short"
msgstr ""
-#: lib/wlan.c:140
+#: lib/wlan.c:127
msgid "Long"
msgstr ""
-#: lib/wlan.c:265
+#: lib/wlan.c:243
msgid "Wireless Settings"
msgstr ""
-#: lib/wlan.c:753
+#: lib/wlan.c:750
msgid "Antenna Configuration:"
msgstr ""
-#: lib/wlan.c:770
+#: lib/wlan.c:767
msgid "General Options"
msgstr ""
-#: lib/wlan.c:772
+#: lib/wlan.c:769
msgid ""
"UIOPTY - antenna; SCANLEDFR1234 - options; W - write conf; Q - quit to menu"
msgstr ""
-#: src/ap-config.c:59
+#: src/ap-config.c:63
msgid "General"
msgstr ""
-#: src/ap-config.c:59
+#: src/ap-config.c:63
msgid "Set general options"
msgstr ""
-#: src/ap-config.c:60
+#: src/ap-config.c:64
msgid "Advanced"
msgstr ""
-#: src/ap-config.c:60
+#: src/ap-config.c:64
msgid "Set advanced options"
msgstr ""
-#: src/ap-config.c:94
+#: src/ap-config.c:97
msgid "Reset AP."
msgstr ""
-#: src/ap-config.c:129
+#: src/ap-config.c:131
msgid "Latest"
msgstr ""
-#: src/ap-config.c:129
+#: src/ap-config.c:131
msgid "Get info about latest events"
msgstr ""
#: src/ap-mrtg.c:42
-#, c-format
msgid ""
"\n"
"Usage:\n"
msgstr ""
#: src/ap-mrtg.c:44
-#, c-format
msgid ""
"\tap-mrtg -i ip -c community -t type [-b bssid] [-n name] [-a aptype] [-v] [-"
"h] [-r]\n"
msgstr ""
#: src/ap-mrtg.c:46
-#, c-format
msgid ""
"Get stats from AP and return it in MRTG parsable format\n"
"\n"
msgstr ""
#: src/ap-mrtg.c:47
-#, c-format
msgid "-i ip - AP ip address\n"
msgstr ""
#: src/ap-mrtg.c:48
-#, c-format
msgid "-c community - SNMP community string\n"
msgstr ""
#: src/ap-mrtg.c:50
-#, c-format
msgid ""
"-t type - statistics type <w>ireless, <e>thernet, associated <s>tations "
"or <l>ink quality in client mode\n"
msgstr ""
#: src/ap-mrtg.c:52
-#, c-format
msgid ""
"-b bssid - mac address of the AP to which get link quality, only if "
"type=l\n"
msgstr ""
#: src/ap-mrtg.c:53
-#, c-format
msgid "-n name - AP name - for check only\n"
msgstr ""
#: src/ap-mrtg.c:54
-#, c-format
msgid ""
"-a aptype - AP type - 410 (default) or 510 for ATMEL12350's, like the "
"ME-102\n"
msgstr ""
#: src/ap-mrtg.c:56
-#, c-format
msgid "-v - report MRTG about problems connecting to AP\n"
msgstr ""
#: src/ap-mrtg.c:57
-#, c-format
msgid "-r - reset AP when getting LinkQuality stats\n"
msgstr ""
#: src/ap-mrtg.c:58
-#, c-format
msgid ""
"-h - print this help screen\n"
"\n"
msgstr ""
#: src/ap-mrtg.c:143
-#, c-format
msgid "Invalid IP-address\n"
msgstr ""
msgid "Agent:v%d %s (%s@%s:%d) %s%s%s. SysUptime %d:%02d:%02d.%02d"
msgstr ""
+#: src/auth_mac.c:34
+msgid "NUM MAC address"
+msgstr ""
+
#: src/bridge.c:36
msgid "[C] Configuration-enabled port(s): "
msgstr ""
msgid "[U] Isolate wireless clients (unicast traffic): "
msgstr ""
-#: src/bridge.c:137
+#: src/bridge.c:122
msgid "Both"
msgstr ""
msgid "Error:"
msgstr ""
-#: src/stations.c:113
-msgid "Id MAC address"
+#: src/stations.c:31
+msgid " # MAC "
+msgstr ""
+
+#: src/stations.c:34
+msgid " # MAC Parent MAC RSSI Status MACn IP "
+msgstr ""
+
+#: src/stations.c:187
+msgid ""
+"Arrows - scroll; S - save to file; Q - return; T - toggle view; Other key - "
+"refresh"
+msgstr ""
+
+#: src/stations.c:190
+msgid "Arrows - scroll; S - save to file; Q - return; Other key - refresh"
msgstr ""
-#: src/stations.c:223 src/stations.c:307
+#: src/stations.c:275 src/stations.c:358
msgid "Associated stations"
msgstr ""
-#: src/stations.c:225
+#: src/stations.c:277
msgid "Id MAC address Quality Age RSSI"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: GNU ap-utils 1.3.2-pre3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-22 15:06+0300\n"
+"POT-Creation-Date: 2004-11-14 22:46+0200\n"
"PO-Revision-Date: 2004-05-10 08:00-0500\n"
"Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
"Language-Team: French <traduc@traduc.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
+"Report-Msgid-Bugs-To: \n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:46 src/bridge.c:222
+#: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:50 src/bridge.c:184
msgid "Bridging"
msgstr "Établissement d'un pont"
-#: ap-gl/ap-gl.c:47 src/ap-config.c:46
+#: ap-gl/ap-gl.c:47 src/ap-config.c:50
msgid "Set bridging and IP-related options"
msgstr "Configuré les options relative au pont et à IP"
-#: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:48
-#: src/ap-config.c:118 src/ap-config.c:127 src/bridge.c:135 src/bridge.c:139
+#: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:52
+#: src/ap-config.c:120 src/ap-config.c:129 src/bridge.c:120 src/bridge.c:124
msgid "Wireless"
msgstr "Sans fil"
-#: ap-gl/ap-gl.c:49 src/ap-config.c:48
+#: ap-gl/ap-gl.c:49 src/ap-config.c:52
msgid "Set wireless options"
msgstr "Configurer les options sans fil"
-#: ap-gl/ap-gl.c:50 src/ap-config.c:49 src/ap-config.c:61
+#: ap-gl/ap-gl.c:50 src/ap-config.c:53 src/ap-config.c:65
msgid "Privacy"
msgstr "Intimité"
-#: ap-gl/ap-gl.c:51 src/ap-config.c:50 src/ap-config.c:62
+#: ap-gl/ap-gl.c:51 src/ap-config.c:54 src/ap-config.c:66
#, fuzzy
msgid "MAC auth"
msgstr "Authenfication MAC"
-#: ap-gl/ap-gl.c:52 src/ap-config.c:51 src/ap-config.c:63
+#: ap-gl/ap-gl.c:52 src/ap-config.c:55 src/ap-config.c:67
msgid "Community"
msgstr "Communauté"
-#: ap-gl/ap-gl.c:53 src/ap-config.c:52
+#: ap-gl/ap-gl.c:53 src/ap-config.c:56
msgid "Radio"
msgstr "Radio"
-#: ap-gl/ap-gl.c:53 src/ap-config.c:52
+#: ap-gl/ap-gl.c:53 src/ap-config.c:56
msgid "Set radio signal power and antenna options"
msgstr ""
"Sélectionner les options pour l'antenne et la puissance du signal radio"
-#: ap-gl/ap-gl.c:66 src/ap-config.c:83
+#: ap-gl/ap-gl.c:66 src/ap-config.c:87
msgid "Upload"
msgstr "Téléchargement"
-#: ap-gl/ap-gl.c:66 src/ap-config.c:83
+#: ap-gl/ap-gl.c:66 src/ap-config.c:87
msgid "Make current configuration active"
msgstr "Rendre la configuration courante active"
-#: ap-gl/ap-gl.c:67 src/ap-config.c:84
+#: ap-gl/ap-gl.c:67 src/ap-config.c:88
msgid "Defaults"
msgstr "Défauts"
-#: ap-gl/ap-gl.c:67 src/ap-config.c:84
+#: ap-gl/ap-gl.c:67 src/ap-config.c:88
msgid "Restore factory default settings"
msgstr "Restaurer les paramètres par défaut du manufacturier"
-#: ap-gl/ap-gl.c:69 src/ap-config.c:86 src/ap-config.c:94
+#: ap-gl/ap-gl.c:69 src/ap-config.c:89 src/ap-config.c:97
msgid "Reset"
msgstr "Réinitialisation"
-#: ap-gl/ap-gl.c:70 src/ap-config.c:87
+#: ap-gl/ap-gl.c:70 src/ap-config.c:90
msgid "Reset AP. All not uploaded configuration will be lost"
msgstr ""
"Réinitialiser le point d'accès. Toutes les config. non préservées seront "
"perdues."
-#: ap-gl/ap-gl.c:72 src/ap-config.c:89
+#: ap-gl/ap-gl.c:72 src/ap-config.c:92
msgid "TestMode"
msgstr "Mode test"
-#: ap-gl/ap-gl.c:72 src/ap-config.c:89
+#: ap-gl/ap-gl.c:72 src/ap-config.c:92
msgid "Put Access Point in test mode"
msgstr "Placer le point d'accès en mode test."
-#: ap-gl/ap-gl.c:83 src/ap-config.c:116 src/ap-config.c:126
+#: ap-gl/ap-gl.c:83 src/ap-config.c:118 src/ap-config.c:128
msgid "SysInfo"
msgstr "SysInfo"
-#: ap-gl/ap-gl.c:84 ap-gl/bridge.c:132 src/ap-config.c:117 src/bridge.c:134
-#: src/bridge.c:138
+#: ap-gl/ap-gl.c:84 ap-gl/bridge.c:132 src/ap-config.c:119 src/bridge.c:119
+#: src/bridge.c:123
msgid "Ethernet"
msgstr "Ethernet"
-#: ap-gl/ap-gl.c:84 src/ap-config.c:117
+#: ap-gl/ap-gl.c:84 src/ap-config.c:119
msgid "Get ethernet port statistics"
msgstr "Obtenir les statistiques des ports Ethernet"
-#: ap-gl/ap-gl.c:86 src/ap-config.c:119 src/ap-config.c:128
+#: ap-gl/ap-gl.c:86 src/ap-config.c:121 src/ap-config.c:130
msgid "Stations"
msgstr "Stations"
-#: ap-gl/ap-gl.c:88 src/ap-config.c:121
+#: ap-gl/ap-gl.c:88 src/ap-config.c:123
msgid "KnownAPs"
msgstr "Point d'accès connus"
-#: ap-gl/ap-gl.c:88 src/ap-config.c:121
+#: ap-gl/ap-gl.c:88 src/ap-config.c:123
msgid "Get info about known Access Points"
msgstr "Obtenir les info des points d'accès connus"
-#: ap-gl/ap-gl.c:105 src/ap-config.c:154
+#: ap-gl/ap-gl.c:105 src/ap-config.c:156
msgid "Info"
msgstr "Info"
-#: ap-gl/ap-gl.c:106 src/ap-config.c:155
+#: ap-gl/ap-gl.c:106 src/ap-config.c:157
msgid "Config"
msgstr "Config"
-#: ap-gl/ap-gl.c:107 src/ap-config.c:156
+#: ap-gl/ap-gl.c:107 src/ap-config.c:158
msgid "Commands"
msgstr "Commandes"
-#: ap-gl/ap-gl.c:107 src/ap-config.c:156
+#: ap-gl/ap-gl.c:107 src/ap-config.c:158
msgid "Execute commands on Access Point"
msgstr "Exécuter les commandes sur le point d'accès"
-#: ap-gl/ap-gl.c:109 src/ap-config.c:158
+#: ap-gl/ap-gl.c:109 src/ap-config.c:160
msgid "Connect"
msgstr "Connecter"
-#: ap-gl/ap-gl.c:110 src/ap-config.c:159
+#: ap-gl/ap-gl.c:110 src/ap-config.c:161
msgid "Search"
msgstr "Chercher"
-#: ap-gl/ap-gl.c:111 lib/common.c:52 src/ap-config.c:160
+#: ap-gl/ap-gl.c:111 lib/common.c:58 src/ap-config.c:162
msgid "About"
msgstr "À propos"
-#: ap-gl/ap-gl.c:112 src/ap-config.c:161
+#: ap-gl/ap-gl.c:112 src/ap-config.c:163
msgid "Shell"
msgstr "Shell"
-#: ap-gl/ap-gl.c:113 src/ap-config.c:162
+#: ap-gl/ap-gl.c:113 src/ap-config.c:164
msgid "Exit"
msgstr "Quitter"
-#: ap-gl/ap-gl.c:162 src/ap-config.c:211
+#: ap-gl/ap-gl.c:162 src/ap-config.c:212
#, c-format
msgid "Wireless Access Point Configurator ver. %s"
msgstr "Configurateur de point d'accès sans fil version %s"
msgid "Authorized MAC addresses"
msgstr "Mac adresses autorisées"
-#: ap-gl/auth_mac.c:34 src/auth_mac.c:34
+#: ap-gl/auth_mac.c:34
#, fuzzy
msgid "NUM MAC address"
msgstr "NUM MAC address"
msgstr ""
"BPGINFDRT - initialisé; W - sauvegarder la config.; Q - quitter vers le menu"
-#: ap-gl/bridge.c:125 src/bridge.c:127
+#: ap-gl/bridge.c:125 src/bridge.c:112
msgid "Wireless Bridge Point to MultiPoint"
msgstr "Point d'accès pont sans fil vers Multi-point"
-#: ap-gl/bridge.c:126 src/bridge.c:128
+#: ap-gl/bridge.c:126 src/bridge.c:113
msgid "Access Point"
msgstr "Point d'accès"
-#: ap-gl/bridge.c:127 src/bridge.c:129
+#: ap-gl/bridge.c:127 src/bridge.c:114
msgid "Access Point client"
msgstr "Point d'accès client"
-#: ap-gl/bridge.c:128 src/bridge.c:130
+#: ap-gl/bridge.c:128 src/bridge.c:115
msgid "Wireless Bridge Point to Point"
msgstr "Point pont sans fil vers un point"
-#: ap-gl/bridge.c:129 src/bridge.c:131
+#: ap-gl/bridge.c:129 src/bridge.c:116
msgid "Repeater"
msgstr "Répéteur"
msgid "Associated Stations"
msgstr "Stations associées"
-#: ap-gl/stations.c:83 src/stations.c:87
-msgid "AP now in AP Client Mode and don't has any associated stations"
+#: ap-gl/stations.c:80 src/stations.c:96
+msgid "AP is currently in AP Client Mode => no associated STAtions."
msgstr ""
-#: ap-gl/stations.c:109
-msgid "# MAC LQ RSSI Status Port IP"
+#: ap-gl/stations.c:105
+msgid "# MAC LQ RSSI Status Port IP"
msgstr ""
-#: ap-gl/stations.c:135 src/stations.c:139
+#: ap-gl/stations.c:131 src/stations.c:155
msgid "AssociatedSTAsInfo packet error"
msgstr "Erreur de paquet AssociatedSTAsInfo"
-#: ap-gl/stations.c:164 src/stations.c:161 src/stations.c:313
+#: ap-gl/stations.c:160 src/stations.c:364
msgid "Arrows - scroll; S - save to file; Q - quit to menu."
msgstr ""
"Flècher - défiler; S - sauvegarder dans un fichier; Q - quitter vers le menu."
msgid "Known Access Points"
msgstr "Point d'accès connus"
-#: lib/aps.c:217
+#: lib/aps.c:219
msgid "NetworkType"
msgstr "Type de réseau"
-#: lib/aps.c:293
+#: lib/aps.c:295
msgid "Infrastructure"
msgstr "Infrastructure"
-#: lib/aps.c:352 lib/aps.c:360 lib/aps.c:368
+#: lib/aps.c:355 lib/aps.c:363 lib/aps.c:371
#, fuzzy
msgid "CN: Channel Name; P: Preambule Type (S: Short; L: Long);"
msgstr "P: type de préambule; S: court; L: long"
-#: lib/aps.c:354
-msgid "RSSI: Radio Signal Strength Indicator [%];"
+#: lib/aps.c:357
+msgid "RSSI: Radio Signal Strength Indicator [%]"
msgstr ""
-#: lib/aps.c:356 lib/aps.c:364
-msgid "LQ: Link Quality [%]"
+#: lib/aps.c:359 lib/aps.c:367
+msgid "; LQ: Link Quality [%]"
msgstr ""
-#: lib/aps.c:362
-msgid "RSSI: Radio Signal Strength Indicator [dBm];"
+#: lib/aps.c:365
+msgid "RSSI: Radio Signal Strength Indicator [dBm]"
msgstr ""
-#: lib/aps.c:370
-msgid "RSSI: Radio Signal Strength Indicator [raw];"
+#: lib/aps.c:373
+msgid "RSSI: Radio Signal Strength Indicator [raw]"
msgstr ""
-#: lib/aps.c:372
-msgid "LQ: Link Quality [raw]"
+#: lib/aps.c:375
+msgid "; LQ: Link Q. [raw]"
msgstr ""
-#: lib/aps.c:378
+#: lib/aps.c:381
#, fuzzy
msgid ""
-"# con. to this AP; R refresh with reset; S refresh w/o reset; T toggle; Q "
-"quit"
+"# con. to AP #; R refresh with reset; T toggle; Q quit; Other = refr. w/o "
+"reset"
msgstr ""
"# connecter à cet AP; R rafraîchir avec réinitialisation; G rafraîchior sans "
"réinitialisation; Q quitter"
-#: lib/aps.c:380
+#: lib/aps.c:383
#, fuzzy
msgid ""
-"# con. to this AP; R initiate AP scan; S refresh view; T toggle view; Q quit"
+"# con. to AP #; R initiate AP scan; T toggle view; Q quit; Other = refresh "
+"view"
msgstr ""
"# connecter à cet AP; R rafraîchir avec réinitialisation; G rafraîchior sans "
"réinitialisation; Q quitter"
-#: lib/aps.c:509 lib/ap_search.c:153
+#: lib/aps.c:512 lib/ap_search.c:164
#, fuzzy, c-format
msgid "Failure in sendto(): %s. Press any key."
msgstr "sendto() invalide: %s. Appuyer sur une touche."
-#: lib/aps.c:518
+#: lib/aps.c:521
msgid "You have just initiated the AP scan. Be advised that it may"
msgstr ""
-#: lib/aps.c:521
+#: lib/aps.c:524
msgid "take a few seconds for your Access Point to find out some"
msgstr ""
-#: lib/aps.c:524
+#: lib/aps.c:527
msgid "values, so expect finishing the scan in about 5 seconds."
msgstr ""
-#: lib/aps.c:527
+#: lib/aps.c:530
msgid "Also note that your Access Point stops forwarding the network"
msgstr ""
-#: lib/aps.c:530
+#: lib/aps.c:533
msgid "traffic while the scan is in progress, but restores itself"
msgstr ""
-#: lib/aps.c:533
+#: lib/aps.c:536
msgid "to normal operation in time ranging up to 1 minute."
msgstr ""
-#: lib/aps.c:536
+#: lib/aps.c:539
msgid "Hence, if you are connected to target Access Point via its"
msgstr ""
-#: lib/aps.c:539
+#: lib/aps.c:542
msgid "wireless port, you need to wait a bit longer"
msgstr ""
-#: lib/aps.c:542
+#: lib/aps.c:545
msgid "after pressing 'S'."
msgstr ""
#: lib/ap_search.c:50
-msgid "# Type IP Description"
+msgid " # Type IP Name"
msgstr ""
-#: lib/ap_search.c:89
+#: lib/ap_search.c:99
msgid "Please wait while scanning, or press 'Q' to quit."
msgstr ""
-#: lib/ap_search.c:105
+#: lib/ap_search.c:115
#, fuzzy
msgid "Can't set broadcast option on socket. Press any key."
msgstr "Ne peut diffuser l'option au socket. Appuyer sur une touche."
-#: lib/ap_search.c:114
+#: lib/ap_search.c:124
#, fuzzy
msgid "Can't set multicast membership on socket. Press any key."
msgstr "Ne peut diffiser par multicast au socket. Appuyer sur une touche."
-#: lib/ap_search.c:120
+#: lib/ap_search.c:131
msgid "Scanning via network interface:"
msgstr ""
-#: lib/ap_search.c:121
+#: lib/ap_search.c:132
#, c-format
msgid " Index: %i"
msgstr ""
-#: lib/ap_search.c:123
+#: lib/ap_search.c:134
#, fuzzy, c-format
msgid " Name: %s"
msgstr "[N] Nom du point d'accès:"
-#: lib/ap_search.c:125
+#: lib/ap_search.c:136
#, c-format
msgid " IP: %s"
msgstr ""
-#: lib/ap_search.c:134
+#: lib/ap_search.c:145
#, c-format
msgid "Scanning for AP type: %s"
msgstr ""
-#: lib/ap_search.c:312
+#: lib/ap_search.c:327
msgid "Access Points Search"
msgstr "Recherche des points d'accès"
-#: lib/ap_search.c:329
+#: lib/ap_search.c:345
#, fuzzy
msgid "realloc() error."
msgstr "Erreur de création de socket"
-#: lib/ap_search.c:341
+#: lib/ap_search.c:357
msgid "Network interface discovery error."
msgstr ""
-#: lib/ap_search.c:416
+#: lib/ap_search.c:432
#, fuzzy
msgid "No local network interfaces found. Press any key."
msgstr "erreur de fork(). Appuyer sur une touche."
-#: lib/ap_search.c:418
+#: lib/ap_search.c:434
msgid "No directly reachable Access Points found. Press any key."
msgstr ""
-#: lib/ap_search.c:422
-msgid "Program-hardcoded maximum number of APs found."
+#: lib/ap_search.c:439
+msgid "Single-screen maximum number of APs found."
msgstr ""
-#: lib/ap_search.c:426
+#: lib/ap_search.c:442
#, fuzzy
msgid "# - connect to AP; Q - quit"
msgstr "Connexion avec AP numéro:"
"pour continuer."
#: lib/ap-utils.h:100
-msgid "Unable to retrieve data from AP. Press any key to continue."
+#, fuzzy
+msgid "Unable to retrieve (valid) data from AP. Press any key to continue."
msgstr ""
"Incapable de récupérer les données du point d'accès. Appuyer sur une touche "
"pour continuer."
#: lib/common.c:33
#, fuzzy
+msgid "Access Point name: "
+msgstr "Point d'accès"
+
+#: lib/common.c:34
+#, fuzzy
+msgid "Do you want to define name for this AP? "
+msgstr "Désirez-vous poursuivre?"
+
+#: lib/common.c:35
+#, fuzzy
msgid "AP type: "
msgstr "Type de point d'accès:"
-#: lib/common.c:34
+#: lib/common.c:36
#, fuzzy
msgid "Save connect-settings: "
msgstr "Sauvegarder la configuration de connexion:"
-#: lib/common.c:69
+#: lib/common.c:75
#, c-format
msgid "From %s"
msgstr "À partir de %s"
-#: lib/common.c:71
+#: lib/common.c:77
#, c-format
msgid "Version %s"
msgstr "Version %s"
-#: lib/common.c:74
+#: lib/common.c:80
msgid "Written by Roman Festchook roma@polesye.net"
msgstr "Écrit par Roman Festchook (roma@polesye.net)"
-#: lib/common.c:76
+#: lib/common.c:82
#, fuzzy
msgid "Copyright (c) Roman Festchook 2001-2004"
msgstr "Copyright © Roman Festchook 2001-2002"
-#: lib/common.c:79
+#: lib/common.c:85
msgid "This program is distributed under the terms"
msgstr "Ce logiciel est distribué selon les termes"
-#: lib/common.c:81
+#: lib/common.c:87
msgid "of the GNU General Public License version 2."
msgstr "de la GNU General Public License version 2."
-#: lib/common.c:83
+#: lib/common.c:89
msgid "See the included COPYING file for details."
msgstr "Consulter le fichier COPYING pour les détails."
msgstr ""
"Caractères saisies ne seront pas affichés pour des raisons de sécurité."
-#: lib/common.c:171
+#: lib/common.c:157
+msgid "Display name for the Access point (NOT the name defined inside the AP!)"
+msgstr ""
+
+#: lib/common.c:187
#, fuzzy
msgid "Determining AP type. Please wait..."
msgstr "Récupérationd des données du point d'accès. SVP patientez..."
-#: lib/common.c:196
+#: lib/common.c:272
#, fuzzy
msgid "Unable to determine AP type (no response). Press any key."
msgstr ""
"Incapable de récupérer les données du point d'accès. Appuyer sur une touche "
"pour continuer."
-#: lib/file.c:176
-msgid "NUM IP ADDRESS TYPE"
+#: lib/file.c:194
+#, fuzzy
+msgid "NUM IP ADDRESS TYPE NAME (in ~/.ap-config)"
msgstr "NUM ADRESSE IP TYPE"
-#: lib/file.c:177
+#: lib/file.c:195
#, fuzzy
msgid "Choose an AP to connect to"
msgstr "Choisir AP pour établir la connexion"
-#: lib/file.c:182
+#: lib/file.c:200
msgid "1-9,C: connect; N: new; D: delete; W: save; Q: quit; arrows: scroll"
msgstr ""
"1-9,C: connect; N: nouveau; D: détruire; W: sauvegarder; Q: quitter; "
"flèches: défiler"
-#: lib/file.c:225
+#: lib/file.c:257
msgid "Connect to AP num:"
msgstr "Connexion avec AP numéro:"
-#: lib/file.c:250
+#: lib/file.c:293
msgid "Delete num:"
msgstr "Détruire num:"
"Incapable d'écrire les données sur le point d'accès. Appuyer sur une touche "
"pour continuer."
-#: lib/oui.c:6052
+#: lib/oui.c:6056
msgid "Unknown or Private"
msgstr "Inconnu ou privé"
msgid "[R] Right:"
msgstr "Droite"
-#: lib/radio.c:114
+#: lib/radio.c:121
msgid "Radio Configuration"
msgstr "Configuration radio"
-#: lib/radio.c:115
+#: lib/radio.c:122
msgid "Output RF signal power level (CR31 register values)"
msgstr ""
-#: lib/radio.c:117
+#: lib/radio.c:124
#, fuzzy
msgid "Key Channel Level"
msgstr "niveau du canal de clé"
-#: lib/radio.c:273
+#: lib/radio.c:280
#, fuzzy
msgid ""
"You can't disable both antennas; unable to save antenna-config. Press any "
"Vous ne pouvez pas déactiver les deux antennes, incapable de sauvegarder la "
"config. des antennes. Appuyer sur une touche."
-#: lib/scr.c:134
+#: lib/scr.c:203
#, c-format
msgid "Current AP: %s Type: %s"
msgstr "Point d'accès courant: %s Type: %s"
msgid "[M] Manufacturer"
msgstr "[M] Manufacturier"
-#: lib/stat.c:29
-msgid "Unable to get data from AP. Press Q to continue."
+#: lib/stat.c:30
+msgid "Q - quit to menu. Other key - force update."
msgstr ""
-"Incapable d'obtenir des données du point d'accès. Appuyer Q pour continuer."
-
-#: lib/stat.c:30 lib/stat.c:428
-msgid "Q - quit to menu."
-msgstr "Q - quitter vers le menu."
#: lib/stat.c:31
-msgid "pipe error. Press any key."
-msgstr "erreur de pipe. Appuyer sur une touche."
-
-#: lib/stat.c:32
-msgid "fcntl error. Press any key."
+#, fuzzy
+msgid "select() function error. Press any key."
msgstr "erreur fcntl(). Appuyer sur une touche."
-#: lib/stat.c:33
-msgid "fork error. Press any key."
-msgstr "erreur de fork(). Appuyer sur une touche."
-
-#: lib/stat.c:72
+#: lib/stat.c:61
msgid "Ethernet Statistics"
msgstr "Statistiques Etherne"
-#: lib/stat.c:108
-msgid "EthRxStat packet error. Press Q to continue."
+#: lib/stat.c:92
+#, fuzzy
+msgid "EthRxStat packet error. Press any key."
msgstr "Erreur de paquet EthRxStat. Appuyer sur la touche Q pour continuer."
-#: lib/stat.c:120
-msgid "EthTxStat packet error. Press Q to continue."
+#: lib/stat.c:105
+#, fuzzy
+msgid "EthTxStat packet error. Press any key."
msgstr "Erreur de paquet EthTxStat. Appuyer sur la touche Q pour continuer."
-#: lib/stat.c:123
+#: lib/stat.c:109
msgid "Received:"
msgstr "Reçu:"
-#: lib/stat.c:124
+#: lib/stat.c:110
#, fuzzy
msgid "Transmitted:"
msgstr "Transmis:"
-#: lib/stat.c:251 lib/stat.c:427
+#: lib/stat.c:235 lib/stat.c:425
msgid "Wireless Statistics"
msgstr "Statistiques du sans fil"
-#: lib/stat.c:282
-msgid "WirelessStat packet error. Press Q to continue."
+#: lib/stat.c:265
+#, fuzzy
+msgid "WirelessStat packet error. Press any key."
msgstr "Erreur de paquet WirelessStat. Appuyer sur la touche Q pour continuer."
-#: lib/stat.c:419
-msgid "pipe error. Press any key"
-msgstr "erreur du pipe. Appuyer sur une touche."
-
-#: lib/stat.c:424
-msgid "fcntl error. Press any key"
-msgstr "erreur fcntl(). Appuyer sur une touche."
-
-#: lib/stat.c:433
-msgid "fork error. Press any key"
-msgstr "erreur de fork(). Appuyer sur une touche."
-
#: lib/sysinfo.c:31
msgid "System Description: "
msgstr "Description système: "
-#: lib/sysinfo.c:93 lib/sysinfo.c:277
+#: lib/sysinfo.c:109 lib/sysinfo.c:303
msgid "System Info"
msgstr "Info système"
-#: lib/sysinfo.c:95
+#: lib/sysinfo.c:111
msgid "Device hardware/software/name info:"
msgstr ""
-#: lib/sysinfo.c:130
+#: lib/sysinfo.c:146
#, fuzzy
msgid "Product name:"
msgstr "Nom de produit:"
-#: lib/sysinfo.c:135
+#: lib/sysinfo.c:151
#, fuzzy, c-format
msgid "Product type: %u"
msgstr "Type de produit: %lu"
-#: lib/sysinfo.c:138
+#: lib/sysinfo.c:154
#, fuzzy, c-format
msgid "Hardware revision: %u"
msgstr "Révision matérielle: %lu"
-#: lib/sysinfo.c:141
+#: lib/sysinfo.c:157
#, fuzzy
msgid "OEM name:"
msgstr "Nom du OEM:"
-#: lib/sysinfo.c:149
+#: lib/sysinfo.c:165
#, fuzzy, c-format
msgid "Regulation domain: %s [%d]"
msgstr "Domaine régulateur: %s"
-#: lib/sysinfo.c:150 lib/sysinfo.c:337
+#: lib/sysinfo.c:166 lib/sysinfo.c:363
msgid "FCC (USA)"
msgstr "FCC (EU)"
-#: lib/sysinfo.c:151 lib/sysinfo.c:338
+#: lib/sysinfo.c:167 lib/sysinfo.c:364
msgid "DOC (Canada)"
msgstr "DOC (Canada)"
-#: lib/sysinfo.c:152 lib/sysinfo.c:339
+#: lib/sysinfo.c:168 lib/sysinfo.c:365
msgid "ETSI (Europe)"
msgstr "ETSI (Europe)"
-#: lib/sysinfo.c:153 lib/sysinfo.c:340
+#: lib/sysinfo.c:169 lib/sysinfo.c:366
msgid "Spain"
msgstr "Espagne"
-#: lib/sysinfo.c:154 lib/sysinfo.c:341
+#: lib/sysinfo.c:170 lib/sysinfo.c:367
msgid "France"
msgstr "France"
-#: lib/sysinfo.c:155 lib/sysinfo.c:342
+#: lib/sysinfo.c:171 lib/sysinfo.c:368
msgid "MKK (Japan)"
msgstr "MKK (Japon)"
-#: lib/sysinfo.c:155 lib/sysinfo.c:236 lib/sysinfo.c:342
+#: lib/sysinfo.c:171 lib/sysinfo.c:262 lib/sysinfo.c:368
msgid "unknown"
msgstr "inconnu"
-#: lib/sysinfo.c:158
+#: lib/sysinfo.c:174
#, fuzzy, c-format
msgid "Info structure version: %u"
msgstr "Version du Struct: %lu"
-#: lib/sysinfo.c:161 lib/sysinfo.c:299
+#: lib/sysinfo.c:177 lib/sysinfo.c:325
#, c-format
msgid "Manufacturer OUI: %02X %02X %02X (%s)"
msgstr "OUI du manufacturier: %02X %02X %02X (%s)"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:187
+#, fuzzy, c-format
+msgid "Uptime: %u days, %02u:%02u:%02u hours:mins:secs"
+msgstr "Temps de marche (uptime): %u:%02u:%02u.%02u"
+
+#: lib/sysinfo.c:259
msgid "FHSS 2.4 GHz"
msgstr "FHSS 2.4 GHz"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:259
msgid "DSSS 2.4 GHz"
msgstr "DSSS 2.4 GHz"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:259
msgid "IR Baseband"
msgstr "Fréquence de base IR"
-#: lib/sysinfo.c:234
+#: lib/sysinfo.c:260
msgid "Commercial range 0..40 C"
msgstr "Étendue commerciale 0..40 C"
-#: lib/sysinfo.c:235
+#: lib/sysinfo.c:261
msgid "Industrial range -30..70 C"
msgstr "Étendue industrielle -30..70 C"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "manual"
msgstr "manuel"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "notsupported"
msgstr "non supporté"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "dynamic"
msgstr "dynamique"
-#: lib/sysinfo.c:287
+#: lib/sysinfo.c:313
msgid "Manufacturer:"
msgstr "Manufacturier"
-#: lib/sysinfo.c:293
+#: lib/sysinfo.c:319
msgid "Manufacturer ID:"
msgstr "Identificateur du manufacturier"
-#: lib/sysinfo.c:305
-#, c-format
+#: lib/sysinfo.c:331
msgid "Product Name:"
msgstr "Nom de produit:"
-#: lib/sysinfo.c:312
-#, c-format
+#: lib/sysinfo.c:338
msgid "Product ID:"
msgstr "Identificateur du produit:"
-#: lib/sysinfo.c:318
-#, c-format
+#: lib/sysinfo.c:344
msgid "Product Version:"
msgstr "Version du produit:"
-#: lib/sysinfo.c:326
+#: lib/sysinfo.c:352
#, c-format
msgid "PHYType: %s"
msgstr "Type PHY: %s"
-#: lib/sysinfo.c:329
+#: lib/sysinfo.c:355
#, c-format
msgid "Temperature: %s"
msgstr "Température: %s"
-#: lib/sysinfo.c:336
+#: lib/sysinfo.c:362
#, c-format
msgid "Regulation Domain: %s"
msgstr "Domaine régulateur: %s"
-#: lib/sysinfo.c:345
+#: lib/sysinfo.c:371
#, c-format
msgid "Transmit Power: %u mW"
msgstr "Puissance de transmission: %u mW"
-#: lib/sysinfo.c:375
-#, c-format
-msgid "WEP inplemented: %s"
+#: lib/sysinfo.c:401
+#, fuzzy, c-format
+msgid "WEP implemented: %s"
msgstr "WEP non implanté: %s"
-#: lib/sysinfo.c:378
+#: lib/sysinfo.c:404
#, c-format
msgid "Diversity: %s"
msgstr "Diversité: %s"
-#: lib/sysinfo.c:406
+#: lib/sysinfo.c:432
#, c-format
msgid "Uptime: %u:%02u:%02u.%02u"
msgstr "Temps de marche (uptime): %u:%02u:%02u.%02u"
-#: lib/sysinfo.c:422
+#: lib/sysinfo.c:448
#, c-format
msgid "IP Address: %s"
msgstr "Adresse IP: %s"
msgstr ""
#: lib/wlan.c:49
+msgid "[T] SIFS time (msec): "
+msgstr ""
+
+#: lib/wlan.c:50
msgid "[key] - set option; W - write conf; Q - quit to menu"
msgstr ""
"[key] - initialiser l'option; W - sauvegarder la config.; Q - quitter vers "
"le menu"
-#: lib/wlan.c:140
+#: lib/wlan.c:127
msgid "Short"
msgstr "Court"
-#: lib/wlan.c:140
+#: lib/wlan.c:127
msgid "Long"
msgstr "Long"
-#: lib/wlan.c:265
+#: lib/wlan.c:243
msgid "Wireless Settings"
msgstr "Paramétrage du sans fil"
-#: lib/wlan.c:753
+#: lib/wlan.c:750
msgid "Antenna Configuration:"
msgstr "Configuration de l'antenne:"
-#: lib/wlan.c:770
+#: lib/wlan.c:767
msgid "General Options"
msgstr "Options générales"
-#: lib/wlan.c:772
+#: lib/wlan.c:769
msgid ""
"UIOPTY - antenna; SCANLEDFR1234 - options; W - write conf; Q - quit to menu"
msgstr ""
"UIOPTY - antenne; SCANLEDFR1234 - options; W - sauvegarder la config.; Q - "
"quitter vers le menu"
-#: src/ap-config.c:59
+#: src/ap-config.c:63
msgid "General"
msgstr "Général"
-#: src/ap-config.c:59
+#: src/ap-config.c:63
msgid "Set general options"
msgstr "Initialiser les options générales"
-#: src/ap-config.c:60
+#: src/ap-config.c:64
msgid "Advanced"
msgstr "Avancé"
-#: src/ap-config.c:60
+#: src/ap-config.c:64
msgid "Set advanced options"
msgstr "Initialiser les options avancées"
-#: src/ap-config.c:94
+#: src/ap-config.c:97
msgid "Reset AP."
msgstr "Réinitialisation du point d'accès."
-#: src/ap-config.c:129
+#: src/ap-config.c:131
msgid "Latest"
msgstr "Dernier"
-#: src/ap-config.c:129
+#: src/ap-config.c:131
msgid "Get info about latest events"
msgstr "Obtenir les infos à propos des derniers événements"
#: src/ap-mrtg.c:42
-#, c-format
msgid ""
"\n"
"Usage:\n"
"Usage:\n"
#: src/ap-mrtg.c:44
-#, fuzzy, c-format
+#, fuzzy
msgid ""
"\tap-mrtg -i ip -c community -t type [-b bssid] [-n name] [-a aptype] [-v] [-"
"h] [-r]\n"
"\n"
#: src/ap-mrtg.c:46
-#, c-format
msgid ""
"Get stats from AP and return it in MRTG parsable format\n"
"\n"
"\n"
#: src/ap-mrtg.c:47
-#, c-format
msgid "-i ip - AP ip address\n"
msgstr "-i ip - adresse ip AP\n"
#: src/ap-mrtg.c:48
-#, c-format
msgid "-c community - SNMP community string\n"
msgstr "-c communauté chaîne de la communauté SNMP\n"
#: src/ap-mrtg.c:50
-#, c-format
msgid ""
"-t type - statistics type <w>ireless, <e>thernet, associated <s>tations "
"or <l>ink quality in client mode\n"
"associées ou qualité du <l>ien en mode client\n"
#: src/ap-mrtg.c:52
-#, c-format
msgid ""
"-b bssid - mac address of the AP to which get link quality, only if "
"type=l\n"
"si le type=l\n"
#: src/ap-mrtg.c:53
-#, c-format
msgid "-n name - AP name - for check only\n"
msgstr ""
#: src/ap-mrtg.c:54
-#, c-format
msgid ""
"-a aptype - AP type - 410 (default) or 510 for ATMEL12350's, like the "
"ME-102\n"
msgstr ""
#: src/ap-mrtg.c:56
-#, c-format
msgid "-v - report MRTG about problems connecting to AP\n"
msgstr "-v rapporter MRTG à propos de problème de connexion à l'AP\n"
#: src/ap-mrtg.c:57
-#, c-format
msgid "-r - reset AP when getting LinkQuality stats\n"
msgstr ""
"-r réinitialise l'AP lors de l'obtention des statistiques de "
"LinkQuality\n"
#: src/ap-mrtg.c:58
-#, c-format
msgid ""
"-h - print this help screen\n"
"\n"
"\n"
#: src/ap-mrtg.c:143
-#, c-format
msgid "Invalid IP-address\n"
msgstr "Adresse IP invalide\n"
msgid "Agent:v%d %s (%s@%s:%d) %s%s%s. SysUptime %d:%02d:%02d.%02d"
msgstr "Agent:v%d %s (%s@%s:%d) %s%s%s. SysUptime %d:%02d:%02d.%02d"
+#: src/auth_mac.c:34
+#, fuzzy
+msgid "NUM MAC address"
+msgstr "NUM MAC address"
+
#: src/bridge.c:36
msgid "[C] Configuration-enabled port(s): "
msgstr ""
msgid "[U] Isolate wireless clients (unicast traffic): "
msgstr ""
-#: src/bridge.c:137
+#: src/bridge.c:122
#, fuzzy
msgid "Both"
msgstr "Les deux types"
msgid "Error:"
msgstr "Erreur:"
-#: src/stations.c:113
+#: src/stations.c:31
+msgid " # MAC "
+msgstr ""
+
+#: src/stations.c:34
+msgid " # MAC Parent MAC RSSI Status MACn IP "
+msgstr ""
+
+#: src/stations.c:187
#, fuzzy
-msgid "Id MAC address"
-msgstr "Id Adresse MAC"
+msgid ""
+"Arrows - scroll; S - save to file; Q - return; T - toggle view; Other key - "
+"refresh"
+msgstr ""
+"Flècher - défiler; S - sauvegarder dans un fichier; Q - quitter vers le menu."
-#: src/stations.c:223 src/stations.c:307
+#: src/stations.c:190
+#, fuzzy
+msgid "Arrows - scroll; S - save to file; Q - return; Other key - refresh"
+msgstr ""
+"Flècher - défiler; S - sauvegarder dans un fichier; Q - quitter vers le menu."
+
+#: src/stations.c:275 src/stations.c:358
msgid "Associated stations"
msgstr "Stations associées"
-#: src/stations.c:225
+#: src/stations.c:277
#, fuzzy
msgid "Id MAC address Quality Age RSSI"
msgstr "Id Adresse MAC Qualité Âge RSSI"
+#~ msgid "Unable to get data from AP. Press Q to continue."
+#~ msgstr ""
+#~ "Incapable d'obtenir des données du point d'accès. Appuyer Q pour "
+#~ "continuer."
+
+#~ msgid "Q - quit to menu."
+#~ msgstr "Q - quitter vers le menu."
+
+#~ msgid "pipe error. Press any key."
+#~ msgstr "erreur de pipe. Appuyer sur une touche."
+
+#~ msgid "fork error. Press any key."
+#~ msgstr "erreur de fork(). Appuyer sur une touche."
+
+#~ msgid "pipe error. Press any key"
+#~ msgstr "erreur du pipe. Appuyer sur une touche."
+
+#~ msgid "fcntl error. Press any key"
+#~ msgstr "erreur fcntl(). Appuyer sur une touche."
+
+#~ msgid "fork error. Press any key"
+#~ msgstr "erreur de fork(). Appuyer sur une touche."
+
+#, fuzzy
+#~ msgid "Id MAC address"
+#~ msgstr "Id Adresse MAC"
+
#~ msgid "on"
#~ msgstr "on"
msgid ""
msgstr ""
"Project-Id-Version: ap-utils 1.3.2-pre3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-22 15:06+0300\n"
+"POT-Creation-Date: 2004-11-14 22:46+0200\n"
"PO-Revision-Date: 2003-07-31 19:03+0100\n"
"Last-Translator: Elros Cyriatan <cyriatan@fastmail.fm>\n"
"Language-Team: Dutch <vertaling@nl.linux.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
-#: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:46 src/bridge.c:222
+#: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:50 src/bridge.c:184
msgid "Bridging"
msgstr ""
-#: ap-gl/ap-gl.c:47 src/ap-config.c:46
+#: ap-gl/ap-gl.c:47 src/ap-config.c:50
#, fuzzy
msgid "Set bridging and IP-related options"
msgstr "Bridging en IP-gerelateerde opties instellen"
-#: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:48
-#: src/ap-config.c:118 src/ap-config.c:127 src/bridge.c:135 src/bridge.c:139
+#: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:52
+#: src/ap-config.c:120 src/ap-config.c:129 src/bridge.c:120 src/bridge.c:124
msgid "Wireless"
msgstr "Draadloos"
-#: ap-gl/ap-gl.c:49 src/ap-config.c:48
+#: ap-gl/ap-gl.c:49 src/ap-config.c:52
msgid "Set wireless options"
msgstr "Draadloze opties instellen"
-#: ap-gl/ap-gl.c:50 src/ap-config.c:49 src/ap-config.c:61
+#: ap-gl/ap-gl.c:50 src/ap-config.c:53 src/ap-config.c:65
msgid "Privacy"
msgstr "Privacy"
-#: ap-gl/ap-gl.c:51 src/ap-config.c:50 src/ap-config.c:62
+#: ap-gl/ap-gl.c:51 src/ap-config.c:54 src/ap-config.c:66
#, fuzzy
msgid "MAC auth"
msgstr "Mac toelating"
-#: ap-gl/ap-gl.c:52 src/ap-config.c:51 src/ap-config.c:63
+#: ap-gl/ap-gl.c:52 src/ap-config.c:55 src/ap-config.c:67
msgid "Community"
msgstr "Gemeenschap"
-#: ap-gl/ap-gl.c:53 src/ap-config.c:52
+#: ap-gl/ap-gl.c:53 src/ap-config.c:56
msgid "Radio"
msgstr "Radio"
-#: ap-gl/ap-gl.c:53 src/ap-config.c:52
+#: ap-gl/ap-gl.c:53 src/ap-config.c:56
msgid "Set radio signal power and antenna options"
msgstr "Vermogen radio en antenne opties instellen"
-#: ap-gl/ap-gl.c:66 src/ap-config.c:83
+#: ap-gl/ap-gl.c:66 src/ap-config.c:87
msgid "Upload"
msgstr "Uploaden"
-#: ap-gl/ap-gl.c:66 src/ap-config.c:83
+#: ap-gl/ap-gl.c:66 src/ap-config.c:87
msgid "Make current configuration active"
msgstr "Huidige configuratie actief maken"
-#: ap-gl/ap-gl.c:67 src/ap-config.c:84
+#: ap-gl/ap-gl.c:67 src/ap-config.c:88
msgid "Defaults"
msgstr "Standaardwaarden"
-#: ap-gl/ap-gl.c:67 src/ap-config.c:84
+#: ap-gl/ap-gl.c:67 src/ap-config.c:88
msgid "Restore factory default settings"
msgstr "Fabrieksinstellingen terugzetten"
-#: ap-gl/ap-gl.c:69 src/ap-config.c:86 src/ap-config.c:94
+#: ap-gl/ap-gl.c:69 src/ap-config.c:89 src/ap-config.c:97
msgid "Reset"
msgstr "Opnieuw instellen"
-#: ap-gl/ap-gl.c:70 src/ap-config.c:87
+#: ap-gl/ap-gl.c:70 src/ap-config.c:90
msgid "Reset AP. All not uploaded configuration will be lost"
msgstr ""
"AP opnieuw instellen. Alle niet verzonden instellingen zullen verloren gaan."
-#: ap-gl/ap-gl.c:72 src/ap-config.c:89
+#: ap-gl/ap-gl.c:72 src/ap-config.c:92
msgid "TestMode"
msgstr "Testmodus"
-#: ap-gl/ap-gl.c:72 src/ap-config.c:89
+#: ap-gl/ap-gl.c:72 src/ap-config.c:92
msgid "Put Access Point in test mode"
msgstr "Access Point in testmodus zetten"
-#: ap-gl/ap-gl.c:83 src/ap-config.c:116 src/ap-config.c:126
+#: ap-gl/ap-gl.c:83 src/ap-config.c:118 src/ap-config.c:128
msgid "SysInfo"
msgstr "SysInfo"
-#: ap-gl/ap-gl.c:84 ap-gl/bridge.c:132 src/ap-config.c:117 src/bridge.c:134
-#: src/bridge.c:138
+#: ap-gl/ap-gl.c:84 ap-gl/bridge.c:132 src/ap-config.c:119 src/bridge.c:119
+#: src/bridge.c:123
msgid "Ethernet"
msgstr "Ethernet"
-#: ap-gl/ap-gl.c:84 src/ap-config.c:117
+#: ap-gl/ap-gl.c:84 src/ap-config.c:119
msgid "Get ethernet port statistics"
msgstr "Ethernet poortstatistieken opvragen"
-#: ap-gl/ap-gl.c:86 src/ap-config.c:119 src/ap-config.c:128
+#: ap-gl/ap-gl.c:86 src/ap-config.c:121 src/ap-config.c:130
msgid "Stations"
msgstr "Stations"
-#: ap-gl/ap-gl.c:88 src/ap-config.c:121
+#: ap-gl/ap-gl.c:88 src/ap-config.c:123
msgid "KnownAPs"
msgstr "BekendeAPs"
-#: ap-gl/ap-gl.c:88 src/ap-config.c:121
+#: ap-gl/ap-gl.c:88 src/ap-config.c:123
msgid "Get info about known Access Points"
msgstr "Info opvragen over bekende Access Points"
-#: ap-gl/ap-gl.c:105 src/ap-config.c:154
+#: ap-gl/ap-gl.c:105 src/ap-config.c:156
msgid "Info"
msgstr "Info"
-#: ap-gl/ap-gl.c:106 src/ap-config.c:155
+#: ap-gl/ap-gl.c:106 src/ap-config.c:157
msgid "Config"
msgstr "Config"
-#: ap-gl/ap-gl.c:107 src/ap-config.c:156
+#: ap-gl/ap-gl.c:107 src/ap-config.c:158
msgid "Commands"
msgstr "Opdrachten"
-#: ap-gl/ap-gl.c:107 src/ap-config.c:156
+#: ap-gl/ap-gl.c:107 src/ap-config.c:158
msgid "Execute commands on Access Point"
msgstr "Opdrachten uitvoeren op Access Point"
-#: ap-gl/ap-gl.c:109 src/ap-config.c:158
+#: ap-gl/ap-gl.c:109 src/ap-config.c:160
msgid "Connect"
msgstr "Verbinden"
-#: ap-gl/ap-gl.c:110 src/ap-config.c:159
+#: ap-gl/ap-gl.c:110 src/ap-config.c:161
msgid "Search"
msgstr "Zoeken"
-#: ap-gl/ap-gl.c:111 lib/common.c:52 src/ap-config.c:160
+#: ap-gl/ap-gl.c:111 lib/common.c:58 src/ap-config.c:162
msgid "About"
msgstr "Info"
-#: ap-gl/ap-gl.c:112 src/ap-config.c:161
+#: ap-gl/ap-gl.c:112 src/ap-config.c:163
msgid "Shell"
msgstr "Shell"
-#: ap-gl/ap-gl.c:113 src/ap-config.c:162
+#: ap-gl/ap-gl.c:113 src/ap-config.c:164
msgid "Exit"
msgstr "Afsluiten"
-#: ap-gl/ap-gl.c:162 src/ap-config.c:211
+#: ap-gl/ap-gl.c:162 src/ap-config.c:212
#, c-format
msgid "Wireless Access Point Configurator ver. %s"
msgstr "Draadloos Access Point configurator versie %s"
msgid "Authorized MAC addresses"
msgstr "Toegelaten Mac adressen"
-#: ap-gl/auth_mac.c:34 src/auth_mac.c:34
+#: ap-gl/auth_mac.c:34
#, fuzzy
msgid "NUM MAC address"
msgstr "NUM MAC adres"
msgid "INGFPDOMSCTRBU - set; W - write conf; Q - quit to menu"
msgstr "BPGINFDRT - instellen; W - conf schrijven; Q - afsluiten naar menu"
-#: ap-gl/bridge.c:125 src/bridge.c:127
+#: ap-gl/bridge.c:125 src/bridge.c:112
msgid "Wireless Bridge Point to MultiPoint"
msgstr ""
-#: ap-gl/bridge.c:126 src/bridge.c:128
+#: ap-gl/bridge.c:126 src/bridge.c:113
msgid "Access Point"
msgstr "Access Point"
-#: ap-gl/bridge.c:127 src/bridge.c:129
+#: ap-gl/bridge.c:127 src/bridge.c:114
msgid "Access Point client"
msgstr "Access Point client"
-#: ap-gl/bridge.c:128 src/bridge.c:130
+#: ap-gl/bridge.c:128 src/bridge.c:115
msgid "Wireless Bridge Point to Point"
msgstr ""
-#: ap-gl/bridge.c:129 src/bridge.c:131
+#: ap-gl/bridge.c:129 src/bridge.c:116
msgid "Repeater"
msgstr "Repeater"
msgid "Associated Stations"
msgstr "Geassocieerde stations"
-#: ap-gl/stations.c:83 src/stations.c:87
-msgid "AP now in AP Client Mode and don't has any associated stations"
+#: ap-gl/stations.c:80 src/stations.c:96
+msgid "AP is currently in AP Client Mode => no associated STAtions."
msgstr ""
-#: ap-gl/stations.c:109
-msgid "# MAC LQ RSSI Status Port IP"
+#: ap-gl/stations.c:105
+msgid "# MAC LQ RSSI Status Port IP"
msgstr ""
-#: ap-gl/stations.c:135 src/stations.c:139
+#: ap-gl/stations.c:131 src/stations.c:155
msgid "AssociatedSTAsInfo packet error"
msgstr "AssociatedSTAsInfo pakketfout"
-#: ap-gl/stations.c:164 src/stations.c:161 src/stations.c:313
+#: ap-gl/stations.c:160 src/stations.c:364
msgid "Arrows - scroll; S - save to file; Q - quit to menu."
msgstr ""
"Pijltjes - schuiven; S - opslaan naar bestand; Q - afsluiten naar menu."
msgid "Known Access Points"
msgstr "Bekende Access Points"
-#: lib/aps.c:217
+#: lib/aps.c:219
msgid "NetworkType"
msgstr "Soort netwerk"
-#: lib/aps.c:293
+#: lib/aps.c:295
msgid "Infrastructure"
msgstr "Infrastructuur"
-#: lib/aps.c:352 lib/aps.c:360 lib/aps.c:368
+#: lib/aps.c:355 lib/aps.c:363 lib/aps.c:371
msgid "CN: Channel Name; P: Preambule Type (S: Short; L: Long);"
msgstr ""
-#: lib/aps.c:354
-msgid "RSSI: Radio Signal Strength Indicator [%];"
+#: lib/aps.c:357
+msgid "RSSI: Radio Signal Strength Indicator [%]"
msgstr ""
-#: lib/aps.c:356 lib/aps.c:364
-msgid "LQ: Link Quality [%]"
+#: lib/aps.c:359 lib/aps.c:367
+msgid "; LQ: Link Quality [%]"
msgstr ""
-#: lib/aps.c:362
-msgid "RSSI: Radio Signal Strength Indicator [dBm];"
+#: lib/aps.c:365
+msgid "RSSI: Radio Signal Strength Indicator [dBm]"
msgstr ""
-#: lib/aps.c:370
-msgid "RSSI: Radio Signal Strength Indicator [raw];"
+#: lib/aps.c:373
+msgid "RSSI: Radio Signal Strength Indicator [raw]"
msgstr ""
-#: lib/aps.c:372
-msgid "LQ: Link Quality [raw]"
+#: lib/aps.c:375
+msgid "; LQ: Link Q. [raw]"
msgstr ""
-#: lib/aps.c:378
+#: lib/aps.c:381
#, fuzzy
msgid ""
-"# con. to this AP; R refresh with reset; S refresh w/o reset; T toggle; Q "
-"quit"
+"# con. to AP #; R refresh with reset; T toggle; Q quit; Other = refr. w/o "
+"reset"
msgstr ""
"# verbinden met deze AP; R verversen met opnieuw instellen; G verversen "
"zonder opnieuw instellen; Q afsluiten"
-#: lib/aps.c:380
+#: lib/aps.c:383
#, fuzzy
msgid ""
-"# con. to this AP; R initiate AP scan; S refresh view; T toggle view; Q quit"
+"# con. to AP #; R initiate AP scan; T toggle view; Q quit; Other = refresh "
+"view"
msgstr ""
"# verbinden met deze AP; R verversen met opnieuw instellen; G verversen "
"zonder opnieuw instellen; Q afsluiten"
-#: lib/aps.c:509 lib/ap_search.c:153
+#: lib/aps.c:512 lib/ap_search.c:164
#, fuzzy, c-format
msgid "Failure in sendto(): %s. Press any key."
msgstr "Onjuist sendto: %s. Druk op een toets."
-#: lib/aps.c:518
+#: lib/aps.c:521
msgid "You have just initiated the AP scan. Be advised that it may"
msgstr ""
-#: lib/aps.c:521
+#: lib/aps.c:524
msgid "take a few seconds for your Access Point to find out some"
msgstr ""
-#: lib/aps.c:524
+#: lib/aps.c:527
msgid "values, so expect finishing the scan in about 5 seconds."
msgstr ""
-#: lib/aps.c:527
+#: lib/aps.c:530
msgid "Also note that your Access Point stops forwarding the network"
msgstr ""
-#: lib/aps.c:530
+#: lib/aps.c:533
msgid "traffic while the scan is in progress, but restores itself"
msgstr ""
-#: lib/aps.c:533
+#: lib/aps.c:536
msgid "to normal operation in time ranging up to 1 minute."
msgstr ""
-#: lib/aps.c:536
+#: lib/aps.c:539
msgid "Hence, if you are connected to target Access Point via its"
msgstr ""
-#: lib/aps.c:539
+#: lib/aps.c:542
msgid "wireless port, you need to wait a bit longer"
msgstr ""
-#: lib/aps.c:542
+#: lib/aps.c:545
msgid "after pressing 'S'."
msgstr ""
#: lib/ap_search.c:50
-msgid "# Type IP Description"
+msgid " # Type IP Name"
msgstr ""
-#: lib/ap_search.c:89
+#: lib/ap_search.c:99
msgid "Please wait while scanning, or press 'Q' to quit."
msgstr ""
-#: lib/ap_search.c:105
+#: lib/ap_search.c:115
#, fuzzy
msgid "Can't set broadcast option on socket. Press any key."
msgstr "Kan broadcast optie naar socket niet instellen. Druk op een toets."
-#: lib/ap_search.c:114
+#: lib/ap_search.c:124
#, fuzzy
msgid "Can't set multicast membership on socket. Press any key."
msgstr "Kan multicast deelname naar socket niet instellen. Druk op een toets."
-#: lib/ap_search.c:120
+#: lib/ap_search.c:131
msgid "Scanning via network interface:"
msgstr ""
-#: lib/ap_search.c:121
+#: lib/ap_search.c:132
#, c-format
msgid " Index: %i"
msgstr ""
-#: lib/ap_search.c:123
+#: lib/ap_search.c:134
#, fuzzy, c-format
msgid " Name: %s"
msgstr "[N] AP naam:"
-#: lib/ap_search.c:125
+#: lib/ap_search.c:136
#, c-format
msgid " IP: %s"
msgstr ""
-#: lib/ap_search.c:134
+#: lib/ap_search.c:145
#, c-format
msgid "Scanning for AP type: %s"
msgstr ""
-#: lib/ap_search.c:312
+#: lib/ap_search.c:327
msgid "Access Points Search"
msgstr "Access Points zoeken"
-#: lib/ap_search.c:329
+#: lib/ap_search.c:345
#, fuzzy
msgid "realloc() error."
msgstr "Fout bij maken socket"
-#: lib/ap_search.c:341
+#: lib/ap_search.c:357
msgid "Network interface discovery error."
msgstr ""
-#: lib/ap_search.c:416
+#: lib/ap_search.c:432
#, fuzzy
msgid "No local network interfaces found. Press any key."
msgstr "fork() fout. Druk op een toets."
-#: lib/ap_search.c:418
+#: lib/ap_search.c:434
msgid "No directly reachable Access Points found. Press any key."
msgstr ""
-#: lib/ap_search.c:422
-msgid "Program-hardcoded maximum number of APs found."
+#: lib/ap_search.c:439
+msgid "Single-screen maximum number of APs found."
msgstr ""
-#: lib/ap_search.c:426
+#: lib/ap_search.c:442
#, fuzzy
msgid "# - connect to AP; Q - quit"
msgstr "Verbinden met AP nummer:"
"Kan geen gegevens schrijven naar AP. Druk op een toets om door te gaan."
#: lib/ap-utils.h:100
-msgid "Unable to retrieve data from AP. Press any key to continue."
+#, fuzzy
+msgid "Unable to retrieve (valid) data from AP. Press any key to continue."
msgstr "Kan geen gegevens ontvangen van AP. Druk op een toets om door te gaan."
#: lib/ap-utils.h:101
#: lib/common.c:33
#, fuzzy
+msgid "Access Point name: "
+msgstr "Access Point"
+
+#: lib/common.c:34
+#, fuzzy
+msgid "Do you want to define name for this AP? "
+msgstr "Wilt u doorgaan?"
+
+#: lib/common.c:35
+#, fuzzy
msgid "AP type: "
msgstr "AP soort:"
-#: lib/common.c:34
+#: lib/common.c:36
#, fuzzy
msgid "Save connect-settings: "
msgstr "Verbindingsinstellingen opslaan:"
-#: lib/common.c:69
+#: lib/common.c:75
#, c-format
msgid "From %s"
msgstr "Van %s"
-#: lib/common.c:71
+#: lib/common.c:77
#, c-format
msgid "Version %s"
msgstr "Versie %s"
-#: lib/common.c:74
+#: lib/common.c:80
msgid "Written by Roman Festchook roma@polesye.net"
msgstr "Geschreven door Roman Festchook roma@polesye.net"
-#: lib/common.c:76
+#: lib/common.c:82
#, fuzzy
msgid "Copyright (c) Roman Festchook 2001-2004"
msgstr "Copyright (c) Roman Festchook 2001-2002"
-#: lib/common.c:79
+#: lib/common.c:85
msgid "This program is distributed under the terms"
msgstr "This program is distributed under the terms"
-#: lib/common.c:81
+#: lib/common.c:87
msgid "of the GNU General Public License version 2."
msgstr "of the GNU General Public License version 2."
-#: lib/common.c:83
+#: lib/common.c:89
msgid "See the included COPYING file for details."
msgstr "See the included COPYING file for details."
msgid "Entered characters will not be displayed for security reason."
msgstr "Ingevoerde tekens worden vanwege veiligheidsredenen niet weergegeven."
-#: lib/common.c:171
+#: lib/common.c:157
+msgid "Display name for the Access point (NOT the name defined inside the AP!)"
+msgstr ""
+
+#: lib/common.c:187
#, fuzzy
msgid "Determining AP type. Please wait..."
msgstr "Bezig met ontvangen gegevens van AP. Even geduld a.u.b...."
-#: lib/common.c:196
+#: lib/common.c:272
#, fuzzy
msgid "Unable to determine AP type (no response). Press any key."
msgstr "Kan geen gegevens ontvangen van AP. Druk op een toets om door te gaan."
-#: lib/file.c:176
-msgid "NUM IP ADDRESS TYPE"
+#: lib/file.c:194
+#, fuzzy
+msgid "NUM IP ADDRESS TYPE NAME (in ~/.ap-config)"
msgstr "NUMMER IP ADRES SOORT"
-#: lib/file.c:177
+#: lib/file.c:195
#, fuzzy
msgid "Choose an AP to connect to"
msgstr "Kies AP om mee te verbinden"
-#: lib/file.c:182
+#: lib/file.c:200
msgid "1-9,C: connect; N: new; D: delete; W: save; Q: quit; arrows: scroll"
msgstr ""
"1-9,C: verbinden; N: nieuw; D: verwijderen; W: opslaan; Q: afsluiten; "
"pijltjes: schuiven"
-#: lib/file.c:225
+#: lib/file.c:257
msgid "Connect to AP num:"
msgstr "Verbinden met AP nummer:"
-#: lib/file.c:250
+#: lib/file.c:293
msgid "Delete num:"
msgstr "Nummer verwijderen:"
msgstr ""
"Kan geen gegevens schrijven naar AP. Druk op een toets om door te gaan."
-#: lib/oui.c:6052
+#: lib/oui.c:6056
msgid "Unknown or Private"
msgstr "Onbekend of privé"
msgid "[R] Right:"
msgstr "Rechts"
-#: lib/radio.c:114
+#: lib/radio.c:121
msgid "Radio Configuration"
msgstr "Radio configuratie"
-#: lib/radio.c:115
+#: lib/radio.c:122
msgid "Output RF signal power level (CR31 register values)"
msgstr ""
-#: lib/radio.c:117
+#: lib/radio.c:124
#, fuzzy
msgid "Key Channel Level"
msgstr "sleutel kanaal niveau"
-#: lib/radio.c:273
+#: lib/radio.c:280
#, fuzzy
msgid ""
"You can't disable both antennas; unable to save antenna-config. Press any "
"U kunt niet beide antennes uitzetten; kan antenne instellingen niet opslaan. "
"Druk op een toets."
-#: lib/scr.c:134
+#: lib/scr.c:203
#, c-format
msgid "Current AP: %s Type: %s"
msgstr "Huidige AP: %s Soort: %s"
msgid "[M] Manufacturer"
msgstr "[M] Maker"
-#: lib/stat.c:29
-msgid "Unable to get data from AP. Press Q to continue."
-msgstr "Kan geen gegevens opvragen van AP. Druk op Q om door te gaan."
-
-#: lib/stat.c:30 lib/stat.c:428
-msgid "Q - quit to menu."
-msgstr "Q - afsluiten naar menu."
+#: lib/stat.c:30
+msgid "Q - quit to menu. Other key - force update."
+msgstr ""
#: lib/stat.c:31
-msgid "pipe error. Press any key."
-msgstr "pijpfout. Druk op een toets."
-
-#: lib/stat.c:32
-msgid "fcntl error. Press any key."
+#, fuzzy
+msgid "select() function error. Press any key."
msgstr "fcntl() fout. Druk op een toets."
-#: lib/stat.c:33
-msgid "fork error. Press any key."
-msgstr "fork() fout. Druk op een toets."
-
-#: lib/stat.c:72
+#: lib/stat.c:61
msgid "Ethernet Statistics"
msgstr "Ethernet statistieken"
-#: lib/stat.c:108
-msgid "EthRxStat packet error. Press Q to continue."
+#: lib/stat.c:92
+#, fuzzy
+msgid "EthRxStat packet error. Press any key."
msgstr "EthRxStat pakketfout. Druk op Q om door te gaan."
-#: lib/stat.c:120
-msgid "EthTxStat packet error. Press Q to continue."
+#: lib/stat.c:105
+#, fuzzy
+msgid "EthTxStat packet error. Press any key."
msgstr "EthTxStat pakketfout. Druk op Q om door te gaan."
-#: lib/stat.c:123
+#: lib/stat.c:109
msgid "Received:"
msgstr "Ontvangen:"
-#: lib/stat.c:124
+#: lib/stat.c:110
#, fuzzy
msgid "Transmitted:"
msgstr "Verzonden:"
-#: lib/stat.c:251 lib/stat.c:427
+#: lib/stat.c:235 lib/stat.c:425
msgid "Wireless Statistics"
msgstr "Draadloos statistieken"
-#: lib/stat.c:282
-msgid "WirelessStat packet error. Press Q to continue."
+#: lib/stat.c:265
+#, fuzzy
+msgid "WirelessStat packet error. Press any key."
msgstr "WirelessStat pakketfout. Druk op Q om door te gaan."
-#: lib/stat.c:419
-msgid "pipe error. Press any key"
-msgstr "pijpfout. Druk op een toets"
-
-#: lib/stat.c:424
-msgid "fcntl error. Press any key"
-msgstr "fcntl() fout. Druk op een toets"
-
-#: lib/stat.c:433
-msgid "fork error. Press any key"
-msgstr "fork() fout. Druk op een toets"
-
#: lib/sysinfo.c:31
msgid "System Description: "
msgstr "Systeemomschrijving:"
-#: lib/sysinfo.c:93 lib/sysinfo.c:277
+#: lib/sysinfo.c:109 lib/sysinfo.c:303
msgid "System Info"
msgstr "Systeeminfo"
-#: lib/sysinfo.c:95
+#: lib/sysinfo.c:111
msgid "Device hardware/software/name info:"
msgstr ""
-#: lib/sysinfo.c:130
+#: lib/sysinfo.c:146
#, fuzzy
msgid "Product name:"
msgstr "Produktnaam:"
-#: lib/sysinfo.c:135
+#: lib/sysinfo.c:151
#, fuzzy, c-format
msgid "Product type: %u"
msgstr "Produktsoort: %lu"
-#: lib/sysinfo.c:138
+#: lib/sysinfo.c:154
#, fuzzy, c-format
msgid "Hardware revision: %u"
msgstr "Hardware revisie: %lu"
-#: lib/sysinfo.c:141
+#: lib/sysinfo.c:157
#, fuzzy
msgid "OEM name:"
msgstr "OEM naam:"
-#: lib/sysinfo.c:149
+#: lib/sysinfo.c:165
#, fuzzy, c-format
msgid "Regulation domain: %s [%d]"
msgstr "Reguleringsdomein: %s"
-#: lib/sysinfo.c:150 lib/sysinfo.c:337
+#: lib/sysinfo.c:166 lib/sysinfo.c:363
msgid "FCC (USA)"
msgstr "FCC (USA)"
-#: lib/sysinfo.c:151 lib/sysinfo.c:338
+#: lib/sysinfo.c:167 lib/sysinfo.c:364
msgid "DOC (Canada)"
msgstr "DOC (Canada)"
-#: lib/sysinfo.c:152 lib/sysinfo.c:339
+#: lib/sysinfo.c:168 lib/sysinfo.c:365
msgid "ETSI (Europe)"
msgstr "ETSI (Europa)"
-#: lib/sysinfo.c:153 lib/sysinfo.c:340
+#: lib/sysinfo.c:169 lib/sysinfo.c:366
msgid "Spain"
msgstr "Spanje"
-#: lib/sysinfo.c:154 lib/sysinfo.c:341
+#: lib/sysinfo.c:170 lib/sysinfo.c:367
msgid "France"
msgstr "Frankrijk"
-#: lib/sysinfo.c:155 lib/sysinfo.c:342
+#: lib/sysinfo.c:171 lib/sysinfo.c:368
msgid "MKK (Japan)"
msgstr "MKK (Japan)"
-#: lib/sysinfo.c:155 lib/sysinfo.c:236 lib/sysinfo.c:342
+#: lib/sysinfo.c:171 lib/sysinfo.c:262 lib/sysinfo.c:368
msgid "unknown"
msgstr "onbekend"
-#: lib/sysinfo.c:158
+#: lib/sysinfo.c:174
#, fuzzy, c-format
msgid "Info structure version: %u"
msgstr "StructVersie: %lu"
-#: lib/sysinfo.c:161 lib/sysinfo.c:299
+#: lib/sysinfo.c:177 lib/sysinfo.c:325
#, c-format
msgid "Manufacturer OUI: %02X %02X %02X (%s)"
msgstr "Maker OUI: %02X %02X %02X (%s)"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:187
+#, fuzzy, c-format
+msgid "Uptime: %u days, %02u:%02u:%02u hours:mins:secs"
+msgstr "Uptime: %u:%02u:%02u.%02u"
+
+#: lib/sysinfo.c:259
msgid "FHSS 2.4 GHz"
msgstr "FHSS 2.4 GHz"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:259
msgid "DSSS 2.4 GHz"
msgstr "DSSS 2.4 GHz"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:259
msgid "IR Baseband"
msgstr "IR Baseband"
-#: lib/sysinfo.c:234
+#: lib/sysinfo.c:260
msgid "Commercial range 0..40 C"
msgstr "Commercieel bereik 0..40 C"
-#: lib/sysinfo.c:235
+#: lib/sysinfo.c:261
msgid "Industrial range -30..70 C"
msgstr "Industrieel bereik -30..70 C"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "manual"
msgstr "handmatig"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "notsupported"
msgstr "niet ondersteund"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "dynamic"
msgstr "dynamisch"
-#: lib/sysinfo.c:287
+#: lib/sysinfo.c:313
msgid "Manufacturer:"
msgstr "Maker:"
-#: lib/sysinfo.c:293
+#: lib/sysinfo.c:319
msgid "Manufacturer ID:"
msgstr "Maker ID:"
-#: lib/sysinfo.c:305
-#, c-format
+#: lib/sysinfo.c:331
msgid "Product Name:"
msgstr "Produktnaam:"
-#: lib/sysinfo.c:312
-#, c-format
+#: lib/sysinfo.c:338
msgid "Product ID:"
msgstr "Produkt ID:"
-#: lib/sysinfo.c:318
-#, c-format
+#: lib/sysinfo.c:344
msgid "Product Version:"
msgstr "Produktversie:"
-#: lib/sysinfo.c:326
+#: lib/sysinfo.c:352
#, c-format
msgid "PHYType: %s"
msgstr "PHY soort: %s"
-#: lib/sysinfo.c:329
+#: lib/sysinfo.c:355
#, c-format
msgid "Temperature: %s"
msgstr "Temperatuur: %s"
-#: lib/sysinfo.c:336
+#: lib/sysinfo.c:362
#, c-format
msgid "Regulation Domain: %s"
msgstr "Reguleringsdomein: %s"
-#: lib/sysinfo.c:345
+#: lib/sysinfo.c:371
#, c-format
msgid "Transmit Power: %u mW"
msgstr "Zendvermogen: %u mW"
-#: lib/sysinfo.c:375
-#, c-format
-msgid "WEP inplemented: %s"
+#: lib/sysinfo.c:401
+#, fuzzy, c-format
+msgid "WEP implemented: %s"
msgstr "WEP geïmplementeerd: %s"
-#: lib/sysinfo.c:378
+#: lib/sysinfo.c:404
#, c-format
msgid "Diversity: %s"
msgstr "Diversiteit: %s"
-#: lib/sysinfo.c:406
+#: lib/sysinfo.c:432
#, c-format
msgid "Uptime: %u:%02u:%02u.%02u"
msgstr "Uptime: %u:%02u:%02u.%02u"
-#: lib/sysinfo.c:422
+#: lib/sysinfo.c:448
#, c-format
msgid "IP Address: %s"
msgstr "IP-adres: %s"
msgstr ""
#: lib/wlan.c:49
+msgid "[T] SIFS time (msec): "
+msgstr ""
+
+#: lib/wlan.c:50
msgid "[key] - set option; W - write conf; Q - quit to menu"
msgstr "[toets] - optie instellen; W - conf schrijven; Q - afsluiten naar menu"
-#: lib/wlan.c:140
+#: lib/wlan.c:127
msgid "Short"
msgstr "Kort"
-#: lib/wlan.c:140
+#: lib/wlan.c:127
msgid "Long"
msgstr "Lang"
-#: lib/wlan.c:265
+#: lib/wlan.c:243
msgid "Wireless Settings"
msgstr "Draadloos instellingen"
-#: lib/wlan.c:753
+#: lib/wlan.c:750
msgid "Antenna Configuration:"
msgstr "Antenneconfiguratie:"
-#: lib/wlan.c:770
+#: lib/wlan.c:767
msgid "General Options"
msgstr "Algemene opties"
-#: lib/wlan.c:772
+#: lib/wlan.c:769
msgid ""
"UIOPTY - antenna; SCANLEDFR1234 - options; W - write conf; Q - quit to menu"
msgstr ""
"UIOPTY - antenne; SCANLEDFR1234 - opties; W - conf schrijven; Q - afsluiten "
"naar menu"
-#: src/ap-config.c:59
+#: src/ap-config.c:63
msgid "General"
msgstr "Algemeen"
-#: src/ap-config.c:59
+#: src/ap-config.c:63
msgid "Set general options"
msgstr "Algemene opties instellen"
-#: src/ap-config.c:60
+#: src/ap-config.c:64
msgid "Advanced"
msgstr "Geavanceerd"
-#: src/ap-config.c:60
+#: src/ap-config.c:64
msgid "Set advanced options"
msgstr "Geavanceerde opties instellen"
-#: src/ap-config.c:94
+#: src/ap-config.c:97
msgid "Reset AP."
msgstr "AP opnieuw instellen."
-#: src/ap-config.c:129
+#: src/ap-config.c:131
msgid "Latest"
msgstr "Laatste"
-#: src/ap-config.c:129
+#: src/ap-config.c:131
msgid "Get info about latest events"
msgstr "Info opvragen over laatste gebeurtenissen"
#: src/ap-mrtg.c:42
-#, c-format
msgid ""
"\n"
"Usage:\n"
"Gebruik:\n"
#: src/ap-mrtg.c:44
-#, fuzzy, c-format
+#, fuzzy
msgid ""
"\tap-mrtg -i ip -c community -t type [-b bssid] [-n name] [-a aptype] [-v] [-"
"h] [-r]\n"
"\n"
#: src/ap-mrtg.c:46
-#, c-format
msgid ""
"Get stats from AP and return it in MRTG parsable format\n"
"\n"
"\n"
#: src/ap-mrtg.c:47
-#, c-format
msgid "-i ip - AP ip address\n"
msgstr "-i ip - AP ip-adres\n"
#: src/ap-mrtg.c:48
-#, c-format
msgid "-c community - SNMP community string\n"
msgstr "-c gemeenschap - SNMP gemeenschap naam\n"
#: src/ap-mrtg.c:50
-#, c-format
msgid ""
"-t type - statistics type <w>ireless, <e>thernet, associated <s>tations "
"or <l>ink quality in client mode\n"
"<s>tations of <l> kwaliteit verbinding in client modus\n"
#: src/ap-mrtg.c:52
-#, c-format
msgid ""
"-b bssid - mac address of the AP to which get link quality, only if "
"type=l\n"
"worden; alleen als soort=l\n"
#: src/ap-mrtg.c:53
-#, c-format
msgid "-n name - AP name - for check only\n"
msgstr ""
#: src/ap-mrtg.c:54
-#, c-format
msgid ""
"-a aptype - AP type - 410 (default) or 510 for ATMEL12350's, like the "
"ME-102\n"
msgstr ""
#: src/ap-mrtg.c:56
-#, c-format
msgid "-v - report MRTG about problems connecting to AP\n"
msgstr "-v - MRTG aangeven over problemen met verbinden met AP\n"
#: src/ap-mrtg.c:57
-#, c-format
msgid "-r - reset AP when getting LinkQuality stats\n"
msgstr ""
"-r - AP opnieuw instellen bij opvragen statistieken "
"verbindingskwaliteit\n"
#: src/ap-mrtg.c:58
-#, c-format
msgid ""
"-h - print this help screen\n"
"\n"
"\n"
#: src/ap-mrtg.c:143
-#, c-format
msgid "Invalid IP-address\n"
msgstr "Onjuist IP-adres\n"
msgid "Agent:v%d %s (%s@%s:%d) %s%s%s. SysUptime %d:%02d:%02d.%02d"
msgstr "Agent:v%d %s (%s@%s:%d) %s%s%s. SysUptime %d:%02d:%02d.%02d"
+#: src/auth_mac.c:34
+#, fuzzy
+msgid "NUM MAC address"
+msgstr "NUM MAC adres"
+
#: src/bridge.c:36
msgid "[C] Configuration-enabled port(s): "
msgstr ""
msgid "[U] Isolate wireless clients (unicast traffic): "
msgstr ""
-#: src/bridge.c:137
+#: src/bridge.c:122
#, fuzzy
msgid "Both"
msgstr "Beide soorten"
msgid "Error:"
msgstr "Fout:"
-#: src/stations.c:113
+#: src/stations.c:31
+msgid " # MAC "
+msgstr ""
+
+#: src/stations.c:34
+msgid " # MAC Parent MAC RSSI Status MACn IP "
+msgstr ""
+
+#: src/stations.c:187
+#, fuzzy
+msgid ""
+"Arrows - scroll; S - save to file; Q - return; T - toggle view; Other key - "
+"refresh"
+msgstr ""
+"Pijltjes - schuiven; S - opslaan naar bestand; Q - afsluiten naar menu."
+
+#: src/stations.c:190
#, fuzzy
-msgid "Id MAC address"
-msgstr "Id MAC adres"
+msgid "Arrows - scroll; S - save to file; Q - return; Other key - refresh"
+msgstr ""
+"Pijltjes - schuiven; S - opslaan naar bestand; Q - afsluiten naar menu."
-#: src/stations.c:223 src/stations.c:307
+#: src/stations.c:275 src/stations.c:358
msgid "Associated stations"
msgstr "Geassocieerde stations"
-#: src/stations.c:225
+#: src/stations.c:277
#, fuzzy
msgid "Id MAC address Quality Age RSSI"
msgstr "Id MAC adres Kwaliteit Ouderdom RSSI"
+#~ msgid "Unable to get data from AP. Press Q to continue."
+#~ msgstr "Kan geen gegevens opvragen van AP. Druk op Q om door te gaan."
+
+#~ msgid "Q - quit to menu."
+#~ msgstr "Q - afsluiten naar menu."
+
+#~ msgid "pipe error. Press any key."
+#~ msgstr "pijpfout. Druk op een toets."
+
+#~ msgid "fork error. Press any key."
+#~ msgstr "fork() fout. Druk op een toets."
+
+#~ msgid "pipe error. Press any key"
+#~ msgstr "pijpfout. Druk op een toets"
+
+#~ msgid "fcntl error. Press any key"
+#~ msgstr "fcntl() fout. Druk op een toets"
+
+#~ msgid "fork error. Press any key"
+#~ msgstr "fork() fout. Druk op een toets"
+
+#, fuzzy
+#~ msgid "Id MAC address"
+#~ msgstr "Id MAC adres"
+
#~ msgid "Wireless Access Point Configurator"
#~ msgstr "Draadloos Access Point configurator"
-# Messages français pour GNU concernant ap-utils.\r
-# Copyright © 2002 Free Software Foundation, Inc.\r
-# Wojciech Puchar <wojtek@tensor.3miasto.net>\r
-# \r
+# Messages français pour GNU concernant ap-utils.
+# Copyright © 2002 Free Software Foundation, Inc.
+# Wojciech Puchar <wojtek@tensor.3miasto.net>
+#
msgid ""
msgstr ""
"Project-Id-Version: GNU ap-utils 1.1.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-22 15:06+0300\n"
+"POT-Creation-Date: 2004-11-14 22:46+0200\n"
"PO-Revision-Date: 2002-10-16 08:00-0500\n"
"Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
"Language-Team: French <traduc@traduc.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
+"Report-Msgid-Bugs-To: \n"
-# src/ap-config.c:42 src/bridge.c:166\r
-#: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:46 src/bridge.c:222
+# src/ap-config.c:42 src/bridge.c:166
+#: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:50 src/bridge.c:184
msgid "Bridging"
-msgstr "Bridge'owanie"
+msgstr "Podstawowe"
-# src/ap-config.c:42\r
-#: ap-gl/ap-gl.c:47 src/ap-config.c:46
+# src/ap-config.c:42
+#: ap-gl/ap-gl.c:47 src/ap-config.c:50
msgid "Set bridging and IP-related options"
-msgstr "Ustawinaie opcji bridge'a i IP"
+msgstr "Ustawianie opcji mostu i IP"
-# src/ap-config.c:44 src/ap-config.c:112 src/ap-config.c:121 src/bridge.c:90\r
-#: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:48
-#: src/ap-config.c:118 src/ap-config.c:127 src/bridge.c:135 src/bridge.c:139
+# src/ap-config.c:44 src/ap-config.c:112 src/ap-config.c:121 src/bridge.c:90
+#: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:52
+#: src/ap-config.c:120 src/ap-config.c:129 src/bridge.c:120 src/bridge.c:124
msgid "Wireless"
msgstr "Radiowe"
-# src/ap-config.c:44\r
-#: ap-gl/ap-gl.c:49 src/ap-config.c:48
+# src/ap-config.c:44
+#: ap-gl/ap-gl.c:49 src/ap-config.c:52
msgid "Set wireless options"
-msgstr "Ustawianie opcji radiowych"
+msgstr "Opcje radiowe"
-# src/ap-config.c:45 src/ap-config.c:57\r
-#: ap-gl/ap-gl.c:50 src/ap-config.c:49 src/ap-config.c:61
+# src/ap-config.c:45 src/ap-config.c:57
+#: ap-gl/ap-gl.c:50 src/ap-config.c:53 src/ap-config.c:65
msgid "Privacy"
-msgstr "Bezpieczeñstwo"
+msgstr "Klucze"
-# src/ap-config.c:46 src/ap-config.c:58\r
-#: ap-gl/ap-gl.c:51 src/ap-config.c:50 src/ap-config.c:62
-#, fuzzy
+# src/ap-config.c:46 src/ap-config.c:58
+#: ap-gl/ap-gl.c:51 src/ap-config.c:54 src/ap-config.c:66
msgid "MAC auth"
-msgstr "Dostêp w/g MAC"
+msgstr "Blokuj MAC"
-# src/ap-config.c:47 src/ap-config.c:59\r
-#: ap-gl/ap-gl.c:52 src/ap-config.c:51 src/ap-config.c:63
+# src/ap-config.c:47 src/ap-config.c:59
+#: ap-gl/ap-gl.c:52 src/ap-config.c:55 src/ap-config.c:67
msgid "Community"
-msgstr "Prawa dostêpu"
+msgstr "Dostêp"
-# src/ap-config.c:48\r
-#: ap-gl/ap-gl.c:53 src/ap-config.c:52
+# src/ap-config.c:48
+#: ap-gl/ap-gl.c:53 src/ap-config.c:56
msgid "Radio"
msgstr "Radio"
-# src/ap-config.c:48\r
-#: ap-gl/ap-gl.c:53 src/ap-config.c:52
+# src/ap-config.c:48
+#: ap-gl/ap-gl.c:53 src/ap-config.c:56
msgid "Set radio signal power and antenna options"
msgstr "Ustawianie mocy sygna³u i opcji antenowych"
-# src/ap-config.c:78\r
-#: ap-gl/ap-gl.c:66 src/ap-config.c:83
+# src/ap-config.c:78
+#: ap-gl/ap-gl.c:66 src/ap-config.c:87
msgid "Upload"
-msgstr "Za³aduj do AP"
+msgstr "Wy¶lij"
-# src/ap-config.c:78\r
-#: ap-gl/ap-gl.c:66 src/ap-config.c:83
+# src/ap-config.c:78
+#: ap-gl/ap-gl.c:66 src/ap-config.c:87
msgid "Make current configuration active"
-msgstr "Zapisuje aktualn± konfiguracje na sta³e"
+msgstr "Uczyñ konfiguracjê aktywn±"
-# src/ap-config.c:79\r
-#: ap-gl/ap-gl.c:67 src/ap-config.c:84
+# src/ap-config.c:79
+#: ap-gl/ap-gl.c:67 src/ap-config.c:88
msgid "Defaults"
msgstr "Domy¶lne"
-# src/ap-config.c:79\r
-#: ap-gl/ap-gl.c:67 src/ap-config.c:84
+# src/ap-config.c:79
+#: ap-gl/ap-gl.c:67 src/ap-config.c:88
msgid "Restore factory default settings"
-msgstr "Ustaw opcje standardowe producenta"
+msgstr "Przywróæ ustawienia producenta"
-# src/ap-config.c:81 src/ap-config.c:89\r
-#: ap-gl/ap-gl.c:69 src/ap-config.c:86 src/ap-config.c:94
+# src/ap-config.c:81 src/ap-config.c:89
+#: ap-gl/ap-gl.c:69 src/ap-config.c:89 src/ap-config.c:97
msgid "Reset"
msgstr "Reset"
-# src/ap-config.c:82\r
-#: ap-gl/ap-gl.c:70 src/ap-config.c:87
+# src/ap-config.c:82
+#: ap-gl/ap-gl.c:70 src/ap-config.c:90
msgid "Reset AP. All not uploaded configuration will be lost"
-msgstr "Reset Access-pointa. Wszystkie nie za³adowane opcje bêd± utracone"
+msgstr "Reset. Wszystkie nie za³adowane opcje bêd± utracone"
-# src/ap-config.c:84\r
-#: ap-gl/ap-gl.c:72 src/ap-config.c:89
+# src/ap-config.c:84
+#: ap-gl/ap-gl.c:72 src/ap-config.c:92
msgid "TestMode"
-msgstr "Tryb testowy"
+msgstr "TrybTest"
-# src/ap-config.c:84\r
-#: ap-gl/ap-gl.c:72 src/ap-config.c:89
+# src/ap-config.c:84
+#: ap-gl/ap-gl.c:72 src/ap-config.c:92
msgid "Put Access Point in test mode"
msgstr "W³±cza tryb testowy AP"
-# src/ap-config.c:110 src/ap-config.c:120\r
-#: ap-gl/ap-gl.c:83 src/ap-config.c:116 src/ap-config.c:126
+# src/ap-config.c:110 src/ap-config.c:120
+#: ap-gl/ap-gl.c:83 src/ap-config.c:118 src/ap-config.c:128
msgid "SysInfo"
msgstr "Ogólne"
-# src/ap-config.c:111 src/bridge.c:90\r
-#: ap-gl/ap-gl.c:84 ap-gl/bridge.c:132 src/ap-config.c:117 src/bridge.c:134
-#: src/bridge.c:138
+# src/ap-config.c:111 src/bridge.c:90
+#: ap-gl/ap-gl.c:84 ap-gl/bridge.c:132 src/ap-config.c:119 src/bridge.c:119
+#: src/bridge.c:123
msgid "Ethernet"
msgstr "Ethernet"
-# src/ap-config.c:111\r
-#: ap-gl/ap-gl.c:84 src/ap-config.c:117
+# src/ap-config.c:111
+#: ap-gl/ap-gl.c:84 src/ap-config.c:119
msgid "Get ethernet port statistics"
-msgstr "Pobiera statystyki portu ethernet"
+msgstr "Pobierz statystyki ethernetu"
-# src/ap-config.c:113 src/ap-config.c:122\r
-#: ap-gl/ap-gl.c:86 src/ap-config.c:119 src/ap-config.c:128
+# src/ap-config.c:113 src/ap-config.c:122
+#: ap-gl/ap-gl.c:86 src/ap-config.c:121 src/ap-config.c:130
msgid "Stations"
msgstr "Stacje"
-# src/ap-config.c:115\r
-#: ap-gl/ap-gl.c:88 src/ap-config.c:121
+# src/ap-config.c:115
+#: ap-gl/ap-gl.c:88 src/ap-config.c:123
msgid "KnownAPs"
-msgstr "Znane access-pointy"
+msgstr "Znane AP"
-# src/ap-config.c:115\r
-#: ap-gl/ap-gl.c:88 src/ap-config.c:121
+# src/ap-config.c:115
+#: ap-gl/ap-gl.c:88 src/ap-config.c:123
msgid "Get info about known Access Points"
-msgstr "Podaje informacje o znanych access-pointach"
+msgstr "Podaj informacje o Access Pointach"
-# src/ap-config.c:141\r
-#: ap-gl/ap-gl.c:105 src/ap-config.c:154
+# src/ap-config.c:141
+#: ap-gl/ap-gl.c:105 src/ap-config.c:156
msgid "Info"
-msgstr "Informacja"
+msgstr "Info"
-# src/ap-config.c:142\r
-#: ap-gl/ap-gl.c:106 src/ap-config.c:155
+# src/ap-config.c:142
+#: ap-gl/ap-gl.c:106 src/ap-config.c:157
msgid "Config"
-msgstr "Konfiguracja"
+msgstr "Konfig"
-# src/ap-config.c:143\r
-#: ap-gl/ap-gl.c:107 src/ap-config.c:156
+# src/ap-config.c:143
+#: ap-gl/ap-gl.c:107 src/ap-config.c:158
msgid "Commands"
msgstr "Komendy"
-# src/ap-config.c:143\r
-#: ap-gl/ap-gl.c:107 src/ap-config.c:156
+# src/ap-config.c:143
+#: ap-gl/ap-gl.c:107 src/ap-config.c:158
msgid "Execute commands on Access Point"
-msgstr "Wykonuje operacje w Access-poincie"
+msgstr "Wykonaj operacje w AP"
-# src/ap-config.c:145\r
-#: ap-gl/ap-gl.c:109 src/ap-config.c:158
+# src/ap-config.c:145
+#: ap-gl/ap-gl.c:109 src/ap-config.c:160
msgid "Connect"
msgstr "Po³±cz"
-# src/ap-config.c:146\r
-#: ap-gl/ap-gl.c:110 src/ap-config.c:159
+# src/ap-config.c:146
+#: ap-gl/ap-gl.c:110 src/ap-config.c:161
msgid "Search"
msgstr "Znajd¼"
-# lib/common.c:50 src/ap-config.c:147\r
-#: ap-gl/ap-gl.c:111 lib/common.c:52 src/ap-config.c:160
+# lib/common.c:50 src/ap-config.c:147
+#: ap-gl/ap-gl.c:111 lib/common.c:58 src/ap-config.c:162
msgid "About"
-msgstr "Informacja"
+msgstr "O..."
-# src/ap-config.c:148\r
-#: ap-gl/ap-gl.c:112 src/ap-config.c:161
+# src/ap-config.c:148
+#: ap-gl/ap-gl.c:112 src/ap-config.c:163
msgid "Shell"
-msgstr "Linia komend"
+msgstr "Shell"
-# src/ap-config.c:149\r
-#: ap-gl/ap-gl.c:113 src/ap-config.c:162
+# src/ap-config.c:149
+#: ap-gl/ap-gl.c:113 src/ap-config.c:164
msgid "Exit"
-msgstr "Koniec"
+msgstr "Wyjd¼"
-# src/ap-config.c:194\r
-#: ap-gl/ap-gl.c:162 src/ap-config.c:211
+# src/ap-config.c:194
+#: ap-gl/ap-gl.c:162 src/ap-config.c:212
#, c-format
msgid "Wireless Access Point Configurator ver. %s"
msgstr "Konfigurator bezprzewodowych access-pointów wersja %s"
-# src/auth_mac.c:35\r
+# src/auth_mac.c:35
#: ap-gl/auth_mac.c:28 src/auth_mac.c:28
msgid "AuthorizedMacTableString packet error"
msgstr "B³êdny pakiet AuthorizedMacTableString"
-# lib/ap-utils.h:117\r
+# lib/ap-utils.h:117
#: ap-gl/auth_mac.c:30 src/auth_mac.c:30
-#, fuzzy
msgid "[A] MAC authorization: "
-msgstr "[A] Ograniczenie dostêpu dla wybranych MAC: %s"
+msgstr "[A] Ograniczenie dostêpu dla wybranych adresów MAC: "
-# lib/ap-utils.h:122\r
+# lib/ap-utils.h:122
#: ap-gl/auth_mac.c:31 src/auth_mac.c:31
-#, fuzzy
msgid "Enter MAC: "
-msgstr "Adres fizyczny:"
+msgstr "Adres fizyczny: "
-# lib/ap-utils.h:121\r
+# lib/ap-utils.h:121
#: ap-gl/auth_mac.c:32 src/auth_mac.c:32
-#, fuzzy
msgid "Delete Num: "
-msgstr "Skasuj pozycje:"
+msgstr "Skasuj pozycjê: "
-# lib/ap-utils.h:118\r
+# lib/ap-utils.h:118
#: ap-gl/auth_mac.c:33 src/auth_mac.c:33
-#, fuzzy
msgid "Authorized MAC addresses"
msgstr "Dostêp w/g MAC"
-# lib/ap-utils.h:119\r
-#: ap-gl/auth_mac.c:34 src/auth_mac.c:34
-#, fuzzy
+# lib/ap-utils.h:119
+#: ap-gl/auth_mac.c:34
msgid "NUM MAC address"
-msgstr "Numer adres fizyczny (MAC)"
+msgstr "Numer adres fizyczny (MAC)"
-# lib/ap-utils.h:120\r
+# lib/ap-utils.h:120
#: ap-gl/auth_mac.c:35 src/auth_mac.c:35
msgid "A - auth; N - new; D - del; arrows - scroll; W - write conf; Q - quit"
msgstr ""
-"A W³/Wy³; N - nowe; D - kasuj; strza³ki - przewijanie; W - zapis; Q - Wyj¶cie"
+"A W³/Wy³; N - nowe; D - kasuj; strza³ki - przewijanie; W - zapis; Q - Wyjd¼"
-# src/nwn_advanced.c:70\r
+# src/nwn_advanced.c:70
#: ap-gl/auth_mac.c:36
-#, fuzzy
msgid "A - auth; IPSTF - set; W - write conf; Q - quit"
msgstr "DA - opcje; W - zapis; Q - powrót"
-# src/nwn_advanced.c:70\r
+# src/nwn_advanced.c:70
#: ap-gl/auth_mac.c:37
-#, fuzzy
msgid "A - auth; W - write conf; Q - quit"
msgstr "DA - opcje; W - zapis; Q - powrót"
msgid "[F] RADIUS SOURCE PORT: "
msgstr ""
-# src/ap-config.c:55\r
+# src/ap-config.c:55
#: ap-gl/auth_mac.c:88
-#, fuzzy
msgid "Internal"
-msgstr "Ogólne"
+msgstr "Ogólnie"
#: ap-gl/auth_mac.c:96
msgid "<hidden>"
-msgstr ""
+msgstr "<ukryto>"
#: ap-gl/bridge.c:27 src/bridge.c:27
msgid "[I] IP: "
msgstr ""
-# src/bridge.c:169\r
+# src/bridge.c:169
#: ap-gl/bridge.c:28 src/bridge.c:28
-#, fuzzy
msgid "[N] Netmask: "
-msgstr "[N] Maska: %s"
+msgstr "[N] Maska: "
-# src/bridge.c:171\r
+# src/bridge.c:171
#: ap-gl/bridge.c:29 src/bridge.c:29
-#, fuzzy
msgid "[G] Gateway: "
-msgstr "[G] Bramka %s"
+msgstr "[G] Brama: "
-# src/bridge.c:32\r
+# src/bridge.c:32
#: ap-gl/bridge.c:30 src/bridge.c:30
-#, fuzzy
msgid "[F] Filter non-IP traffic: "
-msgstr "[F] Wycinaj ruch nie-IP: %s"
+msgstr "[F] Wycinaj ruch nie-IP: "
-# src/bridge.c:33\r
+# src/bridge.c:33
#: ap-gl/bridge.c:31 src/bridge.c:31
-#, fuzzy
msgid "[P] Primary port: "
-msgstr "[P] Port podstawowy: %s"
+msgstr "[P] Port podstawowy: "
-# src/bridge.c:144\r
+# src/bridge.c:144
#: ap-gl/bridge.c:32 src/bridge.c:32
-#, fuzzy
msgid "Attached station MAC: "
-msgstr "MAC do³±czonej stacji: %02X:%02X:%02X:%02X:%02X:%02X"
+msgstr "MAC do³±czonej stacji:"
-# src/bridge.c:34\r
+# src/bridge.c:34
#: ap-gl/bridge.c:33 src/bridge.c:33
-#, fuzzy
msgid "[D] DHCP client: "
-msgstr "[D] DHCP: %s"
+msgstr "[D] Klient DHCP: "
-# src/bridge.c:35\r
+# src/bridge.c:35
#: ap-gl/bridge.c:34 src/bridge.c:34
-#, fuzzy
msgid "[O] Operational mode: "
-msgstr "[O] Tryb pracy: %s"
+msgstr "[O] Tryb pracy: "
-# src/bridge.c:36\r
+# src/bridge.c:36
#: ap-gl/bridge.c:35 src/bridge.c:35
-#, fuzzy
msgid "[M] Preferred BSSID (remote MAC addr.): "
-msgstr "[R] Zdalny adres fizyczny: %02X%02X%02X%02X%02X%02X"
+msgstr "[M] Zdalny adres fizyczny: "
#: ap-gl/bridge.c:37 src/bridge.c:37
msgid "[T] Trap-sending port(s): "
-msgstr ""
+msgstr "[T] SNMP-Trap na porty: "
#: ap-gl/bridge.c:38 src/bridge.c:38
msgid "[R] Forward broadcast traffic: "
-msgstr ""
+msgstr "[R] Przesy³aj ruch rozg³oszeniowy: "
#: ap-gl/bridge.c:40
msgid "[U] Isolate wireless clients: "
-msgstr ""
+msgstr "[U] Izoluj klientów radiowych: "
-# src/bridge.c:30\r
+# src/bridge.c:30
#: ap-gl/bridge.c:41 src/bridge.c:41
-#, fuzzy
msgid "INGFPDOMSCTRBU - set; W - write conf; Q - quit to menu"
msgstr "BPGINFDRT - ustaw; W - Zapisz; Q - powrót"
-# src/bridge.c:85\r
-#: ap-gl/bridge.c:125 src/bridge.c:127
+# src/bridge.c:85
+#: ap-gl/bridge.c:125 src/bridge.c:112
msgid "Wireless Bridge Point to MultiPoint"
msgstr "Bridge punkt-wielopunkt"
-# src/bridge.c:86\r
-#: ap-gl/bridge.c:126 src/bridge.c:128
+# src/bridge.c:86
+#: ap-gl/bridge.c:126 src/bridge.c:113
msgid "Access Point"
msgstr "Access Point"
-# src/bridge.c:87\r
-#: ap-gl/bridge.c:127 src/bridge.c:129
+# src/bridge.c:87
+#: ap-gl/bridge.c:127 src/bridge.c:114
msgid "Access Point client"
msgstr "Klient Access pointa"
-# src/bridge.c:88\r
-#: ap-gl/bridge.c:128 src/bridge.c:130
+# src/bridge.c:88
+#: ap-gl/bridge.c:128 src/bridge.c:115
msgid "Wireless Bridge Point to Point"
msgstr "Bridge punkt-punkt"
-# src/bridge.c:88\r
-#: ap-gl/bridge.c:129 src/bridge.c:131
+# src/bridge.c:88
+#: ap-gl/bridge.c:129 src/bridge.c:116
msgid "Repeater"
-msgstr "Regenerator"
+msgstr "Repeater"
-# src/stations.c:29\r
+# src/stations.c:29
#: ap-gl/stations.c:31 src/stations.c:29
msgid "Associated Stations"
-msgstr "Przynale¿ne stacje"
+msgstr "Pod³±czonych stacji"
-#: ap-gl/stations.c:83 src/stations.c:87
-msgid "AP now in AP Client Mode and don't has any associated stations"
-msgstr ""
+#: ap-gl/stations.c:80 src/stations.c:96
+#, fuzzy
+msgid "AP is currently in AP Client Mode => no associated STAtions."
+msgstr "AP jest teraz w trybie klienta i nie ma stacji pod³±czonych"
-#: ap-gl/stations.c:109
-msgid "# MAC LQ RSSI Status Port IP"
+#: ap-gl/stations.c:105
+msgid "# MAC LQ RSSI Status Port IP"
msgstr ""
-# src/stations.c:110\r
-#: ap-gl/stations.c:135 src/stations.c:139
+# src/stations.c:110
+#: ap-gl/stations.c:131 src/stations.c:155
msgid "AssociatedSTAsInfo packet error"
msgstr "B³êdny pakiet AssociatedSTAsInfo"
-# src/stations.c:132 src/stations.c:284\r
-#: ap-gl/stations.c:164 src/stations.c:161 src/stations.c:313
+# src/stations.c:132 src/stations.c:284
+#: ap-gl/stations.c:160 src/stations.c:364
msgid "Arrows - scroll; S - save to file; Q - quit to menu."
msgstr "Strza³ki - przewijanie; S - zapis do zbioru; Q - powrót."
#: lib/aps.c:128
msgid "Your Access Point is not in \"AP client\" mode => getting"
-msgstr ""
+msgstr "Twój AP nie jest w trybie \"klient AP\""
#: lib/aps.c:131
msgid "up-to-date \"Known APs\" info requires your AP to be"
#: lib/aps.c:134
msgid "temporarily configured into \"AP client\" mode and rebooted."
-msgstr ""
+msgstr "tymczasowo skonfigurowano w tryb klienta AP i zrestartowano."
#: lib/aps.c:137
msgid "Your AP will be reconfigured back to original mode by this"
msgid "utility once you quit the \"KnownAP\" view. This, in turn, may"
msgstr ""
-# src/ap-config.c:78\r
+# src/ap-config.c:78
#: lib/aps.c:143
-#, fuzzy
msgid "cause loss of Access Point's current configuration."
msgstr "Zapisuje aktualn± konfiguracje na sta³e"
msgid "Do NOT answer \"Yes\" if you're connected to the Access Point"
msgstr ""
-# src/ap-config.c:44\r
+# src/ap-config.c:44
#: lib/aps.c:150
-#, fuzzy
msgid "via its wireless port."
-msgstr "Ustawianie opcji radiowych"
+msgstr "poprzez port radiowy"
-# src/aps.c:91 src/cmd.c:41 src/cmd.c:85 src/cmd.c:141 src/test.c:82\r
+# src/aps.c:91 src/cmd.c:41 src/cmd.c:85 src/cmd.c:141 src/test.c:82
#: lib/aps.c:152 lib/cmd.c:49 lib/cmd.c:92 lib/test.c:93
msgid "Do you want to continue? "
-msgstr "Jeste¶ pewien?"
+msgstr "Czesz kontynuowaæ?"
-# src/aps.c:93\r
+# src/aps.c:93
#: lib/aps.c:154
-#, fuzzy
msgid "(Y - Yes; N - No (it's safer to answer No)"
-msgstr "(Y - Tak; N - Nie (lepiej Nie)"
+msgstr "(Y - Tak; N - Nie (lepiej nie)"
-# src/aps.c:138\r
+# src/aps.c:138
#: lib/aps.c:202
msgid "Known Access Points"
msgstr "Znane Access pointy"
-# src/aps.c:143\r
-#: lib/aps.c:217
+# src/aps.c:143
+#: lib/aps.c:219
msgid "NetworkType"
msgstr "Typ sieci"
-# src/aps.c:176\r
-#: lib/aps.c:293
+# src/aps.c:176
+#: lib/aps.c:295
msgid "Infrastructure"
msgstr "Infrastruktura"
-# src/aps.c:191\r
-#: lib/aps.c:352 lib/aps.c:360 lib/aps.c:368
-#, fuzzy
+# src/aps.c:191
+#: lib/aps.c:355 lib/aps.c:363 lib/aps.c:371
msgid "CN: Channel Name; P: Preambule Type (S: Short; L: Long);"
-msgstr "P: Typ nag³ówka; S: Krótki; L: D³ugi"
+msgstr "P: Typ nag³ówka; P: Preambu³a (S: Krótki; L: D³ugi)"
-#: lib/aps.c:354
-msgid "RSSI: Radio Signal Strength Indicator [%];"
+#: lib/aps.c:357
+msgid "RSSI: Radio Signal Strength Indicator [%]"
msgstr ""
-#: lib/aps.c:356 lib/aps.c:364
-msgid "LQ: Link Quality [%]"
+#: lib/aps.c:359 lib/aps.c:367
+msgid "; LQ: Link Quality [%]"
msgstr ""
-#: lib/aps.c:362
-msgid "RSSI: Radio Signal Strength Indicator [dBm];"
+#: lib/aps.c:365
+msgid "RSSI: Radio Signal Strength Indicator [dBm]"
msgstr ""
-#: lib/aps.c:370
-msgid "RSSI: Radio Signal Strength Indicator [raw];"
+#: lib/aps.c:373
+msgid "RSSI: Radio Signal Strength Indicator [raw]"
msgstr ""
-#: lib/aps.c:372
-msgid "LQ: Link Quality [raw]"
+#: lib/aps.c:375
+msgid "; LQ: Link Q. [raw]"
msgstr ""
-# src/aps.c:194\r
-#: lib/aps.c:378
+# src/aps.c:194
+#: lib/aps.c:381
#, fuzzy
msgid ""
-"# con. to this AP; R refresh with reset; S refresh w/o reset; T toggle; Q "
-"quit"
+"# con. to AP #; R refresh with reset; T toggle; Q quit; Other = refr. w/o "
+"reset"
msgstr ""
"# po³±cz z tym AP; R od¶wie¿ przez reset; G od¶wie¿ bez resetu; Q wyj¶cie"
-# src/aps.c:194\r
-#: lib/aps.c:380
+# src/aps.c:194
+#: lib/aps.c:383
#, fuzzy
msgid ""
-"# con. to this AP; R initiate AP scan; S refresh view; T toggle view; Q quit"
+"# con. to AP #; R initiate AP scan; T toggle view; Q quit; Other = refresh "
+"view"
msgstr ""
"# po³±cz z tym AP; R od¶wie¿ przez reset; G od¶wie¿ bez resetu; Q wyj¶cie"
-# lib/ap_search.c:134\r
-#: lib/aps.c:509 lib/ap_search.c:153
-#, fuzzy, c-format
+# lib/ap_search.c:134
+#: lib/aps.c:512 lib/ap_search.c:164
+#, c-format
msgid "Failure in sendto(): %s. Press any key."
msgstr "B³±d sendto() : %s. Wci¶nij dowolny klawisz."
-#: lib/aps.c:518
+#: lib/aps.c:521
msgid "You have just initiated the AP scan. Be advised that it may"
-msgstr ""
+msgstr "W³a¶nie zainicjalizowa³e¶ skanowanie sieci. Musisz wiedzieæ,"
-#: lib/aps.c:521
+#: lib/aps.c:524
msgid "take a few seconds for your Access Point to find out some"
-msgstr ""
+msgstr "¿e potrwa chwilkê, zanim twój AP znajdzie cokolwiek"
-#: lib/aps.c:524
+#: lib/aps.c:527
msgid "values, so expect finishing the scan in about 5 seconds."
-msgstr ""
+msgstr "i mo¿esz oczekiwaæ zakoñczenia skanowania do 5 sekund."
-#: lib/aps.c:527
+#: lib/aps.c:530
msgid "Also note that your Access Point stops forwarding the network"
-msgstr ""
+msgstr "Musisz wiedzieæ równie¿. ¿e AP przestanie przesy³aæ ruch"
-#: lib/aps.c:530
+#: lib/aps.c:533
msgid "traffic while the scan is in progress, but restores itself"
-msgstr ""
+msgstr "sieciowy podczas skanowania, ale przywróci swój stan"
-#: lib/aps.c:533
+#: lib/aps.c:536
msgid "to normal operation in time ranging up to 1 minute."
-msgstr ""
+msgstr "do normalnej pracy po oko³o 1 minucie."
-#: lib/aps.c:536
+#: lib/aps.c:539
msgid "Hence, if you are connected to target Access Point via its"
-msgstr ""
+msgstr "Uwa¿aj! Je¶li jeste¶ pod³±czony do tego AP przez jego"
-#: lib/aps.c:539
+#: lib/aps.c:542
msgid "wireless port, you need to wait a bit longer"
-msgstr ""
+msgstr "port radiowy, bêdziesz musia³ poczekaæ trochê d³u¿ej"
-#: lib/aps.c:542
+#: lib/aps.c:545
msgid "after pressing 'S'."
-msgstr ""
+msgstr "po naci¶niêciu klawisza 'S'."
#: lib/ap_search.c:50
-msgid "# Type IP Description"
+msgid " # Type IP Name"
msgstr ""
-#: lib/ap_search.c:89
+#: lib/ap_search.c:99
msgid "Please wait while scanning, or press 'Q' to quit."
-msgstr ""
+msgstr "Trwa skanowanie, poczekaj chwilê, by przerwaæ wci¶nij 'Q'"
-# lib/ap_search.c:110\r
-#: lib/ap_search.c:105
-#, fuzzy
+# lib/ap_search.c:110
+#: lib/ap_search.c:115
msgid "Can't set broadcast option on socket. Press any key."
msgstr "Nie moge ustawiæ trybu BROADCAST. Wci¶nij dowolny klawisz."
-# lib/ap_search.c:117\r
-#: lib/ap_search.c:114
-#, fuzzy
+# lib/ap_search.c:117
+#: lib/ap_search.c:124
msgid "Can't set multicast membership on socket. Press any key."
msgstr "Nie moge ustawiæ przynale¿no¶ci multicast. Wci¶nij dowolny klawisz."
-#: lib/ap_search.c:120
+#: lib/ap_search.c:131
msgid "Scanning via network interface:"
-msgstr ""
+msgstr "Szukam poprzez interfejs sieciowy: "
-#: lib/ap_search.c:121
+#: lib/ap_search.c:132
#, c-format
msgid " Index: %i"
-msgstr ""
+msgstr " Indeks: %i"
-# lib/ap-utils.h:78\r
-#: lib/ap_search.c:123
-#, fuzzy, c-format
+# lib/ap-utils.h:78
+#: lib/ap_search.c:134
+#, c-format
msgid " Name: %s"
-msgstr "[N] Nazwa urz±dzenia:"
+msgstr " Nazwa: %s"
-#: lib/ap_search.c:125
+#: lib/ap_search.c:136
#, c-format
msgid " IP: %s"
msgstr ""
-#: lib/ap_search.c:134
+#: lib/ap_search.c:145
#, c-format
msgid "Scanning for AP type: %s"
-msgstr ""
+msgstr "Szukam typu AP: %s"
-# lib/ap_search.c:128\r
-#: lib/ap_search.c:312
+# lib/ap_search.c:128
+#: lib/ap_search.c:327
msgid "Access Points Search"
msgstr "Szukanie Access-pointów"
-# src/ap-mrtg.c:178\r
-#: lib/ap_search.c:329
-#, fuzzy
+# src/ap-mrtg.c:178
+#: lib/ap_search.c:345
msgid "realloc() error."
-msgstr "B³±d otwarcia socket'a"
+msgstr "B³±d otwarcia gniazdka"
-#: lib/ap_search.c:341
+#: lib/ap_search.c:357
msgid "Network interface discovery error."
-msgstr ""
+msgstr "B³±d interfejsu sieciowego."
-# src/stat.c:41\r
-#: lib/ap_search.c:416
-#, fuzzy
+# src/stat.c:41
+#: lib/ap_search.c:432
msgid "No local network interfaces found. Press any key."
-msgstr "B³±d tworzenia procesu (fork). Wci¶nij dowolny klawisz."
+msgstr "Nie znaleziono interfejsu sieci lokalnej. Wci¶nij dowolny klawisz."
-#: lib/ap_search.c:418
+#: lib/ap_search.c:434
msgid "No directly reachable Access Points found. Press any key."
-msgstr ""
-
-#: lib/ap_search.c:422
-msgid "Program-hardcoded maximum number of APs found."
-msgstr ""
+msgstr "Nie znaleziono ¿adnego osi±galnego AP. Naci¶nij dowolny klawisz."
-# lib/common.c:118\r
-#: lib/ap_search.c:426
+#: lib/ap_search.c:439
#, fuzzy
+msgid "Single-screen maximum number of APs found."
+msgstr "Program osi±gn±³ maksymaln± liczê Access Pointów znalezionych."
+
+# lib/common.c:118
+#: lib/ap_search.c:442
msgid "# - connect to AP; Q - quit"
-msgstr "Wybór Access-pointa"
+msgstr "# - pod³±cz do AP; Q - wyjd¼"
-# src/sysinfo.c:402\r
+# src/sysinfo.c:402
#: lib/ap-utils.h:74
-#, fuzzy
msgid "MAC address: "
-msgstr "Adres IP: %s"
+msgstr "Adres MAC: "
-# lib/ap-utils.h:80\r
+# lib/ap-utils.h:80
#: lib/ap-utils.h:75
-#, fuzzy
msgid "[S] SNMP traps: "
-msgstr "[S] Sygnalizacja SNMP: %s"
+msgstr "[S] Sygnalizacja SNMP: "
-# lib/ap-utils.h:68\r
+# lib/ap-utils.h:68
#: lib/ap-utils.h:77
-#, fuzzy
msgid "[C] Frequency channel: "
-msgstr "[C] Czêstotliwo¶æ fali: %02u (%u MHz)"
+msgstr "[C] Czêstotliwo¶æ fali: "
-# src/stat.c:123\r
+# src/stat.c:123
#: lib/ap-utils.h:79
-#, fuzzy
msgid "Receive antenna:"
msgstr "Odebrane:"
-# src/test.c:70\r
+# src/test.c:70
#: lib/ap-utils.h:80
-#, fuzzy
msgid "[U] Left"
-msgstr "Lewa"
+msgstr "[U] Lewa"
-# src/test.c:70\r
+# src/test.c:70
#: lib/ap-utils.h:81
-#, fuzzy
msgid "[I] Right"
-msgstr "Prawa"
+msgstr "[I] Prawa"
-# src/stat.c:124\r
+# src/stat.c:124
#: lib/ap-utils.h:82
-#, fuzzy
msgid "Transmit antenna:"
-msgstr "Wys³ane:"
+msgstr "Antena nadawcza:"
-# src/test.c:70\r
+# src/test.c:70
#: lib/ap-utils.h:83
-#, fuzzy
msgid "[O] Left"
-msgstr "Lewa"
+msgstr "[O] Lewa"
-# src/test.c:70\r
+# src/test.c:70
#: lib/ap-utils.h:84
-#, fuzzy
msgid "[P] Right"
-msgstr "Prawa"
+msgstr "[P] Prawa"
-# src/sysinfo.c:358\r
+# src/sysinfo.c:358
#: lib/ap-utils.h:85
-#, fuzzy
msgid "Diversity select:"
-msgstr "Wiêksza moc: %s"
+msgstr "Naprzemienno¶æ:"
-# src/test.c:70\r
+# src/test.c:70
#: lib/ap-utils.h:86
-#, fuzzy
msgid "[T] Left"
-msgstr "Lewa"
+msgstr "[T] Lewa"
-# src/test.c:70\r
+# src/test.c:70
#: lib/ap-utils.h:87
-#, fuzzy
msgid "[Y] Right"
-msgstr "Prawa"
+msgstr "[Y] Prawa"
#: lib/ap-utils.h:89
msgid "Yes"
-msgstr ""
+msgstr "Tak"
#: lib/ap-utils.h:90
msgid "No"
-msgstr ""
+msgstr "Nie"
#: lib/ap-utils.h:92
msgid "On"
-msgstr ""
+msgstr "w³±"
-# lib/ap-utils.h:55\r
+# lib/ap-utils.h:55
#: lib/ap-utils.h:93
-#, fuzzy
msgid "Off"
msgstr "wy³"
-# lib/ap-utils.h:56\r
+# lib/ap-utils.h:56
#: lib/ap-utils.h:95
-#, fuzzy
msgid "Basic"
-msgstr "podstawowy"
+msgstr "Podstawowy"
-# lib/ap-utils.h:58\r
+# lib/ap-utils.h:58
#: lib/ap-utils.h:97
msgid "Press any key to continue."
-msgstr "Wci¶nij dowolny klawisz aby kontynuowaæ"
+msgstr "Wci¶nij dowolny klawisz aby kontynuowaæ."
-# lib/ap-utils.h:86\r
+# lib/ap-utils.h:86
#: lib/ap-utils.h:99
msgid "Unable to write data to AP. Press any key to continue."
msgstr "Nie moge wys³aæ danych do AP. Wci¶nij dowolny klawisz."
-# lib/ap-utils.h:87\r
+# lib/ap-utils.h:87
#: lib/ap-utils.h:100
-msgid "Unable to retrieve data from AP. Press any key to continue."
+#, fuzzy
+msgid "Unable to retrieve (valid) data from AP. Press any key to continue."
msgstr "Nie moge pobraæ danych z AP. Wci¶nij dowolny klawisz."
-# lib/ap-utils.h:88\r
+# lib/ap-utils.h:88
#: lib/ap-utils.h:101
msgid "Retrieving data from AP. Please wait..."
msgstr "Pobieram dane z AP. Proszê czekaæ..."
-# lib/ap-utils.h:89\r
+# lib/ap-utils.h:89
#: lib/ap-utils.h:102
msgid "Writing data to AP. Please wait..."
msgstr "Zapisuje dane do AP. Proszê czekaæ..."
-# lib/ap-utils.h:86\r
+# lib/ap-utils.h:86
#: lib/ap-utils.h:103
-#, fuzzy
msgid "Configuration written to the AP. Press any key to continue."
-msgstr "Nie moge wys³aæ danych do AP. Wci¶nij dowolny klawisz."
+msgstr "Konfiguracja zapisana do AP. Wci¶nij dowolny klawisz."
-# lib/ap-utils.h:92\r
+# lib/ap-utils.h:92
#: lib/ap-utils.h:105
msgid "Create socket error. Press any key."
-msgstr "Nie moge utworzyæ socket'a. Wci¶nij dowolny klawisz."
+msgstr "Nie moge utworzyæ gniazdka. Wci¶nij dowolny klawisz."
-# lib/ap-utils.h:93\r
+# lib/ap-utils.h:93
#: lib/ap-utils.h:106
msgid "Bind socket error. Press any key."
-msgstr "Bl±d bind(). Wci¶nij dowolny klawisz."
+msgstr "Bl±d gniazdka. Wci¶nij dowolny klawisz."
-# lib/ap-utils.h:102\r
+# lib/ap-utils.h:102
#: lib/ap-utils.h:108
msgid "Back to main menu"
-msgstr "Powtór do menu g³ównego"
+msgstr "Powrót do menu g³ównego"
-# lib/ap-utils.h:103\r
+# lib/ap-utils.h:103
#: lib/ap-utils.h:109
msgid "Exit program"
msgstr "Wyj¶cie z programu"
-# lib/ap-utils.h:104\r
+# lib/ap-utils.h:104
#: lib/ap-utils.h:110
-#, fuzzy
msgid "Run subshell. To return type 'exit'."
-msgstr "Uruchomienie shella. Wpisz 'exit' aby wróciæ"
+msgstr "Uruchomienie podpow³oki. By wróciæ wpisz 'exit'."
-# lib/ap-utils.h:105\r
+# lib/ap-utils.h:105
#: lib/ap-utils.h:111
msgid "Short info about program"
msgstr "O programie"
-# lib/ap-utils.h:106\r
+# lib/ap-utils.h:106
#: lib/ap-utils.h:112
msgid "Find connected Access Points"
msgstr "Znajd¼ pod³±czone Access-pointy"
-# lib/ap-utils.h:107\r
+# lib/ap-utils.h:107
#: lib/ap-utils.h:113
msgid "Set connection options: ip and community"
msgstr "Ustawianie opcji po³±czeñ: ip i grupa"
-# lib/ap-utils.h:108\r
+# lib/ap-utils.h:108
#: lib/ap-utils.h:114
-#, fuzzy
msgid "Set encryption; edit WEP keys"
msgstr "Ustawianie szyfracji, zmiana kluczy"
-# lib/ap-utils.h:109\r
+# lib/ap-utils.h:109
#: lib/ap-utils.h:115
-#, fuzzy
msgid "Set MAC authorization; edit MAC authorization table"
msgstr "Ustawianie praw dostêpu w/g MAC i listy MAC"
-# lib/ap-utils.h:110\r
+# lib/ap-utils.h:110
#: lib/ap-utils.h:116
-#, fuzzy
msgid "Set SNMP community/password for access to the AP"
msgstr "Ustawianie hase³/praw SNMP dla AP"
-# lib/ap-utils.h:111\r
+# lib/ap-utils.h:111
#: lib/ap-utils.h:117
-#, fuzzy
msgid "Get info about AP hardware and firmware"
msgstr "Informacja o sprzêcie i oprogramowaniu AP"
-# lib/ap-utils.h:112\r
+# lib/ap-utils.h:112
#: lib/ap-utils.h:118
-#, fuzzy
msgid "Get wireless port statistics"
msgstr "Statystyki portu radiowego"
-# lib/ap-utils.h:113\r
+# lib/ap-utils.h:113
#: lib/ap-utils.h:119
-#, fuzzy
msgid "Get list of currently associated stations (Access Point clients)"
msgstr "Lista aktualnie przy³±czonych stacji"
-# lib/ap-utils.h:114\r
+# lib/ap-utils.h:114
#: lib/ap-utils.h:120
-#, fuzzy
msgid "Get info and statistics from AP"
msgstr "Pobieram informacje i statystyki z AP"
-# lib/ap-utils.h:115\r
+# lib/ap-utils.h:115
#: lib/ap-utils.h:121
-#, fuzzy
msgid "Set various configuration options"
-msgstr "Ustawianie opcji - ró¿ne"
+msgstr "Ustawianie ró¿nych opcji"
-# src/cmd.c:24\r
+# src/cmd.c:24
#: lib/cmd.c:25
-#, fuzzy
msgid ""
"(Y - Yes; N - No (it's safer to answer No, unless you really need this.)"
msgstr "(Y - Tak; N - Nie (lepiej nie)"
-# src/cmd.c:37\r
+# src/cmd.c:37
#: lib/cmd.c:44
msgid "Restore factory default configuration"
msgstr "Przywróæ ustawienia fabryczne."
-# src/cmd.c:40\r
+# src/cmd.c:40
#: lib/cmd.c:47
-#, fuzzy
msgid "After restoring factory defaults your current configuration."
msgstr "Po odtworzeniu ustawieñ fabrycznych CA£O¦Æ ustawien zostanie stracona."
msgid "will be lost."
msgstr ""
-# src/cmd.c:71\r
+# src/cmd.c:71
#: lib/cmd.c:79
-#, fuzzy
msgid "Factory default settings loaded. Press any key to continue."
-msgstr "Ustawiono konfiguracje domy¶ln±. Wci¶nij dowolny klawisz."
+msgstr "Za³adowano ustawienia producenta. Wci¶nij dowolny klawisz."
-# src/cmd.c:81\r
+# src/cmd.c:81
#: lib/cmd.c:88
msgid "Reset Access Point"
msgstr "Zresetuj Access pointa"
-# src/cmd.c:84\r
+# src/cmd.c:84
#: lib/cmd.c:91
-#, fuzzy
msgid "By reset you'll lose all non-uploaded configuration."
msgstr "Przy resecie stracisz wszystkie nie za³adowane informacje."
-# src/cmd.c:106\r
+# src/cmd.c:106
#: lib/cmd.c:113
msgid "Access Point reset. Press any key to continue."
msgstr "Access point zresetowany. Wci¶nij dowolny klawisz."
-# src/cmd.c:134\r
+# src/cmd.c:134
#: lib/cmd.c:146
msgid "Upload configuration"
msgstr "Za³aduj konfiguracje"
-# src/cmd.c:137\r
+# src/cmd.c:137
#: lib/cmd.c:149
-#, fuzzy
msgid "You need to upload the configuration only if you've changed"
-msgstr "Musisz za³adowaæ konfiguracje tylko je¶li co¶ zmieni³e¶."
+msgstr "Musisz za³adowaæ konfiguracje tylko je¶li co¶ zmieni³e¶"
#: lib/cmd.c:152
msgid "some option values before. Using this option may cause loss"
-msgstr ""
+msgstr "jak±¶ opcjê. U¿ywanie tej opcji mo¿e byæ przyczyn± stracenia"
-# src/ap-config.c:78\r
+# src/ap-config.c:78
#: lib/cmd.c:153
-#, fuzzy
msgid "of your current configuration."
-msgstr "Zapisuje aktualn± konfiguracje na sta³e"
+msgstr "twojej obecnej koniguracji."
-# src/cmd.c:163\r
+# src/cmd.c:163
#: lib/cmd.c:176
-#, fuzzy
msgid "Configuration uploaded. Press any key to continue."
msgstr "Konfiguracja za³adowana. Wci¶nij dowolny klawisz."
#: lib/common.c:30
msgid "Autodetect AP type? "
-msgstr ""
+msgstr "Wykryæ typ AP? "
-# lib/common.c:120\r
+# lib/common.c:120
#: lib/common.c:31
-#, fuzzy
msgid "Access Point IP-address: "
-msgstr "Adres IP:"
+msgstr "Adres IP Access Pointa: "
-# lib/common.c:121\r
+# lib/common.c:121
#: lib/common.c:32
-#, fuzzy
msgid "Password (community): "
-msgstr "Has³o (prawa dostêpu):"
+msgstr "Has³o (community): "
-# lib/common.c:122\r
+# src/bridge.c:86
#: lib/common.c:33
#, fuzzy
-msgid "AP type: "
-msgstr "Typ Access-pointa"
+msgid "Access Point name: "
+msgstr "Access Point"
-# lib/common.c:159\r
+# src/aps.c:91 src/cmd.c:41 src/cmd.c:85 src/cmd.c:141 src/test.c:82
#: lib/common.c:34
#, fuzzy
+msgid "Do you want to define name for this AP? "
+msgstr "Czesz kontynuowaæ?"
+
+# lib/common.c:122
+#: lib/common.c:35
+msgid "AP type: "
+msgstr "Typ AP: "
+
+# lib/common.c:159
+#: lib/common.c:36
msgid "Save connect-settings: "
-msgstr "Zapisaæ na sta³e:"
+msgstr "Zapisz na sta³e: "
-# lib/common.c:67\r
-#: lib/common.c:69
+# lib/common.c:67
+#: lib/common.c:75
#, c-format
msgid "From %s"
-msgstr "Z %s"
+msgstr "Od %s"
-# lib/common.c:69\r
-#: lib/common.c:71
+# lib/common.c:69
+#: lib/common.c:77
#, c-format
msgid "Version %s"
msgstr "Wersja %s"
-# lib/common.c:72\r
-#: lib/common.c:74
+# lib/common.c:72
+#: lib/common.c:80
msgid "Written by Roman Festchook roma@polesye.net"
msgstr "Napisa³ Roman Festchook (roma@polesye.net)"
-# lib/common.c:74\r
-#: lib/common.c:76
-#, fuzzy
+# lib/common.c:74
+#: lib/common.c:82
msgid "Copyright (c) Roman Festchook 2001-2004"
-msgstr "Prawa autorskie © Roman Festchook 2001-2002"
+msgstr "Prawa autorskie - Roman Festchook 2001-2004"
-# lib/common.c:77\r
-#: lib/common.c:79
+# lib/common.c:77
+#: lib/common.c:85
msgid "This program is distributed under the terms"
msgstr "Program dostêpnu wed³ug zasad"
-# lib/common.c:79\r
-#: lib/common.c:81
+# lib/common.c:79
+#: lib/common.c:87
msgid "of the GNU General Public License version 2."
-msgstr "Publicznej licencji GNU w wersji 2."
+msgstr "Publicznej Licencji GNU w wersji 2."
-# lib/common.c:81\r
-#: lib/common.c:83
+# lib/common.c:81
+#: lib/common.c:89
msgid "See the included COPYING file for details."
-msgstr "Szczegó³ny - przeczytaj plik COPYING."
+msgstr "Szczegó³y - przeczytaj plik COPYING."
-# lib/common.c:118\r
+# lib/common.c:118
#: lib/common.c:135
msgid "Connect options"
-msgstr "Wybór Access-pointa"
+msgstr "Opcje pod³±czenia"
-# lib/common.c:124\r
+# lib/common.c:124
#: lib/common.c:143
msgid "Enter IP address of your Access Point."
-msgstr "Wpisz adres IP Access pointa"
+msgstr "Wpisz adres IP swojego Access Pointa."
-# lib/common.c:133\r
+# lib/common.c:133
#: lib/common.c:148
msgid "Entered characters will not be displayed for security reason."
-msgstr "Wpisywane litery nie bêd± wy¶wietlane bo to has³o."
+msgstr "Wpisywane litery nie bêd± wy¶wietlane z powodów bezpieczeñstwa."
-# lib/ap-utils.h:88\r
-#: lib/common.c:171
-#, fuzzy
+#: lib/common.c:157
+msgid "Display name for the Access point (NOT the name defined inside the AP!)"
+msgstr ""
+
+# lib/ap-utils.h:88
+#: lib/common.c:187
msgid "Determining AP type. Please wait..."
msgstr "Pobieram dane z AP. Proszê czekaæ..."
-# lib/ap-utils.h:87\r
-#: lib/common.c:196
-#, fuzzy
+# lib/ap-utils.h:87
+#: lib/common.c:272
msgid "Unable to determine AP type (no response). Press any key."
msgstr "Nie moge pobraæ danych z AP. Wci¶nij dowolny klawisz."
-#: lib/file.c:176
-msgid "NUM IP ADDRESS TYPE"
+#: lib/file.c:194
+msgid "NUM IP ADDRESS TYPE NAME (in ~/.ap-config)"
msgstr ""
-#: lib/file.c:177
+#: lib/file.c:195
msgid "Choose an AP to connect to"
-msgstr ""
+msgstr "Wybierz AP do którego chcesz siê pod³±czyæ"
-#: lib/file.c:182
+#: lib/file.c:200
msgid "1-9,C: connect; N: new; D: delete; W: save; Q: quit; arrows: scroll"
msgstr ""
+"1-9,C: pod³±cz; N: nowy; D: kasuj; W: zapisz; Q: wyjd¼; kursor: przewiñ"
-# lib/common.c:118\r
-#: lib/file.c:225
-#, fuzzy
+# lib/common.c:118
+#: lib/file.c:257
msgid "Connect to AP num:"
-msgstr "Wybór Access-pointa"
+msgstr "Nr AP do pod³. :"
-# lib/ap-utils.h:121\r
-#: lib/file.c:250
+# lib/ap-utils.h:121
+#: lib/file.c:293
msgid "Delete num:"
msgstr "Skasuj pozycje:"
-# src/bridge.c:31\r
+# src/bridge.c:31
#: lib/input.c:31
-#, fuzzy
msgid "Invalid value. Press any key to continue."
msgstr "B³êdny adres IP. Wci¶nij dowolny klawisz."
-# lib/ap-utils.h:86\r
+# lib/ap-utils.h:86
#: lib/input.c:32
-#, fuzzy, c-format
+#, c-format
msgid "Value must be in range %i - %i. Press any key to continue."
-msgstr "Nie moge wys³aæ danych do AP. Wci¶nij dowolny klawisz."
+msgstr "Warto¶æ musi byæ od %i do %i. Wci¶nij dowolny klawisz."
-# lib/oui.c:6048\r
-#: lib/oui.c:6052
+# lib/oui.c:6048
+#: lib/oui.c:6056
msgid "Unknown or Private"
-msgstr "Nieznany lub w³asny"
+msgstr "Nieznany lub Prywatny"
-# src/radio.c:93\r
+# src/radio.c:93
#: lib/radio.c:27
-#, fuzzy
msgid ""
"[key] - power level; UIOP or LR - antenna; W - write config; Q - quit to menu"
msgstr "Kl. - moc sygna³y; UIOP - antena; W - Zapis.; Q - Koniec"
-# src/test.c:28\r
+# src/test.c:28
#: lib/radio.c:29
-#, fuzzy
msgid "Antenna:"
-msgstr "[A] Antena: %s"
+msgstr "Antena:"
-# src/test.c:70\r
+# src/test.c:70
#: lib/radio.c:30
-#, fuzzy
msgid "[L] Left:"
-msgstr "Lewa"
+msgstr "[L] Lewa"
-# src/test.c:70\r
+# src/test.c:70
#: lib/radio.c:31
-#, fuzzy
msgid "[R] Right:"
-msgstr "Prawa"
+msgstr "[R] Prawa:"
-# src/radio.c:100\r
-#: lib/radio.c:114
+# src/radio.c:100
+#: lib/radio.c:121
msgid "Radio Configuration"
msgstr "Konfiguracja radia"
-#: lib/radio.c:115
+#: lib/radio.c:122
msgid "Output RF signal power level (CR31 register values)"
msgstr ""
-# src/radio.c:103\r
-#: lib/radio.c:117
-#, fuzzy
+# src/radio.c:103
+#: lib/radio.c:124
msgid "Key Channel Level"
msgstr "Kl. kana³ poziom"
-# src/radio.c:225\r
-#: lib/radio.c:273
-#, fuzzy
+# src/radio.c:225
+#: lib/radio.c:280
msgid ""
"You can't disable both antennas; unable to save antenna-config. Press any "
"key."
msgstr "Nie wy³±cza siê wszystkich anten!!! Wci¶nij dowolny klawisz"
-# lib/scr.c:112\r
-#: lib/scr.c:134
+# lib/scr.c:112
+#: lib/scr.c:203
#, c-format
msgid "Current AP: %s Type: %s"
msgstr "Aktualny AP: %s Typ: %s"
-# lib/ap-utils.h:95\r
+# lib/ap-utils.h:95
#: lib/set_community.c:28
msgid "Set community/password"
msgstr "Ustawianie hase³"
-# lib/ap-utils.h:96\r
+# lib/ap-utils.h:96
#: lib/set_community.c:29
-#, fuzzy
msgid "Key Access level"
msgstr "Kl. Prawa dostêpu"
-# lib/ap-utils.h:97\r
+# lib/ap-utils.h:97
#: lib/set_community.c:30
msgid "Community/Password"
msgstr "Has³o"
-# lib/ap-utils.h:98\r
+# lib/ap-utils.h:98
#: lib/set_community.c:31
msgid "[U] User"
msgstr "[U] U¿ytkownik"
-# lib/ap-utils.h:99\r
+# lib/ap-utils.h:99
#: lib/set_community.c:32
msgid "[A] Administrator"
msgstr "[A] Administrator"
-# lib/ap-utils.h:100\r
+# lib/ap-utils.h:100
#: lib/set_community.c:33
-#, fuzzy
msgid ""
"[key] - set community/password; W - write config to AP; Q - quit to menu"
msgstr "Kl. - ustaw has³o; W - zapisz konfiguracje; Q - wyj¶cie"
-# lib/set_community.c:64\r
+# lib/set_community.c:64
#: lib/set_community.c:80
msgid "[M] Manufacturer"
msgstr "[M] Producent"
-# src/stat.c:37\r
-#: lib/stat.c:29
-msgid "Unable to get data from AP. Press Q to continue."
-msgstr "Nie moge zczytaæ danych z Access pointa. Wci¶nij Q aby kontynuowaæ."
-
-# src/stat.c:38 src/stat.c:423\r
-#: lib/stat.c:30 lib/stat.c:428
-msgid "Q - quit to menu."
-msgstr "Q - powrót do menu."
+#: lib/stat.c:30
+msgid "Q - quit to menu. Other key - force update."
+msgstr ""
-# src/stat.c:39\r
+# src/stat.c:40
#: lib/stat.c:31
-msgid "pipe error. Press any key."
-msgstr "B³±d 'pipe'. Wci¶nij dowolny klawisz."
-
-# src/stat.c:40\r
-#: lib/stat.c:32
-msgid "fcntl error. Press any key."
+#, fuzzy
+msgid "select() function error. Press any key."
msgstr "B³±d fcntl(). Wci¶nij dowolny klawisz."
-# src/stat.c:41\r
-#: lib/stat.c:33
-msgid "fork error. Press any key."
-msgstr "B³±d tworzenia procesu (fork). Wci¶nij dowolny klawisz."
-
-# src/stat.c:72\r
-#: lib/stat.c:72
+# src/stat.c:72
+#: lib/stat.c:61
msgid "Ethernet Statistics"
msgstr "Statystyki ethernetu"
-# src/stat.c:108\r
-#: lib/stat.c:108
-msgid "EthRxStat packet error. Press Q to continue."
+# src/stat.c:108
+#: lib/stat.c:92
+#, fuzzy
+msgid "EthRxStat packet error. Press any key."
msgstr "B³êdny pakiet EthRxStat. Wci¶nij Q aby kontynuowaæ."
-# src/stat.c:120\r
-#: lib/stat.c:120
-msgid "EthTxStat packet error. Press Q to continue."
+# src/stat.c:120
+#: lib/stat.c:105
+#, fuzzy
+msgid "EthTxStat packet error. Press any key."
msgstr "B³êdny pakiet EthTxStat. Wci¶nij Q aby kontynuowaæ."
-# src/stat.c:123\r
-#: lib/stat.c:123
+# src/stat.c:123
+#: lib/stat.c:109
msgid "Received:"
msgstr "Odebrane:"
-# src/stat.c:124\r
-#: lib/stat.c:124
-#, fuzzy
+# src/stat.c:124
+#: lib/stat.c:110
msgid "Transmitted:"
msgstr "Wys³ane:"
-# src/stat.c:246 src/stat.c:422\r
-#: lib/stat.c:251 lib/stat.c:427
+# src/stat.c:246 src/stat.c:422
+#: lib/stat.c:235 lib/stat.c:425
msgid "Wireless Statistics"
msgstr "Statystyki radiowe"
-# src/stat.c:277\r
-#: lib/stat.c:282
-msgid "WirelessStat packet error. Press Q to continue."
+# src/stat.c:277
+#: lib/stat.c:265
+#, fuzzy
+msgid "WirelessStat packet error. Press any key."
msgstr "B³êdny pakiet WirelessStat. Wci¶nij dowolny klawisz."
-# src/stat.c:414\r
-#: lib/stat.c:419
-msgid "pipe error. Press any key"
-msgstr "B³±d 'pipe'. Wci¶nij dowolny klawisz."
-
-# src/stat.c:419\r
-#: lib/stat.c:424
-msgid "fcntl error. Press any key"
-msgstr "B³±d fcntl(). Wci¶nij dowolny klawisz."
-
-# src/stat.c:428\r
-#: lib/stat.c:433
-msgid "fork error. Press any key"
-msgstr "B³±d tworzenia procesu (fork). Wci¶nij dowolny klawisz."
-
-# src/sysinfo.c:42\r
+# src/sysinfo.c:42
#: lib/sysinfo.c:31
msgid "System Description: "
msgstr "Opis systemu: "
-# src/sysinfo.c:83 src/sysinfo.c:257\r
-#: lib/sysinfo.c:93 lib/sysinfo.c:277
+# src/sysinfo.c:83 src/sysinfo.c:257
+#: lib/sysinfo.c:109 lib/sysinfo.c:303
msgid "System Info"
msgstr "Informacja o systemie"
-#: lib/sysinfo.c:95
+#: lib/sysinfo.c:111
msgid "Device hardware/software/name info:"
-msgstr ""
+msgstr "Wersja urz±dzenia sprzêtowa/programowa/nazwa:"
-# src/sysinfo.c:103 src/sysinfo.c:285\r
-#: lib/sysinfo.c:130
-#, fuzzy
+# src/sysinfo.c:103 src/sysinfo.c:285
+#: lib/sysinfo.c:146
msgid "Product name:"
-msgstr "Nazwa produktu:"
+msgstr "Produkt:"
-# src/sysinfo.c:108\r
-#: lib/sysinfo.c:135
-#, fuzzy, c-format
+# src/sysinfo.c:108
+#: lib/sysinfo.c:151
+#, c-format
msgid "Product type: %u"
msgstr "Typ produktu: %u"
-# src/sysinfo.c:111\r
-#: lib/sysinfo.c:138
-#, fuzzy, c-format
+# src/sysinfo.c:111
+#: lib/sysinfo.c:154
+#, c-format
msgid "Hardware revision: %u"
-msgstr "Wersja sprzêtu/uk³adu: %u"
+msgstr "Wersja sprzêtu: %u"
-# src/sysinfo.c:116\r
-#: lib/sysinfo.c:141
-#, fuzzy
+# src/sysinfo.c:116
+#: lib/sysinfo.c:157
msgid "OEM name:"
msgstr "Nazwa OEM:"
-# src/sysinfo.c:316\r
-#: lib/sysinfo.c:149
-#, fuzzy, c-format
+# src/sysinfo.c:316
+#: lib/sysinfo.c:165
+#, c-format
msgid "Regulation domain: %s [%d]"
-msgstr "Regulacje dot. kana³ów: %s"
+msgstr "Regulacje: %s [%d]"
-# src/sysinfo.c:126 src/sysinfo.c:317\r
-#: lib/sysinfo.c:150 lib/sysinfo.c:337
+# src/sysinfo.c:126 src/sysinfo.c:317
+#: lib/sysinfo.c:166 lib/sysinfo.c:363
msgid "FCC (USA)"
msgstr "FCC (USA)"
-# src/sysinfo.c:127 src/sysinfo.c:318\r
-#: lib/sysinfo.c:151 lib/sysinfo.c:338
+# src/sysinfo.c:127 src/sysinfo.c:318
+#: lib/sysinfo.c:167 lib/sysinfo.c:364
msgid "DOC (Canada)"
msgstr "DOC (Kanada)"
-# src/sysinfo.c:128 src/sysinfo.c:319\r
-#: lib/sysinfo.c:152 lib/sysinfo.c:339
+# src/sysinfo.c:128 src/sysinfo.c:319
+#: lib/sysinfo.c:168 lib/sysinfo.c:365
msgid "ETSI (Europe)"
msgstr "ETSI (Europa)"
-# src/sysinfo.c:129 src/sysinfo.c:320\r
-#: lib/sysinfo.c:153 lib/sysinfo.c:340
+# src/sysinfo.c:129 src/sysinfo.c:320
+#: lib/sysinfo.c:169 lib/sysinfo.c:366
msgid "Spain"
msgstr "Hiszpania"
-# src/sysinfo.c:130 src/sysinfo.c:321\r
-#: lib/sysinfo.c:154 lib/sysinfo.c:341
+# src/sysinfo.c:130 src/sysinfo.c:321
+#: lib/sysinfo.c:170 lib/sysinfo.c:367
msgid "France"
msgstr "Francja"
-# src/sysinfo.c:131 src/sysinfo.c:322\r
-#: lib/sysinfo.c:155 lib/sysinfo.c:342
+# src/sysinfo.c:131 src/sysinfo.c:322
+#: lib/sysinfo.c:171 lib/sysinfo.c:368
msgid "MKK (Japan)"
msgstr "MKK (Japonia)"
-# src/sysinfo.c:131 src/sysinfo.c:216 src/sysinfo.c:322\r
-#: lib/sysinfo.c:155 lib/sysinfo.c:236 lib/sysinfo.c:342
+# src/sysinfo.c:131 src/sysinfo.c:216 src/sysinfo.c:322
+#: lib/sysinfo.c:171 lib/sysinfo.c:262 lib/sysinfo.c:368
msgid "unknown"
msgstr "nieznany"
-# src/sysinfo.c:134\r
-#: lib/sysinfo.c:158
-#, fuzzy, c-format
+# src/sysinfo.c:134
+#: lib/sysinfo.c:174
+#, c-format
msgid "Info structure version: %u"
msgstr "StructVersion: %u"
-# src/sysinfo.c:138 src/sysinfo.c:279\r
-#: lib/sysinfo.c:161 lib/sysinfo.c:299
+# src/sysinfo.c:138 src/sysinfo.c:279
+#: lib/sysinfo.c:177 lib/sysinfo.c:325
#, c-format
msgid "Manufacturer OUI: %02X %02X %02X (%s)"
msgstr "OUI producenta: %02X %02X %02X (%s)"
-# src/sysinfo.c:213\r
-#: lib/sysinfo.c:233
+# src/sysinfo.c:386
+#: lib/sysinfo.c:187
+#, fuzzy, c-format
+msgid "Uptime: %u days, %02u:%02u:%02u hours:mins:secs"
+msgstr "Dzia³a ju¿: %u:%02u:%02u.%02u"
+
+# src/sysinfo.c:213
+#: lib/sysinfo.c:259
msgid "FHSS 2.4 GHz"
msgstr "FHSS 2.4 GHz"
-# src/sysinfo.c:213\r
-#: lib/sysinfo.c:233
+# src/sysinfo.c:213
+#: lib/sysinfo.c:259
msgid "DSSS 2.4 GHz"
msgstr "DSSS 2.4 GHz"
-# src/sysinfo.c:213\r
-#: lib/sysinfo.c:233
+# src/sysinfo.c:213
+#: lib/sysinfo.c:259
msgid "IR Baseband"
msgstr "IR Baseband"
-# src/sysinfo.c:214\r
-#: lib/sysinfo.c:234
+# src/sysinfo.c:214
+#: lib/sysinfo.c:260
msgid "Commercial range 0..40 C"
msgstr "Temp. standardowe: 0..40 C"
-# src/sysinfo.c:215\r
-#: lib/sysinfo.c:235
+# src/sysinfo.c:215
+#: lib/sysinfo.c:261
msgid "Industrial range -30..70 C"
msgstr "Temp przemys³owe: -30..70 C"
-# src/sysinfo.c:218\r
-#: lib/sysinfo.c:238
+# src/sysinfo.c:218
+#: lib/sysinfo.c:264
msgid "manual"
msgstr "rêczne"
-# src/sysinfo.c:218\r
-#: lib/sysinfo.c:238
+# src/sysinfo.c:218
+#: lib/sysinfo.c:264
msgid "notsupported"
msgstr "nie obs³ugiwane"
-# src/sysinfo.c:218\r
-#: lib/sysinfo.c:238
+# src/sysinfo.c:218
+#: lib/sysinfo.c:264
msgid "dynamic"
msgstr "dynamiczne"
-# src/sysinfo.c:267\r
-#: lib/sysinfo.c:287
+# src/sysinfo.c:267
+#: lib/sysinfo.c:313
msgid "Manufacturer:"
msgstr "Producent:"
-# src/sysinfo.c:273\r
-#: lib/sysinfo.c:293
+# src/sysinfo.c:273
+#: lib/sysinfo.c:319
msgid "Manufacturer ID:"
msgstr "ID producenta:"
-# src/sysinfo.c:103 src/sysinfo.c:285\r
-#: lib/sysinfo.c:305
-#, c-format
+# src/sysinfo.c:103 src/sysinfo.c:285
+#: lib/sysinfo.c:331
msgid "Product Name:"
msgstr "Nazwa produktu:"
-# src/sysinfo.c:292\r
-#: lib/sysinfo.c:312
-#, c-format
+# src/sysinfo.c:292
+#: lib/sysinfo.c:338
msgid "Product ID:"
msgstr "ID produktu:"
-# src/sysinfo.c:298\r
-#: lib/sysinfo.c:318
-#, c-format
+# src/sysinfo.c:298
+#: lib/sysinfo.c:344
msgid "Product Version:"
msgstr "Wersja produktu:"
-# src/sysinfo.c:306\r
-#: lib/sysinfo.c:326
+# src/sysinfo.c:306
+#: lib/sysinfo.c:352
#, c-format
msgid "PHYType: %s"
msgstr "Typ PHY: %s"
-# src/sysinfo.c:309\r
-#: lib/sysinfo.c:329
+# src/sysinfo.c:309
+#: lib/sysinfo.c:355
#, c-format
msgid "Temperature: %s"
msgstr "Temperatura: %s"
-# src/sysinfo.c:316\r
-#: lib/sysinfo.c:336
+# src/sysinfo.c:316
+#: lib/sysinfo.c:362
#, c-format
msgid "Regulation Domain: %s"
msgstr "Regulacje dot. kana³ów: %s"
-# src/sysinfo.c:325\r
-#: lib/sysinfo.c:345
+# src/sysinfo.c:325
+#: lib/sysinfo.c:371
#, c-format
msgid "Transmit Power: %u mW"
msgstr "Moc wyj¶ciowa: %u mW"
-# src/sysinfo.c:355\r
-#: lib/sysinfo.c:375
-#, c-format
-msgid "WEP inplemented: %s"
-msgstr "WEP: %s"
+# src/sysinfo.c:355
+#: lib/sysinfo.c:401
+#, fuzzy, c-format
+msgid "WEP implemented: %s"
+msgstr "Obs³uga WEP: %s"
-# src/sysinfo.c:358\r
-#: lib/sysinfo.c:378
+# src/sysinfo.c:358
+#: lib/sysinfo.c:404
#, c-format
msgid "Diversity: %s"
-msgstr "Wiêksza moc: %s"
+msgstr "Naprzemienno¶æ: %s"
-# src/sysinfo.c:386\r
-#: lib/sysinfo.c:406
+# src/sysinfo.c:386
+#: lib/sysinfo.c:432
#, c-format
msgid "Uptime: %u:%02u:%02u.%02u"
msgstr "Dzia³a ju¿: %u:%02u:%02u.%02u"
-# src/sysinfo.c:402\r
-#: lib/sysinfo.c:422
+# src/sysinfo.c:402
+#: lib/sysinfo.c:448
#, c-format
msgid "IP Address: %s"
msgstr "Adres IP: %s"
-# src/test.c:32\r
+# src/test.c:32
#: lib/test.c:27
-#, fuzzy
msgid "[T] Test mode: "
-msgstr "[T] Tryb testowy: %s"
+msgstr "[T] Tryb testowy: "
-# src/test.c:28\r
+# src/test.c:28
#: lib/test.c:28
-#, fuzzy
msgid "[A] Antenna: "
-msgstr "[A] Antena: %s"
+msgstr "[A] Antena: "
-# src/test.c:117\r
+# src/test.c:117
#: lib/test.c:29
-#, fuzzy
msgid "[S] Signal level: "
-msgstr "[S] Poziom sygna³u: %03u"
+msgstr "[S] Poziom sygna³u: "
-# src/test.c:29\r
+# src/test.c:29
#: lib/test.c:30
-#, fuzzy
msgid "[R] Rate: "
-msgstr "[R] Prêdko¶æ: %.1f Mbit/s"
+msgstr "[R] Prêdko¶æ: "
-# src/test.c:31\r
+# src/test.c:31
#: lib/test.c:31
-#, fuzzy
msgid "[F] TxFiler: "
-msgstr "[F] TxFiler: %s"
+msgstr "[F] TxFiler: "
-# src/test.c:30\r
+# src/test.c:30
#: lib/test.c:32
-#, fuzzy
msgid "[O] Command: "
-msgstr "[O] Komenda: %s"
+msgstr "[O] Komenda: "
-# src/test.c:33\r
+# src/test.c:33
#: lib/test.c:33
-#, fuzzy
msgid "T - Test mode On/Off; CASRFO - set options; Q - quit to menu"
msgstr "T - Test W³/Wy³; CASRFO - ustawianie; Q - koniecmenu"
-# src/test.c:70\r
+# src/test.c:70
#: lib/test.c:71
msgid "Left"
msgstr "Lewa"
-# src/test.c:70\r
+# src/test.c:70
#: lib/test.c:71
msgid "Right"
msgstr "Prawa"
-# src/test.c:78\r
+# src/test.c:78
#: lib/test.c:88
-#, fuzzy
msgid "Test mode"
msgstr "Tryb testowy"
-# src/test.c:81\r
+# src/test.c:81
#: lib/test.c:91
-#, fuzzy
msgid "Using the \"Test mode\" may cause loss of your current"
-msgstr "U¿ycie trybu testowego mo¿e spowodowaæ utrate konfiguracji."
+msgstr "U¿ycie trybu testowego mo¿e spowodowaæ utratê obecnej"
-# src/cmd.c:134\r
+# src/cmd.c:134
#: lib/test.c:92
-#, fuzzy
msgid "configuration."
-msgstr "Za³aduj konfiguracje"
+msgstr "konfiguracji."
-# src/test.c:84\r
+# src/test.c:84
#: lib/test.c:95
-#, fuzzy
msgid "(Y - Yes; N - No (it's safer to answer No.)"
-msgstr "(Y - Tak; N - Nie (lepiej nie)"
+msgstr "(Y - Tak; N - Nie (bezpieczny wybór)"
-# src/test.c:106\r
+# src/test.c:106
#: lib/test.c:118
msgid "Options:"
-msgstr "Opcje"
+msgstr "Opcje:"
-# src/test.c:132\r
+# src/test.c:132
#: lib/test.c:144
msgid "Statistics:"
msgstr "Statystyki:"
-# src/test.c:133\r
+# src/test.c:133
#: lib/test.c:145
msgid "Success Frames: 0 Failed Frames: 0"
msgstr "Ramki OK: 0 Ramki z³e: 0"
-# src/test.c:197\r
+# src/test.c:197
#: lib/test.c:207
#, c-format
msgid "Success Frames: %lu Failed Frames: %lu"
msgstr "Ramki OK: %lu Ramki z³e: %lu"
-# lib/ap-utils.h:62\r
+# lib/ap-utils.h:62
#: lib/wep.c:29
-#, fuzzy
msgid "[E] Standard encryption mechanism: "
-msgstr "[E] Tryb szyfrowania: %s"
+msgstr "[E] Tryb szyfrowania: "
-# src/wep.c:29\r
+# src/wep.c:29
#: lib/wep.c:30
-#, fuzzy
msgid "[A] Allow unencrypted: "
-msgstr "[A] Dopu¶æ bez szyfracji: %s"
+msgstr "[A] Dopu¶æ bez szyfracji: "
-# src/wep.c:31\r
+# src/wep.c:31
#: lib/wep.c:31
-#, fuzzy
msgid "[K] Default WEP key: "
-msgstr "[K] U¿ywany klucz nr: %d"
+msgstr "[K] U¿ywany klucz nr: "
-# src/wep.c:30\r
+# src/wep.c:30
#: lib/wep.c:32
-#, fuzzy
msgid "[P] Public key: "
-msgstr "[P] Klucz publiczny: %s"
+msgstr "[P] Klucz publiczny: "
-# src/wep.c:73\r
+# src/wep.c:73
#: lib/wep.c:85
msgid "EK1234 - set; W - write conf; Q - quit to menu"
msgstr "EK1234 - ustaw; W - zapisz; Q - wyj¶cie"
-# src/wep.c:75 src/wep.c:236\r
+# src/wep.c:75 src/wep.c:236
#: lib/wep.c:87 lib/wep.c:249
msgid "Privacy Settings"
msgstr "Ustawienia szyfracji"
-# src/wep.c:82 src/wep.c:250\r
+# src/wep.c:82 src/wep.c:250
#: lib/wep.c:94 lib/wep.c:263
msgid "Key WEP"
msgstr "Klucz WEP"
#: lib/wep.c:101
msgid "Hint! Confused by WEP key values? See man ap-config for info..."
-msgstr ""
+msgstr "Podpowied¼! Masz do¶æ opcji WEP? U¿yj komendy man ap-config ..."
-# src/wep.c:234\r
+# src/wep.c:234
#: lib/wep.c:247
msgid "AEPK1234 - set options; W - write conf; Q - quit to menu"
msgstr "AEPK1234 - ustaw opcje; W - Zapis; Q - Wyj¶cie"
msgid "[E] ESSID: "
msgstr ""
-# lib/ap-utils.h:78\r
+# lib/ap-utils.h:78
#: lib/wlan.c:29
-#, fuzzy
msgid "[N] AP name: "
-msgstr "[N] Nazwa urz±dzenia:"
+msgstr "[N] Nazwa AP: "
-# src/wlan.c:579\r
+# src/wlan.c:579
#: lib/wlan.c:31
-#, fuzzy
msgid "[K] AP contact: "
-msgstr "[E] Osoba kontaktowa: %s"
+msgstr "[K] Osoba kontaktowa: "
-# src/wlan.c:577\r
+# src/wlan.c:577
#: lib/wlan.c:32
-#, fuzzy
msgid "[L] AP location: "
-msgstr "[L] Lokalizacja: %s"
+msgstr "[L] Lokalizacja: "
-# lib/ap-utils.h:71\r
+# lib/ap-utils.h:71
#: lib/wlan.c:34
-#, fuzzy
msgid "[R] RTS threshold: "
-msgstr "[R] Min. bajtów do RTS: %d"
+msgstr ""
-# lib/ap-utils.h:72\r
+# lib/ap-utils.h:72
#: lib/wlan.c:35
-#, fuzzy
msgid "[F] Fragmentation threshold: "
-msgstr "[F] Min. bajtów do fragmentacji: %d"
+msgstr ""
-# src/wlan.c:33\r
+# src/wlan.c:33
#: lib/wlan.c:36
-#, fuzzy
msgid "[P] Preambule type: "
-msgstr "[P] Typ nag³ówka: %s"
+msgstr "[P] Preambu³a: "
-# lib/ap-utils.h:69\r
+# lib/ap-utils.h:69
#: lib/wlan.c:37
-#, fuzzy
msgid "[A] Auth type: "
-msgstr "[A] Tryb autoryzacji: %s"
+msgstr "[A] Tryb autoryzacji: "
-# lib/ap-utils.h:64\r
+# lib/ap-utils.h:64
#: lib/wlan.c:38
-#, fuzzy
msgid "Open system"
-msgstr "Bez kluczy (Open System)"
+msgstr "Bez kluczy"
-# lib/ap-utils.h:65\r
+# lib/ap-utils.h:65
#: lib/wlan.c:39
-#, fuzzy
msgid "Shared key"
msgstr "Wspólny klucz"
-# lib/ap-utils.h:66\r
+# lib/ap-utils.h:66
#: lib/wlan.c:40
-#, fuzzy
msgid "Both types"
msgstr "Oba"
-# src/wlan.c:32\r
+# src/wlan.c:32
#: lib/wlan.c:41
-#, fuzzy
msgid "[U] Auto rate fallback: "
-msgstr "[U] Automatyczne spowalnianie: %s"
+msgstr "[U] Auto. ustawianie prêdko¶ci: "
-# src/wlan.c:31\r
+# src/wlan.c:31
#: lib/wlan.c:42
-#, fuzzy
msgid "[S] Insert ESSID in broadcast packets: "
-msgstr "[S] Wysy³aæ ESSID w pakietach rozg³oszeniowych (broadcast): %s"
+msgstr "[S] Wysy³aæ ESSID w pakietach rozg³oszeniowych (broadcast): "
-# lib/ap-utils.h:74\r
+# lib/ap-utils.h:74
#: lib/wlan.c:43
-#, fuzzy
msgid "Basic and Supported rates:"
msgstr "Podstawowe i obs³ugiwane prêdko¶ci:"
-# lib/ap-utils.h:75\r
+# lib/ap-utils.h:75
#: lib/wlan.c:44
msgid "Key Rate Status"
-msgstr "Klaw. Prêd. Stan"
+msgstr "Klu Prêd Stan"
-# src/bridge.c:35\r
+# src/bridge.c:35
#: lib/wlan.c:46
-#, fuzzy
msgid "[I] International roaming: "
-msgstr "[O] Tryb pracy: %s"
+msgstr ""
#: lib/wlan.c:47
msgid "[B] Beacon period (msec): "
msgid "[D] DTIM sending interval (beacons): "
msgstr ""
-# src/wlan.c:185\r
#: lib/wlan.c:49
+msgid "[T] SIFS time (msec): "
+msgstr ""
+
+# src/wlan.c:185
+#: lib/wlan.c:50
msgid "[key] - set option; W - write conf; Q - quit to menu"
-msgstr "[kl] - ustaw opcje; W - zapis; Q - wyj¶ciele menu"
+msgstr "[kl] - ustaw opcje; W - zapis; Q - wyj¶cie do menu"
-# src/wlan.c:100\r
-#: lib/wlan.c:140
+# src/wlan.c:100
+#: lib/wlan.c:127
msgid "Short"
-msgstr "Krótki"
+msgstr "Krótka"
-# src/wlan.c:100\r
-#: lib/wlan.c:140
+# src/wlan.c:100
+#: lib/wlan.c:127
msgid "Long"
-msgstr "D³ugi"
+msgstr "D³uga"
-# src/wlan.c:104\r
-#: lib/wlan.c:265
+# src/wlan.c:104
+#: lib/wlan.c:243
msgid "Wireless Settings"
msgstr "Parametry radia"
-# src/wlan.c:584\r
-#: lib/wlan.c:753
+# src/wlan.c:584
+#: lib/wlan.c:750
msgid "Antenna Configuration:"
msgstr "Konfiguracja anten:"
-# src/wlan.c:596\r
-#: lib/wlan.c:770
+# src/wlan.c:596
+#: lib/wlan.c:767
msgid "General Options"
msgstr "Opcje ogólne"
-# src/wlan.c:598\r
-#: lib/wlan.c:772
+# src/wlan.c:598
+#: lib/wlan.c:769
msgid ""
"UIOPTY - antenna; SCANLEDFR1234 - options; W - write conf; Q - quit to menu"
msgstr "UIOPTY - antena; SCANLEDFR1234 - opcje; W - zapis; Q - powrót"
-# src/ap-config.c:55\r
-#: src/ap-config.c:59
+# src/ap-config.c:55
+#: src/ap-config.c:63
msgid "General"
msgstr "Ogólne"
-# src/ap-config.c:55\r
-#: src/ap-config.c:59
+# src/ap-config.c:55
+#: src/ap-config.c:63
msgid "Set general options"
msgstr "Opcje ogólne"
-# src/ap-config.c:56\r
-#: src/ap-config.c:60
+# src/ap-config.c:56
+#: src/ap-config.c:64
msgid "Advanced"
msgstr "Zaawansowane"
-# src/ap-config.c:56\r
-#: src/ap-config.c:60
+# src/ap-config.c:56
+#: src/ap-config.c:64
msgid "Set advanced options"
msgstr "Opcje zaawansowane"
-# \r
-# src/ap-config.c:89\r
-#: src/ap-config.c:94
+#
+# src/ap-config.c:89
+#: src/ap-config.c:97
msgid "Reset AP."
msgstr "Reset AP."
-# src/ap-config.c:123\r
-#: src/ap-config.c:129
+# src/ap-config.c:123
+#: src/ap-config.c:131
msgid "Latest"
msgstr "Ostatnie"
-# src/ap-config.c:123\r
-#: src/ap-config.c:129
+# src/ap-config.c:123
+#: src/ap-config.c:131
msgid "Get info about latest events"
msgstr "Pobiera info o ostatnich zdarzeniach"
-# src/ap-mrtg.c:45\r
+# src/ap-mrtg.c:45
#: src/ap-mrtg.c:42
-#, c-format
msgid ""
"\n"
"Usage:\n"
"\n"
"U¿ycie:\n"
-# src/ap-mrtg.c:47\r
+# src/ap-mrtg.c:47
#: src/ap-mrtg.c:44
-#, fuzzy, c-format
msgid ""
"\tap-mrtg -i ip -c community -t type [-b bssid] [-n name] [-a aptype] [-v] [-"
"h] [-r]\n"
"\tap-mrtg -i ip -c has³o -t typ [-b bssid] [-v] [-h] [-r]\n"
"\n"
-# src/ap-mrtg.c:49\r
+# src/ap-mrtg.c:49
#: src/ap-mrtg.c:46
-#, c-format
msgid ""
"Get stats from AP and return it in MRTG parsable format\n"
"\n"
"Pobierz statystyki z AP i wypisz w formacie strawnym dla MRTG\n"
"\n"
-# src/ap-mrtg.c:50\r
+# src/ap-mrtg.c:50
#: src/ap-mrtg.c:47
-#, c-format
msgid "-i ip - AP ip address\n"
msgstr "-i ip - adres IP\n"
-# src/ap-mrtg.c:51\r
+# src/ap-mrtg.c:51
#: src/ap-mrtg.c:48
-#, c-format
msgid "-c community - SNMP community string\n"
msgstr "-c communauté has³o SNMP\n"
-# src/ap-mrtg.c:53\r
+# src/ap-mrtg.c:53
#: src/ap-mrtg.c:50
-#, c-format
msgid ""
"-t type - statistics type <w>ireless, <e>thernet, associated <s>tations "
"or <l>ink quality in client mode\n"
"-t type typ statystyk <w> radio, <e>thernet, <s>tacje lub <l> jako¶æ "
"po³±czenia w trybie klienta\n"
-# src/ap-mrtg.c:55\r
+# src/ap-mrtg.c:55
#: src/ap-mrtg.c:52
-#, c-format
msgid ""
"-b bssid - mac address of the AP to which get link quality, only if "
"type=l\n"
"(tylko typ=l)\n"
#: src/ap-mrtg.c:53
-#, c-format
msgid "-n name - AP name - for check only\n"
-msgstr ""
+msgstr "-n nazwa - Nazwa AP - tylko do kontroli\n"
#: src/ap-mrtg.c:54
-#, c-format
msgid ""
"-a aptype - AP type - 410 (default) or 510 for ATMEL12350's, like the "
"ME-102\n"
msgstr ""
-# src/ap-mrtg.c:57\r
+# src/ap-mrtg.c:57
#: src/ap-mrtg.c:56
-#, c-format
msgid "-v - report MRTG about problems connecting to AP\n"
-msgstr "-v - Zg³aszaj MRTG o problemach z po³±czeniem do AP\n"
+msgstr "-v - zg³aszaj MRTG o problemach z po³±czeniem do AP\n"
-# src/ap-mrtg.c:58\r
+# src/ap-mrtg.c:58
#: src/ap-mrtg.c:57
-#, c-format
msgid "-r - reset AP when getting LinkQuality stats\n"
msgstr "-r - resetuj AP po wziêciu statystyk jako¶ci ³±cza\n"
-# src/ap-mrtg.c:59\r
+# src/ap-mrtg.c:59
#: src/ap-mrtg.c:58
-#, c-format
msgid ""
"-h - print this help screen\n"
"\n"
"-h - ten tekst\n"
"\n"
-# src/ap-mrtg.c:60\r
+# src/ap-mrtg.c:60
#: src/ap-mrtg.c:59
-#, fuzzy, c-format
+#, c-format
msgid ""
"ap-mrtg %s Copyright (c) 2002-2003 Roman Festchook\n"
"\n"
msgstr ""
-"ap-mrtg %s Prawa autorskie © 2002 Roman Festchook\n"
+"ap-mrtg %s Prawa autorskie © 2002-2003 Roman Festchook\n"
"\n"
-# src/ap-mrtg.c:142\r
+# src/ap-mrtg.c:142
#: src/ap-mrtg.c:143
-#, c-format
msgid "Invalid IP-address\n"
msgstr "B³êdny adres IP\n"
#: src/ap-mrtg.c:188
#, c-format
msgid "Invalid AP-Type '%s' - valid types are 510 or 410\n"
-msgstr ""
+msgstr "B³êdny typ AP '%s' - mo¿esz wpisaæ tylko 410 lub 510\n"
-# src/ap-mrtg.c:178\r
+# src/ap-mrtg.c:178
#: src/ap-mrtg.c:207
msgid "Create socket error"
-msgstr "B³±d otwarcia socket'a"
+msgstr "B³±d tworzenia gniazda"
-# src/ap-mrtg.c:182\r
+# src/ap-mrtg.c:182
#: src/ap-mrtg.c:211
msgid "Bind socket error"
msgstr "B³±d bind()"
-# src/ap-trapd.c:150\r
+# src/ap-trapd.c:150
#: src/ap-trapd.c:148
#, c-format
msgid "ap-trapd %s started%s%s."
msgstr "ap-trapd %s uruchomiony%s%s."
-# src/ap-trapd.c:151\r
+# src/ap-trapd.c:151
#: src/ap-trapd.c:149
msgid " on "
msgstr " w³ "
-# src/ap-trapd.c:157\r
+# src/ap-trapd.c:157
#: src/ap-trapd.c:155
msgid "Unable to fork. Exiting."
-msgstr "Nie moge utworzyæ procesu. Wychodze."
+msgstr "Nie moge utworzyæ procesu. Wychodzê."
-# src/ap-trapd.c:161\r
+# src/ap-trapd.c:161
#: src/ap-trapd.c:159
msgid "Can't create socket. Exiting."
-msgstr "Nie moge utworzyæ socket'a. Wychodze."
+msgstr "Nie moge utworzyæ gniazda. Wychodzê."
-# src/ap-trapd.c:167\r
+# src/ap-trapd.c:167
#: src/ap-trapd.c:165
msgid "Can't bind socket. Exiting."
-msgstr "Nie dzia³a bind(). Wychodze."
+msgstr "Nie zaj±æ gniazda. Wychodzê."
-# src/ap-trapd.c:174\r
+# src/ap-trapd.c:174
#: src/ap-trapd.c:172
#, c-format
msgid "Can't bind to device %s. Exiting."
-msgstr "Nie moge pod³±czyæ siê do urz±dzenia %s. Wychodze."
+msgstr "Nie moge pod³±czyæ siê do urz±dzenia %s. Wychodzê."
-# src/ap-trapd.c:185\r
+# src/ap-trapd.c:185
#: src/ap-trapd.c:183
#, c-format
msgid "Unable to process username %s. Error: %m."
msgstr "Nie moge skumaæ u¿ytkownika %s. B³±d: %m."
-# src/ap-trapd.c:190\r
+# src/ap-trapd.c:190
#: src/ap-trapd.c:188
#, c-format
msgid "Unable to change to uid %d."
msgstr "Nie moge przej¶æ na UID %d"
-# src/ap-trapd.c:237\r
+# src/ap-trapd.c:237
#: src/ap-trapd.c:235
#, c-format
msgid ""
"Received unknown SNMP ver %d trap. From %s:%d. Agent: %s. Community: %s."
msgstr "Odebra³em nieznany pakiet SNMP %d z %s:%d agent: %s grupa: %s."
-# src/ap-trapd.c:309\r
+# src/ap-trapd.c:309
#: src/ap-trapd.c:307
#, c-format
msgid "Agent:v%d %s (%s@%s:%d) %s%s%s. SysUptime %d:%02d:%02d.%02d"
msgstr "Agent:v%d %s (%s@%s:%d) %s%s%s. Dzia³a ju¿ %d:%02d:%02d.%02d"
+# lib/ap-utils.h:119
+#: src/auth_mac.c:34
+#, fuzzy
+msgid "NUM MAC address"
+msgstr "Numer adres fizyczny (MAC)"
+
#: src/bridge.c:36
msgid "[C] Configuration-enabled port(s): "
-msgstr ""
+msgstr "[C] Dostêp do konfiguracji porzez port: "
#: src/bridge.c:39
msgid "[B] Isolate wireless clients (broadcast traffic): "
-msgstr ""
+msgstr "[B] Izolacja klientów radiowych (ruch broadcast): "
#: src/bridge.c:40
msgid "[U] Isolate wireless clients (unicast traffic): "
-msgstr ""
+msgstr "[U] Izolacja klientów radiowych (ruch unicast): "
-# lib/ap-utils.h:66\r
-#: src/bridge.c:137
-#, fuzzy
+# lib/ap-utils.h:66
+#: src/bridge.c:122
msgid "Both"
msgstr "Oba"
-# src/nwn_advanced.c:64\r
+# src/nwn_advanced.c:64
#: src/nwn_advanced.c:61
#, c-format
msgid "[D] DB Station Timeout: %d"
-msgstr "[D] DB Station Timeout: %d"
+msgstr "[D] Czas bezaktywno¶ci stacji DB: %d"
-# src/nwn_advanced.c:66\r
+# src/nwn_advanced.c:66
#: src/nwn_advanced.c:63
#, c-format
msgid "[A] ACK Window: %d"
msgstr "[A] Okno potwierdzenia (ACK): %d"
-# src/nwn_advanced.c:69\r
+# src/nwn_advanced.c:69
#: src/nwn_advanced.c:66
msgid "Advanced Options"
msgstr "Opcje zaawansowane"
-# src/nwn_advanced.c:70\r
+# src/nwn_advanced.c:70
#: src/nwn_advanced.c:67
msgid "DA - options; W - write conf; Q - quit to menu"
msgstr "DA - opcje; W - zapis; Q - powrót"
-# src/nwn_latest.c:31\r
+# src/nwn_latest.c:31
#: src/nwn_latest.c:31
#, c-format
msgid "Reason: %u Station: %02X%02X%02X%02X%02X%02X"
msgstr "Przyczyna: %u Stacja: %02X%02X%02X%02X%02X%02X"
-# src/nwn_latest.c:89\r
+# src/nwn_latest.c:89
#: src/nwn_latest.c:89
msgid "Latest Events"
msgstr "Ostatnie zdarzenia"
-# src/nwn_latest.c:90\r
+# src/nwn_latest.c:90
#: src/nwn_latest.c:90
msgid "Disassociate:"
msgstr "Oddziel:"
-# src/nwn_latest.c:97\r
+# src/nwn_latest.c:97
#: src/nwn_latest.c:97
msgid "Deauthenticate:"
-msgstr "Wyloguj:"
+msgstr "Usuñ autoryzacjê:"
-# src/nwn_latest.c:104\r
+# src/nwn_latest.c:104
#: src/nwn_latest.c:104
-#, fuzzy
msgid "Authenticate Fail:"
msgstr "B³±d autoryzacji:"
-# src/nwn_latest.c:110\r
+# src/nwn_latest.c:110
#: src/nwn_latest.c:110
msgid "Last error:"
msgstr "Ostatni b³±d:"
-# src/nwn_latest.c:111\r
+# src/nwn_latest.c:111
#: src/nwn_latest.c:111
msgid "Error:"
msgstr "B³±d:"
-# src/stations.c:84\r
-#: src/stations.c:113
+#: src/stations.c:31
+msgid " # MAC "
+msgstr ""
+
+#: src/stations.c:34
+msgid " # MAC Parent MAC RSSI Status MACn IP "
+msgstr ""
+
+# src/stations.c:132 src/stations.c:284
+#: src/stations.c:187
+#, fuzzy
+msgid ""
+"Arrows - scroll; S - save to file; Q - return; T - toggle view; Other key - "
+"refresh"
+msgstr "Strza³ki - przewijanie; S - zapis do zbioru; Q - powrót."
+
+# src/stations.c:132 src/stations.c:284
+#: src/stations.c:190
#, fuzzy
-msgid "Id MAC address"
-msgstr "Id Adres fizyczny"
+msgid "Arrows - scroll; S - save to file; Q - return; Other key - refresh"
+msgstr "Strza³ki - przewijanie; S - zapis do zbioru; Q - powrót."
-# src/stations.c:194 src/stations.c:278\r
-#: src/stations.c:223 src/stations.c:307
+# src/stations.c:194 src/stations.c:278
+#: src/stations.c:275 src/stations.c:358
msgid "Associated stations"
-msgstr "Przynale¿ne stacje"
+msgstr "Pod³±czone stacje"
-# src/stations.c:196\r
-#: src/stations.c:225
-#, fuzzy
+# src/stations.c:196
+#: src/stations.c:277
msgid "Id MAC address Quality Age RSSI"
-msgstr "Id Adres fizyczny Jako¶æ Wiek RSSI"
+msgstr "Id Adres fizyczny Jako¶æ Wiek RSSI"
+
+# src/stat.c:37
+#~ msgid "Unable to get data from AP. Press Q to continue."
+#~ msgstr "Nie moge pobraæ danych z AP. Wci¶nij Q aby kontynuowaæ."
+
+# src/stat.c:38 src/stat.c:423
+#~ msgid "Q - quit to menu."
+#~ msgstr "Q - powrót do menu."
+
+# src/stat.c:39
+#~ msgid "pipe error. Press any key."
+#~ msgstr "B³±d 'pipe'. Wci¶nij dowolny klawisz."
+
+# src/stat.c:41
+#~ msgid "fork error. Press any key."
+#~ msgstr "B³±d tworzenia procesu (fork). Wci¶nij dowolny klawisz."
+
+# src/stat.c:414
+#~ msgid "pipe error. Press any key"
+#~ msgstr "B³±d 'pipe'. Wci¶nij dowolny klawisz."
+
+# src/stat.c:419
+#~ msgid "fcntl error. Press any key"
+#~ msgstr "B³±d fcntl(). Wci¶nij dowolny klawisz."
+
+# src/stat.c:428
+#~ msgid "fork error. Press any key"
+#~ msgstr "B³±d tworzenia procesu (fork). Wci¶nij dowolny klawisz."
+
+# src/stations.c:84
+#~ msgid "Id MAC address"
+#~ msgstr "Id Adres fizyczny"
-# lib/common.c:66\r
+# lib/common.c:66
#~ msgid "Wireless Access Point Configurator"
#~ msgstr "Program do konfiguracji Access-pointów radiowych"
-# lib/ap_search.c:95\r
+# lib/ap_search.c:95
#~ msgid "Invalid multicast address. Press any key."
#~ msgstr "B³êdny adres multicast. Wci¶nij dowolny klawisz."
-# lib/ap_search.c:129\r
+# lib/ap_search.c:129
#~ msgid "Searching please wait..."
-#~ msgstr "Proszê czekaæ wyszukiwanie..."
+#~ msgstr "Proszê czekaæ - wyszukiwanie..."
-# lib/ap_search.c:194\r
+# lib/ap_search.c:194
#~ msgid "No Access Points found."
#~ msgstr "Nie znaleziono ¿adnych Access-pointów."
-# src/radio.c:101\r
+# src/radio.c:101
#~ msgid "Output Signal Power Level"
#~ msgstr "Moc sygna³u wyj¶ciowego"
-# src/sysinfo.c:85\r
+# src/sysinfo.c:85
#~ msgid "SysInfo:"
#~ msgstr "SysInfo:"
-# src/sysinfo.c:125\r
+# src/sysinfo.c:125
#~ msgid "RegulationDomain: %s"
#~ msgstr "Regulacje dot. kana³ów: %s"
-# lib/ap-utils.h:60\r
+# lib/ap-utils.h:60
#~ msgid "Mac Address: %02X%02X%02X%02X%02X%02X"
#~ msgstr "Adres fizyczny: %02X%02X%02X%02X%02X%02X"
-# src/test.c:104\r
+# src/test.c:104
#~ msgid "[T] Test Mode: Off"
#~ msgstr "[T] Test: Off"
-# lib/ap-utils.h:82\r
+# lib/ap-utils.h:82
#~ msgid "Transmit Antenna: [O] Left %3s, [P] Right %3s"
#~ msgstr "Antena nadawcza: [O] Lewa %3s, [P] Prawa %3s"
-# lib/ap-utils.h:83\r
+# lib/ap-utils.h:83
#~ msgid "Receive Antenna: [U] Left %3s, [I] Right %3s"
#~ msgstr "Antena odbiorcza: [U] Lewa %3s, [I] Prawa %3s"
-# lib/ap-utils.h:84\r
+# lib/ap-utils.h:84
#~ msgid "Diversity Select: [T] Left %3s, [Y] Right %3s"
#~ msgstr "Mocniejszy sygna³ na: [T] Lewej %3s, [Y] Prawej %3s"
-# lib/ap-utils.h:54\r
+# lib/ap-utils.h:54
#~ msgid "on"
#~ msgstr "w³"
-# lib/ap-utils.h:90\r
+# lib/ap-utils.h:90
#~ msgid "Write configuration to AP done. Press any key to continue."
#~ msgstr "Konfiguracja zapisana. Wci¶nij dowolny klawisz."
-# src/cmd.c:140\r
+# src/cmd.c:140
#~ msgid "Using this option may cause lost of current configuration."
#~ msgstr "U¿ycie tego mo¿e spowodowaæ strate aktualnej konfiguracji."
-# src/aps.c:90\r
+# src/aps.c:90
#~ msgid ""
#~ "Getting known AP's info need to reboot you AP and may cause lost of "
#~ "current configuration."
#~ "Pobranie informacji o znanych AP mo¿e spowodowaæ strate aktualnej "
#~ "konfiguracji."
-# src/aps.c:189\r
+# src/aps.c:189
#~ msgid "CN: Channel; RSSI: Signal Strenght; LQ: Link Quality"
#~ msgstr "CN: Kana³; RSSI: Moc sygna³u; LQ: Jako¶æ ³±cza"
msgid ""
msgstr ""
"Project-Id-Version: ap-utils-1.3.2-pre3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-22 15:06+0300\n"
+"POT-Creation-Date: 2004-11-14 22:46+0200\n"
"PO-Revision-Date: 2003-05-19 12:51+0300\n"
"Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
-#: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:46 src/bridge.c:222
+#: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:50 src/bridge.c:184
msgid "Bridging"
msgstr "Conexiune(Bridging)"
-#: ap-gl/ap-gl.c:47 src/ap-config.c:46
+#: ap-gl/ap-gl.c:47 src/ap-config.c:50
msgid "Set bridging and IP-related options"
msgstr "Setare opþiuni legate de bridging ºi IP"
-#: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:48
-#: src/ap-config.c:118 src/ap-config.c:127 src/bridge.c:135 src/bridge.c:139
+#: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:52
+#: src/ap-config.c:120 src/ap-config.c:129 src/bridge.c:120 src/bridge.c:124
msgid "Wireless"
msgstr "Wireless"
-#: ap-gl/ap-gl.c:49 src/ap-config.c:48
+#: ap-gl/ap-gl.c:49 src/ap-config.c:52
msgid "Set wireless options"
msgstr "Setare opþiuni wireless"
-#: ap-gl/ap-gl.c:50 src/ap-config.c:49 src/ap-config.c:61
+#: ap-gl/ap-gl.c:50 src/ap-config.c:53 src/ap-config.c:65
msgid "Privacy"
msgstr "Secret(Privacy)"
-#: ap-gl/ap-gl.c:51 src/ap-config.c:50 src/ap-config.c:62
+#: ap-gl/ap-gl.c:51 src/ap-config.c:54 src/ap-config.c:66
#, fuzzy
msgid "MAC auth"
msgstr "Autorizare Mac"
-#: ap-gl/ap-gl.c:52 src/ap-config.c:51 src/ap-config.c:63
+#: ap-gl/ap-gl.c:52 src/ap-config.c:55 src/ap-config.c:67
msgid "Community"
msgstr "Comunitate"
-#: ap-gl/ap-gl.c:53 src/ap-config.c:52
+#: ap-gl/ap-gl.c:53 src/ap-config.c:56
msgid "Radio"
msgstr "Radio"
-#: ap-gl/ap-gl.c:53 src/ap-config.c:52
+#: ap-gl/ap-gl.c:53 src/ap-config.c:56
msgid "Set radio signal power and antenna options"
msgstr "Setãri putere semnal radio ºi opþiuni antenã"
-#: ap-gl/ap-gl.c:66 src/ap-config.c:83
+#: ap-gl/ap-gl.c:66 src/ap-config.c:87
msgid "Upload"
msgstr "Upload"
-#: ap-gl/ap-gl.c:66 src/ap-config.c:83
+#: ap-gl/ap-gl.c:66 src/ap-config.c:87
msgid "Make current configuration active"
msgstr "Seteazã configuraþia curentã ca activã"
-#: ap-gl/ap-gl.c:67 src/ap-config.c:84
+#: ap-gl/ap-gl.c:67 src/ap-config.c:88
msgid "Defaults"
msgstr "Implicite"
-#: ap-gl/ap-gl.c:67 src/ap-config.c:84
+#: ap-gl/ap-gl.c:67 src/ap-config.c:88
msgid "Restore factory default settings"
msgstr "Restaureazã setãrile implicite din fabricã"
-#: ap-gl/ap-gl.c:69 src/ap-config.c:86 src/ap-config.c:94
+#: ap-gl/ap-gl.c:69 src/ap-config.c:89 src/ap-config.c:97
msgid "Reset"
msgstr "Reset"
-#: ap-gl/ap-gl.c:70 src/ap-config.c:87
+#: ap-gl/ap-gl.c:70 src/ap-config.c:90
msgid "Reset AP. All not uploaded configuration will be lost"
msgstr "Resetare AP. Toate configuraþiile ne-uploadate vor fi pierdute"
-#: ap-gl/ap-gl.c:72 src/ap-config.c:89
+#: ap-gl/ap-gl.c:72 src/ap-config.c:92
msgid "TestMode"
msgstr "ModTestare"
-#: ap-gl/ap-gl.c:72 src/ap-config.c:89
+#: ap-gl/ap-gl.c:72 src/ap-config.c:92
msgid "Put Access Point in test mode"
msgstr "Aducere Access Point în mod testare"
-#: ap-gl/ap-gl.c:83 src/ap-config.c:116 src/ap-config.c:126
+#: ap-gl/ap-gl.c:83 src/ap-config.c:118 src/ap-config.c:128
msgid "SysInfo"
msgstr "SysInfo"
-#: ap-gl/ap-gl.c:84 ap-gl/bridge.c:132 src/ap-config.c:117 src/bridge.c:134
-#: src/bridge.c:138
+#: ap-gl/ap-gl.c:84 ap-gl/bridge.c:132 src/ap-config.c:119 src/bridge.c:119
+#: src/bridge.c:123
msgid "Ethernet"
msgstr "Ethernet"
-#: ap-gl/ap-gl.c:84 src/ap-config.c:117
+#: ap-gl/ap-gl.c:84 src/ap-config.c:119
msgid "Get ethernet port statistics"
msgstr "Procurare statistici port ethernet"
-#: ap-gl/ap-gl.c:86 src/ap-config.c:119 src/ap-config.c:128
+#: ap-gl/ap-gl.c:86 src/ap-config.c:121 src/ap-config.c:130
msgid "Stations"
msgstr "Staþii"
-#: ap-gl/ap-gl.c:88 src/ap-config.c:121
+#: ap-gl/ap-gl.c:88 src/ap-config.c:123
msgid "KnownAPs"
msgstr "AP-uri cunoscute"
-#: ap-gl/ap-gl.c:88 src/ap-config.c:121
+#: ap-gl/ap-gl.c:88 src/ap-config.c:123
msgid "Get info about known Access Points"
msgstr "Procurare informaþii despre Access Point-urile cunoscute"
-#: ap-gl/ap-gl.c:105 src/ap-config.c:154
+#: ap-gl/ap-gl.c:105 src/ap-config.c:156
msgid "Info"
msgstr "Informaþii"
-#: ap-gl/ap-gl.c:106 src/ap-config.c:155
+#: ap-gl/ap-gl.c:106 src/ap-config.c:157
msgid "Config"
msgstr "Configuraþie"
-#: ap-gl/ap-gl.c:107 src/ap-config.c:156
+#: ap-gl/ap-gl.c:107 src/ap-config.c:158
msgid "Commands"
msgstr "Comenzi"
-#: ap-gl/ap-gl.c:107 src/ap-config.c:156
+#: ap-gl/ap-gl.c:107 src/ap-config.c:158
msgid "Execute commands on Access Point"
msgstr "Executare comenzi pe Access Point"
-#: ap-gl/ap-gl.c:109 src/ap-config.c:158
+#: ap-gl/ap-gl.c:109 src/ap-config.c:160
msgid "Connect"
msgstr "Conectare "
-#: ap-gl/ap-gl.c:110 src/ap-config.c:159
+#: ap-gl/ap-gl.c:110 src/ap-config.c:161
msgid "Search"
msgstr "Cãutare"
-#: ap-gl/ap-gl.c:111 lib/common.c:52 src/ap-config.c:160
+#: ap-gl/ap-gl.c:111 lib/common.c:58 src/ap-config.c:162
msgid "About"
msgstr "Despre"
-#: ap-gl/ap-gl.c:112 src/ap-config.c:161
+#: ap-gl/ap-gl.c:112 src/ap-config.c:163
msgid "Shell"
msgstr "Shell"
-#: ap-gl/ap-gl.c:113 src/ap-config.c:162
+#: ap-gl/ap-gl.c:113 src/ap-config.c:164
msgid "Exit"
msgstr "Ieºire"
-#: ap-gl/ap-gl.c:162 src/ap-config.c:211
+#: ap-gl/ap-gl.c:162 src/ap-config.c:212
#, c-format
msgid "Wireless Access Point Configurator ver. %s"
msgstr "Wireless Access Point Configurator ver. %s"
msgid "Authorized MAC addresses"
msgstr "Adrese MAC Autorizate"
-#: ap-gl/auth_mac.c:34 src/auth_mac.c:34
+#: ap-gl/auth_mac.c:34
#, fuzzy
msgid "NUM MAC address"
msgstr "NUM adresã MAC"
msgid "INGFPDOMSCTRBU - set; W - write conf; Q - quit to menu"
msgstr "BPGINFDRT - setãri; W - scriere configuraþie; Q - ieºire în meniu"
-#: ap-gl/bridge.c:125 src/bridge.c:127
+#: ap-gl/bridge.c:125 src/bridge.c:112
msgid "Wireless Bridge Point to MultiPoint"
msgstr "Conexiune(bridge) Wireless Point to MultiPoint"
-#: ap-gl/bridge.c:126 src/bridge.c:128
+#: ap-gl/bridge.c:126 src/bridge.c:113
msgid "Access Point"
msgstr "Access Point"
-#: ap-gl/bridge.c:127 src/bridge.c:129
+#: ap-gl/bridge.c:127 src/bridge.c:114
msgid "Access Point client"
msgstr "Client Access Point"
-#: ap-gl/bridge.c:128 src/bridge.c:130
+#: ap-gl/bridge.c:128 src/bridge.c:115
msgid "Wireless Bridge Point to Point"
msgstr "Conexiune(bridge) Wireless Point to Point"
-#: ap-gl/bridge.c:129 src/bridge.c:131
+#: ap-gl/bridge.c:129 src/bridge.c:116
msgid "Repeater"
msgstr "Repetor"
msgid "Associated Stations"
msgstr "Staþii Asociate"
-#: ap-gl/stations.c:83 src/stations.c:87
-msgid "AP now in AP Client Mode and don't has any associated stations"
+#: ap-gl/stations.c:80 src/stations.c:96
+msgid "AP is currently in AP Client Mode => no associated STAtions."
msgstr ""
-#: ap-gl/stations.c:109
-msgid "# MAC LQ RSSI Status Port IP"
+#: ap-gl/stations.c:105
+msgid "# MAC LQ RSSI Status Port IP"
msgstr ""
-#: ap-gl/stations.c:135 src/stations.c:139
+#: ap-gl/stations.c:131 src/stations.c:155
msgid "AssociatedSTAsInfo packet error"
msgstr "Eroare pachet AssociatedSTAsInfo"
-#: ap-gl/stations.c:164 src/stations.c:161 src/stations.c:313
+#: ap-gl/stations.c:160 src/stations.c:364
msgid "Arrows - scroll; S - save to file; Q - quit to menu."
msgstr "Sãgeþi - scroll; S - salvare în fiºier; Q - ieºire în meniu."
msgid "Known Access Points"
msgstr "Access Point-uri Cunoscute"
-#: lib/aps.c:217
+#: lib/aps.c:219
msgid "NetworkType"
msgstr "TipReþea"
-#: lib/aps.c:293
+#: lib/aps.c:295
msgid "Infrastructure"
msgstr "Infrastructurã"
-#: lib/aps.c:352 lib/aps.c:360 lib/aps.c:368
+#: lib/aps.c:355 lib/aps.c:363 lib/aps.c:371
#, fuzzy
msgid "CN: Channel Name; P: Preambule Type (S: Short; L: Long);"
msgstr "P: Tip Preambul; S: Scurt; L: Lung"
-#: lib/aps.c:354
-msgid "RSSI: Radio Signal Strength Indicator [%];"
+#: lib/aps.c:357
+msgid "RSSI: Radio Signal Strength Indicator [%]"
msgstr ""
-#: lib/aps.c:356 lib/aps.c:364
-msgid "LQ: Link Quality [%]"
+#: lib/aps.c:359 lib/aps.c:367
+msgid "; LQ: Link Quality [%]"
msgstr ""
-#: lib/aps.c:362
-msgid "RSSI: Radio Signal Strength Indicator [dBm];"
+#: lib/aps.c:365
+msgid "RSSI: Radio Signal Strength Indicator [dBm]"
msgstr ""
-#: lib/aps.c:370
-msgid "RSSI: Radio Signal Strength Indicator [raw];"
+#: lib/aps.c:373
+msgid "RSSI: Radio Signal Strength Indicator [raw]"
msgstr ""
-#: lib/aps.c:372
-msgid "LQ: Link Quality [raw]"
+#: lib/aps.c:375
+msgid "; LQ: Link Q. [raw]"
msgstr ""
-#: lib/aps.c:378
+#: lib/aps.c:381
#, fuzzy
msgid ""
-"# con. to this AP; R refresh with reset; S refresh w/o reset; T toggle; Q "
-"quit"
+"# con. to AP #; R refresh with reset; T toggle; Q quit; Other = refr. w/o "
+"reset"
msgstr ""
"# conectare la acest AP; R împrospãtare cu reset; G împrospãtare fãrã reset; "
"Q ieºire"
-#: lib/aps.c:380
+#: lib/aps.c:383
#, fuzzy
msgid ""
-"# con. to this AP; R initiate AP scan; S refresh view; T toggle view; Q quit"
+"# con. to AP #; R initiate AP scan; T toggle view; Q quit; Other = refresh "
+"view"
msgstr ""
"# conectare la acest AP; R împrospãtare cu reset; G împrospãtare fãrã reset; "
"Q ieºire"
-#: lib/aps.c:509 lib/ap_search.c:153
+#: lib/aps.c:512 lib/ap_search.c:164
#, fuzzy, c-format
msgid "Failure in sendto(): %s. Press any key."
msgstr "Sendto invalid: %s. Apãsaþi o tastã."
-#: lib/aps.c:518
+#: lib/aps.c:521
msgid "You have just initiated the AP scan. Be advised that it may"
msgstr ""
-#: lib/aps.c:521
+#: lib/aps.c:524
msgid "take a few seconds for your Access Point to find out some"
msgstr ""
-#: lib/aps.c:524
+#: lib/aps.c:527
msgid "values, so expect finishing the scan in about 5 seconds."
msgstr ""
-#: lib/aps.c:527
+#: lib/aps.c:530
msgid "Also note that your Access Point stops forwarding the network"
msgstr ""
-#: lib/aps.c:530
+#: lib/aps.c:533
msgid "traffic while the scan is in progress, but restores itself"
msgstr ""
-#: lib/aps.c:533
+#: lib/aps.c:536
msgid "to normal operation in time ranging up to 1 minute."
msgstr ""
-#: lib/aps.c:536
+#: lib/aps.c:539
msgid "Hence, if you are connected to target Access Point via its"
msgstr ""
-#: lib/aps.c:539
+#: lib/aps.c:542
msgid "wireless port, you need to wait a bit longer"
msgstr ""
-#: lib/aps.c:542
+#: lib/aps.c:545
msgid "after pressing 'S'."
msgstr ""
#: lib/ap_search.c:50
-msgid "# Type IP Description"
+msgid " # Type IP Name"
msgstr ""
-#: lib/ap_search.c:89
+#: lib/ap_search.c:99
msgid "Please wait while scanning, or press 'Q' to quit."
msgstr ""
-#: lib/ap_search.c:105
+#: lib/ap_search.c:115
#, fuzzy
msgid "Can't set broadcast option on socket. Press any key."
msgstr "Nu se poate seta opþiunea de broadcast spre socket. Apãsaþi o tastã."
-#: lib/ap_search.c:114
+#: lib/ap_search.c:124
#, fuzzy
msgid "Can't set multicast membership on socket. Press any key."
msgstr ""
"Nu se poate seta apartenenþa(membership) multicast la socket. Apãsaþi o "
"tastã."
-#: lib/ap_search.c:120
+#: lib/ap_search.c:131
msgid "Scanning via network interface:"
msgstr ""
-#: lib/ap_search.c:121
+#: lib/ap_search.c:132
#, c-format
msgid " Index: %i"
msgstr ""
-#: lib/ap_search.c:123
+#: lib/ap_search.c:134
#, fuzzy, c-format
msgid " Name: %s"
msgstr "[N] Nume AP:"
-#: lib/ap_search.c:125
+#: lib/ap_search.c:136
#, c-format
msgid " IP: %s"
msgstr ""
-#: lib/ap_search.c:134
+#: lib/ap_search.c:145
#, c-format
msgid "Scanning for AP type: %s"
msgstr ""
-#: lib/ap_search.c:312
+#: lib/ap_search.c:327
msgid "Access Points Search"
msgstr "Cãutare de Access Points."
-#: lib/ap_search.c:329
+#: lib/ap_search.c:345
#, fuzzy
msgid "realloc() error."
msgstr "Eroare în crearea socketului"
-#: lib/ap_search.c:341
+#: lib/ap_search.c:357
msgid "Network interface discovery error."
msgstr ""
-#: lib/ap_search.c:416
+#: lib/ap_search.c:432
#, fuzzy
msgid "No local network interfaces found. Press any key."
msgstr "Eroare la fork. Apãsaþi o tastã."
-#: lib/ap_search.c:418
+#: lib/ap_search.c:434
msgid "No directly reachable Access Points found. Press any key."
msgstr ""
-#: lib/ap_search.c:422
-msgid "Program-hardcoded maximum number of APs found."
+#: lib/ap_search.c:439
+msgid "Single-screen maximum number of APs found."
msgstr ""
-#: lib/ap_search.c:426
+#: lib/ap_search.c:442
#, fuzzy
msgid "# - connect to AP; Q - quit"
msgstr "Conectare la AP num:"
msgstr "Nu se pot scrie date în AP. Apãsaþi o tastã pentru continuare."
#: lib/ap-utils.h:100
-msgid "Unable to retrieve data from AP. Press any key to continue."
+#, fuzzy
+msgid "Unable to retrieve (valid) data from AP. Press any key to continue."
msgstr "Nu se pot recupera date din AP. Apãsaþi o tastã pentru continuare."
#: lib/ap-utils.h:101
#: lib/common.c:33
#, fuzzy
+msgid "Access Point name: "
+msgstr "Access Point"
+
+#: lib/common.c:34
+#, fuzzy
+msgid "Do you want to define name for this AP? "
+msgstr "Doriþi sã continuaþi? "
+
+#: lib/common.c:35
+#, fuzzy
msgid "AP type: "
msgstr "Tip AP:"
-#: lib/common.c:34
+#: lib/common.c:36
#, fuzzy
msgid "Save connect-settings: "
msgstr "Salvare setãri conectare:"
-#: lib/common.c:69
+#: lib/common.c:75
#, c-format
msgid "From %s"
msgstr "De la %s"
-#: lib/common.c:71
+#: lib/common.c:77
#, c-format
msgid "Version %s"
msgstr "Versiunea %s"
-#: lib/common.c:74
+#: lib/common.c:80
msgid "Written by Roman Festchook roma@polesye.net"
msgstr "Scris de Roman Festchook roma@polesye.net"
-#: lib/common.c:76
+#: lib/common.c:82
#, fuzzy
msgid "Copyright (c) Roman Festchook 2001-2004"
msgstr "Copyright (c) Roman Festchook 2001-2002"
-#: lib/common.c:79
+#: lib/common.c:85
msgid "This program is distributed under the terms"
msgstr "Acest program este distribuit sub termenii "
-#: lib/common.c:81
+#: lib/common.c:87
msgid "of the GNU General Public License version 2."
msgstr "Licenþei Publice Generale GNU versiunea 2"
-#: lib/common.c:83
+#: lib/common.c:89
msgid "See the included COPYING file for details."
msgstr "Citiþi fiºierul COPYING inclus pentru detalii."
msgid "Entered characters will not be displayed for security reason."
msgstr "Caracterele introduse nu vor fi afiºate din motive de securitate."
-#: lib/common.c:171
+#: lib/common.c:157
+msgid "Display name for the Access point (NOT the name defined inside the AP!)"
+msgstr ""
+
+#: lib/common.c:187
#, fuzzy
msgid "Determining AP type. Please wait..."
msgstr "Recuperare date din AP. Vã rugãm aºteptaþi..."
-#: lib/common.c:196
+#: lib/common.c:272
#, fuzzy
msgid "Unable to determine AP type (no response). Press any key."
msgstr "Nu se pot recupera date din AP. Apãsaþi o tastã pentru continuare."
-#: lib/file.c:176
-msgid "NUM IP ADDRESS TYPE"
+#: lib/file.c:194
+#, fuzzy
+msgid "NUM IP ADDRESS TYPE NAME (in ~/.ap-config)"
msgstr "NUM ADRES? IP TIP"
-#: lib/file.c:177
+#: lib/file.c:195
#, fuzzy
msgid "Choose an AP to connect to"
msgstr "Alege?i AP-ul la care se efectueaz? conexiunea"
-#: lib/file.c:182
+#: lib/file.c:200
msgid "1-9,C: connect; N: new; D: delete; W: save; Q: quit; arrows: scroll"
msgstr ""
"1-9,C: conectare; N: nou; D: ?tergere; W: salvare; Q: ie?ire; s?ge?i: scroll"
-#: lib/file.c:225
+#: lib/file.c:257
msgid "Connect to AP num:"
msgstr "Conectare la AP num:"
-#: lib/file.c:250
+#: lib/file.c:293
msgid "Delete num:"
msgstr "ªterge Num:"
msgid "Value must be in range %i - %i. Press any key to continue."
msgstr "Nu se pot scrie date în AP. Apãsaþi o tastã pentru continuare."
-#: lib/oui.c:6052
+#: lib/oui.c:6056
msgid "Unknown or Private"
msgstr "Necunoscut sau Privat"
msgid "[R] Right:"
msgstr "Dreapta"
-#: lib/radio.c:114
+#: lib/radio.c:121
msgid "Radio Configuration"
msgstr "Configuraþie Radio"
-#: lib/radio.c:115
+#: lib/radio.c:122
msgid "Output RF signal power level (CR31 register values)"
msgstr ""
-#: lib/radio.c:117
+#: lib/radio.c:124
#, fuzzy
msgid "Key Channel Level"
msgstr "cheie nivel canal"
-#: lib/radio.c:273
+#: lib/radio.c:280
#, fuzzy
msgid ""
"You can't disable both antennas; unable to save antenna-config. Press any "
"Nu puteþi dezactiva ambele antene, nu se poate salva configuraþia antenei. "
"Apãsaþi o tastã."
-#: lib/scr.c:134
+#: lib/scr.c:203
#, c-format
msgid "Current AP: %s Type: %s"
msgstr "AP Current: %s Tip: %s"
msgid "[M] Manufacturer"
msgstr "[M] Producãtor"
-#: lib/stat.c:29
-msgid "Unable to get data from AP. Press Q to continue."
-msgstr "Nu se pot procura date din AP. Apãsaþi Q pentru continuare."
-
-#: lib/stat.c:30 lib/stat.c:428
-msgid "Q - quit to menu."
-msgstr "Q - ieºire în meniu."
+#: lib/stat.c:30
+msgid "Q - quit to menu. Other key - force update."
+msgstr ""
#: lib/stat.c:31
-msgid "pipe error. Press any key."
-msgstr "eroare de legãturã(pipe). Apãsaþi o tastã."
-
-#: lib/stat.c:32
-msgid "fcntl error. Press any key."
+#, fuzzy
+msgid "select() function error. Press any key."
msgstr "Eroare fcntl. Apãsaþi o tastã."
-#: lib/stat.c:33
-msgid "fork error. Press any key."
-msgstr "Eroare la fork. Apãsaþi o tastã."
-
-#: lib/stat.c:72
+#: lib/stat.c:61
msgid "Ethernet Statistics"
msgstr "Statistici Ethernet"
-#: lib/stat.c:108
-msgid "EthRxStat packet error. Press Q to continue."
+#: lib/stat.c:92
+#, fuzzy
+msgid "EthRxStat packet error. Press any key."
msgstr "Eroare de pachet EthRxStat Apãsaþi Q pentru continuare."
-#: lib/stat.c:120
-msgid "EthTxStat packet error. Press Q to continue."
+#: lib/stat.c:105
+#, fuzzy
+msgid "EthTxStat packet error. Press any key."
msgstr "Eroare de pachet EthTxStat. Apãsaþi Q pentru continuare."
-#: lib/stat.c:123
+#: lib/stat.c:109
msgid "Received:"
msgstr "Primite:"
-#: lib/stat.c:124
+#: lib/stat.c:110
#, fuzzy
msgid "Transmitted:"
msgstr "Transmise:"
-#: lib/stat.c:251 lib/stat.c:427
+#: lib/stat.c:235 lib/stat.c:425
msgid "Wireless Statistics"
msgstr "Statistici Wireless"
-#: lib/stat.c:282
-msgid "WirelessStat packet error. Press Q to continue."
+#: lib/stat.c:265
+#, fuzzy
+msgid "WirelessStat packet error. Press any key."
msgstr "Eroare de pachet WirelessStat. Apãsaþi Q pentru continuare."
-#: lib/stat.c:419
-msgid "pipe error. Press any key"
-msgstr "Eroare de legãturã(pipe). Apãsaþi o tastã"
-
-#: lib/stat.c:424
-msgid "fcntl error. Press any key"
-msgstr "Eroare de fcntl. Apãsaþi o tastã"
-
-#: lib/stat.c:433
-msgid "fork error. Press any key"
-msgstr "Eroare de fork. Apãsaþi o tastã"
-
#: lib/sysinfo.c:31
msgid "System Description: "
msgstr "Descriere sistem: "
-#: lib/sysinfo.c:93 lib/sysinfo.c:277
+#: lib/sysinfo.c:109 lib/sysinfo.c:303
msgid "System Info"
msgstr "Informaþii Sistem"
-#: lib/sysinfo.c:95
+#: lib/sysinfo.c:111
msgid "Device hardware/software/name info:"
msgstr ""
-#: lib/sysinfo.c:130
+#: lib/sysinfo.c:146
#, fuzzy
msgid "Product name:"
msgstr "Nume Produs:"
-#: lib/sysinfo.c:135
+#: lib/sysinfo.c:151
#, fuzzy, c-format
msgid "Product type: %u"
msgstr "TipProdus: %u"
-#: lib/sysinfo.c:138
+#: lib/sysinfo.c:154
#, fuzzy, c-format
msgid "Hardware revision: %u"
msgstr "RevizieHardware: %u"
-#: lib/sysinfo.c:141
+#: lib/sysinfo.c:157
#, fuzzy
msgid "OEM name:"
msgstr "NumeOEM:"
-#: lib/sysinfo.c:149
+#: lib/sysinfo.c:165
#, fuzzy, c-format
msgid "Regulation domain: %s [%d]"
msgstr "Domeniu Regularizare: %s"
-#: lib/sysinfo.c:150 lib/sysinfo.c:337
+#: lib/sysinfo.c:166 lib/sysinfo.c:363
msgid "FCC (USA)"
msgstr "FCC (USA)"
-#: lib/sysinfo.c:151 lib/sysinfo.c:338
+#: lib/sysinfo.c:167 lib/sysinfo.c:364
msgid "DOC (Canada)"
msgstr "DOC (Canada)"
-#: lib/sysinfo.c:152 lib/sysinfo.c:339
+#: lib/sysinfo.c:168 lib/sysinfo.c:365
msgid "ETSI (Europe)"
msgstr "ETSI (Europa)"
-#: lib/sysinfo.c:153 lib/sysinfo.c:340
+#: lib/sysinfo.c:169 lib/sysinfo.c:366
msgid "Spain"
msgstr "Spania"
-#: lib/sysinfo.c:154 lib/sysinfo.c:341
+#: lib/sysinfo.c:170 lib/sysinfo.c:367
msgid "France"
msgstr "Franþa"
-#: lib/sysinfo.c:155 lib/sysinfo.c:342
+#: lib/sysinfo.c:171 lib/sysinfo.c:368
msgid "MKK (Japan)"
msgstr "MKK (Japonia)"
-#: lib/sysinfo.c:155 lib/sysinfo.c:236 lib/sysinfo.c:342
+#: lib/sysinfo.c:171 lib/sysinfo.c:262 lib/sysinfo.c:368
msgid "unknown"
msgstr "necunoscut"
-#: lib/sysinfo.c:158
+#: lib/sysinfo.c:174
#, fuzzy, c-format
msgid "Info structure version: %u"
msgstr "VersiuneStruct: %u"
-#: lib/sysinfo.c:161 lib/sysinfo.c:299
+#: lib/sysinfo.c:177 lib/sysinfo.c:325
#, c-format
msgid "Manufacturer OUI: %02X %02X %02X (%s)"
msgstr "OUI Producãtor: %02X %02X %02X (%s)"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:187
+#, fuzzy, c-format
+msgid "Uptime: %u days, %02u:%02u:%02u hours:mins:secs"
+msgstr "Uptime: %u:%02u:%02u.%02u"
+
+#: lib/sysinfo.c:259
msgid "FHSS 2.4 GHz"
msgstr "FHSS 2.4 GHz"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:259
msgid "DSSS 2.4 GHz"
msgstr "DSSS 2.4 GHz"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:259
msgid "IR Baseband"
msgstr "Bandã de bazã IR"
-#: lib/sysinfo.c:234
+#: lib/sysinfo.c:260
msgid "Commercial range 0..40 C"
msgstr "Interval comercial 0..40 C"
-#: lib/sysinfo.c:235
+#: lib/sysinfo.c:261
msgid "Industrial range -30..70 C"
msgstr "Interval industrial -30..70 C"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "manual"
msgstr "manual"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "notsupported"
msgstr "nesuportat"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "dynamic"
msgstr "dinamic"
-#: lib/sysinfo.c:287
+#: lib/sysinfo.c:313
msgid "Manufacturer:"
msgstr "Producãtor:"
-#: lib/sysinfo.c:293
+#: lib/sysinfo.c:319
msgid "Manufacturer ID:"
msgstr "ID Producãtor:"
-#: lib/sysinfo.c:305
-#, c-format
+#: lib/sysinfo.c:331
msgid "Product Name:"
msgstr "Nume Produs:"
-#: lib/sysinfo.c:312
-#, c-format
+#: lib/sysinfo.c:338
msgid "Product ID:"
msgstr "ID Produs:"
-#: lib/sysinfo.c:318
-#, c-format
+#: lib/sysinfo.c:344
msgid "Product Version:"
msgstr "Versiune Produs:"
-#: lib/sysinfo.c:326
+#: lib/sysinfo.c:352
#, c-format
msgid "PHYType: %s"
msgstr "TipPHY: %s"
-#: lib/sysinfo.c:329
+#: lib/sysinfo.c:355
#, c-format
msgid "Temperature: %s"
msgstr "Temperaturã: %s"
-#: lib/sysinfo.c:336
+#: lib/sysinfo.c:362
#, c-format
msgid "Regulation Domain: %s"
msgstr "Domeniu Regularizare: %s"
-#: lib/sysinfo.c:345
+#: lib/sysinfo.c:371
#, c-format
msgid "Transmit Power: %u mW"
msgstr "Putere Transmisie: %u mW"
-#: lib/sysinfo.c:375
-#, c-format
-msgid "WEP inplemented: %s"
+#: lib/sysinfo.c:401
+#, fuzzy, c-format
+msgid "WEP implemented: %s"
msgstr "WEP inplementat: %s"
-#: lib/sysinfo.c:378
+#: lib/sysinfo.c:404
#, c-format
msgid "Diversity: %s"
msgstr "Variaþie: %s"
-#: lib/sysinfo.c:406
+#: lib/sysinfo.c:432
#, c-format
msgid "Uptime: %u:%02u:%02u.%02u"
msgstr "Uptime: %u:%02u:%02u.%02u"
-#: lib/sysinfo.c:422
+#: lib/sysinfo.c:448
#, c-format
msgid "IP Address: %s"
msgstr "Adresã IP: %s"
msgstr ""
#: lib/wlan.c:49
+msgid "[T] SIFS time (msec): "
+msgstr ""
+
+#: lib/wlan.c:50
msgid "[key] - set option; W - write conf; Q - quit to menu"
msgstr ""
"[tastã] - setãri opþiuni; W - scriere configuraþie; Q - ieºire în meniu"
-#: lib/wlan.c:140
+#: lib/wlan.c:127
msgid "Short"
msgstr "Scurt"
-#: lib/wlan.c:140
+#: lib/wlan.c:127
msgid "Long"
msgstr "Lung"
-#: lib/wlan.c:265
+#: lib/wlan.c:243
msgid "Wireless Settings"
msgstr "Setãri Wireless"
-#: lib/wlan.c:753
+#: lib/wlan.c:750
msgid "Antenna Configuration:"
msgstr "Configuraþie Antenã:"
-#: lib/wlan.c:770
+#: lib/wlan.c:767
msgid "General Options"
msgstr "Opþiuni Generale"
-#: lib/wlan.c:772
+#: lib/wlan.c:769
msgid ""
"UIOPTY - antenna; SCANLEDFR1234 - options; W - write conf; Q - quit to menu"
msgstr ""
"UIOPTY - antenã; SCANLEDFR1234 - opþiuni; W - scriere configuraþie; Q - "
"ieºire în meniu"
-#: src/ap-config.c:59
+#: src/ap-config.c:63
msgid "General"
msgstr "General"
-#: src/ap-config.c:59
+#: src/ap-config.c:63
msgid "Set general options"
msgstr "Setare opþiuni generale"
-#: src/ap-config.c:60
+#: src/ap-config.c:64
msgid "Advanced"
msgstr "Avansat"
-#: src/ap-config.c:60
+#: src/ap-config.c:64
msgid "Set advanced options"
msgstr "Setare opþiuni avansate"
-#: src/ap-config.c:94
+#: src/ap-config.c:97
msgid "Reset AP."
msgstr "Resetare AP."
-#: src/ap-config.c:129
+#: src/ap-config.c:131
msgid "Latest"
msgstr "Ultimul"
-#: src/ap-config.c:129
+#: src/ap-config.c:131
msgid "Get info about latest events"
msgstr "Procurare informaþii despre ultimele evenimente"
#: src/ap-mrtg.c:42
-#, c-format
msgid ""
"\n"
"Usage:\n"
"Folosire:\n"
#: src/ap-mrtg.c:44
-#, fuzzy, c-format
+#, fuzzy
msgid ""
"\tap-mrtg -i ip -c community -t type [-b bssid] [-n name] [-a aptype] [-v] [-"
"h] [-r]\n"
"\n"
#: src/ap-mrtg.c:46
-#, c-format
msgid ""
"Get stats from AP and return it in MRTG parsable format\n"
"\n"
"\n"
#: src/ap-mrtg.c:47
-#, c-format
msgid "-i ip - AP ip address\n"
msgstr "-i ip - Adresã de ip AP \n"
#: src/ap-mrtg.c:48
-#, c-format
msgid "-c community - SNMP community string\n"
msgstr "-c comunitate - SNMP ºir de caractere comunitate\n"
#: src/ap-mrtg.c:50
-#, c-format
msgid ""
"-t type - statistics type <w>ireless, <e>thernet, associated <s>tations "
"or <l>ink quality in client mode\n"
"calitate <l>egãturã(link) în mod client\n"
#: src/ap-mrtg.c:52
-#, c-format
msgid ""
"-b bssid - mac address of the AP to which get link quality, only if "
"type=l\n"
"conexiunii(link), numai dacã tip=l\n"
#: src/ap-mrtg.c:53
-#, c-format
msgid "-n name - AP name - for check only\n"
msgstr ""
#: src/ap-mrtg.c:54
-#, c-format
msgid ""
"-a aptype - AP type - 410 (default) or 510 for ATMEL12350's, like the "
"ME-102\n"
msgstr ""
#: src/ap-mrtg.c:56
-#, c-format
msgid "-v - report MRTG about problems connecting to AP\n"
msgstr ""
"-v - raporteazã MRTG-ului problemele apãrute la conectarea la AP\n"
#: src/ap-mrtg.c:57
-#, c-format
msgid "-r - reset AP when getting LinkQuality stats\n"
msgstr ""
"-r - reseteazã AP-ul când se procurã statisticile LinkQuality\n"
#: src/ap-mrtg.c:58
-#, c-format
msgid ""
"-h - print this help screen\n"
"\n"
"\n"
#: src/ap-mrtg.c:143
-#, c-format
msgid "Invalid IP-address\n"
msgstr "Adresã de IP invalidã\n"
msgid "Agent:v%d %s (%s@%s:%d) %s%s%s. SysUptime %d:%02d:%02d.%02d"
msgstr "Agent:v%d %s (%s@%s:%d) %s%s%s. SysUptime %d:%02d:%02d.%02d"
+#: src/auth_mac.c:34
+#, fuzzy
+msgid "NUM MAC address"
+msgstr "NUM adresã MAC"
+
#: src/bridge.c:36
msgid "[C] Configuration-enabled port(s): "
msgstr ""
msgid "[U] Isolate wireless clients (unicast traffic): "
msgstr ""
-#: src/bridge.c:137
+#: src/bridge.c:122
#, fuzzy
msgid "Both"
msgstr "Ambele Tipuri"
msgid "Error:"
msgstr "Eroare:"
-#: src/stations.c:113
+#: src/stations.c:31
+msgid " # MAC "
+msgstr ""
+
+#: src/stations.c:34
+msgid " # MAC Parent MAC RSSI Status MACn IP "
+msgstr ""
+
+#: src/stations.c:187
+#, fuzzy
+msgid ""
+"Arrows - scroll; S - save to file; Q - return; T - toggle view; Other key - "
+"refresh"
+msgstr "Sãgeþi - scroll; S - salvare în fiºier; Q - ieºire în meniu."
+
+#: src/stations.c:190
#, fuzzy
-msgid "Id MAC address"
-msgstr "Id adresã MAC"
+msgid "Arrows - scroll; S - save to file; Q - return; Other key - refresh"
+msgstr "Sãgeþi - scroll; S - salvare în fiºier; Q - ieºire în meniu."
-#: src/stations.c:223 src/stations.c:307
+#: src/stations.c:275 src/stations.c:358
msgid "Associated stations"
msgstr "Staþii asociate"
-#: src/stations.c:225
+#: src/stations.c:277
#, fuzzy
msgid "Id MAC address Quality Age RSSI"
msgstr "Id Adresã MAC Calitate Vechime RSSI"
+#~ msgid "Unable to get data from AP. Press Q to continue."
+#~ msgstr "Nu se pot procura date din AP. Apãsaþi Q pentru continuare."
+
+#~ msgid "Q - quit to menu."
+#~ msgstr "Q - ieºire în meniu."
+
+#~ msgid "pipe error. Press any key."
+#~ msgstr "eroare de legãturã(pipe). Apãsaþi o tastã."
+
+#~ msgid "fork error. Press any key."
+#~ msgstr "Eroare la fork. Apãsaþi o tastã."
+
+#~ msgid "pipe error. Press any key"
+#~ msgstr "Eroare de legãturã(pipe). Apãsaþi o tastã"
+
+#~ msgid "fcntl error. Press any key"
+#~ msgstr "Eroare de fcntl. Apãsaþi o tastã"
+
+#~ msgid "fork error. Press any key"
+#~ msgstr "Eroare de fork. Apãsaþi o tastã"
+
+#, fuzzy
+#~ msgid "Id MAC address"
+#~ msgstr "Id adresã MAC"
+
#~ msgid "Wireless Access Point Configurator"
#~ msgstr "Wireless Access Point Configurator"
msgid ""
msgstr ""
"Project-Id-Version: ap-utils 1.3.2-pre3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-22 15:06+0300\n"
+"POT-Creation-Date: 2004-11-14 22:46+0200\n"
"PO-Revision-Date: 2004-06-14 14:03+0200\n"
"Last-Translator: Elif Bilge Maden <bilgemaden_1@yahoo.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
-#: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:46 src/bridge.c:222
+#: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:50 src/bridge.c:184
msgid "Bridging"
msgstr "Bağlanıyor"
-#: ap-gl/ap-gl.c:47 src/ap-config.c:46
+#: ap-gl/ap-gl.c:47 src/ap-config.c:50
msgid "Set bridging and IP-related options"
msgstr "Bağlantı kurma ve IP bağlantılı seçenekler"
-#: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:48
-#: src/ap-config.c:118 src/ap-config.c:127 src/bridge.c:135 src/bridge.c:139
+#: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:52
+#: src/ap-config.c:120 src/ap-config.c:129 src/bridge.c:120 src/bridge.c:124
msgid "Wireless"
msgstr "Kablosuz"
-#: ap-gl/ap-gl.c:49 src/ap-config.c:48
+#: ap-gl/ap-gl.c:49 src/ap-config.c:52
msgid "Set wireless options"
msgstr "Kablosuz seçenekleri kur"
-#: ap-gl/ap-gl.c:50 src/ap-config.c:49 src/ap-config.c:61
+#: ap-gl/ap-gl.c:50 src/ap-config.c:53 src/ap-config.c:65
msgid "Privacy"
msgstr "Gizlilik"
-#: ap-gl/ap-gl.c:51 src/ap-config.c:50 src/ap-config.c:62
+#: ap-gl/ap-gl.c:51 src/ap-config.c:54 src/ap-config.c:66
#, fuzzy
msgid "MAC auth"
msgstr "Mac adresini gir"
-#: ap-gl/ap-gl.c:52 src/ap-config.c:51 src/ap-config.c:63
+#: ap-gl/ap-gl.c:52 src/ap-config.c:55 src/ap-config.c:67
msgid "Community"
msgstr "Topluluk"
-#: ap-gl/ap-gl.c:53 src/ap-config.c:52
+#: ap-gl/ap-gl.c:53 src/ap-config.c:56
msgid "Radio"
msgstr "Radyo"
-#: ap-gl/ap-gl.c:53 src/ap-config.c:52
+#: ap-gl/ap-gl.c:53 src/ap-config.c:56
msgid "Set radio signal power and antenna options"
msgstr "Radyo sinyal gücünü ve anten seçeneklerini ayarlayınız."
-#: ap-gl/ap-gl.c:66 src/ap-config.c:83
+#: ap-gl/ap-gl.c:66 src/ap-config.c:87
msgid "Upload"
msgstr "Yükleme"
-#: ap-gl/ap-gl.c:66 src/ap-config.c:83
+#: ap-gl/ap-gl.c:66 src/ap-config.c:87
msgid "Make current configuration active"
msgstr "Geçerli yapılandırmaları aktif hale getir."
-#: ap-gl/ap-gl.c:67 src/ap-config.c:84
+#: ap-gl/ap-gl.c:67 src/ap-config.c:88
msgid "Defaults"
msgstr "Varsayılanlar"
-#: ap-gl/ap-gl.c:67 src/ap-config.c:84
+#: ap-gl/ap-gl.c:67 src/ap-config.c:88
msgid "Restore factory default settings"
msgstr "Fabrika varsayılan ayarlarını geri yükle "
-#: ap-gl/ap-gl.c:69 src/ap-config.c:86 src/ap-config.c:94
+#: ap-gl/ap-gl.c:69 src/ap-config.c:89 src/ap-config.c:97
msgid "Reset"
msgstr "Sıfırla"
-#: ap-gl/ap-gl.c:70 src/ap-config.c:87
+#: ap-gl/ap-gl.c:70 src/ap-config.c:90
msgid "Reset AP. All not uploaded configuration will be lost"
msgstr "AP' yi sıfırla. Yüklenmemiş yapılandırmalar kaybolacaktır"
-#: ap-gl/ap-gl.c:72 src/ap-config.c:89
+#: ap-gl/ap-gl.c:72 src/ap-config.c:92
msgid "TestMode"
msgstr "TestKipi"
-#: ap-gl/ap-gl.c:72 src/ap-config.c:89
+#: ap-gl/ap-gl.c:72 src/ap-config.c:92
msgid "Put Access Point in test mode"
msgstr "Test kipine Erişim Noktası koy"
-#: ap-gl/ap-gl.c:83 src/ap-config.c:116 src/ap-config.c:126
+#: ap-gl/ap-gl.c:83 src/ap-config.c:118 src/ap-config.c:128
msgid "SysInfo"
msgstr "Sistembilgisi"
-#: ap-gl/ap-gl.c:84 ap-gl/bridge.c:132 src/ap-config.c:117 src/bridge.c:134
-#: src/bridge.c:138
+#: ap-gl/ap-gl.c:84 ap-gl/bridge.c:132 src/ap-config.c:119 src/bridge.c:119
+#: src/bridge.c:123
msgid "Ethernet"
msgstr "Eternet"
-#: ap-gl/ap-gl.c:84 src/ap-config.c:117
+#: ap-gl/ap-gl.c:84 src/ap-config.c:119
msgid "Get ethernet port statistics"
msgstr "Eternet bağlantı noktaları istatistiklerini bul"
-#: ap-gl/ap-gl.c:86 src/ap-config.c:119 src/ap-config.c:128
+#: ap-gl/ap-gl.c:86 src/ap-config.c:121 src/ap-config.c:130
msgid "Stations"
msgstr "İstasyonlar"
-#: ap-gl/ap-gl.c:88 src/ap-config.c:121
+#: ap-gl/ap-gl.c:88 src/ap-config.c:123
msgid "KnownAPs"
msgstr "Bilinen AP' ler"
-#: ap-gl/ap-gl.c:88 src/ap-config.c:121
+#: ap-gl/ap-gl.c:88 src/ap-config.c:123
msgid "Get info about known Access Points"
msgstr "Bilinen Erişim Noktaları hakkında bilgi edinin."
-#: ap-gl/ap-gl.c:105 src/ap-config.c:154
+#: ap-gl/ap-gl.c:105 src/ap-config.c:156
msgid "Info"
msgstr "Bilgi"
-#: ap-gl/ap-gl.c:106 src/ap-config.c:155
+#: ap-gl/ap-gl.c:106 src/ap-config.c:157
msgid "Config"
msgstr "Yapılandırma"
-#: ap-gl/ap-gl.c:107 src/ap-config.c:156
+#: ap-gl/ap-gl.c:107 src/ap-config.c:158
msgid "Commands"
msgstr "Komutlar"
-#: ap-gl/ap-gl.c:107 src/ap-config.c:156
+#: ap-gl/ap-gl.c:107 src/ap-config.c:158
msgid "Execute commands on Access Point"
msgstr "Erişim Noktasında komut gönder"
-#: ap-gl/ap-gl.c:109 src/ap-config.c:158
+#: ap-gl/ap-gl.c:109 src/ap-config.c:160
msgid "Connect"
msgstr "Bağlan"
-#: ap-gl/ap-gl.c:110 src/ap-config.c:159
+#: ap-gl/ap-gl.c:110 src/ap-config.c:161
msgid "Search"
msgstr "Ara"
-#: ap-gl/ap-gl.c:111 lib/common.c:52 src/ap-config.c:160
+#: ap-gl/ap-gl.c:111 lib/common.c:58 src/ap-config.c:162
msgid "About"
msgstr "Hakkında"
-#: ap-gl/ap-gl.c:112 src/ap-config.c:161
+#: ap-gl/ap-gl.c:112 src/ap-config.c:163
msgid "Shell"
msgstr "Kabuk"
-#: ap-gl/ap-gl.c:113 src/ap-config.c:162
+#: ap-gl/ap-gl.c:113 src/ap-config.c:164
msgid "Exit"
msgstr "Çıkış"
-#: ap-gl/ap-gl.c:162 src/ap-config.c:211
+#: ap-gl/ap-gl.c:162 src/ap-config.c:212
#, c-format
msgid "Wireless Access Point Configurator ver. %s"
msgstr "Kablosuz Erişim Noktası Konfigürasyon Tanımlayıcısı Sürümü %s"
msgid "Authorized MAC addresses"
msgstr "Yetkili makro adresler"
-#: ap-gl/auth_mac.c:34 src/auth_mac.c:34
+#: ap-gl/auth_mac.c:34
#, fuzzy
msgid "NUM MAC address"
msgstr "NUM MAKRO adres"
msgid "INGFPDOMSCTRBU - set; W - write conf; Q - quit to menu"
msgstr "BPGINFDRT - kur;W - yapılandırmayı yaz; Q - menüye dön"
-#: ap-gl/bridge.c:125 src/bridge.c:127
+#: ap-gl/bridge.c:125 src/bridge.c:112
msgid "Wireless Bridge Point to MultiPoint"
msgstr "Noktadan Çok Bağlantı Noktasına Kablosuz Köprü"
-#: ap-gl/bridge.c:126 src/bridge.c:128
+#: ap-gl/bridge.c:126 src/bridge.c:113
msgid "Access Point"
msgstr "Erişim Noktası"
-#: ap-gl/bridge.c:127 src/bridge.c:129
+#: ap-gl/bridge.c:127 src/bridge.c:114
msgid "Access Point client"
msgstr "Erşim Noktası Kullanıcısı"
-#: ap-gl/bridge.c:128 src/bridge.c:130
+#: ap-gl/bridge.c:128 src/bridge.c:115
msgid "Wireless Bridge Point to Point"
msgstr "noktadan noktaya kablosuz köprü"
-#: ap-gl/bridge.c:129 src/bridge.c:131
+#: ap-gl/bridge.c:129 src/bridge.c:116
msgid "Repeater"
msgstr "Yineleyici"
msgid "Associated Stations"
msgstr "İlişkili istasyonlar"
-#: ap-gl/stations.c:83 src/stations.c:87
-msgid "AP now in AP Client Mode and don't has any associated stations"
+#: ap-gl/stations.c:80 src/stations.c:96
+msgid "AP is currently in AP Client Mode => no associated STAtions."
msgstr ""
-#: ap-gl/stations.c:109
-msgid "# MAC LQ RSSI Status Port IP"
+#: ap-gl/stations.c:105
+msgid "# MAC LQ RSSI Status Port IP"
msgstr ""
-#: ap-gl/stations.c:135 src/stations.c:139
+#: ap-gl/stations.c:131 src/stations.c:155
msgid "AssociatedSTAsInfo packet error"
msgstr "İlişkiliSTAbilgi paketi hatası"
-#: ap-gl/stations.c:164 src/stations.c:161 src/stations.c:313
+#: ap-gl/stations.c:160 src/stations.c:364
msgid "Arrows - scroll; S - save to file; Q - quit to menu."
msgstr "Oklar - kaydırma; S - dosyaya kaydet; Q - menüye geri dön"
msgid "Known Access Points"
msgstr "Tanımlana Erişim Noktaları"
-#: lib/aps.c:217
+#: lib/aps.c:219
msgid "NetworkType"
msgstr "Ağ Türü"
-#: lib/aps.c:293
+#: lib/aps.c:295
msgid "Infrastructure"
msgstr "Altyapı"
-#: lib/aps.c:352 lib/aps.c:360 lib/aps.c:368
+#: lib/aps.c:355 lib/aps.c:363 lib/aps.c:371
#, fuzzy
msgid "CN: Channel Name; P: Preambule Type (S: Short; L: Long);"
msgstr "P: Başlangıç Türü, S: Kısa; L: Uzun"
-#: lib/aps.c:354
-msgid "RSSI: Radio Signal Strength Indicator [%];"
+#: lib/aps.c:357
+msgid "RSSI: Radio Signal Strength Indicator [%]"
msgstr ""
-#: lib/aps.c:356 lib/aps.c:364
-msgid "LQ: Link Quality [%]"
+#: lib/aps.c:359 lib/aps.c:367
+msgid "; LQ: Link Quality [%]"
msgstr ""
-#: lib/aps.c:362
-msgid "RSSI: Radio Signal Strength Indicator [dBm];"
+#: lib/aps.c:365
+msgid "RSSI: Radio Signal Strength Indicator [dBm]"
msgstr ""
-#: lib/aps.c:370
-msgid "RSSI: Radio Signal Strength Indicator [raw];"
+#: lib/aps.c:373
+msgid "RSSI: Radio Signal Strength Indicator [raw]"
msgstr ""
-#: lib/aps.c:372
-msgid "LQ: Link Quality [raw]"
+#: lib/aps.c:375
+msgid "; LQ: Link Q. [raw]"
msgstr ""
-#: lib/aps.c:378
+#: lib/aps.c:381
#, fuzzy
msgid ""
-"# con. to this AP; R refresh with reset; S refresh w/o reset; T toggle; Q "
-"quit"
+"# con. to AP #; R refresh with reset; T toggle; Q quit; Other = refr. w/o "
+"reset"
msgstr ""
"# bu AP'ye bağlan; R yeniden başlatarak yenile; G yeniden başlatmadan "
"yenile; Q geri dön"
-#: lib/aps.c:380
+#: lib/aps.c:383
#, fuzzy
msgid ""
-"# con. to this AP; R initiate AP scan; S refresh view; T toggle view; Q quit"
+"# con. to AP #; R initiate AP scan; T toggle view; Q quit; Other = refresh "
+"view"
msgstr ""
"# bu AP'ye bağlan; R yeniden başlatarak yenile; G yeniden başlatmadan "
"yenile; Q geri dön"
-#: lib/aps.c:509 lib/ap_search.c:153
+#: lib/aps.c:512 lib/ap_search.c:164
#, fuzzy, c-format
msgid "Failure in sendto(): %s. Press any key."
msgstr "Geçersiz gönderim: %s. Bir tuşa basınız."
-#: lib/aps.c:518
+#: lib/aps.c:521
msgid "You have just initiated the AP scan. Be advised that it may"
msgstr ""
-#: lib/aps.c:521
+#: lib/aps.c:524
msgid "take a few seconds for your Access Point to find out some"
msgstr ""
-#: lib/aps.c:524
+#: lib/aps.c:527
msgid "values, so expect finishing the scan in about 5 seconds."
msgstr ""
-#: lib/aps.c:527
+#: lib/aps.c:530
msgid "Also note that your Access Point stops forwarding the network"
msgstr ""
-#: lib/aps.c:530
+#: lib/aps.c:533
msgid "traffic while the scan is in progress, but restores itself"
msgstr ""
-#: lib/aps.c:533
+#: lib/aps.c:536
msgid "to normal operation in time ranging up to 1 minute."
msgstr ""
-#: lib/aps.c:536
+#: lib/aps.c:539
msgid "Hence, if you are connected to target Access Point via its"
msgstr ""
-#: lib/aps.c:539
+#: lib/aps.c:542
msgid "wireless port, you need to wait a bit longer"
msgstr ""
-#: lib/aps.c:542
+#: lib/aps.c:545
msgid "after pressing 'S'."
msgstr ""
#: lib/ap_search.c:50
-msgid "# Type IP Description"
+msgid " # Type IP Name"
msgstr ""
-#: lib/ap_search.c:89
+#: lib/ap_search.c:99
msgid "Please wait while scanning, or press 'Q' to quit."
msgstr ""
-#: lib/ap_search.c:105
+#: lib/ap_search.c:115
#, fuzzy
msgid "Can't set broadcast option on socket. Press any key."
msgstr "Yuvaya yayın seçeneği kurulamıyor. Bir tuşa basınız."
-#: lib/ap_search.c:114
+#: lib/ap_search.c:124
#, fuzzy
msgid "Can't set multicast membership on socket. Press any key."
msgstr "yuvaya çoğa gönderim üyeliği kurulamıyor. Bir tuşa basınız."
-#: lib/ap_search.c:120
+#: lib/ap_search.c:131
msgid "Scanning via network interface:"
msgstr ""
-#: lib/ap_search.c:121
+#: lib/ap_search.c:132
#, c-format
msgid " Index: %i"
msgstr ""
-#: lib/ap_search.c:123
+#: lib/ap_search.c:134
#, fuzzy, c-format
msgid " Name: %s"
msgstr "(N) AP Adı:"
-#: lib/ap_search.c:125
+#: lib/ap_search.c:136
#, c-format
msgid " IP: %s"
msgstr ""
-#: lib/ap_search.c:134
+#: lib/ap_search.c:145
#, c-format
msgid "Scanning for AP type: %s"
msgstr ""
-#: lib/ap_search.c:312
+#: lib/ap_search.c:327
msgid "Access Points Search"
msgstr "Erişim Noktaları Araştırması"
-#: lib/ap_search.c:329
+#: lib/ap_search.c:345
#, fuzzy
msgid "realloc() error."
msgstr "Soket hatası oluştur"
-#: lib/ap_search.c:341
+#: lib/ap_search.c:357
msgid "Network interface discovery error."
msgstr ""
-#: lib/ap_search.c:416
+#: lib/ap_search.c:432
#, fuzzy
msgid "No local network interfaces found. Press any key."
msgstr "çatal hata. Bir tuşa basınız."
-#: lib/ap_search.c:418
+#: lib/ap_search.c:434
msgid "No directly reachable Access Points found. Press any key."
msgstr ""
-#: lib/ap_search.c:422
-msgid "Program-hardcoded maximum number of APs found."
+#: lib/ap_search.c:439
+msgid "Single-screen maximum number of APs found."
msgstr ""
-#: lib/ap_search.c:426
+#: lib/ap_search.c:442
#, fuzzy
msgid "# - connect to AP; Q - quit"
msgstr "AP numarasına bağlan:"
msgstr "AP' ye veri yazılamıyor. Devam etmek için bir tuşa basınız."
#: lib/ap-utils.h:100
-msgid "Unable to retrieve data from AP. Press any key to continue."
+#, fuzzy
+msgid "Unable to retrieve (valid) data from AP. Press any key to continue."
msgstr "AP' den veri alınamıyor. Devam etmek için bir tuşa basınız."
#: lib/ap-utils.h:101
#: lib/common.c:33
#, fuzzy
+msgid "Access Point name: "
+msgstr "Erişim Noktası"
+
+#: lib/common.c:34
+#, fuzzy
+msgid "Do you want to define name for this AP? "
+msgstr "Devam etmek istiyor musunuz?"
+
+#: lib/common.c:35
+#, fuzzy
msgid "AP type: "
msgstr "AP türü:"
-#: lib/common.c:34
+#: lib/common.c:36
#, fuzzy
msgid "Save connect-settings: "
msgstr "Bağlantı ayarlarını kaydediniz."
-#: lib/common.c:69
+#: lib/common.c:75
#, c-format
msgid "From %s"
msgstr "%s' ten"
-#: lib/common.c:71
+#: lib/common.c:77
#, c-format
msgid "Version %s"
msgstr "Sürüm %s"
-#: lib/common.c:74
+#: lib/common.c:80
msgid "Written by Roman Festchook roma@polesye.net"
msgstr "Roman Festchook tarafından yazılmıştır roma@polesye.net"
-#: lib/common.c:76
+#: lib/common.c:82
#, fuzzy
msgid "Copyright (c) Roman Festchook 2001-2004"
msgstr "Telif Hakkı (c) Roman Festchoo 2001-2002"
-#: lib/common.c:79
+#: lib/common.c:85
msgid "This program is distributed under the terms"
msgstr "Bu program GNU Toplu Kamu Lisansı Sürüm 2"
-#: lib/common.c:81
+#: lib/common.c:87
msgid "of the GNU General Public License version 2."
msgstr "denetiminde dağıtılmaktadır. "
-#: lib/common.c:83
+#: lib/common.c:89
msgid "See the included COPYING file for details."
msgstr "Ayrıntılar için mevcuti KOPYALAMA dosyasına bakınız."
msgid "Entered characters will not be displayed for security reason."
msgstr "Girdiğiniz karakterler güvenlik nedeniyle gösterilmeyecektir."
-#: lib/common.c:171
+#: lib/common.c:157
+msgid "Display name for the Access point (NOT the name defined inside the AP!)"
+msgstr ""
+
+#: lib/common.c:187
#, fuzzy
msgid "Determining AP type. Please wait..."
msgstr "AP' den veri alınıyor. Lütfen bekleyin."
-#: lib/common.c:196
+#: lib/common.c:272
#, fuzzy
msgid "Unable to determine AP type (no response). Press any key."
msgstr "AP' den veri alınamıyor. Devam etmek için bir tuşa basınız."
-#: lib/file.c:176
-msgid "NUM IP ADDRESS TYPE"
+#: lib/file.c:194
+#, fuzzy
+msgid "NUM IP ADDRESS TYPE NAME (in ~/.ap-config)"
msgstr "NO IP ADRESİ TÜR"
-#: lib/file.c:177
+#: lib/file.c:195
#, fuzzy
msgid "Choose an AP to connect to"
msgstr "Bağlanmak için AP'yi seç"
-#: lib/file.c:182
+#: lib/file.c:200
msgid "1-9,C: connect; N: new; D: delete; W: save; Q: quit; arrows: scroll"
msgstr "1-9,C: bağlan; N: yeni; D: sil; W: kaydet; Q: çıkış; oklar: kaydırma"
-#: lib/file.c:225
+#: lib/file.c:257
msgid "Connect to AP num:"
msgstr "AP numarasına bağlan:"
-#: lib/file.c:250
+#: lib/file.c:293
msgid "Delete num:"
msgstr "numarayı sil"
msgid "Value must be in range %i - %i. Press any key to continue."
msgstr "AP' ye veri yazılamıyor. Devam etmek için bir tuşa basınız."
-#: lib/oui.c:6052
+#: lib/oui.c:6056
msgid "Unknown or Private"
msgstr "Bilinmiyor ya da gizli"
msgid "[R] Right:"
msgstr "Sağ"
-#: lib/radio.c:114
+#: lib/radio.c:121
msgid "Radio Configuration"
msgstr "Radyo Yapılandırması"
-#: lib/radio.c:115
+#: lib/radio.c:122
msgid "Output RF signal power level (CR31 register values)"
msgstr ""
-#: lib/radio.c:117
+#: lib/radio.c:124
#, fuzzy
msgid "Key Channel Level"
msgstr "tuş kanal seviyesi"
-#: lib/radio.c:273
+#: lib/radio.c:280
#, fuzzy
msgid ""
"You can't disable both antennas; unable to save antenna-config. Press any "
"İki anten birden geçersiz kılınamaz, anten yapılandırması kaydedilemiyor. "
"Bir tuşa basınız."
-#: lib/scr.c:134
+#: lib/scr.c:203
#, c-format
msgid "Current AP: %s Type: %s"
msgstr "Geçerli AP: %s Çeşit: %s"
msgid "[M] Manufacturer"
msgstr "(M) Üretici"
-#: lib/stat.c:29
-msgid "Unable to get data from AP. Press Q to continue."
-msgstr "AP'den veri alınamıyor. Devam etmek için Q'ya basınız."
-
-#: lib/stat.c:30 lib/stat.c:428
-msgid "Q - quit to menu."
-msgstr "Q - menüye dönüş"
+#: lib/stat.c:30
+msgid "Q - quit to menu. Other key - force update."
+msgstr ""
#: lib/stat.c:31
-msgid "pipe error. Press any key."
-msgstr "ardışık hata. Bir tuşa basınız."
-
-#: lib/stat.c:32
-msgid "fcntl error. Press any key."
+#, fuzzy
+msgid "select() function error. Press any key."
msgstr "fcntl hatası: Bir tuşa basınız."
-#: lib/stat.c:33
-msgid "fork error. Press any key."
-msgstr "çatal hata. Bir tuşa basınız."
-
-#: lib/stat.c:72
+#: lib/stat.c:61
msgid "Ethernet Statistics"
msgstr "Eternet İstatistikleri"
-#: lib/stat.c:108
-msgid "EthRxStat packet error. Press Q to continue."
+#: lib/stat.c:92
+#, fuzzy
+msgid "EthRxStat packet error. Press any key."
msgstr "EthRxStat paket hatası. Devam etmek için Q'ya basınız."
-#: lib/stat.c:120
-msgid "EthTxStat packet error. Press Q to continue."
+#: lib/stat.c:105
+#, fuzzy
+msgid "EthTxStat packet error. Press any key."
msgstr "EthTxStat paket hatası. Devam etmek için Q'ya basınız."
-#: lib/stat.c:123
+#: lib/stat.c:109
msgid "Received:"
msgstr "Alındı:"
-#: lib/stat.c:124
+#: lib/stat.c:110
#, fuzzy
msgid "Transmitted:"
msgstr "İletildi:"
-#: lib/stat.c:251 lib/stat.c:427
+#: lib/stat.c:235 lib/stat.c:425
msgid "Wireless Statistics"
msgstr "Kablosuz İstatistikler"
-#: lib/stat.c:282
-msgid "WirelessStat packet error. Press Q to continue."
+#: lib/stat.c:265
+#, fuzzy
+msgid "WirelessStat packet error. Press any key."
msgstr "Kablosuz İstatistik paket hatası. Devam etmek için bir tuşa basınız."
-#: lib/stat.c:419
-msgid "pipe error. Press any key"
-msgstr "ardışık hata. Bir tuşa basınız."
-
-#: lib/stat.c:424
-msgid "fcntl error. Press any key"
-msgstr "fcntl hatası. Bir tuşa basınız"
-
-#: lib/stat.c:433
-msgid "fork error. Press any key"
-msgstr "çatal hata. Bir tuşa basınız"
-
#: lib/sysinfo.c:31
msgid "System Description: "
msgstr "Sistem Tanımı:"
-#: lib/sysinfo.c:93 lib/sysinfo.c:277
+#: lib/sysinfo.c:109 lib/sysinfo.c:303
msgid "System Info"
msgstr "Sistem Bilgisi"
-#: lib/sysinfo.c:95
+#: lib/sysinfo.c:111
msgid "Device hardware/software/name info:"
msgstr ""
-#: lib/sysinfo.c:130
+#: lib/sysinfo.c:146
#, fuzzy
msgid "Product name:"
msgstr "Ürün Adı"
-#: lib/sysinfo.c:135
+#: lib/sysinfo.c:151
#, fuzzy, c-format
msgid "Product type: %u"
msgstr "ÜrünTürü: %lu"
-#: lib/sysinfo.c:138
+#: lib/sysinfo.c:154
#, fuzzy, c-format
msgid "Hardware revision: %u"
msgstr "DonanımDeğişiklikleri: %lu"
-#: lib/sysinfo.c:141
+#: lib/sysinfo.c:157
#, fuzzy
msgid "OEM name:"
msgstr "OEMAdı:"
-#: lib/sysinfo.c:149
+#: lib/sysinfo.c:165
#, fuzzy, c-format
msgid "Regulation domain: %s [%d]"
msgstr "Düzenleme Alanı: %s"
-#: lib/sysinfo.c:150 lib/sysinfo.c:337
+#: lib/sysinfo.c:166 lib/sysinfo.c:363
msgid "FCC (USA)"
msgstr "FCC ( Amerika)"
-#: lib/sysinfo.c:151 lib/sysinfo.c:338
+#: lib/sysinfo.c:167 lib/sysinfo.c:364
msgid "DOC (Canada)"
msgstr "DOC (Kanada)"
-#: lib/sysinfo.c:152 lib/sysinfo.c:339
+#: lib/sysinfo.c:168 lib/sysinfo.c:365
msgid "ETSI (Europe)"
msgstr "ETSI (Avrupa)"
-#: lib/sysinfo.c:153 lib/sysinfo.c:340
+#: lib/sysinfo.c:169 lib/sysinfo.c:366
msgid "Spain"
msgstr "İspanya"
-#: lib/sysinfo.c:154 lib/sysinfo.c:341
+#: lib/sysinfo.c:170 lib/sysinfo.c:367
msgid "France"
msgstr "Fransa"
-#: lib/sysinfo.c:155 lib/sysinfo.c:342
+#: lib/sysinfo.c:171 lib/sysinfo.c:368
msgid "MKK (Japan)"
msgstr "MKK ( Japonya)"
-#: lib/sysinfo.c:155 lib/sysinfo.c:236 lib/sysinfo.c:342
+#: lib/sysinfo.c:171 lib/sysinfo.c:262 lib/sysinfo.c:368
msgid "unknown"
msgstr "tanımlanamayan"
-#: lib/sysinfo.c:158
+#: lib/sysinfo.c:174
#, fuzzy, c-format
msgid "Info structure version: %u"
msgstr "YapıSürüm: %lu"
-#: lib/sysinfo.c:161 lib/sysinfo.c:299
+#: lib/sysinfo.c:177 lib/sysinfo.c:325
#, c-format
msgid "Manufacturer OUI: %02X %02X %02X (%s)"
msgstr "Üretici OUI: %02X %02X %02X (%s)"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:187
+#, fuzzy, c-format
+msgid "Uptime: %u days, %02u:%02u:%02u hours:mins:secs"
+msgstr "işlem süresi: %u:%02u:%02u.%02u"
+
+#: lib/sysinfo.c:259
msgid "FHSS 2.4 GHz"
msgstr "FHSS 2.4 GHz"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:259
msgid "DSSS 2.4 GHz"
msgstr "DSSS 2.4 GHz"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:259
msgid "IR Baseband"
msgstr "IR Tabanbant"
-#: lib/sysinfo.c:234
+#: lib/sysinfo.c:260
msgid "Commercial range 0..40 C"
msgstr "Ticari Aralık 0..40 C"
-#: lib/sysinfo.c:235
+#: lib/sysinfo.c:261
msgid "Industrial range -30..70 C"
msgstr "Endüstriyel aralık -30..70 C"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "manual"
msgstr "kılavuz"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "notsupported"
msgstr "desteklenmiyor"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "dynamic"
msgstr "dinamik"
-#: lib/sysinfo.c:287
+#: lib/sysinfo.c:313
msgid "Manufacturer:"
msgstr "Üretici:"
-#: lib/sysinfo.c:293
+#: lib/sysinfo.c:319
msgid "Manufacturer ID:"
msgstr "Üretici ID:"
-#: lib/sysinfo.c:305
-#, c-format
+#: lib/sysinfo.c:331
msgid "Product Name:"
msgstr "Ürün Adı"
-#: lib/sysinfo.c:312
-#, c-format
+#: lib/sysinfo.c:338
msgid "Product ID:"
msgstr "Ürün ID:"
-#: lib/sysinfo.c:318
-#, c-format
+#: lib/sysinfo.c:344
msgid "Product Version:"
msgstr "Ürün Sürümü:"
-#: lib/sysinfo.c:326
+#: lib/sysinfo.c:352
#, c-format
msgid "PHYType: %s"
msgstr "PHYTürü: %s"
-#: lib/sysinfo.c:329
+#: lib/sysinfo.c:355
#, c-format
msgid "Temperature: %s"
msgstr "Sıcaklık: %s"
-#: lib/sysinfo.c:336
+#: lib/sysinfo.c:362
#, c-format
msgid "Regulation Domain: %s"
msgstr "Düzenleme Alanı: %s"
-#: lib/sysinfo.c:345
+#: lib/sysinfo.c:371
#, c-format
msgid "Transmit Power: %u mW"
msgstr "Geçiş süresi: %u mW"
-#: lib/sysinfo.c:375
-#, c-format
-msgid "WEP inplemented: %s"
+#: lib/sysinfo.c:401
+#, fuzzy, c-format
+msgid "WEP implemented: %s"
msgstr "WEP girildi: %s"
-#: lib/sysinfo.c:378
+#: lib/sysinfo.c:404
#, c-format
msgid "Diversity: %s"
msgstr "Çeşitleme: %s"
-#: lib/sysinfo.c:406
+#: lib/sysinfo.c:432
#, c-format
msgid "Uptime: %u:%02u:%02u.%02u"
msgstr "işlem süresi: %u:%02u:%02u.%02u"
-#: lib/sysinfo.c:422
+#: lib/sysinfo.c:448
#, c-format
msgid "IP Address: %s"
msgstr "IP Adresi: %s"
msgstr ""
#: lib/wlan.c:49
+msgid "[T] SIFS time (msec): "
+msgstr ""
+
+#: lib/wlan.c:50
msgid "[key] - set option; W - write conf; Q - quit to menu"
msgstr "(tuş) - seçenek kur; W - yapılandırmayı yaz; Q - menüye geri dön"
-#: lib/wlan.c:140
+#: lib/wlan.c:127
msgid "Short"
msgstr "Kısa"
-#: lib/wlan.c:140
+#: lib/wlan.c:127
msgid "Long"
msgstr "Uzun"
-#: lib/wlan.c:265
+#: lib/wlan.c:243
msgid "Wireless Settings"
msgstr "Kablosuz Ayarlar"
-#: lib/wlan.c:753
+#: lib/wlan.c:750
msgid "Antenna Configuration:"
msgstr "Anten Yapılandırması"
-#: lib/wlan.c:770
+#: lib/wlan.c:767
msgid "General Options"
msgstr "Genel Seçenekler"
-#: lib/wlan.c:772
+#: lib/wlan.c:769
msgid ""
"UIOPTY - antenna; SCANLEDFR1234 - options; W - write conf; Q - quit to menu"
msgstr ""
"UIOPTY - anten; SCANLEDFR1234 - seçenekler; W - yapılandırmayı yaz; Q - "
"menüye geri dön"
-#: src/ap-config.c:59
+#: src/ap-config.c:63
msgid "General"
msgstr "Genel"
-#: src/ap-config.c:59
+#: src/ap-config.c:63
msgid "Set general options"
msgstr "Genel seçenekleri kurunuz"
-#: src/ap-config.c:60
+#: src/ap-config.c:64
msgid "Advanced"
msgstr "Gelişmiş"
-#: src/ap-config.c:60
+#: src/ap-config.c:64
msgid "Set advanced options"
msgstr "Gelişmiş seçenekleri kurunuz"
-#: src/ap-config.c:94
+#: src/ap-config.c:97
msgid "Reset AP."
msgstr "AP'yi sıfırla"
-#: src/ap-config.c:129
+#: src/ap-config.c:131
msgid "Latest"
msgstr "Son haberler"
-#: src/ap-config.c:129
+#: src/ap-config.c:131
msgid "Get info about latest events"
msgstr "son gelişmeler hakkında bilgi edinin."
#: src/ap-mrtg.c:42
-#, c-format
msgid ""
"\n"
"Usage:\n"
"Kullanım:\n"
#: src/ap-mrtg.c:44
-#, fuzzy, c-format
+#, fuzzy
msgid ""
"\tap-mrtg -i ip -c community -t type [-b bssid] [-n name] [-a aptype] [-v] [-"
"h] [-r]\n"
"\n"
#: src/ap-mrtg.c:46
-#, c-format
msgid ""
"Get stats from AP and return it in MRTG parsable format\n"
"\n"
"\n"
#: src/ap-mrtg.c:47
-#, c-format
msgid "-i ip - AP ip address\n"
msgstr "-i ip - AP ip adresi\n"
#: src/ap-mrtg.c:48
-#, c-format
msgid "-c community - SNMP community string\n"
msgstr "-c topluluk - SNMP topluluk dizgisi\n"
#: src/ap-mrtg.c:50
-#, c-format
msgid ""
"-t type - statistics type <w>ireless, <e>thernet, associated <s>tations "
"or <l>ink quality in client mode\n"
"istasyonlar ya da kullanıcı kipinde bağlantı kalitesi\n"
#: src/ap-mrtg.c:52
-#, c-format
msgid ""
"-b bssid - mac address of the AP to which get link quality, only if "
"type=l\n"
"ise kullanılır\n"
#: src/ap-mrtg.c:53
-#, c-format
msgid "-n name - AP name - for check only\n"
msgstr ""
#: src/ap-mrtg.c:54
-#, c-format
msgid ""
"-a aptype - AP type - 410 (default) or 510 for ATMEL12350's, like the "
"ME-102\n"
msgstr ""
#: src/ap-mrtg.c:56
-#, c-format
msgid "-v - report MRTG about problems connecting to AP\n"
msgstr "-v - r AP ilişkili problemleri MRTG'ye aktar\n"
#: src/ap-mrtg.c:57
-#, c-format
msgid "-r - reset AP when getting LinkQuality stats\n"
msgstr ""
"-r - BağlantıKalitesi istatistiklerini alıp AP'yi yeniden başlat \n"
#: src/ap-mrtg.c:58
-#, c-format
msgid ""
"-h - print this help screen\n"
"\n"
"\n"
#: src/ap-mrtg.c:143
-#, c-format
msgid "Invalid IP-address\n"
msgstr "geçersiz IP-adresi\n"
msgid "Agent:v%d %s (%s@%s:%d) %s%s%s. SysUptime %d:%02d:%02d.%02d"
msgstr "Aracı:v%d %s (%s@%s:%d) %s%s%s. SistemİşlemSüresi %d:%02d:%02d.%02d"
+#: src/auth_mac.c:34
+#, fuzzy
+msgid "NUM MAC address"
+msgstr "NUM MAKRO adres"
+
#: src/bridge.c:36
msgid "[C] Configuration-enabled port(s): "
msgstr ""
msgid "[U] Isolate wireless clients (unicast traffic): "
msgstr ""
-#: src/bridge.c:137
+#: src/bridge.c:122
#, fuzzy
msgid "Both"
msgstr "Her İki Tür"
msgid "Error:"
msgstr "Hata"
-#: src/stations.c:113
+#: src/stations.c:31
+msgid " # MAC "
+msgstr ""
+
+#: src/stations.c:34
+msgid " # MAC Parent MAC RSSI Status MACn IP "
+msgstr ""
+
+#: src/stations.c:187
+#, fuzzy
+msgid ""
+"Arrows - scroll; S - save to file; Q - return; T - toggle view; Other key - "
+"refresh"
+msgstr "Oklar - kaydırma; S - dosyaya kaydet; Q - menüye geri dön"
+
+#: src/stations.c:190
#, fuzzy
-msgid "Id MAC address"
-msgstr "Id MAC adresi"
+msgid "Arrows - scroll; S - save to file; Q - return; Other key - refresh"
+msgstr "Oklar - kaydırma; S - dosyaya kaydet; Q - menüye geri dön"
-#: src/stations.c:223 src/stations.c:307
+#: src/stations.c:275 src/stations.c:358
msgid "Associated stations"
msgstr "İlişkili istasyonlar"
-#: src/stations.c:225
+#: src/stations.c:277
#, fuzzy
msgid "Id MAC address Quality Age RSSI"
msgstr "Id MAC adresi Kalite Yükseltme RSSI"
+#~ msgid "Unable to get data from AP. Press Q to continue."
+#~ msgstr "AP'den veri alınamıyor. Devam etmek için Q'ya basınız."
+
+#~ msgid "Q - quit to menu."
+#~ msgstr "Q - menüye dönüş"
+
+#~ msgid "pipe error. Press any key."
+#~ msgstr "ardışık hata. Bir tuşa basınız."
+
+#~ msgid "fork error. Press any key."
+#~ msgstr "çatal hata. Bir tuşa basınız."
+
+#~ msgid "pipe error. Press any key"
+#~ msgstr "ardışık hata. Bir tuşa basınız."
+
+#~ msgid "fcntl error. Press any key"
+#~ msgstr "fcntl hatası. Bir tuşa basınız"
+
+#~ msgid "fork error. Press any key"
+#~ msgstr "çatal hata. Bir tuşa basınız"
+
+#, fuzzy
+#~ msgid "Id MAC address"
+#~ msgstr "Id MAC adresi"
+
#~ msgid "on"
#~ msgstr "açma"
msgid ""
msgstr ""
"Project-Id-Version: ap-utils 1.4.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-22 15:06+0300\n"
+"POT-Creation-Date: 2004-11-14 22:46+0200\n"
"PO-Revision-Date: 2004-02-27 00:44+0200\n"
"Last-Translator: Roman Festchook <roma@polesye.net>\n"
"Language-Team: UK <roma@polesye.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=koi8-u\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
-#: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:46 src/bridge.c:222
+#: ap-gl/ap-gl.c:47 ap-gl/bridge.c:179 src/ap-config.c:50 src/bridge.c:184
msgid "Bridging"
msgstr "íÏÓÔ"
-#: ap-gl/ap-gl.c:47 src/ap-config.c:46
+#: ap-gl/ap-gl.c:47 src/ap-config.c:50
msgid "Set bridging and IP-related options"
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÏÐæ§ ÍÏÓÔÁ ÔÁ ¶ò ÐÒÏÔÏËÏÌÕ"
-#: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:48
-#: src/ap-config.c:118 src/ap-config.c:127 src/bridge.c:135 src/bridge.c:139
+#: ap-gl/ap-gl.c:49 ap-gl/ap-gl.c:85 ap-gl/bridge.c:133 src/ap-config.c:52
+#: src/ap-config.c:120 src/ap-config.c:129 src/bridge.c:120 src/bridge.c:124
msgid "Wireless"
msgstr "òÁĦÏ"
-#: ap-gl/ap-gl.c:49 src/ap-config.c:48
+#: ap-gl/ap-gl.c:49 src/ap-config.c:52
msgid "Set wireless options"
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÐÁÒÁÍÅÔÒÉ ÒÁĦÏÍÅÒÅÖ¦"
-#: ap-gl/ap-gl.c:50 src/ap-config.c:49 src/ap-config.c:61
+#: ap-gl/ap-gl.c:50 src/ap-config.c:53 src/ap-config.c:65
msgid "Privacy"
msgstr "ûÉÆÒÕ×ÁÎÎÑ"
-#: ap-gl/ap-gl.c:51 src/ap-config.c:50 src/ap-config.c:62
+#: ap-gl/ap-gl.c:51 src/ap-config.c:54 src/ap-config.c:66
msgid "MAC auth"
msgstr "íáó ÄÏÓÔÕÐ"
-#: ap-gl/ap-gl.c:52 src/ap-config.c:51 src/ap-config.c:63
+#: ap-gl/ap-gl.c:52 src/ap-config.c:55 src/ap-config.c:67
msgid "Community"
msgstr "ëÏÍ'ÀΦԦ"
-#: ap-gl/ap-gl.c:53 src/ap-config.c:52
+#: ap-gl/ap-gl.c:53 src/ap-config.c:56
msgid "Radio"
msgstr "ðÅÒÅÄÁ×ÁÞ"
-#: ap-gl/ap-gl.c:53 src/ap-config.c:52
+#: ap-gl/ap-gl.c:53 src/ap-config.c:56
msgid "Set radio signal power and antenna options"
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÐÏÔÕÖΦÓÔØ ÐÅÒÅÄÁ×ÁÞÁ ÔÁ ÁÎÔÅÎÉ"
-#: ap-gl/ap-gl.c:66 src/ap-config.c:83
+#: ap-gl/ap-gl.c:66 src/ap-config.c:87
msgid "Upload"
msgstr "úÁ×ÁÎÔÁÖÉÔÉ"
-#: ap-gl/ap-gl.c:66 src/ap-config.c:83
+#: ap-gl/ap-gl.c:66 src/ap-config.c:87
msgid "Make current configuration active"
msgstr "úÒÏÂÉÔÉ ÐÏÔÏÞÎÕ ËÏÎƦÇÕÒÁæÀ ÁËÔÉ×ÎÏÀ"
-#: ap-gl/ap-gl.c:67 src/ap-config.c:84
+#: ap-gl/ap-gl.c:67 src/ap-config.c:88
msgid "Defaults"
msgstr "æÁÂÒ¦ÞΦ"
-#: ap-gl/ap-gl.c:67 src/ap-config.c:84
+#: ap-gl/ap-gl.c:67 src/ap-config.c:88
msgid "Restore factory default settings"
msgstr "÷¦ÄÎÏ×ÉÔÉ ÆÁÂÒ¦ÞΦ ÎÁÓÔÒÏÊËÉ."
-#: ap-gl/ap-gl.c:69 src/ap-config.c:86 src/ap-config.c:94
+#: ap-gl/ap-gl.c:69 src/ap-config.c:89 src/ap-config.c:97
msgid "Reset"
msgstr "òÅÓÔÁÒÔ"
-#: ap-gl/ap-gl.c:70 src/ap-config.c:87
+#: ap-gl/ap-gl.c:70 src/ap-config.c:90
msgid "Reset AP. All not uploaded configuration will be lost"
msgstr "ðÅÒÅÚÁ×ÁÎÔÁÖÉÔÉ áò. îÅÁËÔÉצÚÏ×ÁΦ ÚͦÎÉ Õ ËÏÎƦÇÕÒÁæ§ ÂÕÄÁ ×ÔÒÁÞÅÎÏ."
-#: ap-gl/ap-gl.c:72 src/ap-config.c:89
+#: ap-gl/ap-gl.c:72 src/ap-config.c:92
msgid "TestMode"
msgstr "ôÅÓÔ"
-#: ap-gl/ap-gl.c:72 src/ap-config.c:89
+#: ap-gl/ap-gl.c:72 src/ap-config.c:92
msgid "Put Access Point in test mode"
msgstr "ðÏÓÔÁ×ÉÔÉ áò Õ ÔÅÓÔÏ×ÉÊ ÒÅÖÉÍ"
-#: ap-gl/ap-gl.c:83 src/ap-config.c:116 src/ap-config.c:126
+#: ap-gl/ap-gl.c:83 src/ap-config.c:118 src/ap-config.c:128
msgid "SysInfo"
msgstr "óÉÓÔÅÍÁ"
-#: ap-gl/ap-gl.c:84 ap-gl/bridge.c:132 src/ap-config.c:117 src/bridge.c:134
-#: src/bridge.c:138
+#: ap-gl/ap-gl.c:84 ap-gl/bridge.c:132 src/ap-config.c:119 src/bridge.c:119
+#: src/bridge.c:123
msgid "Ethernet"
msgstr "åÚÅÒÎÅÔ"
-#: ap-gl/ap-gl.c:84 src/ap-config.c:117
+#: ap-gl/ap-gl.c:84 src/ap-config.c:119
msgid "Get ethernet port statistics"
msgstr "ïÔÒÉÍÁÔÉ ÓÔÁÔÉÓÔÉËÕ ÅÚÅÒÎÅÔ ÐÏÒÔÕ"
-#: ap-gl/ap-gl.c:86 src/ap-config.c:119 src/ap-config.c:128
+#: ap-gl/ap-gl.c:86 src/ap-config.c:121 src/ap-config.c:130
msgid "Stations"
msgstr "óÔÁÎæ§"
-#: ap-gl/ap-gl.c:88 src/ap-config.c:121
+#: ap-gl/ap-gl.c:88 src/ap-config.c:123
msgid "KnownAPs"
msgstr "÷¦ÄÏͦôÏÞËÉ"
-#: ap-gl/ap-gl.c:88 src/ap-config.c:121
+#: ap-gl/ap-gl.c:88 src/ap-config.c:123
msgid "Get info about known Access Points"
msgstr "ïÔÒÉÍÁÔÉ ¦ÎÆÏÒÍÁÃÉÀ ÐÒÏ ×¦ÄÏͦ ôÏÞËÉ äÏÓÔÕÐÕ"
-#: ap-gl/ap-gl.c:105 src/ap-config.c:154
+#: ap-gl/ap-gl.c:105 src/ap-config.c:156
msgid "Info"
msgstr "¶ÎÆÏÒÍÁæÑ"
-#: ap-gl/ap-gl.c:106 src/ap-config.c:155
+#: ap-gl/ap-gl.c:106 src/ap-config.c:157
msgid "Config"
msgstr "õÓÔÁÎÏ×ËÉ"
-#: ap-gl/ap-gl.c:107 src/ap-config.c:156
+#: ap-gl/ap-gl.c:107 src/ap-config.c:158
msgid "Commands"
msgstr "ëÏÍÁÎÄÉ"
-#: ap-gl/ap-gl.c:107 src/ap-config.c:156
+#: ap-gl/ap-gl.c:107 src/ap-config.c:158
msgid "Execute commands on Access Point"
msgstr "÷ÉËÏÎÁÔÉ ËÏÍÁÎÄÉ ÎÁ áò"
-#: ap-gl/ap-gl.c:109 src/ap-config.c:158
+#: ap-gl/ap-gl.c:109 src/ap-config.c:160
msgid "Connect"
msgstr "ú'¤ÄÎÁÎÎÑ"
-#: ap-gl/ap-gl.c:110 src/ap-config.c:159
+#: ap-gl/ap-gl.c:110 src/ap-config.c:161
msgid "Search"
msgstr "ðÏÛÕË"
-#: ap-gl/ap-gl.c:111 lib/common.c:52 src/ap-config.c:160
+#: ap-gl/ap-gl.c:111 lib/common.c:58 src/ap-config.c:162
msgid "About"
msgstr "ðÒÏÇÒÁÍÁ"
-#: ap-gl/ap-gl.c:112 src/ap-config.c:161
+#: ap-gl/ap-gl.c:112 src/ap-config.c:163
msgid "Shell"
msgstr "ïÂÏÌÏÎËÁ"
-#: ap-gl/ap-gl.c:113 src/ap-config.c:162
+#: ap-gl/ap-gl.c:113 src/ap-config.c:164
msgid "Exit"
msgstr "÷ÉȦÄ"
-#: ap-gl/ap-gl.c:162 src/ap-config.c:211
+#: ap-gl/ap-gl.c:162 src/ap-config.c:212
#, c-format
msgid "Wireless Access Point Configurator ver. %s"
msgstr "ëÏÎƦÇÕÒÁÔÏÒ ÔÏÞËÉ ÄÏÓÔÕÐÕ ÒÁĦÏÍÅÒÅÖ¦ ×ÅÒ. %s"
msgid "Authorized MAC addresses"
msgstr "á×ÔÏÒÉÚÏ×ÁΦ íáó ÁÄÒÅÓÉ"
-#: ap-gl/auth_mac.c:34 src/auth_mac.c:34
+#: ap-gl/auth_mac.c:34
msgid "NUM MAC address"
msgstr "# íáó ÁÄÒÅÓÁ"
msgid "INGFPDOMSCTRBU - set; W - write conf; Q - quit to menu"
msgstr "INGFPDOMSCTRBU - ×ÓÔÁÎÏ×ÉÔÉ; W - ÚÁÐÉÓÁÔÉ; Q - ×ÉÊÔÉ"
-#: ap-gl/bridge.c:125 src/bridge.c:127
+#: ap-gl/bridge.c:125 src/bridge.c:112
msgid "Wireless Bridge Point to MultiPoint"
msgstr "òÁĦÏÍÏÓÔ ÔÏÞËÁ-ÂÁÇÁÔÏÔÏÞËÁ"
-#: ap-gl/bridge.c:126 src/bridge.c:128
+#: ap-gl/bridge.c:126 src/bridge.c:113
msgid "Access Point"
msgstr "âÁÚÏ×Á ÓÔÁÎæÑ"
-#: ap-gl/bridge.c:127 src/bridge.c:129
+#: ap-gl/bridge.c:127 src/bridge.c:114
msgid "Access Point client"
msgstr "ë̦¤ÎÔÓØËÁ ÓÔÁÎæÑ"
-#: ap-gl/bridge.c:128 src/bridge.c:130
+#: ap-gl/bridge.c:128 src/bridge.c:115
msgid "Wireless Bridge Point to Point"
msgstr "òÁĦÏÍÏÓÔ ÔÏÞËÁ-ÔÏÞËÁ"
-#: ap-gl/bridge.c:129 src/bridge.c:131
+#: ap-gl/bridge.c:129 src/bridge.c:116
msgid "Repeater"
msgstr "ðÏ×ÔÏÒÀ×ÁÞ"
msgid "Associated Stations"
msgstr "áÓÏæÊÏ×ÁΦ ÓÔÁÎæ§"
-#: ap-gl/stations.c:83 src/stations.c:87
-msgid "AP now in AP Client Mode and don't has any associated stations"
+#: ap-gl/stations.c:80 src/stations.c:96
+#, fuzzy
+msgid "AP is currently in AP Client Mode => no associated STAtions."
msgstr "îÅÍÁ¤ ЦÄ'¤ÄÎÁÎÉÈ ÓÔÁÎÃ¦Ê - ôÏÞËÁ äÏÓÔÕÐÕ Õ ÒÅÖÉͦ Ë̦¤ÎÔÁ"
-#: ap-gl/stations.c:109
-msgid "# MAC LQ RSSI Status Port IP"
+#: ap-gl/stations.c:105
+#, fuzzy
+msgid "# MAC LQ RSSI Status Port IP"
msgstr "# MAC LQ RSSI óÔÁÔ ðÏÒÔ IP"
-#: ap-gl/stations.c:135 src/stations.c:139
+#: ap-gl/stations.c:131 src/stations.c:155
msgid "AssociatedSTAsInfo packet error"
msgstr "ðÏÍÉÌËÏ×ÉÊ ÐÁËÅÔ AssociatedSTAsInfo."
-#: ap-gl/stations.c:164 src/stations.c:161 src/stations.c:313
+#: ap-gl/stations.c:160 src/stations.c:364
msgid "Arrows - scroll; S - save to file; Q - quit to menu."
msgstr "óÔÒ¦ÌËÉ - ÐÒÏËÒÕÔËÁ; S - ÚÂÅÒÅÇÔÉ Õ ÆÁÊÌ; Q - ×ÉÊÔÉ × ÍÅÎÀ."
msgid "Known Access Points"
msgstr "÷¦ÄÏͦ ÔÏÞËÉ ÄÏÓÔÕÐÕ"
-#: lib/aps.c:217
+#: lib/aps.c:219
msgid "NetworkType"
msgstr "ôÉÐ ÍÅÒÅÖ¦"
-#: lib/aps.c:293
+#: lib/aps.c:295
msgid "Infrastructure"
msgstr "¶ÎÆÒÁÓÔÒÕËÔÕÒÁ"
-#: lib/aps.c:352 lib/aps.c:360 lib/aps.c:368
+#: lib/aps.c:355 lib/aps.c:363 lib/aps.c:371
msgid "CN: Channel Name; P: Preambule Type (S: Short; L: Long);"
msgstr "CN: ëÁÎÁÌ; P: ôÉÐ ÐÒÅÁÍÂÕÌÉ (S: ëÏÒÏÔËÁ; L: äÏ×ÇÁ)"
-#: lib/aps.c:354
-msgid "RSSI: Radio Signal Strength Indicator [%];"
+#: lib/aps.c:357
+#, fuzzy
+msgid "RSSI: Radio Signal Strength Indicator [%]"
msgstr "RSSI: ¶ÎÄÉËÁÔÏÒ ÐÏÔÕÖÎÏÓÔ¦ ÓÉÇÎÁÌÕ [%];"
-#: lib/aps.c:356 lib/aps.c:364
-msgid "LQ: Link Quality [%]"
+#: lib/aps.c:359 lib/aps.c:367
+#, fuzzy
+msgid "; LQ: Link Quality [%]"
msgstr "LQ: ñ˦ÓÔØ Ú'¤ÄÎÁÎÎÑ [%]"
-#: lib/aps.c:362
-msgid "RSSI: Radio Signal Strength Indicator [dBm];"
+#: lib/aps.c:365
+#, fuzzy
+msgid "RSSI: Radio Signal Strength Indicator [dBm]"
msgstr "RSSI: ¶ÎÄÉËÁÔÏÒ ÐÏÔÕÖÎÏÓÔ¦ ÓÉÇÎÁÌÕ [dBm];"
-#: lib/aps.c:370
-msgid "RSSI: Radio Signal Strength Indicator [raw];"
+#: lib/aps.c:373
+#, fuzzy
+msgid "RSSI: Radio Signal Strength Indicator [raw]"
msgstr "RSSI: ¶ÎÄÉËÁÔÏÒ ÐÏÔÕÖÎÏÓÔ¦ ÓÉÇÎÁÌÕ [ÎÅÏÂÒÏÂÌÅÎÅ];"
-#: lib/aps.c:372
-msgid "LQ: Link Quality [raw]"
-msgstr "LQ: ñ˦ÓÔØ Ú'¤ÄÎÁÎÎÑ [ÎÅÏÂÒÏÂÌÅÎÅ]"
+#: lib/aps.c:375
+msgid "; LQ: Link Q. [raw]"
+msgstr "; LQ: ñ˦ÓÔØ Ì¦ÎËÕ [ÎÅÏÂÒÏÂÌÅÎÅ]"
-#: lib/aps.c:378
+#: lib/aps.c:381
+#, fuzzy
msgid ""
-"# con. to this AP; R refresh with reset; S refresh w/o reset; T toggle; Q "
-"quit"
+"# con. to AP #; R refresh with reset; T toggle; Q quit; Other = refr. w/o "
+"reset"
msgstr ""
"# ÐÒɤÄÎÁÔÉÓÑ ÄÏ áò; R ÐÅÒÅÚÁ×ÁÎÔÁÖÉÔÉ; S ÐÏÎÏ×ÉÔÉ; T ÐÅÒÅÍËÎÕÔÉ; Q ×ÉÊÔÉ"
-#: lib/aps.c:380
+#: lib/aps.c:383
+#, fuzzy
msgid ""
-"# con. to this AP; R initiate AP scan; S refresh view; T toggle view; Q quit"
+"# con. to AP #; R initiate AP scan; T toggle view; Q quit; Other = refresh "
+"view"
msgstr ""
"# ÐÒɤÄÎÁÔÉÓÑ ÄÏ áò; R ÚÁÐÕÓÔÉÔÉ ÐÏÛÕË; S ÐÏÎÏ×ÉÔÉ; T ÐÅÒÅÍËÎÕÔÉ; Q ×ÉÊÔÉ"
-#: lib/aps.c:509 lib/ap_search.c:153
+#: lib/aps.c:512 lib/ap_search.c:164
#, c-format
msgid "Failure in sendto(): %s. Press any key."
msgstr "îÅ×iÒÎÉÊ sendto: %s. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
-#: lib/aps.c:518
+#: lib/aps.c:521
msgid "You have just initiated the AP scan. Be advised that it may"
msgstr "÷É ÚÁÐÕÓÔÉÌÉ ÓËÁÎÕ×ÁÎÎÑ ÄÌÑ ÐÏÛÕËÕ ÔÏÞÏË ÄÏÓÔÕÐÕ. ãÅ ÍÏÖÅ"
-#: lib/aps.c:521
+#: lib/aps.c:524
msgid "take a few seconds for your Access Point to find out some"
msgstr "ÚÁÊÎÑÔÉ ÄÅ˦ÌØËÁ ÓÅËÕÎÄ ÄÏËÉ ×ÁÛÁ ÔÏÞËÁ ÄÏÓÔÕÐÕ ÚÎÁÊÄÅ"
-#: lib/aps.c:524
+#: lib/aps.c:527
msgid "values, so expect finishing the scan in about 5 seconds."
msgstr ""
"ÎÅÏÂȦÄΦ ÄÁÎΦ, ÔÏÖ ÒÁÚÒÁÈÏ×ÕÊÔÅ ÎÁ ÚÁ×ÅÒÛÅÎΦ ÓËÁÎÕ×ÁÎÎÑ ÚÁ 5 ÓÅËÕÎÄ."
-#: lib/aps.c:527
+#: lib/aps.c:530
msgid "Also note that your Access Point stops forwarding the network"
msgstr "ôÁËÖ ÚÁÕ×ÁÖÔÅ, ÝÏ ÷ÁÛÁ ÔÏÞËÁ ÄÏÓÔÕÐÕ ÐÒÉÐÉÎѤ ÐÅÒÅÄÁ×ÁÔÉ"
-#: lib/aps.c:530
+#: lib/aps.c:533
msgid "traffic while the scan is in progress, but restores itself"
msgstr "ÍÅÒÅÖÅ×ÉÊ ÔÒÁÆ¦Ë ÐÒÉ ÓËÁÎÕ×ÁÎΦ, ÔÁ צÄÎÏ×ÌÀ¤ ÓÅÂÅ Õ ÎÏÒÍÁÌØÎÉÊ"
-#: lib/aps.c:533
+#: lib/aps.c:536
msgid "to normal operation in time ranging up to 1 minute."
msgstr "ÒÅÖÉÍ ÒÁÂÏÔÉ ÐÒÉÂÌÉÚÎÏ ÚÁ È×ÉÌÉÎÕ."
-#: lib/aps.c:536
+#: lib/aps.c:539
msgid "Hence, if you are connected to target Access Point via its"
msgstr "ôÁËÏÖ, ÑËÝÏ ÷É Ð¦Ä'¤ÄÎÁΦ ÄÏ Ã¦ÏÌØÏ×ϧ ÔÏÞËÉ ÄÏÓÔÕÐÕ ÞÅÒÅÚ §§"
-#: lib/aps.c:539
+#: lib/aps.c:542
msgid "wireless port, you need to wait a bit longer"
msgstr "ÒÁÄ¦Ï ÐÏÒÔ, ÔÏ ÷ÁÍ ÐÏÔÒ¦ÂÎÏ ÚÁÖÄÁÔÉ ÔÒÏÈÉ ÄÏ×ÛÅ "
-#: lib/aps.c:542
+#: lib/aps.c:545
msgid "after pressing 'S'."
msgstr "ЦÓÌÑ ÎÁÔÉÓËÁÎÎÑ 'S'."
#: lib/ap_search.c:50
-msgid "# Type IP Description"
+#, fuzzy
+msgid " # Type IP Name"
msgstr "# ôÉÐ IP ïÐÉÓ"
-#: lib/ap_search.c:89
+#: lib/ap_search.c:99
msgid "Please wait while scanning, or press 'Q' to quit."
msgstr "úÁÞÅËÁÊÔÅ ÐÏËÉ ÊÄÅ ÐÏÛÕË ÁÂÏ ÎÁÔÉÓΦÔØ 'Q' ÄÌÑ ×ÉÈÏÄÕ. "
-#: lib/ap_search.c:105
+#: lib/ap_search.c:115
msgid "Can't set broadcast option on socket. Press any key."
msgstr ""
"îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ ÂÒÏÁÄËÁÓÔÏ×ÉÊ ÓÏËÅÔ. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
-#: lib/ap_search.c:114
+#: lib/ap_search.c:124
msgid "Can't set multicast membership on socket. Press any key."
msgstr "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ ÍÕÌØÔÉËÁÓÔÏ×ÉÊ ÓÏËÅÔ. ðÒÏÄÏ×ÖÅÎÎÑ ÂÕÄØ ÑËÁ ËÌÁצÛÁ."
-#: lib/ap_search.c:120
+#: lib/ap_search.c:131
msgid "Scanning via network interface:"
msgstr "ûÕËÁ¤ÍÏ ÞÅÒÅÚ ÍÅÒÅÖÅ×ÉÊ ¦ÎÔÅÒÆÅÊÓ:"
-#: lib/ap_search.c:121
+#: lib/ap_search.c:132
#, c-format
msgid " Index: %i"
msgstr " ¶ÎÄÅËÓ: %i"
-#: lib/ap_search.c:123
+#: lib/ap_search.c:134
#, c-format
msgid " Name: %s"
msgstr " ¶Í'Ñ: %s"
-#: lib/ap_search.c:125
+#: lib/ap_search.c:136
#, c-format
msgid " IP: %s"
msgstr " IP: %s"
-#: lib/ap_search.c:134
+#: lib/ap_search.c:145
#, c-format
msgid "Scanning for AP type: %s"
msgstr "÷ÉÚÎÁÞÁÀ ÔÉÐ áò: %s"
-#: lib/ap_search.c:312
+#: lib/ap_search.c:327
msgid "Access Points Search"
msgstr "ðÏÛÕË ÔÏÞÏË ÄÏÓÔÕÐÕ"
-#: lib/ap_search.c:329
+#: lib/ap_search.c:345
msgid "realloc() error."
msgstr "ðÏÍÉÌËÁ realloc()."
-#: lib/ap_search.c:341
+#: lib/ap_search.c:357
msgid "Network interface discovery error."
msgstr "ðÏÍÉÌËÁ ×ÉÚÎÁÞÅÎÎÑ ÍÅÒÅÖÅ×ÉÈ ¦ÎÔÅÒÆÅÊÓ¦×."
-#: lib/ap_search.c:416
+#: lib/ap_search.c:432
msgid "No local network interfaces found. Press any key."
msgstr "îÅ ÚÎÁÊÄÅÎÏ ÍÅÒÅÖÅ×ÉÈ ¦ÎÔÅÒÆÅÊÓ¦×. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
-#: lib/ap_search.c:418
+#: lib/ap_search.c:434
msgid "No directly reachable Access Points found. Press any key."
msgstr "îÅ ÚÎÁÊÄÅÎÏ ÄÏÓÔÕÐÎÉÈ ÎÁÐÒÑÍÕ áò. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
-#: lib/ap_search.c:422
-msgid "Program-hardcoded maximum number of APs found."
+#: lib/ap_search.c:439
+#, fuzzy
+msgid "Single-screen maximum number of APs found."
msgstr "úÎÁÊÄÅÎÏ ÍÁËÓÉÍÁÌØÎÕ ÄÌÑ ÐÒÏÇÒÁÍÉ Ë¦ÌØ˦ÓÔØ áò."
-#: lib/ap_search.c:426
+#: lib/ap_search.c:442
msgid "# - connect to AP; Q - quit"
msgstr "# - ЦÄ'¤ÄÎÁÔÉÓÑ ÄÏ AP; Q - ×ÉÊÔÉ"
msgstr "îÅ ÍÏÖÕ ÚÁÐÉÓÁÔÉ ÄÁÎΦ × áò. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
#: lib/ap-utils.h:100
-msgid "Unable to retrieve data from AP. Press any key to continue."
+#, fuzzy
+msgid "Unable to retrieve (valid) data from AP. Press any key to continue."
msgstr "îÅ ÍÏÖÕ ÏÔÒÉÍÁÔÉ ÄÁÎΦ Ú áò. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
#: lib/ap-utils.h:101
msgstr "ðÁÒÏÌØ (ËÏÍ`ÀΦԦ): "
#: lib/common.c:33
+msgid "Access Point name: "
+msgstr "¶Í'Ñ áò: "
+
+#: lib/common.c:34
+#, fuzzy
+msgid "Do you want to define name for this AP? "
+msgstr "âÁÖÁ¤ÔÅ ÐÒÏÄÏ×ÖÉÔÉ? "
+
+#: lib/common.c:35
msgid "AP type: "
msgstr "ôÉÐ áò: "
-#: lib/common.c:34
+#: lib/common.c:36
msgid "Save connect-settings: "
msgstr "úÂÅÒÅÇÔÉ Ã¦ ÐÁÒÁÍÅÔÒÉ: "
-#: lib/common.c:69
+#: lib/common.c:75
#, c-format
msgid "From %s"
msgstr "Ú %s"
-#: lib/common.c:71
+#: lib/common.c:77
#, c-format
msgid "Version %s"
msgstr "÷ÅÒÓ¦Ñ %s"
-#: lib/common.c:74
+#: lib/common.c:80
msgid "Written by Roman Festchook roma@polesye.net"
msgstr "á×ÔÏÒ òÏÍÁÎ æÅÝÕË roma@polesye.net"
-#: lib/common.c:76
+#: lib/common.c:82
msgid "Copyright (c) Roman Festchook 2001-2004"
msgstr "Copyright (c) òÏÍÁÎ æÅÝÕË 2001-2004"
-#: lib/common.c:79
+#: lib/common.c:85
msgid "This program is distributed under the terms"
msgstr "ãÑ ÐÒÏÇÒÁÍÁ ÒÏÚÐÏ×ÓÀÄÖÕ¤ÔØÓÑ ÎÁ ÕÍÏ×ÁÈ"
-#: lib/common.c:81
+#: lib/common.c:87
msgid "of the GNU General Public License version 2."
msgstr "GNU úÁÇÁÌØÎϧ ðÕÂ̦ÞÎϧ ì¦ÃÅÎÚ¦§ ×ÅÒÓ¦§ 2"
-#: lib/common.c:83
+#: lib/common.c:89
msgid "See the included COPYING file for details."
msgstr "ÄÌÑ ¦ÎÆÏÒÍÁæ§ ÄÉצÔØÓÑ ÆÁÊÌ COPYING"
msgid "Entered characters will not be displayed for security reason."
msgstr "÷×ÅÄÅΦ ÓÉÍ×ÏÌÉ ÎŠצÄÏÂÒÁÖÕÀÔØÓÑ Ú Í¦ÒËÕ×ÁΦ ÂÅÚÐÅËÉ."
-#: lib/common.c:171
+#: lib/common.c:157
+#, fuzzy
+msgid "Display name for the Access point (NOT the name defined inside the AP!)"
+msgstr "¶Í'Ñ ÔÏÞËÉ ÄÏÓÔÕÐÕ"
+
+#: lib/common.c:187
msgid "Determining AP type. Please wait..."
msgstr "÷ÉÚÎÁÞÁÀ ÔÉÐ áò - ÚÁÖĦÔØ ÂÕÄØ ÌÁÓËÁ..."
-#: lib/common.c:196
+#: lib/common.c:272
msgid "Unable to determine AP type (no response). Press any key."
msgstr ""
"îÅ ÍÏÖÕ ×ÉÚÎÁÞÉÔÉ ÔÉÐ áò (ΊצÄÐÏצÄÁ¤). âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ"
-#: lib/file.c:176
-msgid "NUM IP ADDRESS TYPE"
-msgstr " # IP áäòåóá ôéð"
+#: lib/file.c:194
+#, fuzzy
+msgid "NUM IP ADDRESS TYPE NAME (in ~/.ap-config)"
+msgstr " # IP áäòåóá ôéð ¶í'ñ"
-#: lib/file.c:177
+#: lib/file.c:195
msgid "Choose an AP to connect to"
msgstr "÷ÉÂÅÒ¦ÔØ áò ÄÌÑ Ú`¤ÄÎÁÎÎÑ"
-#: lib/file.c:182
+#: lib/file.c:200
msgid "1-9,C: connect; N: new; D: delete; W: save; Q: quit; arrows: scroll"
msgstr ""
"1-9,C Ú`¤ÄÎÁÎÎÑ; N ÎÏ×ÉÊ; D ×ÉÄÁÌÉÔÉ; W ÚÂÅÒÅÇÔÉ; Q ×ÉÊÔÉ; ÓÔÒ¦ÌËÉ ÐÒÏËÒÕÔËÁ"
-#: lib/file.c:225
+#: lib/file.c:257
msgid "Connect to AP num:"
msgstr "ú`ÜÄÎÁÔÉÓÑ Ú áò #:"
-#: lib/file.c:250
+#: lib/file.c:293
msgid "Delete num:"
msgstr "÷ÉÄÁÌÉÔÉ #:"
msgstr ""
"úÎÁÞÅÎÎÑ ÍÁ¤ ÂÕÔÉ Õ ÄÉÁÐÁÚÏΦ %i - %i. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ"
-#: lib/oui.c:6052
+#: lib/oui.c:6056
msgid "Unknown or Private"
msgstr "îÅצÄÏÍÉÊ ÁÂÏ ÐÒÉ×ÁÔÎÉÊ"
msgid "[R] Right:"
msgstr "[R] ðÒÁ×Á"
-#: lib/radio.c:114
+#: lib/radio.c:121
msgid "Radio Configuration"
msgstr "ëÏÎƦÇÕÒÁÃ¦Ñ ÒÁĦÏÐÅÒÅÄÁ×ÁÞÁ"
-#: lib/radio.c:115
+#: lib/radio.c:122
msgid "Output RF signal power level (CR31 register values)"
msgstr "ò¦×ÅÎØ ×ÉȦÄÎÏÇÏ ÒÁĦÏÓÉÇÎÁÌÕ (ÚÎÁÞÅÎÎÑ ÒÅǦÓÔÒÕ CR31)"
-#: lib/radio.c:117
+#: lib/radio.c:124
msgid "Key Channel Level"
msgstr "# ËÁÎÁÌ Ò¦×ÅÎØ"
-#: lib/radio.c:273
+#: lib/radio.c:280
msgid ""
"You can't disable both antennas; unable to save antenna-config. Press any "
"key."
msgstr "÷É ÎÅ ÍÏÖÅÔÅ ×ÉÍËÎÕÔÉ ÏÂÉÄצ ÁÎÔÅÎÉ. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
-#: lib/scr.c:134
+#: lib/scr.c:203
#, c-format
msgid "Current AP: %s Type: %s"
msgstr "ðÏÔÏÞÎÉÊ ÐÒÉÓÔÒ¦Ê: %s ôÉÐ: %s"
msgid "[M] Manufacturer"
msgstr "[M] ÷ÉÒÏÂÎÉË"
-#: lib/stat.c:29
-msgid "Unable to get data from AP. Press Q to continue."
-msgstr "îÅ ÍÏÖÕ ÏÔÒÉÍÁÔÉ ÄÁÎΦ Ú áò. îÁÔÉÓΦÔØ Q ÄÌÑ ×ÉÈÏÄÕ"
-
-#: lib/stat.c:30 lib/stat.c:428
-msgid "Q - quit to menu."
-msgstr "Q - ×ÉÊÔÉ × ÍÅÎÀ"
+#: lib/stat.c:30
+msgid "Q - quit to menu. Other key - force update."
+msgstr ""
#: lib/stat.c:31
-msgid "pipe error. Press any key."
-msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ pipe. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
-
-#: lib/stat.c:32
-msgid "fcntl error. Press any key."
+#, fuzzy
+msgid "select() function error. Press any key."
msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ fcntl. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
-#: lib/stat.c:33
-msgid "fork error. Press any key."
-msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ fork. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
-
-#: lib/stat.c:72
+#: lib/stat.c:61
msgid "Ethernet Statistics"
msgstr "óÔÁÔÉÓÔÉËÁ ÅÚÅÒÎÅÔ ÐÏÒÔÕ"
-#: lib/stat.c:108
-msgid "EthRxStat packet error. Press Q to continue."
+#: lib/stat.c:92
+#, fuzzy
+msgid "EthRxStat packet error. Press any key."
msgstr "ðÏÍÉÌËÏ×ÉÊ ÐÁËÅÔ EthRxStat. îÁÔÉÓΦÔØ Q ÄÌÑ ×ÉÈÏÄÕ."
-#: lib/stat.c:120
-msgid "EthTxStat packet error. Press Q to continue."
+#: lib/stat.c:105
+#, fuzzy
+msgid "EthTxStat packet error. Press any key."
msgstr "ðÏÍÉÌËÏ×ÉÊ ÐÁËÅÔ EthTxStat. îÁÔÉÓΦÔØ Q ÄÌÑ ×ÉÈÏÄÕ."
-#: lib/stat.c:123
+#: lib/stat.c:109
msgid "Received:"
msgstr "ðÒÉÊÎÑÔÏ:"
-#: lib/stat.c:124
+#: lib/stat.c:110
msgid "Transmitted:"
msgstr "ðÅÒÅÄÁÎÏ:"
-#: lib/stat.c:251 lib/stat.c:427
+#: lib/stat.c:235 lib/stat.c:425
msgid "Wireless Statistics"
msgstr "óÔÁÔÉÓÔÉËÁ ÒÁĦÏÐÏÒÔÕ"
-#: lib/stat.c:282
-msgid "WirelessStat packet error. Press Q to continue."
+#: lib/stat.c:265
+#, fuzzy
+msgid "WirelessStat packet error. Press any key."
msgstr "ðÏÍÉÌËÏ×ÉÊ ÐÁËÅÔ WirelessStat. îÁÔÉÓΦÔØ Q ÄÌÑ ×ÉÈÏÄÕ."
-#: lib/stat.c:419
-msgid "pipe error. Press any key"
-msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ pipe. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ"
-
-#: lib/stat.c:424
-msgid "fcntl error. Press any key"
-msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ fcntl. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ"
-
-#: lib/stat.c:433
-msgid "fork error. Press any key"
-msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ fork. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ"
-
#: lib/sysinfo.c:31
msgid "System Description: "
msgstr "ïÐÉÓ ÓÉÓÔÅÍÉ:"
-#: lib/sysinfo.c:93 lib/sysinfo.c:277
+#: lib/sysinfo.c:109 lib/sysinfo.c:303
msgid "System Info"
msgstr "óÉÓÔÅÍÎÁ ¦ÎÆÏÒÍÁæÑ"
-#: lib/sysinfo.c:95
+#: lib/sysinfo.c:111
msgid "Device hardware/software/name info:"
msgstr "¶ÎÆÏÒÍÁÃ¦Ñ ÐÒÏ ÐÒÉÓÔÒ¦Ê ÁÐÁÒÁÔÕÒÁ/ÐÒÏÇÒÁÍÁ/ÎÁÚ×Á:"
-#: lib/sysinfo.c:130
+#: lib/sysinfo.c:146
msgid "Product name:"
msgstr "¶Í`Ñ ÐÒÏÄÕËÔÕ:"
-#: lib/sysinfo.c:135
+#: lib/sysinfo.c:151
#, c-format
msgid "Product type: %u"
msgstr "ôÉÐ ÐÒÏÄÕËÔÕ: %u"
-#: lib/sysinfo.c:138
+#: lib/sysinfo.c:154
#, c-format
msgid "Hardware revision: %u"
msgstr "áÐÁÒÁÔÎÁ ×ÅÒÓ¦Ñ: %u"
-#: lib/sysinfo.c:141
+#: lib/sysinfo.c:157
msgid "OEM name:"
msgstr "OEM ¶Í`Ñ:"
-#: lib/sysinfo.c:149
+#: lib/sysinfo.c:165
#, c-format
msgid "Regulation domain: %s [%d]"
msgstr "òÅÇÕÌÑÔÏÒΦ ÏÂÍÅÖÅÎÎÑ: %s [%d]"
-#: lib/sysinfo.c:150 lib/sysinfo.c:337
+#: lib/sysinfo.c:166 lib/sysinfo.c:363
msgid "FCC (USA)"
msgstr "FCC (óûá)"
-#: lib/sysinfo.c:151 lib/sysinfo.c:338
+#: lib/sysinfo.c:167 lib/sysinfo.c:364
msgid "DOC (Canada)"
msgstr "DOC (ëÁÎÁÄÁ)"
-#: lib/sysinfo.c:152 lib/sysinfo.c:339
+#: lib/sysinfo.c:168 lib/sysinfo.c:365
msgid "ETSI (Europe)"
msgstr "ETSI (´×ÒÏÐÁ)"
-#: lib/sysinfo.c:153 lib/sysinfo.c:340
+#: lib/sysinfo.c:169 lib/sysinfo.c:366
msgid "Spain"
msgstr "¶ÓÐÁΦÑ"
-#: lib/sysinfo.c:154 lib/sysinfo.c:341
+#: lib/sysinfo.c:170 lib/sysinfo.c:367
msgid "France"
msgstr "æÒÁÎæÑ"
-#: lib/sysinfo.c:155 lib/sysinfo.c:342
+#: lib/sysinfo.c:171 lib/sysinfo.c:368
msgid "MKK (Japan)"
msgstr "MKK (ñÐÏΦÑ)"
-#: lib/sysinfo.c:155 lib/sysinfo.c:236 lib/sysinfo.c:342
+#: lib/sysinfo.c:171 lib/sysinfo.c:262 lib/sysinfo.c:368
msgid "unknown"
msgstr "ÎÅצÄÏÍÉÊ"
-#: lib/sysinfo.c:158
+#: lib/sysinfo.c:174
#, c-format
msgid "Info structure version: %u"
msgstr "÷ÅÒÓ¦Ñ ÓÔÒÕËÔÕÒÉ: %u"
-#: lib/sysinfo.c:161 lib/sysinfo.c:299
+#: lib/sysinfo.c:177 lib/sysinfo.c:325
#, c-format
msgid "Manufacturer OUI: %02X %02X %02X (%s)"
msgstr "OUI ×ÉÒÏÂÎÉËÁ: %02X %02X %02X (%s)"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:187
+#, fuzzy, c-format
+msgid "Uptime: %u days, %02u:%02u:%02u hours:mins:secs"
+msgstr "îÁÐÒÁÃØÏ×ÁÎÏ: %u:%02u:%02u.%02u"
+
+#: lib/sysinfo.c:259
msgid "FHSS 2.4 GHz"
msgstr "FHSS 2.4 ççÃ"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:259
msgid "DSSS 2.4 GHz"
msgstr "ûðó 2.4 ççÃ"
-#: lib/sysinfo.c:233
+#: lib/sysinfo.c:259
msgid "IR Baseband"
msgstr "¶ÎÆÒÁÞÅÒ×ÏÎÉÊ"
-#: lib/sysinfo.c:234
+#: lib/sysinfo.c:260
msgid "Commercial range 0..40 C"
msgstr "ëÏÍÅÒæÊÎÉÊ Ä¦ÁÐÁÚÏÎ 0..40 C"
-#: lib/sysinfo.c:235
+#: lib/sysinfo.c:261
msgid "Industrial range -30..70 C"
msgstr "¶ÎÄÕÓÔÒ¦ÁÌØÎÉÊ Ä¦ÁÐÁÚÏÎ -30..70 C"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "manual"
msgstr "×ÒÕÞÎÕ"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "notsupported"
msgstr "ΊЦÄÔÒÉÍÕ¤ÔØÓÑ"
-#: lib/sysinfo.c:238
+#: lib/sysinfo.c:264
msgid "dynamic"
msgstr "ĦÎÁͦÞÎÏ"
-#: lib/sysinfo.c:287
+#: lib/sysinfo.c:313
msgid "Manufacturer:"
msgstr "÷ÉÒÏÂÎÉË:"
-#: lib/sysinfo.c:293
+#: lib/sysinfo.c:319
msgid "Manufacturer ID:"
msgstr "ID ×ÉÒÏÂÎÉËÁ:"
-#: lib/sysinfo.c:305
-#, c-format
+#: lib/sysinfo.c:331
msgid "Product Name:"
msgstr "¶Í`Ñ ÐÒÏÄÕËÔÕ:"
-#: lib/sysinfo.c:312
-#, c-format
+#: lib/sysinfo.c:338
msgid "Product ID:"
msgstr "ID ÐÒÏÄÕËÔÕ:"
-#: lib/sysinfo.c:318
-#, c-format
+#: lib/sysinfo.c:344
msgid "Product Version:"
msgstr "÷ÅÒÓ¦Ñ ÐÒÏÄÕËÔÕ:"
-#: lib/sysinfo.c:326
+#: lib/sysinfo.c:352
#, c-format
msgid "PHYType: %s"
msgstr "ôÉÐ PHY: %s"
-#: lib/sysinfo.c:329
+#: lib/sysinfo.c:355
#, c-format
msgid "Temperature: %s"
msgstr "ôÅÍÐÅÒÁÔÕÒÁ: %s"
-#: lib/sysinfo.c:336
+#: lib/sysinfo.c:362
#, c-format
msgid "Regulation Domain: %s"
msgstr "òÅÇÕÌÑÔÏÒΦ ÏÂÍÅÖÅÎÎÑ: %s"
-#: lib/sysinfo.c:345
+#: lib/sysinfo.c:371
#, c-format
msgid "Transmit Power: %u mW"
msgstr "ðÏÔÕÖΦÓÔØ: %u Í÷Ô"
-#: lib/sysinfo.c:375
-#, c-format
-msgid "WEP inplemented: %s"
+#: lib/sysinfo.c:401
+#, fuzzy, c-format
+msgid "WEP implemented: %s"
msgstr "ð¦ÄÔÒÉÍËÁ WEP: %s"
-#: lib/sysinfo.c:378
+#: lib/sysinfo.c:404
#, c-format
msgid "Diversity: %s"
msgstr "÷ÉÂ¦Ò ÁÎÔÅÎÉ: %s"
-#: lib/sysinfo.c:406
+#: lib/sysinfo.c:432
#, c-format
msgid "Uptime: %u:%02u:%02u.%02u"
msgstr "îÁÐÒÁÃØÏ×ÁÎÏ: %u:%02u:%02u.%02u"
-#: lib/sysinfo.c:422
+#: lib/sysinfo.c:448
#, c-format
msgid "IP Address: %s"
msgstr "IP ÁÄÒÅÓÁ: %s"
msgstr "[D] ¶ÎÔÅÒ×ÁÌ ×¦ÄÐÒÁ×ËÉ DTIM (ÂÅËÏÎÉ): "
#: lib/wlan.c:49
+msgid "[T] SIFS time (msec): "
+msgstr ""
+
+#: lib/wlan.c:50
msgid "[key] - set option; W - write conf; Q - quit to menu"
msgstr "# - ×ÓÔÁÎÏ×ÉÔÉ ÐÁÒÁÍÅÔÒ; W - ÚÁÐÉÓÁÔÉ ËÏÎƦÇÕÒÁæÀ; Q - ×ÉÊÔÉ × ÍÅÎÀ"
-#: lib/wlan.c:140
+#: lib/wlan.c:127
msgid "Short"
msgstr "ËÏÒÏÔËÁ"
-#: lib/wlan.c:140
+#: lib/wlan.c:127
msgid "Long"
msgstr "ÄÏ×ÇÁ"
-#: lib/wlan.c:265
+#: lib/wlan.c:243
msgid "Wireless Settings"
msgstr "ðÁÒÁÍÅÔÒÉ ÒÁĦÏÍÅÒÅÖ¦"
-#: lib/wlan.c:753
+#: lib/wlan.c:750
msgid "Antenna Configuration:"
msgstr "ëÏÎƦÇÕÒÁÃ¦Ñ ÁÎÔÅÎ:"
-#: lib/wlan.c:770
+#: lib/wlan.c:767
msgid "General Options"
msgstr "úÁÇÁÌØΦ ÐÁÒÁÍÅÔÒÉ"
-#: lib/wlan.c:772
+#: lib/wlan.c:769
msgid ""
"UIOPTY - antenna; SCANLEDFR1234 - options; W - write conf; Q - quit to menu"
msgstr "UIOPTY - ÁÎÔÅÎÁ; SCANLEDFR1234 - ×ÓÔÁÎÏ×ÉÔÉ; W - ÚÁÐÉÓÁÔÉ; Q - ×ÉÊÔÉ"
-#: src/ap-config.c:59
+#: src/ap-config.c:63
msgid "General"
msgstr "çÏÌÏ×Φ"
-#: src/ap-config.c:59
+#: src/ap-config.c:63
msgid "Set general options"
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÚÁÇÁÌØΦ ÐÁÒÁÍÅÔÒÉ"
-#: src/ap-config.c:60
+#: src/ap-config.c:64
msgid "Advanced"
msgstr "óÐÅæÁÌØΦ"
-#: src/ap-config.c:60
+#: src/ap-config.c:64
msgid "Set advanced options"
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÓÐÅæÁÌØΦ ÐÁÒÁÍÅÔÒÉ"
-#: src/ap-config.c:94
+#: src/ap-config.c:97
msgid "Reset AP."
msgstr "òÅÓÔÁÒÔ"
-#: src/ap-config.c:129
+#: src/ap-config.c:131
msgid "Latest"
msgstr "ðÏĦ§"
-#: src/ap-config.c:129
+#: src/ap-config.c:131
msgid "Get info about latest events"
msgstr "ïÔÒÉÍÁÔÉ ¦ÎÆÏÒÍÁæÀ ÐÒÏ ÏÓÔÁÎΦ ÐÏĦ§"
#: src/ap-mrtg.c:42
-#, c-format
msgid ""
"\n"
"Usage:\n"
"÷ÉËÏÒÉÓÔÁÎÎÑ:\n"
#: src/ap-mrtg.c:44
-#, c-format
msgid ""
"\tap-mrtg -i ip -c community -t type [-b bssid] [-n name] [-a aptype] [-v] [-"
"h] [-r]\n"
"\n"
#: src/ap-mrtg.c:46
-#, c-format
msgid ""
"Get stats from AP and return it in MRTG parsable format\n"
"\n"
"\n"
#: src/ap-mrtg.c:47
-#, c-format
msgid "-i ip - AP ip address\n"
msgstr "-i ip - ip ÁÄÒÅÓÁ ÔÏÞËÉ ÄÏÓÔÕÐÕ\n"
#: src/ap-mrtg.c:48
-#, c-format
msgid "-c community - SNMP community string\n"
msgstr "-c ËÏÍ`ÀΦԦ - SNMP ËÏÍ'ÀΦԦ\n"
#: src/ap-mrtg.c:50
-#, c-format
msgid ""
"-t type - statistics type <w>ireless, <e>thernet, associated <s>tations "
"or <l>ink quality in client mode\n"
"ÓÔÁÎæ§ ÁÂÏ l - Ñ˦ÓÔØ ËÁÎÁÌÕ Õ ÒÅÖÉͦ Ë̦ÅÎÔÁ\n"
#: src/ap-mrtg.c:52
-#, c-format
msgid ""
"-b bssid - mac address of the AP to which get link quality, only if "
"type=l\n"
"̦ÎËÕ×ÉËÏÒÉÓÔÏ×ÕÊÔÅ Ô¦ÌØ˦ ÌÉÛÅ, ÑËÝÏ ÔÉÐ=l\n"
#: src/ap-mrtg.c:53
-#, c-format
msgid "-n name - AP name - for check only\n"
msgstr "-n ÎÁÚ×Á - ÎÁÚ×Á ÔÏÞËÉ ÄÏÓÔÕÐÕ (ÌÉÛÅ ÄÌÑ ÐÅÒÅצÒËÉ)\n"
#: src/ap-mrtg.c:54
-#, c-format
msgid ""
"-a aptype - AP type - 410 (default) or 510 for ATMEL12350's, like the "
"ME-102\n"
"ATMEL12350, ÑË íå-102\n"
#: src/ap-mrtg.c:56
-#, c-format
msgid "-v - report MRTG about problems connecting to AP\n"
msgstr ""
"-v - ÐÏצÄÏÍÌÑÔÉ MRTG ÐÒÏ ÐÏÍÉÌËÉ Ú`¤ÄÎÁÎÎÑ Ú ÔÏÞËÏÀ ÄÏÓÔÕÐÕ\n"
#: src/ap-mrtg.c:57
-#, c-format
msgid "-r - reset AP when getting LinkQuality stats\n"
msgstr ""
"-r - ÒÅÓÔÁÒÔÕ×ÁÔÉ ÔÏÞËÕ ÄÏÓÔÕÐÕ ÐÒÉ ÏÔÒÉÍÁÎΦ ÄÁÎÎÉÈ ÐÒÏ Ñ˦ÓÔØ "
"̦ÎËÕ\n"
#: src/ap-mrtg.c:58
-#, c-format
msgid ""
"-h - print this help screen\n"
"\n"
"\n"
#: src/ap-mrtg.c:143
-#, c-format
msgid "Invalid IP-address\n"
msgstr "îÅצÒÎÁ ¶ò ÁÄÒÅÓÁ\n"
msgid "Agent:v%d %s (%s@%s:%d) %s%s%s. SysUptime %d:%02d:%02d.%02d"
msgstr "áÇÅÎÔ:v%d %s (%s@%s:%d) %s%s%s. îÁÐÒÁÃØÏ×ÁÎÏ %d:%02d:%02d.%02d"
+#: src/auth_mac.c:34
+#, fuzzy
+msgid "NUM MAC address"
+msgstr "# íáó ÁÄÒÅÓÁ"
+
#: src/bridge.c:36
msgid "[C] Configuration-enabled port(s): "
msgstr "[C] ðÏÒÔ ËÏÎƦÇÕÒÕ×ÁÎÎÑ: "
msgid "[U] Isolate wireless clients (unicast traffic): "
msgstr "[U] ¶ÚÏÌÀ×ÁÔÉ ÒÁĦÏË̦¤ÎÔ¦× (ÕΦËÁÓÔÏצ ÐÁËÕÎËÉ): "
-#: src/bridge.c:137
+#: src/bridge.c:122
msgid "Both"
msgstr "ïÂÉÄ×Á"
msgid "Error:"
msgstr "ðÏÍÉÌËÁ:"
-#: src/stations.c:113
-msgid "Id MAC address"
-msgstr "# MAC ÁÄÒÅÓÁ"
+#: src/stations.c:31
+msgid " # MAC "
+msgstr ""
+
+#: src/stations.c:34
+#, fuzzy
+msgid " # MAC Parent MAC RSSI Status MACn IP "
+msgstr "# MAC LQ RSSI óÔÁÔ ðÏÒÔ IP"
-#: src/stations.c:223 src/stations.c:307
+#: src/stations.c:187
+#, fuzzy
+msgid ""
+"Arrows - scroll; S - save to file; Q - return; T - toggle view; Other key - "
+"refresh"
+msgstr "óÔÒ¦ÌËÉ - ÐÒÏËÒÕÔËÁ; S - ÚÂÅÒÅÇÔÉ Õ ÆÁÊÌ; Q - ×ÉÊÔÉ × ÍÅÎÀ."
+
+#: src/stations.c:190
+#, fuzzy
+msgid "Arrows - scroll; S - save to file; Q - return; Other key - refresh"
+msgstr "óÔÒ¦ÌËÉ - ÐÒÏËÒÕÔËÁ; S - ÚÂÅÒÅÇÔÉ Õ ÆÁÊÌ; Q - ×ÉÊÔÉ × ÍÅÎÀ."
+
+#: src/stations.c:275 src/stations.c:358
msgid "Associated stations"
msgstr "áÓÏæÊÏ×ÁΦ ÓÔÁÎæ§"
-#: src/stations.c:225
+#: src/stations.c:277
msgid "Id MAC address Quality Age RSSI"
msgstr "# MAC ÁÄÒÅÓÁ ñ˦ÓÔØ âÅÚÄ¦Ñ óÉÌÁ ÓÉÇÎÁÌÕ"
+#~ msgid "LQ: Link Quality [raw]"
+#~ msgstr "LQ: ñ˦ÓÔØ Ú'¤ÄÎÁÎÎÑ [ÎÅÏÂÒÏÂÌÅÎÅ]"
+
+#~ msgid "Unable to get data from AP. Press Q to continue."
+#~ msgstr "îÅ ÍÏÖÕ ÏÔÒÉÍÁÔÉ ÄÁÎΦ Ú áò. îÁÔÉÓΦÔØ Q ÄÌÑ ×ÉÈÏÄÕ"
+
+#~ msgid "Q - quit to menu."
+#~ msgstr "Q - ×ÉÊÔÉ × ÍÅÎÀ"
+
+#~ msgid "pipe error. Press any key."
+#~ msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ pipe. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
+
+#~ msgid "fork error. Press any key."
+#~ msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ fork. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
+
+#~ msgid "pipe error. Press any key"
+#~ msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ pipe. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ"
+
+#~ msgid "fcntl error. Press any key"
+#~ msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ fcntl. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ"
+
+#~ msgid "fork error. Press any key"
+#~ msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ fork. âÕÄØ ÑËÁ ËÌÁצÛÁ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ"
+
+#~ msgid "Id MAC address"
+#~ msgstr "# MAC ÁÄÒÅÓÁ"
+
#~ msgid "[B] Send back broadcast traffic: "
#~ msgstr "[B] ÷¦ÄÐÒÁ×ËÁ ÂÒÏÁÄËÁÓÔÏ×ÉÈ ÐÁËÕÎ˦×: "
#~ msgid "Wireless Access Point Configurator"
#~ msgstr "ëÏÎƦÇÕÒÁÔÏÒ ÔÏÞËÉ ÄÏÓÔÕÐÕ ÒÁĦÏÍÅÒÅÖ¦"
-
-#~ msgid "; LQ: Link Q. [raw]"
-#~ msgstr "; LQ: ñ˦ÓÔØ Ì¦ÎËÕ [ÎÅÏÂÒÏÂÌÅÎÅ]"
INCLUDES = -I../lib -I../intl -I..
LIBS = @INTLLIBS@ @LIBS@
-bin_PROGRAMS = ap-config ap-mrtg
+bin_PROGRAMS = ap-config ap-mrtg ap-auth
sbin_PROGRAMS = ap-trapd
ap_config_SOURCES = ap-config.c auth_mac.c bridge.c nwn_advanced.c nwn_latest.c stations.c
ap_mrtg_LDADD = ../lib/libap.a
ap_trapd_SOURCES = ap-trapd.c
+
+ap_auth_SOURCES = ap-auth.c
+ap_auth_LDADD = ../lib/libap.a
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.7.8 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
target_alias = @target_alias@
INCLUDES = -I../lib -I../intl -I..
-bin_PROGRAMS = ap-config ap-mrtg
+bin_PROGRAMS = ap-config ap-mrtg ap-auth
sbin_PROGRAMS = ap-trapd
ap_config_SOURCES = ap-config.c auth_mac.c bridge.c nwn_advanced.c nwn_latest.c stations.c
ap_mrtg_LDADD = ../lib/libap.a
ap_trapd_SOURCES = ap-trapd.c
+
+ap_auth_SOURCES = ap-auth.c
+ap_auth_LDADD = ../lib/libap.a
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-bin_PROGRAMS = ap-config$(EXEEXT) ap-mrtg$(EXEEXT)
+bin_PROGRAMS = ap-config$(EXEEXT) ap-mrtg$(EXEEXT) ap-auth$(EXEEXT)
sbin_PROGRAMS = ap-trapd$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
+am_ap_auth_OBJECTS = ap-auth.$(OBJEXT)
+ap_auth_OBJECTS = $(am_ap_auth_OBJECTS)
+ap_auth_DEPENDENCIES = ../lib/libap.a
+ap_auth_LDFLAGS =
am_ap_config_OBJECTS = ap-config.$(OBJEXT) auth_mac.$(OBJEXT) \
bridge.$(OBJEXT) nwn_advanced.$(OBJEXT) nwn_latest.$(OBJEXT) \
stations.$(OBJEXT)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ap-config.Po ./$(DEPDIR)/ap-mrtg.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/ap-trapd.Po ./$(DEPDIR)/auth_mac.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/bridge.Po ./$(DEPDIR)/nwn_advanced.Po \
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ap-auth.Po ./$(DEPDIR)/ap-config.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/ap-mrtg.Po ./$(DEPDIR)/ap-trapd.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/auth_mac.Po ./$(DEPDIR)/bridge.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/nwn_advanced.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/nwn_latest.Po ./$(DEPDIR)/stations.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(ap_config_SOURCES) $(ap_mrtg_SOURCES) \
- $(ap_trapd_SOURCES)
+DIST_SOURCES = $(ap_auth_SOURCES) $(ap_config_SOURCES) \
+ $(ap_mrtg_SOURCES) $(ap_trapd_SOURCES)
DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(ap_config_SOURCES) $(ap_mrtg_SOURCES) $(ap_trapd_SOURCES)
+SOURCES = $(ap_auth_SOURCES) $(ap_config_SOURCES) $(ap_mrtg_SOURCES) $(ap_trapd_SOURCES)
all: all-am
clean-sbinPROGRAMS:
-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
+ap-auth$(EXEEXT): $(ap_auth_OBJECTS) $(ap_auth_DEPENDENCIES)
+ @rm -f ap-auth$(EXEEXT)
+ $(LINK) $(ap_auth_LDFLAGS) $(ap_auth_OBJECTS) $(ap_auth_LDADD) $(LIBS)
ap-config$(EXEEXT): $(ap_config_OBJECTS) $(ap_config_DEPENDENCIES)
@rm -f ap-config$(EXEEXT)
$(LINK) $(ap_config_LDFLAGS) $(ap_config_OBJECTS) $(ap_config_LDADD) $(LIBS)
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap-auth.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap-config.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap-mrtg.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap-trapd.Po@am__quote@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
--- /dev/null
+/*
+ * ap-auth.c from Access Point SNMP Utils for Linux
+ *
+ * Copyright (c) 2002 Roman Festchook <roma at polesye dot net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License Version 2 from
+ * June 1991 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+#include <stdio.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#if defined (__GLIBC__)
+#include <libgen.h>
+#endif
+#include "ap-utils.h"
+
+#define PACKET_ERROR _("AuthorizedMacTableString packet error")
+#define ERROR_DATA _("Invalid data in source file")
+#define ERROR_FILE_OPEN _("Can't open file")
+#define ERROR_FILE_WRITE _("Can't write to file")
+#define ERROR_FILE_CLOSE _("Error closing file")
+
+short ap_type = ATMEL410;
+char *community = NULL;
+int sockfd;
+struct in_addr ap_ip;
+
+void usage()
+{
+ printf(_("\nUsage:\n"));
+ printf(_("\tap-auth -i ip -c community -d filename [-h]\n"));
+ printf(_("\tap-auth -i ip -c community -u filename [-h]\n\n"));
+ printf(_("Change accesspoint's list of authorised MAC"
+ " addresses\n\n"));
+ printf(_("-i ip - AP ip address\n"));
+ printf(_("-c community - SNMP community string\n"));
+ printf(_("-d filename - download list of authorised MAC addresses from AP"
+ " to a file\n"));
+ printf(_("-u filename - upload list of authorised MAC addresses from"
+ " a file to AP\n"));
+ printf(_("-h - print this help screen\n\n"));
+ printf(_("ap-auth %s Copyright (c) 2002-2004 Roman Festchook\n\n"),
+ VERSION);
+}
+
+int write_addr (FILE *f, const struct MacListStat *n)
+{
+ if (fprintf (f, "%02x%02x%02x%02x%02x%02x\n", n->addr[0], n->addr[1],
+ n->addr[2], n->addr[3],
+ n->addr[4], n->addr[5])
+ != 13)
+ return 1;
+
+ return 0;
+}
+
+int get_addr (struct MacListStat *ml, char *addr)
+{
+ int i;
+ char tmp[3];
+
+ if (strlen (addr) != 12)
+ return 1;
+
+ tmp[2] = '\0';
+
+ for (i = 0; i < 6 ; i++) {
+ tmp[0] = addr[2 * i];
+ tmp[1] = addr[2 * i + 1];
+ ml->addr[i] = strtol (tmp, NULL, 16);
+ }
+
+ return 0;
+}
+
+int main(int argc, char **argv)
+{
+ extern char *optarg;
+ extern int optind;
+ extern int opterr;
+ extern int optopt;
+ int opt = 0;
+ int mode = 0; /* 1 = download, 2 = upload */
+
+ FILE *f;
+ char *filename = NULL;
+ struct sockaddr_in client;
+
+ struct AuthorizedMacTableString {
+ unsigned int short Action;
+ unsigned int short NumOfAllTableAddresses;
+ unsigned int short NumOfCurrentAddress;
+ unsigned char MacAddress[6];
+ } *AuthMac = NULL, get;
+
+ struct MacListStat *first = NULL, *curr = NULL;
+
+ char AutorizedMac[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01,
+ 0x02, 0x06, 0x02, 0x00
+ };
+
+ int total_mac, mac_num = 0;
+ varbind varbinds[1];
+ char mac_tmp[13];
+ struct MacListStat ml_tmp;
+ int i, tmp;
+
+#ifdef HAVE_GETTEXT
+ setlocale(LC_ALL, "");
+ bindtextdomain("ap-utils", LOCALEDIR);
+ textdomain("ap-utils");
+#endif
+
+ memset(&client, 0, sizeof client);
+ client.sin_family = AF_INET;
+ client.sin_port = INADDR_ANY;
+ client.sin_addr.s_addr = INADDR_ANY;
+
+ do {
+ opterr = 0;
+ switch (opt = getopt(argc, argv, "i:c:d:u:")) {
+ case 'i':
+ if (inet_aton(optarg, &ap_ip) == 0) {
+ printf(_("Invalid IP-address\n"));
+ return 1;
+ }
+ break;
+ case 'c':
+ community = malloc(strlen(optarg) + 1);
+ strncpy(community, optarg, strlen(optarg) + 1);
+ break;
+ case 'd':
+ filename = malloc(strlen(optarg) + 1);
+ strncpy(filename, optarg, strlen(optarg) + 1);
+ mode = 1;
+ break;
+ case 'u':
+ filename = malloc(strlen(optarg) + 1);
+ strncpy(filename, optarg, strlen(optarg) + 1);
+ mode = 2;
+ break;
+ case -1:
+ break;
+ default:
+ usage();
+ return 1;
+ }
+ } while (opt != -1);
+
+ if (!community) {
+ usage();
+ return 1;
+ }
+
+ if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
+ perror(_("Create socket error"));
+ return 1;
+ }
+ if (bind(sockfd, (struct sockaddr *) &client, SIZE) == -1) {
+ perror(_("Bind socket error"));
+ return 1;
+ }
+
+ switch (mode) {
+
+ case 1: /* download */
+
+ total_mac = 0;
+ mac_num = 0;
+
+ while (mac_num <= total_mac) {
+ get.Action = 0x02; rshort(get.Action);
+ get.NumOfAllTableAddresses = total_mac; rshort(get.NumOfAllTableAddresses);
+ get.NumOfCurrentAddress = mac_num; rshort(get.NumOfCurrentAddress);
+
+ varbinds[0].oid = AutorizedMac;
+ varbinds[0].len_oid = sizeof(AutorizedMac);
+ varbinds[0].value = (char *) &get;
+ varbinds[0].len_val = 12;
+ varbinds[0].type = STRING_VALUE;
+
+ if (snmp(varbinds, 1, SET) <= 0) {
+ printf(ERR_RET);
+ printf("\n");
+ return 1;
+ }
+
+ if (varbinds[0].len_val == 12) {
+ if (AuthMac)
+ free(AuthMac);
+ AuthMac =
+ (struct AuthorizedMacTableString *) malloc(varbinds[0].
+ len_val);
+ memcpy(AuthMac, varbinds[0].value, varbinds[0].len_val);
+ } else {
+ printf(PACKET_ERROR);
+ printf("\n");
+ return 1;
+ }
+
+ rshort(AuthMac->NumOfAllTableAddresses);
+ total_mac =
+ (AuthMac->NumOfAllTableAddresses ==
+ 65535) ? 0 : AuthMac->NumOfAllTableAddresses;
+
+ if (mac_num) {
+ if (first == NULL) {
+ first = (struct MacListStat *)
+ malloc(sizeof(struct MacListStat));
+ curr = first;
+ } else {
+ curr->next = (struct MacListStat *)
+ malloc(sizeof(struct MacListStat));
+ curr = curr->next;
+ }
+ memcpy(curr->addr, AuthMac->MacAddress, 6);
+ curr->next = NULL;
+ }
+ mac_num++;
+ }
+ f = fopen(filename, "w");
+ if(f == NULL) {
+ perror(ERROR_FILE_OPEN);
+ return 1;
+ }
+ if (first == NULL) {
+ /* no authorised addresses */
+ } else {
+ curr = first;
+ while (curr != NULL) {
+ if(write_addr (f, curr) != 0) {
+ perror(ERROR_FILE_WRITE);
+ return 1;
+ }
+ curr = curr->next;
+ }
+ }
+ if(fclose(f) != 0) {
+ perror(ERROR_FILE_CLOSE);
+ return 1;
+ }
+ break;
+ case 2: /* upload */
+ f = fopen(filename, "r");
+ if (f == NULL) {
+ perror(ERROR_FILE_OPEN);
+ return 1;
+ }
+ mac_num = 0;
+ while (!feof (f)) {
+ tmp = fread (mac_tmp, 1, sizeof (mac_tmp), f);
+
+ if (tmp == sizeof (mac_tmp)) {
+ if (mac_tmp[12] != '\n') {
+ printf(ERROR_DATA);
+ printf("\n");
+ return 1;
+ }
+ mac_tmp[12] = '\0';
+
+ if (get_addr (&ml_tmp, mac_tmp) != 0) {
+ printf(ERROR_DATA);
+ printf("\n");
+ return 1;
+ }
+ if (first == NULL) {
+ first = (struct MacListStat *)
+ malloc (sizeof (struct MacListStat));
+ curr = first;
+ } else {
+ curr->next = (struct MacListStat *)
+ malloc (sizeof (struct MacListStat));
+ curr = curr->next;
+ }
+ memcpy (curr, &ml_tmp, sizeof (struct MacListStat));
+ curr->next = NULL;
+ mac_num++;
+ }
+ }
+ fclose(f);
+
+ curr = first;
+ i = 1;
+ while (curr != NULL) {
+ get.Action = 0x01;
+ rshort(get.Action);
+ get.NumOfAllTableAddresses = mac_num;
+ rshort(get.NumOfAllTableAddresses);
+ get.NumOfCurrentAddress = i;
+ rshort(get.NumOfCurrentAddress);
+ memcpy(get.MacAddress, curr->addr, 6);
+ varbinds[0].oid = AutorizedMac;
+ varbinds[0].len_oid = sizeof(AutorizedMac);
+ varbinds[0].value = (char *) &get;
+ varbinds[0].len_val = 12;
+ varbinds[0].type = STRING_VALUE;
+ if (snmp(varbinds, 1, SET) <= 0) {
+ printf(ERR_RET);
+ printf("\n");
+ return 1;
+ }
+ if (varbinds[0].len_val != 12) {
+ printf(PACKET_ERROR);
+ printf("\n");
+ return 1;
+ }
+ curr = curr->next;
+ i++;
+ }
+ break;
+ default:
+ usage();
+ return 1;
+ }
+
+ close(sockfd);
+
+ curr = first;
+ while (curr != NULL) {
+ curr = curr->next;
+ free (first);
+ first = curr;
+ }
+
+ if (community)
+ free(community);
+ if (filename)
+ free(filename);
+ return 0;
+}
struct in_addr ap_ip;
char *prog_title = "Wireless Access Point Configurator";
+extern char IS_ATMEL410_SBRIDGES;
+extern char IS_ATMEL12350_TELLUS;
+extern char IS_ATMEL12350_VERNET;
+
void config_menu()
{
struct umitems umenu_atmel[] = {
};
switch (ap_type) {
- case ATMEL410:
+ case ATMEL410:
case ATMEL12350:
- uni_menu(umenu_atmel, sizeof(umenu_atmel) / sizeof(umenu_atmel[0]));
- break;
+ uni_menu(umenu_atmel, sizeof(umenu_atmel) / sizeof(umenu_atmel[0]));
+ break;
case NWN:
- uni_menu(umenu_nwn, sizeof(umenu_nwn) / sizeof(umenu_nwn[0]));
- break;
+ uni_menu(umenu_nwn, sizeof(umenu_nwn) / sizeof(umenu_nwn[0]));
+ break;
}
}
{
struct umitems command_umenu_atmel[] = {
{_("Upload"), _("Make current configuration active"), upload, 0},
- {_("Defaults"), _("Restore factory default settings"), defaults,
- 0},
+ {_("Defaults"), _("Restore factory default settings"), defaults, 0},
{_("Reset"),
_("Reset AP. All not uploaded configuration will be lost"),
reset, 0},
uni_menu(command_umenu_nwn,
sizeof(command_umenu_nwn) / sizeof(command_umenu_nwn[0]));
break;
- }
+ }
}
-
void stat_menu()
{
struct umitems umenu_atmel[] = {
case NWN:
uni_menu(umenu_nwn, sizeof(umenu_nwn) / sizeof(umenu_nwn[0]));
break;
- }
+ }
}
void _auth()
{
- if(get_opts() == 0)
- connect_options((unsigned long) NULL, (int) NULL);
+ if(get_opts() == 0)
+ connect_options((unsigned long) NULL, (int) NULL);
}
void main_menu()
WINDOW *win_for_title;
char message[100];
-
#ifdef HAVE_GETTEXT
/* locale support init */
setlocale(LC_ALL, "");
wrefresh(main_win);
about();
- if (get_opts() == 0) {
- connect_options((unsigned long) NULL, (int) NULL);
+ if (get_opts() == 0)
+ connect_options((unsigned long) NULL, (int) NULL);
- }
while (1)
main_menu();
#define MAC_ADD _("Enter MAC: ")
#define MAC_DEL _("Delete Num: ")
#define MAC_TITLE _("Authorized MAC addresses")
-#define MAC_HEADER _("NUM MAC address")
+#define MAC_HEADER _("NUM MAC address")
#define MAC_HELP _("A - auth; N - new; D - del; arrows - scroll; W - write conf; Q - quit")
extern WINDOW *main_sub;
auth_mac = *(varbinds[0].value);
sprintf(message, "%s%s", MAC_AUTH, (auth_mac == 1) ? ON : OFF);
mvwaddstr(main_sub, 0, 0, message);
- mvwaddstr(main_sub, 2, 5, MAC_HEADER);
+ mvwaddstr(main_sub, 2, 1, MAC_HEADER);
wrefresh(main_sub);
total_mac = 0;
#define HELP _("INGFPDOMSCTRBU - set; W - write conf; Q - quit to menu")
extern short ap_type;
+extern char IS_ATMEL410_SBRIDGES;
+extern char IS_ATMEL12350_TELLUS;
void bridging()
{
-
- char sysTrapSwitch[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x01, 0x03,
- 0x00
+ char sysTrapSwitch[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x01, 0x03, 0x00
};
- char operIPAddress[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x02, 0x01,
- 0x00
+ char operIPAddress[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x02, 0x01, 0x00
};
- char operIPMask[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x02, 0x02,
- 0x00
+ char operIPMask[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x02, 0x02, 0x00
};
- char operEthernetAddress[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x02, 0x03,
- 0x00
+ char operEthernetAddress[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x02, 0x03, 0x00
};
- char operGateway[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x02, 0x04,
- 0x00
+ char operGateway[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x02, 0x04, 0x00
};
- char operDHCP[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x02, 0x05,
- 0x00
+ char operDHCP[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x02, 0x05, 0x00
};
- char PrimaryPort[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x02, 0x06,
- 0x00
+ char PrimaryPort[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x02, 0x06, 0x00
};
/* This one is ATMEL12350 MIB specific. */
- char ConfigPort[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x01, 0x02, 0x07,
- 0x00
+ char ConfigPort[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x01, 0x02, 0x07, 0x00
};
/* This one is ATMEL12350 TELLUS MIB specific. */
- char TrapPort[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x01, 0x02, 0x08,
- 0x00
+ char TrapPort[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x01, 0x02, 0x08, 0x00
};
- char IPFilter[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x03, 0x01,
- 0x00
+ char IPFilter[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x03, 0x01, 0x00
};
-
/* These 3 are ATMEL12350 MIB specific. */
- char ForwardBroadcast[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x01, 0x03, 0x02,
- 0x00
+ char ForwardBroadcast[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x01, 0x03, 0x02, 0x00
};
- char SendBackBcast[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x01, 0x03, 0x03,
- 0x00
+ char SendBackBcast[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x01, 0x03, 0x03, 0x00
};
- char SendBackUnicast[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x01, 0x03, 0x04,
- 0x00
+ char SendBackUnicast[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x01, 0x03, 0x04, 0x00
};
- char bridgeOperationalMode[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x04, 0x01,
- 0x00
+ char bridgeOperationalMode[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x04, 0x01, 0x00
};
- char bridgeRemoteBridgeBSSID[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x04, 0x02,
- 0x00
+ char bridgeRemoteBridgeBSSID[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x04, 0x02, 0x00
};
extern WINDOW *main_sub;
_("Both"),
_("Ethernet"),
_("Wireless")
- },
- oui_sbridges[3] = { 0x00, 0x30, 0x1A },
- oui_tellus[3] = { 0x00, 0x04, 0xDB },
- IS_ATMEL410_SBRIDGES = 0,
- IS_ATMEL12350_TELLUS = 0;
+ };
int i;
unsigned int trap_port = 0;
if (ap_type == ATMEL12350) {
- operEthernetAddress[5] = 0xE0;
+ operEthernetAddress[5] = 0xE0;
operEthernetAddress[6] = 0x3E;
IPFilter[5] = 0xE0;
IPFilter[6] = 0x3E;
sysTrapSwitch[6] = 0x3E;
}
-
- /* Determine the advanced MIB subtype of the device from its MAC address. */
- varbinds[0].type = NULL_VALUE;
- varbinds[0].oid = operEthernetAddress;
- varbinds[0].len_oid = sizeof(operEthernetAddress);
- varbinds[0].len_val = 0;
-
- print_help(WAIT_RET);
- if (snmp(varbinds, 1, GET) <= 0) {
- print_helperr(ERR_RET);
- goto exit;
- }
-
- if (ap_type == ATMEL410 && (memcmp(oui_sbridges, varbinds[0].value, 3) ==0))
- IS_ATMEL410_SBRIDGES = 1;
-
- if (ap_type == ATMEL12350 && (memcmp(oui_tellus, varbinds[0].value, 3) ==0))
- IS_ATMEL12350_TELLUS = 1;
-
-
- for (i = 1; i < 15; i++) {
+ for (i = 0; i < 15; i++) {
varbinds[i].type = NULL_VALUE;
varbinds[i].len_val = 0;
varbinds[i].len_oid = sizeof(sysTrapSwitch);
}
- i = 1;
+ i = 0;
+ varbinds[i++].oid = operEthernetAddress;
varbinds[i++].oid = IPFilter;
varbinds[i++].oid = PrimaryPort;
varbinds[i++].oid = operDHCP;
if (IS_ATMEL410_SBRIDGES) {
sprintf(message, "%s%02X%02X%02X%02X%02X%02X", SB_ATTMAC,
- *(varbinds[2].value +0) & 0xFF, *(varbinds[1].value +1) & 0xFF,
- *(varbinds[2].value +2) & 0xFF, *(varbinds[1].value +3) & 0xFF,
- *(varbinds[2].value +4) & 0xFF, *(varbinds[1].value +5) & 0xFF);
+ *(varbinds[2].value +0) & 0xFF, *(varbinds[2].value +1) & 0xFF,
+ *(varbinds[2].value +2) & 0xFF, *(varbinds[2].value +3) & 0xFF,
+ *(varbinds[2].value +4) & 0xFF, *(varbinds[2].value +5) & 0xFF);
} else {
primary_port = *(varbinds[2].value);
if (primary_port < 1 || primary_port > 2) {
#include "ap-curses.h"
#define STAS _("Associated Stations")
+#define STAS_HEADER \
+ _(" # MAC ")
+/* following for VERNET-enhanced ATMEL12350 MIB */
+#define STAS_HEADER_VERNET \
+ _(" # MAC Parent MAC RSSI Status MACn IP ")
#define MAX_LINES LINES-4
extern int LINES;
extern WINDOW *main_sub;
extern short ap_type;
+extern char IS_ATMEL12350_VERNET;
+extern int sts_viewtype;
void stations()
{
+ char bridgeOperationalMode[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x04, 0x01, 0x00
+ };
+ char StasNum[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x05, 0x01, 0x00
+ };
+ char StasMac[] = {
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x05, 0x02, 0x00
+ };
+
struct AssociatedSTAsInfo {
unsigned short Num;
unsigned char MacAddress[6];
+ /* following ones are specific for enhanced ATMEL 12350 MIB by VERNET */
+ unsigned char Status;
+ unsigned char Port;
+ unsigned char ParentMacAddress[6];
+ unsigned char RSSI;
+ unsigned char IP[4];
} *mac = NULL, get;
- char StasNum[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x05, 0x01,
- 0x00
- };
-
- char StasMac[] =
- { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x02, 0x05, 0x02,
- 0x00
- };
- char bridgeOperationalMode[] = {
- 0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x04, 0x01, 0x00
- };
-
-
struct MacListStat *first = NULL, *curr = NULL;
char message[1024];
- int mac_num, begin, end, total_mac;
+ int mac_idx, begin, end, total_mac;
varbind varbinds[1];
-
+
if (ap_type == ATMEL12350) {
+ bridgeOperationalMode[5] = 0xE0;
+ bridgeOperationalMode[6] = 0x3E;
StasNum[5] = 0xE0;
StasNum[6] = 0x3E;
StasMac[5] = 0xE0;
StasMac[6] = 0x3E;
- bridgeOperationalMode[5] = 0xE0;
- bridgeOperationalMode[6] = 0x3E;
}
- print_title(STAS);
-
+ /* find out in what mode the AP currently is */
varbinds[0].oid = bridgeOperationalMode;
varbinds[0].len_oid = sizeof(bridgeOperationalMode);
varbinds[0].value = bridgeOperationalMode;
goto exit;
}
- if (*(varbinds[0].value) == 3) {
- mvwaddstr(main_sub, 3, 1, _("AP now in AP Client Mode and don't has any associated stations"));
- print_help(ANY_KEY);
- wrefresh(main_sub);
- getch();
- goto exit;
+ /* for AP in AP-Client mode & without VERNET firmware, disable status */
+ if (*(varbinds[0].value) == 3 && !IS_ATMEL12350_VERNET) {
+ mvwaddstr(main_sub, 3, 1, _("AP is currently in AP Client Mode => "
+ "no associated STAtions."));
+ print_help(ANY_KEY);
+ wrefresh(main_sub);
+ getch();
+ goto exit;
}
-
-
+ noecho();
+ wattrset(main_sub, COLOR_PAIR(3));
+ if (IS_ATMEL12350_VERNET)
+ mvwaddstr(main_sub, 0, 0, STAS_HEADER_VERNET);
+ else
+ mvwaddstr(main_sub, 0, 0, STAS_HEADER);
+ wattrset(main_sub, A_NORMAL);
+
+refresh:
+ /* find out how many STAtions is in the list */
varbinds[0].oid = StasNum;
varbinds[0].len_oid = sizeof(StasNum);
varbinds[0].value = StasNum;
varbinds[0].type = NULL_VALUE;
varbinds[0].len_val = 0;
+
print_help(WAIT_RET);
+
if (snmp(varbinds, 1, GET) <= 0) {
print_helperr(ERR_RET);
getch();
}
total_mac = *(varbinds[0].value);
- mac_num = 1;
-
- sprintf(message, "%s: %d", STAS, total_mac);
- print_title(message);
- mvwaddstr(main_sub, 0, 3, _("Id MAC address"));
- noecho();
-
- while (mac_num <= total_mac) {
+ print_help(WAIT_SET);
+ mac_idx = 1;
+ while (mac_idx <= total_mac) {
+ /* tell the AP we want first mac_idx-th MAC */
varbinds[0].oid = StasMac;
varbinds[0].len_oid = sizeof(StasMac);
varbinds[0].type = INT_VALUE;
- get.Num = swap2(mac_num);
+ get.Num = swap2(mac_idx);
varbinds[0].value = (char *) &get;
varbinds[0].len_val = sizeof(get);
mac =
(struct AssociatedSTAsInfo *) malloc(varbinds[0].len_val);
memcpy(mac, varbinds[0].value, varbinds[0].len_val);
-/* mac = (struct AssociatedSTAsInfo *) varbinds[0].value;*/
+ /* mac = (struct AssociatedSTAsInfo *) varbinds[0].value; */
} else {
print_helperr(_("AssociatedSTAsInfo packet error"));
goto exit;
}
-
if (first == NULL) {
first =
(struct MacListStat *) malloc(sizeof(struct MacListStat));
}
memcpy(curr->addr, mac->MacAddress, 6);
+
+ if (IS_ATMEL12350_VERNET) {
+ curr->Status = mac->Status;
+ curr->Port = mac->Port;
+ memcpy(curr->ParentMacAddress, mac->ParentMacAddress, 6);
+ curr->rssi = mac->RSSI;
+ memcpy(&(curr->IP.s_addr), mac->IP, 4);
+ }
+
curr->next = NULL;
- mac_num++;
+ mac_idx++;
}
+
begin = 1;
- end = (MAX_LINES < mac_num) ? MAX_LINES : mac_num;
- scroll_rows(first, begin, end, 1, 0);
- print_help(_("Arrows - scroll; S - save to file; Q - quit to menu."));
+ end = (MAX_LINES < mac_idx) ? MAX_LINES : mac_idx;
+
+ if (IS_ATMEL12350_VERNET)
+ print_help(_("Arrows - scroll; S - save to file; Q - return; "
+ "T - toggle view; Other key - refresh"));
+ else
+ print_help(_("Arrows - scroll; S - save to file; Q - return; "
+ "Other key - refresh"));
+
while (1) {
+ sprintf(message, "%s: %d", STAS, total_mac);
+ print_title(message);
+
+ if (IS_ATMEL12350_VERNET) {
+ print_viewtype_rssi();
+ scroll_rows(first, begin, end, 1, 3);
+ } else
+ scroll_rows(first, begin, end, 1, 0);
+
switch (getch()) {
- case 'S':
- case 's':
- save_Stations(first);
- continue;
- case KEY_RIGHT:
- case KEY_DOWN:
- if (end < mac_num) {
- begin++;
- end++;
- scroll_rows(first, begin, end, 1, 0);
- }
- continue;
- case KEY_UP:
- case KEY_LEFT:
- if (begin > 1) {
- begin--;
- end--;
- scroll_rows(first, begin, end, 1, 0);
- }
- continue;
- case 'Q':
- case 'q':
- goto exit;
+ case 'S':
+ case 's':
+ save_Stations(first);
+ continue;
+ case KEY_RIGHT:
+ case KEY_DOWN:
+ if (end < mac_idx) {
+ begin++;
+ end++;
+ }
+ continue;
+ case KEY_UP:
+ case KEY_LEFT:
+ if (begin > 1) {
+ begin--;
+ end--;
+ }
+ continue;
+ case 'Q':
+ case 'q':
+ goto exit;
+ case 'T':
+ case 't':
+ if (IS_ATMEL12350_VERNET) {
+ sts_viewtype += 1;
+ if (sts_viewtype == 3)
+ sts_viewtype = 0;
+ }
+ continue;
+ default:
+ while ((curr = first)) {
+ first = curr->next;
+ free(curr);
+ }
+ first = curr = NULL;
+ goto refresh;
}
}
- exit:
+exit:
while ((curr = first)) {
first = curr->next;
free(curr);
void nwn_stations()
{
- unsigned char Mac[] =
- { 0x2b, 0x06, 0x01, 0x04, 0x01, 0x87, 0x29, 0x03, 0x01, 0x03, 0x01,
+ unsigned char Mac[] = {
+ 0x2b, 0x06, 0x01, 0x04, 0x01, 0x87, 0x29, 0x03, 0x01, 0x03, 0x01,
0x02, 0x01, 0x02, 0x80, 0x00 };
-
- unsigned char Quality[] =
- { 0x2b, 0x06, 0x01, 0x04, 0x01, 0x87, 0x29, 0x03, 0x01, 0x03, 0x01,
- 0x02, 0x01, 0x03, 0x80, 0x00 };
- unsigned char Age[] =
- { 0x2b, 0x06, 0x01, 0x04, 0x01, 0x87, 0x29, 0x03, 0x01, 0x03, 0x01,
- 0x02, 0x01, 0x04, 0x80, 0x00 };
- unsigned char RSSI[] =
- { 0x2b, 0x06, 0x01, 0x04, 0x01, 0x87, 0x29, 0x03, 0x01, 0x03, 0x01,
- 0x02, 0x01, 0x05, 0x80, 0x00 };
+ unsigned char Quality[] = {
+ 0x2b, 0x06, 0x01, 0x04, 0x01, 0x87, 0x29, 0x03, 0x01, 0x03, 0x01,
+ 0x02, 0x01, 0x03, 0x80, 0x00 };
+ unsigned char Age[] = {
+ 0x2b, 0x06, 0x01, 0x04, 0x01, 0x87, 0x29, 0x03, 0x01, 0x03, 0x01,
+ 0x02, 0x01, 0x04, 0x80, 0x00 };
+ unsigned char RSSI[] = {
+ 0x2b, 0x06, 0x01, 0x04, 0x01, 0x87, 0x29, 0x03, 0x01, 0x03, 0x01,
+ 0x02, 0x01, 0x05, 0x80, 0x00 };
struct MacListStat *first = NULL, *curr = NULL;
char null[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, message[1024];
- int mac_num, begin, end;
+ int mac_idx, begin, end;
varbind varbinds[4];
unsigned char next_num;
- mac_num = 0;
+ mac_idx = 0;
print_title(_("Associated stations"));
mvwaddstr(main_sub, 0, 3,
_("Id MAC address Quality Age RSSI"));
goto exit;
}
-
if (memcmp(null, varbinds[0].value, 6)) {
if (first == NULL) {
first =
malloc(sizeof(struct MacListStat));
curr = curr->next;
}
- memcpy(curr->addr, varbinds[0].value, 6);
- curr->quality = *varbinds[1].value;
- curr->idle = *varbinds[2].value;
- curr->rssi = *varbinds[3].value;
- curr->next = NULL;
- mac_num++;
+ memcpy(curr->addr, varbinds[0].value, 6);
+ curr->quality = *varbinds[1].value;
+ curr->idle = *varbinds[2].value;
+ curr->rssi = *varbinds[3].value;
+ curr->next = NULL;
+ mac_idx++;
}
varbinds[0].oid = Mac;
next_num = varbinds[0].oid[varbinds[0].len_oid - 1];
}
- sprintf(message, "%s: %d", _("Associated stations"), mac_num);
+ sprintf(message, "%s: %d", _("Associated stations"), mac_idx);
print_title(message);
- if(mac_num) {
+ if(mac_idx) {
begin = 1;
- end = (MAX_LINES < mac_num+1) ? MAX_LINES : mac_num+1;
+ end = (MAX_LINES < mac_idx+1) ? MAX_LINES : mac_idx+1;
scroll_rows(first, begin, end, 1, 1);
print_help(_("Arrows - scroll; S - save to file; Q - quit to menu."));
while (1) {
continue;
case KEY_DOWN:
case KEY_RIGHT:
- if (end < mac_num+1) {
+ if (end < mac_idx+1) {
begin++;
end++;
scroll_rows(first, begin, end, 1, 1);
projects / ap-utils.git / commitdiff