x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

nx-libs.git - build-baikal (branch) created: redist-server/3.5.0.17
by git-admin＠x2go.org 04 Jan '13

04 Jan '13

The branch, build-baikal has been created at 69c809af9659d1b429d832d05642beb78722f67c (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - build-main (branch) updated: redist-server/3.5.0.17
by git-admin＠x2go.org 04 Jan '13

04 Jan '13

The branch, build-main has been updated via 69c809af9659d1b429d832d05642beb78722f67c (commit) via 1d766945896449579fec1c79696dc6bb9a40c088 (commit) via abc2ce3f89346dae54cd595ed980540b52245652 (commit) via 17371711fcc8afb9824b4bb8db103e9709de9be1 (commit) via 62f66b02af0ee9e2366ac6cf672da42c367aff98 (commit) via bfe6f4349e15fe2ae70e773552e1dc080f04b68d (commit) via 36a2247e0e65d7b30f95687aaa43f51c373fcc24 (commit) via 300bafb1af567620df502cacb8bab7cac1ce9bf3 (commit) via 978aaa0a468aed9cb9efc6b414f5bb18acdcc7b1 (commit) via 918e2b10dbcc435b81929aadd6305b25cc0ccbad (commit) via 352751ef9e0d9d652a7f0ae2403c647c9053dcb1 (commit) via f2011a718adfab50d050abd282cfc04c8c534f75 (commit) via 08d568a2c0a4845c92358a710d22d74804d38ef3 (commit) via d123923a501758cace37fc2138feff5751b0a25b (commit) via 0ef5ea2eb63cda1b4e40fd1c7eb1f32cb80e4071 (commit) via 682c8070563310272890f8bd6364216e2e6d007b (commit) via e559c7522f1c4883b7e1a190ec4d1ded4d99b856 (commit) via 9a3737b14aabe3b077b54183a326ec4d83354ce0 (commit) via b09b686cf380a96717e29fbf1557b86d057a465f (commit) via d139e5d3da1b56457d7f076581de7e186fe2e6f2 (commit) via a12ad50503536fc1e9cd3ff1bf11ef4869da6e6d (commit) via 3970fabc565a26751a795c71722eaf3ec510303f (commit) via 263523d7bde6fd6f24c2e14ba88180ac38335fe7 (commit) via 6b505a48acf38d0450d7c615ac8f2e67b44aacf4 (commit) via d634c16aaa793ab61ac40ced6ab741d5831ef570 (commit) via 3727d736b600096b9a177bec5b8639605ba776ac (commit) via 923b7c7eb08520622becfa86389abc2a45e771b7 (commit) via 016959d115d86e65771d876ec1287e30e5245401 (commit) via 241010302cdcd8c4f4ee33a717958e8782a24a6c (commit) via 19685c5665850cfdee350023f6187f6d8a22e5d5 (commit) via 26901cc52224dbfbf308b9252640563e4b52e960 (commit) via fe598a1e55a7bcd5578c06848e91ff869637c9c6 (commit) via 0def0092f904ecbcaf68a4f1880a730dcc2d8aed (commit) via 6c9bd8865df4ec7e1fbd63bb7e349a6aaef3e8ae (commit) via 2093e705a25923942819f31f2b51229c9da85ced (commit) via cf5ac17d6f3bc427e3f50bc1ec60e56c05214e81 (commit) via 2a112c1c3285da54a880c2ac19369d2c271b2760 (commit) via 5938c38aed27035718cea6e92f98294734836e36 (commit) via 0a91caa987a5a4f278140323089c4afd8fe1041f (commit) via 34f232c142929a1f833faae96873e009b317ec2b (commit) via 5a640efd1002d5fadff72542afb8e00bd14bcb6e (commit) via 9e8a2792f5c378345248d781877940a30684c759 (commit) from 3fd30962b9c3eda3b92ee5f998ffc4eeef6faeed (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/Makefile.nx-libs | 161 + debian/VERSION.x2goagent | 2 +- debian/changelog | 49 + debian/control | 69 +- debian/libnx-mesa-extras-dev.install | 6 +- debian/libnx-x11-dev.dirs | 2 - debian/libnx-x11-dev.install | 10 +- debian/libnx-x11.dirs | 1 - debian/libnx-x11.install | 4 +- debian/nxagent.docs | 3 +- debian/nxauth.install | 4 +- debian/nxproxy.install | 5 +- ...00_add-NX-redistribution-README.full+lite.patch | 3 +- .../patches/001_add-main-makefile.full+lite.patch | 91 - ...xcompext_makefile-uninstall+autoconf.full.patch | 2 +- debian/patches/020_add-nxagent-wrapper.full.patch | 35 - debian/patches/021_add-nxauth-wrapper.full.patch | 36 - .../022_add-nxproxy-wrapper.full+lite.patch | 36 - .../patches/023_add-x2goagent-wrapper.full.patch | 36 - .../025_nxproxy_no-configure-file.full+lite.patch | 5637 -------------------- .../026_nxcomp_honour-optflags.full+lite.patch | 31 + .../026_nxcompext_honour-optflags.full.patch | 17 + .../026_nxcompshad_honour-optflags.full.patch | 17 + .../patches/030_nx-X11_configure-args.full.patch | 4 +- debian/patches/031_nx-X11_parallel-make.full.patch | 40 +- .../302_nxagent_configurable-keystrokes.full.patch | 1031 ++++ ...nxcompext+nxcompshad_unique-libnames.full.patch | 544 +- debian/patches/series | 10 +- debian/post-build-nx.sh | 25 - debian/pre-build-nx.sh | 12 - debian/roll-tarballs.sh | 150 + debian/rules | 39 +- debian/wrappers/nxagent | 32 + debian/wrappers/nxauth | 32 + debian/wrappers/nxproxy | 32 + debian/wrappers/x2goagent | 32 + debian/x2goagent.dirs | 4 +- debian/x2goagent.install | 9 +- debian/x2goagent.links | 1 - nxproxy/configure | 5634 ------------------- 40 files changed, 1873 insertions(+), 12015 deletions(-) create mode 100644 debian/Makefile.nx-libs delete mode 100644 debian/libnx-x11-dev.dirs delete mode 100644 debian/patches/001_add-main-makefile.full+lite.patch delete mode 100644 debian/patches/020_add-nxagent-wrapper.full.patch delete mode 100644 debian/patches/021_add-nxauth-wrapper.full.patch delete mode 100644 debian/patches/022_add-nxproxy-wrapper.full+lite.patch delete mode 100644 debian/patches/023_add-x2goagent-wrapper.full.patch delete mode 100644 debian/patches/025_nxproxy_no-configure-file.full+lite.patch create mode 100644 debian/patches/026_nxcomp_honour-optflags.full+lite.patch create mode 100644 debian/patches/026_nxcompext_honour-optflags.full.patch create mode 100644 debian/patches/026_nxcompshad_honour-optflags.full.patch create mode 100644 debian/patches/302_nxagent_configurable-keystrokes.full.patch delete mode 100755 debian/post-build-nx.sh delete mode 100755 debian/pre-build-nx.sh create mode 100755 debian/roll-tarballs.sh create mode 100644 debian/wrappers/nxagent create mode 100644 debian/wrappers/nxauth create mode 100644 debian/wrappers/nxproxy create mode 100644 debian/wrappers/x2goagent delete mode 100644 debian/x2goagent.links delete mode 100755 nxproxy/configure The diff of changes is: diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs new file mode 100644 index 0000000..5cfc96e --- /dev/null +++ b/debian/Makefile.nx-libs @@ -0,0 +1,161 @@ +#!/usr/bin/make -f + +INSTALL_DIR=install -d -m 755 +INSTALL_FILE=install -m 644 +INSTALL_PROGRAM=install -m 755 +COPY_SYMLINK=cp -a +RM_FILE=rm -f +RM_DIR=rmdir -p --ignore-fail-on-non-empty + +PREFIX ?= /usr/local +BINDIR=$(PREFIX)/bin +NXLIBDIR=$(PREFIX)/lib/nx +X2GOLIBDIR=$(PREFIX)/lib/x2go +CONFIGURE ?= ./configure + +SHELL:=/bin/bash + +%: + if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi + if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi + if test -d nx-X11; then \ + if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ + if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ + if test -f nx-X11/Makefile; then ${MAKE} -C nx-X11 $@; fi; \ + fi + +all: build + +test: + echo "No testing for NX (redistributed)" + +build-lite: + cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE} + cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} + +build-full: +# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles... + cd nxcomp && autoconf + cd nxcompext && autoconf + cd nxcompshad && autoconf + cd nx-X11 && ${MAKE} World + cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} + +build: + if ! test -d nx-X11; then \ + ${MAKE} build-lite; \ + else \ + ${MAKE} build-full; \ + fi + +install: + $(MAKE) install-lite + [ ! -d nx-X11 ] || $(MAKE) install-full + +install-lite: + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + for f in nxproxy; do \ + $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done + for d in nxcomp nxproxy; do \ + $(MAKE) -C $$d install; done + $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin + $(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(NXLIBDIR)/bin + +install-full: + for f in nxagent nxauth x2goagent; do \ + $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done + for d in nxcompext nxcompshad; do \ + $(MAKE) -C $$d install; done + + $(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ + cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf ../../nx/bin/nxagent x2goagent + + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps + $(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/x2go.xpm $(DESTDIR)$(PREFIX)/share/pixmaps + + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go + $(INSTALL_FILE) rgb $(DESTDIR)$(PREFIX)/share/x2go + + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/nx + $(INSTALL_FILE) nx-X11/programs/Xserver/Xext/SecurityPolicy $(DESTDIR)$(PREFIX)/share/nx + + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go/versions + $(INSTALL_FILE) VERSION.x2goagent $(DESTDIR)$(PREFIX)/share/x2go/versions + + $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin + $(INSTALL_PROGRAM) nx-X11/programs/nxauth/nxauth $(DESTDIR)$(NXLIBDIR)/bin + $(INSTALL_PROGRAM) nx-X11/programs/Xserver/nxagent $(DESTDIR)$(NXLIBDIR)/bin + + # create a clean nx-X11/.build-exports space + rm -Rf nx-X11/.build-exports + mkdir -p nx-X11/.build-exports/include + mkdir -p nx-X11/.build-exports/lib + + # copy headers (for libnx-x11-dev) + cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include + + # copy libs (for libnx-x11) + find nx-X11/exports/lib/ | egrep "^.*\.so$$" | while read libpath; do \ + libfile=$$(basename $$libpath); \ + libdir=$$(dirname $$libpath); \ + \ + mkdir -p $${libdir//exports/.build-exports}; \ + cp -L $$libpath $${libdir//exports/.build-exports}; \ + \ + find $$libdir/$$libfile.* | while read symlink; do \ + ln -s $$libfile $${libdir//exports/.build-exports}/$$(basename $$symlink); \ + done; \ + done; + + $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11 + $(INSTALL_FILE) nx-X11/.build-exports/lib/*.so $(DESTDIR)$(NXLIBDIR)/X11/ + $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so.* $(DESTDIR)$(NXLIBDIR)/X11/ + + find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \ + while read dirname; do \ + $(INSTALL_DIR) $${dirname//"nx-X11/.build-exports/include"/"$(DESTDIR)$(PREFIX)/include/nx"}; \ + $(INSTALL_FILE) $${dirname}/*.h \ + $${dirname//"nx-X11/.build-exports/include"/"$(DESTDIR)$(PREFIX)/include/nx"}/ || true; \ + done; \ + + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/X11/bitmaps + $(INSTALL_FILE) nx-X11/.build-exports/include/X11/bitmaps/* \ + $(DESTDIR)$(PREFIX)/include/nx/X11/bitmaps/ + + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GL/internal + $(INSTALL_FILE) nx-X11/extras/Mesa/include/GL/*.h \ + $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GL/ + + $(INSTALL_FILE) nx-X11/extras/Mesa/include/GL/internal/*.h \ + $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GL/internal/ + + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GLES/ + $(INSTALL_FILE) nx-X11/extras/Mesa/include/GLES/*.h \ + $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GLES/ + +uninstall: + $(MAKE) uninstall-lite + [ ! -d nx-X11 ] || $(MAKE) uninstall-full + +uninstall-lite: + for f in nxproxy; do \ + $(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done + +uninstall-full: + for f in nxagent nxauth x2goagent; do \ + $(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done + + $(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent + $(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ + + if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi + if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi + + if test -d nx-X11; then \ + if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ + if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ + if test -f nx-X11/Makefile; then \ + if test -d $(PREFIX)/lib/nx; then rm -rf $(PREFIX)/lib/nx; fi; \ + if test -d $(PREFIX)/include/nx; then rm -rf $(PREFIX)/include/nx; fi; \ + fi; \ + fi diff --git a/debian/VERSION.x2goagent b/debian/VERSION.x2goagent index a1320c3..056cec0 100644 --- a/debian/VERSION.x2goagent +++ b/debian/VERSION.x2goagent @@ -1 +1 @@ -3.5.0.15 \ No newline at end of file +3.5.0.17 \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index a0cd320..52627bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,52 @@ +nx-libs (2:3.5.0.17-0) unstable; urgency=low + + [ Jan Engelhardt ] + * Fix /bin/Makefile. Add $(DESTDIR) to every install path. + + [ Alexander Wuerstlein ] + * Add patch: 302_nxagent_configurable-keystrokes.full.patch, replaces the + hardcoded nxagent keybindings by a configurable table of keybindings. + (Closes upstream issue: #74). + * Follow-up commit for 302_nxagent_configurable-keystrokes.full.patch, fixes + FTBFS problem with the first version of that patch. + + [ Mike Gabriel ] + * Add README.keystrokes to doc section of bin:package nxagent. + * Add libxml2-dev to build dependencies. + * Add pkg-config to build dependencies. + * Continue Reinhard's work on top-level install/uninstall. Esp. + integrate debian/post-nx-build.sh into main Makefile. Make + value of CONFIGURE variable traversable through the Makefile tree. + + [ Orion Poplawski ] + * Add patches: 026_nxcomp*_honour-optflags.full*.patch. (Closes upstream + issue #84). + + [ Reinhard Tartler ] + * Install debug symbols for all packages in a new binary package + 'nx-x11-dbg'. + * Drop patch: 025_nxproxy_no-configure-file.full+lite.patch, instead remove + file nxproxy/configure from the source tree. + * Add roll-tarball.sh: replaces nx-tarballrelease script that could be + found in nx-buildscripts branch of nx-libs.git. Use this script to + create tarballs of nx-libs and nx-libs-lite. + * Fix installation of libxcompext, thanks to Orion Paplowski for spotting + this. + * /debian/rules: + + Integrate code from /debian/pre-build-nx.sh and drop the named file. + + Disable parallel build of .deb packages. + * /debian/control: + + Rely on shlibs instead of hardcoded dependencies. + + Drop xbitmaps from Build-Depends. + + Move xfonts-base over to Recommends. + * Update 031_nx-X11_parallel-make.full.patch. Add an explicit dependency + from the NX libX11.so to the nxcomp libraries. Unbreaks parallel builds. + (Fixes: #87). + * Fix and greatly enhance the top-level install and uninstall target for + plain makefile installs. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 04 Jan 2013 13:23:57 +0100 + nx-libs (2:3.5.0.16-0) unstable; urgency=low * Fix installation of header files in Debian package. diff --git a/debian/control b/debian/control index 75a7f30..541eeff 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: nx-libs Section: x11 -Priority: optional +Priority: extra Maintainer: X2Go Developers <x2go-dev(a)lists.berlios.de> Uploaders: Reinhard Tartler <siretart(a)tauware.de>, @@ -13,14 +13,15 @@ Build-Depends: zlib1g-dev, quilt (>= 0.46-7~), libxmltok1-dev, - autoconf + libxml2-dev, + autoconf, + pkg-config, Build-Conflicts: x11proto-core-dev, x11proto-kb-dev, x11proto-randr-dev, x11proto-record-dev, x11proto-xinerama-dev, - xbitmaps Standards-Version: 3.9.3 Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary Vcs-Git: git://code.x2go.org/nx-libs.git @@ -30,8 +31,8 @@ Package: libnx-x11 Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} -Breaks: nxlibs (<=3.5.1) + ${misc:Depends}, +Breaks: nxlibs (<= 3.5.1) Replaces: nxlibs Description: nx-X11 NX is a software suite which implements very efficient @@ -47,8 +48,8 @@ Architecture: any Breaks: nxlibs-dev (<=3.5.1) Replaces: nxlibs-dev Depends: - libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~), - ${misc:Depends} + libnx-x11 (= ${binary:Version}), + ${misc:Depends}, Description: Library headers for nx-X11 NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -61,8 +62,8 @@ Package: libnx-mesa-extras-dev Section: libdevel Architecture: any Depends: - libnx-x11-dev (>= ${source:Version}), libnx-x11-dev (<< ${source:Version}.1~), - ${misc:Depends} + libnx-x11-dev (= ${binary:Version}), + ${misc:Depends}, Description: Library headers for nx-X11 (extra headers) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -74,10 +75,10 @@ Description: Library headers for nx-X11 (extra headers) Package: nxagent Architecture: any Depends: - libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~), - xfonts-base, ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, +Recommends: + xfonts-base, Description: NX agent NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -101,7 +102,7 @@ Package: x2goagent Architecture: all Depends: nxagent (>= ${source:Version}), - ${misc:Depends} + ${misc:Depends}, Suggests: x2goserver Description: X2Go agent @@ -122,9 +123,8 @@ Description: X2Go agent Package: nxproxy Architecture: any Depends: - libxcomp3 (>= ${source:Version}), libxcomp3 (<< ${source:Version}.1~), ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, Description: NX proxy NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -135,9 +135,8 @@ Description: NX proxy Package: nxauth Architecture: any Depends: - libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~), ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, Description: NX xauth NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -149,8 +148,8 @@ Package: libxcomp3 Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} -Breaks: nxcomp (<=3.5.1) + ${misc:Depends}, +Breaks: nxcomp (<= 3.5.1) Replaces: nxcomp Description: NX X compression library NX is a software suite which implements very efficient @@ -164,7 +163,7 @@ Section: libdevel Architecture: any Depends: libxcomp3 (= ${binary:Version}), - ${misc:Depends} + ${misc:Depends}, Breaks: nxcomp-dev (<=3.5.1) Replaces: nxcomp-dev Description: NX X compression library headers @@ -177,9 +176,8 @@ Description: NX X compression library headers Package: libxcompext3 Architecture: any Depends: - libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~), ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, Breaks: nxcompext (<=3.5.1) Replaces: nxcompext Description: NX X11 protocol compression extensions library @@ -193,7 +191,7 @@ Package: libxcompext-dev Architecture: any Section: libdevel Depends: - libxcompext3 (=${binary:Version}), + libxcompext3 (= ${binary:Version}), ${misc:Depends}, libxcomp-dev, Breaks: nxcompext-dev (<=3.5.1) @@ -210,9 +208,8 @@ Package: libxcompshad3 Section: x11 Architecture: any Depends: - libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~), ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, Breaks: nxcompshad (<=3.5.1) Replaces: nxcompshad Description: NX shadowing library @@ -226,9 +223,9 @@ Package: libxcompshad-dev Section: libdevel Architecture: any Depends: - libxcompshad3 (=${binary:Version}), - ${misc:Depends} -Breaks: nxcompshad-dev (<=3.5.1) + libxcompshad3 (= ${binary:Version}), + ${misc:Depends}, +Breaks: nxcompshad-dev (<= 3.5.1) Replaces: nxcompshad-dev Description: NX shadowing library headers NX is a software suite which implements very efficient @@ -237,3 +234,19 @@ Description: NX shadowing library headers . This package provides a library for shadow session support (header files). + +Package: nx-x11-dbg +Section: debug +Architecture: any +Depends: + libnx-x11 (= ${binary:Version}), + nxagent (= ${binary:Version}), + ${misc:Depends}, +Description: Debug Symbols for nx-x11 libraries + NX is a software suite which implements very efficient + compression of the X11 protocol. This increases performance when + using X applications over a network, especially a slow one. + . + This package contains detached debug symbols that help generating more + helpful backtraces. You can safely remove it if you do not intend to + debug NX packages on this system. diff --git a/debian/libnx-mesa-extras-dev.install b/debian/libnx-mesa-extras-dev.install index 7a54b8f..52fc7ba 100644 --- a/debian/libnx-mesa-extras-dev.install +++ b/debian/libnx-mesa-extras-dev.install @@ -1,3 +1,3 @@ -nx-X11/extras/Mesa/include/GL/*.h usr/include/nx/extras/Mesa/GL/ -nx-X11/extras/Mesa/include/GL/internal/*.h usr/include/nx/extras/Mesa/GL/internal/ -nx-X11/extras/Mesa/include/GLES/*.h usr/include/nx/extras/Mesa/GLES/ +usr/include/nx/extras/Mesa/GL/ +usr/include/nx/extras/Mesa/GL/internal/ +usr/include/nx/extras/Mesa/GLES/ diff --git a/debian/libnx-x11-dev.dirs b/debian/libnx-x11-dev.dirs deleted file mode 100644 index 4496244..0000000 --- a/debian/libnx-x11-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/nx/X11 -usr/include/nx/X11/extensions diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install index 47fca29..09379b9 100644 --- a/debian/libnx-x11-dev.install +++ b/debian/libnx-x11-dev.install @@ -1,4 +1,6 @@ -nx-X11/.build-exports/include/* usr/include/nx/ -nx-X11/include/extensions/Xinerama.h usr/include/nx/X11/extensions/ - - +usr/include/nx/expat.h +usr/include/nx/ft2build.h +usr/include/nx/GL +usr/include/nx/X11 +usr/include/nx/fontconfig +usr/include/nx/freetype2 diff --git a/debian/libnx-x11.dirs b/debian/libnx-x11.dirs index 72f9ea3..339b13b 100644 --- a/debian/libnx-x11.dirs +++ b/debian/libnx-x11.dirs @@ -1,4 +1,3 @@ -usr/lib/nx/X11 usr/lib/nx/X11/Xinerama usr/lib/nx/X11/Xrandr usr/share/nx diff --git a/debian/libnx-x11.install b/debian/libnx-x11.install index 7838d08..fb609cc 100644 --- a/debian/libnx-x11.install +++ b/debian/libnx-x11.install @@ -1,2 +1,2 @@ -nx-X11/.build-exports/lib/* usr/lib/nx/X11 -nx-X11/programs/Xserver/Xext/SecurityPolicy usr/share/nx +usr/lib/nx/X11 +usr/share/nx diff --git a/debian/nxagent.docs b/debian/nxagent.docs index 111e25b..6d791c6 100644 --- a/debian/nxagent.docs +++ b/debian/nxagent.docs @@ -1 +1,2 @@ -nx-X11/programs/Xserver/hw/nxagent/changelog \ No newline at end of file +nx-X11/programs/Xserver/hw/nxagent/changelog +README.keystrokes \ No newline at end of file diff --git a/debian/nxauth.install b/debian/nxauth.install index 94e4035..9c5db00 100644 --- a/debian/nxauth.install +++ b/debian/nxauth.install @@ -1,2 +1,2 @@ -nx-X11/programs/nxauth/nxauth usr/lib/nx/bin -bin/nxauth usr/bin +usr/lib/nx/bin/nxauth +usr/bin/nxauth diff --git a/debian/nxproxy.install b/debian/nxproxy.install index 7b2af0f..46c2e0a 100644 --- a/debian/nxproxy.install +++ b/debian/nxproxy.install @@ -1,3 +1,2 @@ -nxproxy/nxproxy usr/lib/nx/bin -bin/nxproxy usr/bin - +usr/lib/nx/bin/nxproxy +usr/bin/nxproxy diff --git a/debian/patches/000_add-NX-redistribution-README.full+lite.patch b/debian/patches/000_add-NX-redistribution-README.full+lite.patch index c9641cc..47490c7 100644 --- a/debian/patches/000_add-NX-redistribution-README.full+lite.patch +++ b/debian/patches/000_add-NX-redistribution-README.full+lite.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/README.NX-redistributed -@@ -0,0 +1,43 @@ +@@ -0,0 +1,42 @@ +NX redistribution by X2Go +------------------------- +This source tree is a re-distribution of those NX packages needed to @@ -43,4 +43,3 @@ + +thanks+light+love +Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -+ diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch deleted file mode 100644 index 1376d44..0000000 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ /dev/null @@ -1,91 +0,0 @@ -Description: Provide main Makefile for whole source tree - By design this patch is not needed to be sent upstream. -Forwarded: not-needed -Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- /dev/null -+++ b/Makefile -@@ -0,0 +1,51 @@ -+#!/usr/bin/make -f -+ -+PREFIX ?= /usr/local -+CONFIGURE=./configure -+ -+%: -+ if test -f bin/Makefile; then ${MAKE} -C bin $@; fi -+ if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi -+ if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi -+ if test -d nx-X11; then \ -+ if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ -+ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ -+ if test -f nx-X11/Makefile; then ${MAKE} -C nx-X11 $@; fi; \ -+ fi -+ -+all: build -+ -+test: -+ echo "No testing for NX (redistributed)" -+ -+build-lite: -+ cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE} -+ cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} -+ -+build-full: -+# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles... -+ cd nxcomp && autoconf -+ cd nxcompext && autoconf -+ cd nxcompshad && autoconf -+ cd nx-X11 && ${MAKE} World -+ cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} -+ -+build: -+ if ! test -d nx-X11; then \ -+ ${MAKE} build-lite; \ -+ else \ -+ ${MAKE} build-full; \ -+ fi -+ -+uninstall: -+ if test -f bin/Makefile; then ${MAKE} -C bin $@; fi -+ if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi -+ if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi -+ if test -d nx-X11; then \ -+ if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ -+ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ -+ if test -f nx-X11/Makefile; then \ -+ if test -d $(PREFIX)/lib/nx; then rm -rf $(PREFIX)/lib/nx; fi; \ -+ if test -d $(PREFIX)/include/nx; then rm -rf $(PREFIX)/include/nx; fi; \ -+ fi; \ -+ fi ---- /dev/null -+++ b/bin/Makefile -@@ -0,0 +1,29 @@ -+#!/usr/bin/make -f -+ -+INSTALL_DIR=install -d -o root -g root -m 755 -+INSTALL_FILE=install -o root -g root -m 644 -+INSTALL_PROGRAM=install -o root -g root -m 755 -+ -+RM_FILE=rm -f -+RM_DIR=rmdir -p --ignore-fail-on-non-empty -+ -+DESTDIR= -+PREFIX ?= /usr/local -+BINDIR=$(PREFIX)/bin -+NXLIBDIR=$(PREFIX)/lib/nx -+X2GOLIBDIR=$(PREFIX)/lib/x2go -+ -+%: -+ echo "Nothing to do for $@..." -+ -+install: -+ $(INSTALL_DIR) $(X2GOLIBDIR)/bin/ -+ ln -sf $(NXLIBDIR)/bin/nxagent $(X2GOLIBDIR)/bin/x2goagent -+ find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done -+ find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done -+ -+uninstall: -+ find nx* | while read file; do rm -f $(BINDIR)/$$file; done -+ find x2go* | while read file; do rm -f $(BINDIR)/$$file; done -+ $(RM_FILE) $(X2GOLIBDIR)/bin/x2goagent -+ $(RM_DIR) $(X2GOLIBDIR)/bin/ diff --git a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch index f6c522a..b704fc1 100644 --- a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch +++ b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch @@ -40,7 +40,7 @@ Last-Update: 2012-02-14 + ./mkinstalldirs $(DESTDIR)${libdir}/nx + ./mkinstalldirs $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx -+ $(INSTALL_DATA) libXcompext.so.3 $(DESTDIR)${libdir}/nx ++ $(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx + echo "Running ldconfig tool, this may take a while..." && ldconfig || true diff --git a/debian/patches/020_add-nxagent-wrapper.full.patch b/debian/patches/020_add-nxagent-wrapper.full.patch deleted file mode 100644 index 6e98cb8..0000000 --- a/debian/patches/020_add-nxagent-wrapper.full.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- /dev/null -+++ b/bin/nxagent -@@ -0,0 +1,32 @@ -+#!/bin/bash -+ -+# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -+# -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# 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, see http://www.gnu.org/licenses/. -+ -+NXAPP=nxagent -+NX_LIBS=/usr/lib/nx -+NX_LOCAL_LIBS=/usr/local/lib/nx -+ -+# make sure nxagent starts properly with pam_tmpdir.so being in use -+NX_TEMP=${NX_TEMP:-/tmp} -+export NX_TEMP -+ -+LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH -+test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS -+test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS -+ -+export LD_LIBRARY_PATH -+ -+exec $NX_LIBS/bin/$NXAPP "$@" diff --git a/debian/patches/021_add-nxauth-wrapper.full.patch b/debian/patches/021_add-nxauth-wrapper.full.patch deleted file mode 100644 index caa1a71..0000000 --- a/debian/patches/021_add-nxauth-wrapper.full.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- /dev/null -+++ b/bin/nxauth -@@ -0,0 +1,32 @@ -+#!/bin/bash -+ -+# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -+# -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# 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, see http://www.gnu.org/licenses/. -+ -+NXAPP=nxauth -+NX_LIBS=/usr/lib/nx -+NX_LOCAL_LIBS=/usr/local/lib/nx -+ -+# make sure nxagent starts properly with pam_tmpdir.so being in use -+NX_TEMP=${NX_TEMP:-/tmp} -+export NX_TEMP -+ -+LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH -+test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS -+test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS -+ -+export LD_LIBRARY_PATH -+ -+exec $NX_LIBS/bin/$NXAPP "$@" -\ No newline at end of file diff --git a/debian/patches/022_add-nxproxy-wrapper.full+lite.patch b/debian/patches/022_add-nxproxy-wrapper.full+lite.patch deleted file mode 100644 index 20a1e68..0000000 --- a/debian/patches/022_add-nxproxy-wrapper.full+lite.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- /dev/null -+++ b/bin/nxproxy -@@ -0,0 +1,32 @@ -+#!/bin/bash -+ -+# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -+# -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# 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, see http://www.gnu.org/licenses/. -+ -+NXAPP=nxproxy -+NX_LIBS=/usr/lib/nx -+NX_LOCAL_LIBS=/usr/local/lib/nx -+ -+# make sure nxagent starts properly with pam_tmpdir.so being in use -+NX_TEMP=${NX_TEMP:-/tmp} -+export NX_TEMP -+ -+LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH -+test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS -+test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS -+ -+export LD_LIBRARY_PATH -+ -+exec $NX_LIBS/bin/$NXAPP "$@" -\ No newline at end of file diff --git a/debian/patches/023_add-x2goagent-wrapper.full.patch b/debian/patches/023_add-x2goagent-wrapper.full.patch deleted file mode 100644 index b3be894..0000000 --- a/debian/patches/023_add-x2goagent-wrapper.full.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- /dev/null -+++ b/bin/x2goagent -@@ -0,0 +1,32 @@ -+#!/bin/bash -+ -+# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -+# -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# 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, see http://www.gnu.org/licenses/. -+ -+NXAPP=x2goagent -+NX_LIBS=/usr/lib/nx -+NX_LOCAL_LIBS=/usr/local/lib/nx -+ -+# make sure nxagent starts properly with pam_tmpdir.so being in use -+NX_TEMP=${NX_TEMP:-/tmp} -+export NX_TEMP -+ -+LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH -+test -x $NX_LOCAL_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS -+test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS -+ -+export LD_LIBRARY_PATH -+ -+exec $NX_LIBS/../x2go/bin/$NXAPP "$@" -\ No newline at end of file diff --git a/debian/patches/025_nxproxy_no-configure-file.full+lite.patch b/debian/patches/025_nxproxy_no-configure-file.full+lite.patch deleted file mode 100644 index a718cca..0000000 --- a/debian/patches/025_nxproxy_no-configure-file.full+lite.patch +++ /dev/null @@ -1,5637 +0,0 @@ ---- a/nxproxy/configure -+++ /dev/null -@@ -1,5634 +0,0 @@ --#! /bin/sh --# Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59. --# --# Copyright (C) 2003 Free Software Foundation, Inc. --# This configure script is free software; the Free Software Foundation --# gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -- --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '${1+"$@"}'='"$@"' --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 -- as_unset=unset --else -- as_unset=false --fi -- -- --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH --PS1='$ ' --PS2='> ' --PS4='+ ' -- --# NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- 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 -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -- fi --done -- --# Required to use basename. --if expr a : '$a$' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -- as_basename=basename --else -- as_basename=false --fi -- -- --# Name of the executable. --as_me=`$as_basename "$0" || --$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ -- X"$0" : 'X$//$$' \| \ -- X"$0" : 'X$/$$' \| \ -- . : '$.$' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/; q; } -- /^X\/$\/\/$$/{ s//\1/; q; } -- /^X\/$\/$.*/{ s//\1/; q; } -- s/.*/./; q'` -- -- --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -- --# 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 -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^$['$as_cr_digits']*$$.*$[$]LINENO$[^'$as_cr_alnum'_]$,\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; --esac -- --if expr a : '$a$' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -- as_ln_s='ln -s' -- fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln --else -- as_ln_s='cp -p' --fi --rm -f conf$$ conf$$.exe conf$$.file -- --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'" -- --# Sed expression to map a string onto a valid variable name. --as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -- -- --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- -- --# Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, --# so uname gets run too. --ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -- --exec 6>&1 -- --# --# Initializations. --# --ac_default_prefix=/usr/local --ac_config_libobj_dir=. --cross_compiling=no --subdirs= --MFLAGS= --MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} -- --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} -- --# Identity of this package. --PACKAGE_NAME= --PACKAGE_TARNAME= --PACKAGE_VERSION= --PACKAGE_STRING= --PACKAGE_BUGREPORT= -- --ac_unique_file="Main.c" --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 armcxx armcc CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CXXCPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBVERSION VERSION MAKEDEPEND LIBOBJS LTLIBOBJS' --ac_subst_files='' -- --# Initialize some variables set by options. --ac_init_help= --ac_init_version=false --# The variables have the same names as the options, with --# dashes changed to underlines. --cache_file=/dev/null --exec_prefix=NONE --no_create= --no_recursion= --prefix=NONE --program_prefix=NONE --program_suffix=NONE --program_transform_name=s,x,x, --silent= --site= --srcdir= --verbose= --x_includes=NONE --x_libraries=NONE -- --# Installation directory options. --# These are left unexpanded so users can "make install exec_prefix=/foo" --# and all the variables that are supposed to be based on exec_prefix --# by default will actually change. --# Use braces instead of parens because sh, perl, etc. also accept them. --bindir='${exec_prefix}/bin' --sbindir='${exec_prefix}/sbin' --libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' --sysconfdir='${prefix}/etc' --sharedstatedir='${prefix}/com' --localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' --includedir='${prefix}/include' --oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -- --ac_prev= --for ac_option --do -- # If the previous option needs an argument, assign it. -- if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -- ac_prev= -- continue -- fi -- -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=$.*$'` -- -- # Accept the important Cygnus configure options, so we can diagnose typos. -- -- case $ac_option in -- -- -bindir | --bindir | --bindi | --bind | --bin | --bi) -- ac_prev=bindir ;; -- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) -- bindir=$ac_optarg ;; -- -- -build | --build | --buil | --bui | --bu) -- ac_prev=build_alias ;; -- -build=* | --build=* | --buil=* | --bui=* | --bu=*) -- build_alias=$ac_optarg ;; -- -- -cache-file | --cache-file | --cache-fil | --cache-fi \ -- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -- ac_prev=cache_file ;; -- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -- cache_file=$ac_optarg ;; -- -- --config-cache | -C) -- cache_file=config.cache ;; -- -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -- ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -- datadir=$ac_optarg ;; -- -- -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-$.*$'` -- # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -- -- -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-$[^=]*$'` -- # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -- esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -- -- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ -- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -- | --exec | --exe | --ex) -- ac_prev=exec_prefix ;; -- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ -- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ -- | --exec=* | --exe=* | --ex=*) -- exec_prefix=$ac_optarg ;; -- -- -gas | --gas | --ga | --g) -- # Obsolete; use --with-gas. -- with_gas=yes ;; -- -- -help | --help | --hel | --he | -h) -- ac_init_help=long ;; -- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) -- ac_init_help=recursive ;; -- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) -- ac_init_help=short ;; -- -- -host | --host | --hos | --ho) -- ac_prev=host_alias ;; -- -host=* | --host=* | --hos=* | --ho=*) -- host_alias=$ac_optarg ;; -- -- -includedir | --includedir | --includedi | --included | --include \ -- | --includ | --inclu | --incl | --inc) -- ac_prev=includedir ;; -- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ -- | --includ=* | --inclu=* | --incl=* | --inc=*) -- includedir=$ac_optarg ;; -- -- -infodir | --infodir | --infodi | --infod | --info | --inf) -- ac_prev=infodir ;; -- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -- infodir=$ac_optarg ;; -- -- -libdir | --libdir | --libdi | --libd) -- ac_prev=libdir ;; -- -libdir=* | --libdir=* | --libdi=* | --libd=*) -- libdir=$ac_optarg ;; -- -- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ -- | --libexe | --libex | --libe) -- ac_prev=libexecdir ;; -- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ -- | --libexe=* | --libex=* | --libe=*) -- libexecdir=$ac_optarg ;; -- -- -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -- ac_prev=localstatedir ;; -- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -- localstatedir=$ac_optarg ;; -- -- -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -- ac_prev=mandir ;; -- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -- mandir=$ac_optarg ;; -- -- -nfp | --nfp | --nf) -- # Obsolete; use --without-fp. -- with_fp=no ;; -- -- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -- | --no-cr | --no-c | -n) -- no_create=yes ;; -- -- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) -- no_recursion=yes ;; -- -- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ -- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ -- | --oldin | --oldi | --old | --ol | --o) -- ac_prev=oldincludedir ;; -- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ -- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ -- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) -- oldincludedir=$ac_optarg ;; -- -- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) -- ac_prev=prefix ;; -- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -- prefix=$ac_optarg ;; -- -- -program-prefix | --program-prefix | --program-prefi | --program-pref \ -- | --program-pre | --program-pr | --program-p) -- ac_prev=program_prefix ;; -- -program-prefix=* | --program-prefix=* | --program-prefi=* \ -- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) -- program_prefix=$ac_optarg ;; -- -- -program-suffix | --program-suffix | --program-suffi | --program-suff \ -- | --program-suf | --program-su | --program-s) -- ac_prev=program_suffix ;; -- -program-suffix=* | --program-suffix=* | --program-suffi=* \ -- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) -- program_suffix=$ac_optarg ;; -- -- -program-transform-name | --program-transform-name \ -- | --program-transform-nam | --program-transform-na \ -- | --program-transform-n | --program-transform- \ -- | --program-transform | --program-transfor \ -- | --program-transfo | --program-transf \ -- | --program-trans | --program-tran \ -- | --progr-tra | --program-tr | --program-t) -- ac_prev=program_transform_name ;; -- -program-transform-name=* | --program-transform-name=* \ -- | --program-transform-nam=* | --program-transform-na=* \ -- | --program-transform-n=* | --program-transform-=* \ -- | --program-transform=* | --program-transfor=* \ -- | --program-transfo=* | --program-transf=* \ -- | --program-trans=* | --program-tran=* \ -- | --progr-tra=* | --program-tr=* | --program-t=*) -- program_transform_name=$ac_optarg ;; -- -- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -- | -silent | --silent | --silen | --sile | --sil) -- silent=yes ;; -- -- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -- ac_prev=sbindir ;; -- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -- | --sbi=* | --sb=*) -- sbindir=$ac_optarg ;; -- -- -sharedstatedir | --sharedstatedir | --sharedstatedi \ -- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ -- | --sharedst | --shareds | --shared | --share | --shar \ -- | --sha | --sh) -- ac_prev=sharedstatedir ;; -- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ -- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ -- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ -- | --sha=* | --sh=*) -- sharedstatedir=$ac_optarg ;; -- -- -site | --site | --sit) -- ac_prev=site ;; -- -site=* | --site=* | --sit=*) -- site=$ac_optarg ;; -- -- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -- ac_prev=srcdir ;; -- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -- srcdir=$ac_optarg ;; -- -- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ -- | --syscon | --sysco | --sysc | --sys | --sy) -- ac_prev=sysconfdir ;; -- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ -- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) -- sysconfdir=$ac_optarg ;; -- -- -target | --target | --targe | --targ | --tar | --ta | --t) -- ac_prev=target_alias ;; -- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -- target_alias=$ac_optarg ;; -- -- -v | -verbose | --verbose | --verbos | --verbo | --verb) -- verbose=yes ;; -- -- -version | --version | --versio | --versi | --vers | -V) -- ac_init_version=: ;; -- -- -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-$[^=]*$'` -- # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -- esac -- eval "with_$ac_package='$ac_optarg'" ;; -- -- -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-$.*$'` -- # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -- -- --x) -- # Obsolete; use --with-x. -- with_x=yes ;; -- -- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ -- | --x-incl | --x-inc | --x-in | --x-i) -- ac_prev=x_includes ;; -- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ -- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) -- x_includes=$ac_optarg ;; -- -- -x-libraries | --x-libraries | --x-librarie | --x-librari \ -- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) -- ac_prev=x_libraries ;; -- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ -- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) -- x_libraries=$ac_optarg ;; -- -- -*) { echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -- ;; -- -- *=*) -- ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='` -- # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -- export $ac_envvar ;; -- -- *) -- # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -- ;; -- -- esac --done -- --if test -n "$ac_prev"; then -- ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } --fi -- --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -- esac --done -- --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -- esac --done -- --# There might be people who depend on the old broken behavior: `$host' --# used to hold the argument of --host etc. --# FIXME: To remove some day. --build=$build_alias --host=$host_alias --target=$target_alias -- --# FIXME: To remove some day. --if test "x$host_alias" != x; then -- if test "x$build_alias" = x; then -- cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used." >&2 -- elif test "x$build_alias" != "x$host_alias"; then -- cross_compiling=yes -- fi --fi -- --ac_tool_prefix= --test -n "$host_alias" && ac_tool_prefix=$host_alias- -- --test "$silent" = yes && exec 6>/dev/null -- -- --# Find the source files, if location was not specified. --if test -z "$srcdir"; then -- ac_srcdir_defaulted=yes -- # 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 || --echo X"$0" | -- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X$\/\/$[^/].*/{ s//\1/; q; } -- /^X$\/\/$$/{ s//\1/; q; } -- /^X$\/$.*/{ s//\1/; q; } -- s/.*/./; q'` -- srcdir=$ac_confdir -- if test ! -r $srcdir/$ac_unique_file; then -- srcdir=.. -- fi --else -- ac_srcdir_defaulted=no --fi --if test ! -r $srcdir/$ac_unique_file; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -- else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -- fi --fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%$[^\\/]$[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CXX_set=${CXX+set} --ac_env_CXX_value=$CXX --ac_cv_env_CXX_set=${CXX+set} --ac_cv_env_CXX_value=$CXX --ac_env_CXXFLAGS_set=${CXXFLAGS+set} --ac_env_CXXFLAGS_value=$CXXFLAGS --ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} --ac_cv_env_CXXFLAGS_value=$CXXFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_CXXCPP_set=${CXXCPP+set} --ac_env_CXXCPP_value=$CXXCPP --ac_cv_env_CXXCPP_set=${CXXCPP+set} --ac_cv_env_CXXCPP_value=$CXXCPP -- --# --# Report the --help message. --# --if test "$ac_init_help" = "long"; then -- # Omit some internal or obsolete options to make the list less imposing. -- # This message is too long to be a string in the A/UX 3.1 sh. -- cat <<_ACEOF --\`configure' configures this package to adapt to many kinds of systems. -- --Usage: $0 [OPTION]... [VAR=VALUE]... -- --To assign environment variables (e.g., CC, CFLAGS...), specify them as --VAR=VALUE. See below for descriptions of some of the useful variables. -- --Defaults for the options are specified in brackets. -- --Configuration: -- -h, --help display this help and exit -- --help=short display options specific to this package -- --help=recursive display the short help of all the included packages -- -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking...' messages -- --cache-file=FILE cache test results in FILE [disabled] -- -C, --config-cache alias for \`--cache-file=config.cache' -- -n, --no-create do not create output files -- --srcdir=DIR find the sources in DIR [configure dir or \`..'] -- --_ACEOF -- -- cat <<_ACEOF --Installation directories: -- --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -- --By default, \`make install' will install all the files in --\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify --an installation prefix other than \`$ac_default_prefix' using \`--prefix', --for instance \`--prefix=\$HOME'. -- --For better control, use the options below. -- --Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] --_ACEOF -- -- cat <<\_ACEOF -- --X features: -- --x-includes=DIR X include files are in DIR -- --x-libraries=DIR X library files are in DIR --_ACEOF --fi -- --if test -n "$ac_init_help"; then -- -- cat <<\_ACEOF -- --Optional Packages: -- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -- --with-x use the X Window System -- --Some influential environment variables: -- CXX C++ compiler command -- CXXFLAGS C++ compiler flags -- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a -- nonstandard directory <lib dir> -- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have -- headers in a nonstandard directory <include dir> -- CC C compiler command -- CFLAGS C compiler flags -- CXXCPP C++ preprocessor -- --Use these variables to override the choices made by `configure' or to help --it to find libraries and programs with nonstandard names/locations. -- --_ACEOF --fi -- --if test "$ac_init_help" = "recursive"; then -- # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` -- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -- ac_builddir=. -- --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -- --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- 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 -- -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -- else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -- done --fi -- --test -n "$ac_init_help" && exit 0 --if $ac_init_version; then -- cat <<\_ACEOF -- --Copyright (C) 2003 Free Software Foundation, Inc. --This configure script is free software; the Free Software Foundation --gives unlimited permission to copy, distribute and modify it. --_ACEOF -- exit 0 --fi --exec 5>config.log --cat >&5 <<_ACEOF --This file contains any messages produced by compilers while --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 -- -- $ $0 $@ -- --_ACEOF --{ --cat <<_ASUNAME --## --------- ## --## Platform. ## --## --------- ## -- --hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` --uname -m = `(uname -m) 2>/dev/null || echo unknown` --uname -r = `(uname -r) 2>/dev/null || echo unknown` --uname -s = `(uname -s) 2>/dev/null || echo unknown` --uname -v = `(uname -v) 2>/dev/null || echo unknown` -- --/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` --/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -- --/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` --/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` --/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` --/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` --/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` --/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -- --_ASUNAME -- --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done -- --} >&5 -- --cat >&5 <<_ACEOF -- -- --## ----------- ## --## Core tests. ## --## ----------- ## -- --_ACEOF -- -- --# Keep a trace of the command line. --# Strip out --no-create and --no-recursion so they do not pile up. --# Strip out --silent because we don't want to record it for future runs. --# Also quote any args containing shell meta-characters. --# Make two passes to allow for proper duplicate-argument suppression. --ac_configure_args= --ac_configure_args0= --ac_configure_args1= --ac_sep= --ac_must_keep_next=false --for ac_pass in 1 2 --do -- for ac_arg -- do -- case $ac_arg in -- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -- | -silent | --silent | --silen | --sile | --sil) -- continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -- 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. -- 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 -- fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -- ;; -- esac -- done --done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -- --# When interrupted or exit'd, cleanup temporary files, and complete --# config.log. We remove comments because anyway the quotes in there --# would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. --trap 'exit_status=$? -- # Save into config.log some information that might help in debugging. -- { -- echo -- -- cat <<\_ASBOX --## ---------------- ## --## Cache variables. ## --## ---------------- ## --_ASBOX -- echo -- # The following way of writing the cache mishandles newlines in values, --{ -- (set) 2>&1 | -- 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" -- ;; -- *) -- sed -n \ -- "s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1=\\2/p" -- ;; -- esac; --} -- echo -- -- cat <<\_ASBOX --## ----------------- ## --## Output variables. ## --## ----------------- ## --_ASBOX -- echo -- for ac_var in $ac_subst_vars -- do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -- done | sort -- echo -- -- if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## --_ASBOX -- echo -- for ac_var in $ac_subst_files -- do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -- done | sort -- echo -- fi -- -- if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## --## confdefs.h. ## --## ----------- ## --_ASBOX -- echo -- sed "/^$/d" confdefs.h | sort -- echo -- fi -- test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -- } >&5 -- rm -f core *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -- exit $exit_status -- ' 0 --for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal --done --ac_signal=0 -- --# confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -- --# Predefined preprocessor variables. -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_NAME "$PACKAGE_NAME" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_TARNAME "$PACKAGE_TARNAME" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_VERSION "$PACKAGE_VERSION" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_STRING "$PACKAGE_STRING" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" --_ACEOF -- -- --# Let the site file select an alternate cache file if it wants to. --# Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi --fi --for ac_site_file in $CONFIG_SITE; do -- if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -- sed 's/^/| /' "$ac_site_file" >&5 -- . "$ac_site_file" -- fi --done -- --if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -- case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -- esac -- fi --else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -- >$cache_file --fi -- --# Check that the precious variables saved in the cache have kept the same --# 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 -- 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" -- eval ac_new_val="\$ac_env_${ac_var}_value" -- case $ac_old_set,$ac_new_set in -- set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -- ac_cache_corrupted=: ;; -- ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -- ac_cache_corrupted=: ;; -- ,);; -- *) -- 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: error: \`$ac_var' has changed since the previous run:" >&2;} -- { 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: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -- fi;; -- esac -- # Pass precious variables to config.status. -- if test "$ac_new_set" = set; then -- case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -- *) ac_arg=$ac_var=$ac_new_val ;; -- esac -- case " $ac_configure_args " in -- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -- esac -- fi --done --if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } --fi -- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --CXXFLAGS="-O3" --CPPFLAGS="-O3" -- -- --if test -d "../nx-X11/exports/include" ; then -- CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include" -- LIBS="$LIBS -L../nx-X11/exports/lib" --fi -- -- --if test "${with_ipaq}" = yes; then -- echo -e "enabling ipaq configuration" -- CXX="arm-linux-c++" -- CC="arm-linux-gcc" -- unset ac_cv_prog_armcxx -- unset ac_cv_prog_armcc -- unset ac_cv_prog_CXXCPP -- # Extract the first word of ""$CXX"", so it can be a program name with args. --set dummy "$CXX"; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_armcxx+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$armcxx"; then -- ac_cv_prog_armcxx="$armcxx" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_armcxx="yes" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -- test -z "$ac_cv_prog_armcxx" && ac_cv_prog_armcxx="no" --fi --fi --armcxx=$ac_cv_prog_armcxx --if test -n "$armcxx"; then -- echo "$as_me:$LINENO: result: $armcxx" >&5 --echo "${ECHO_T}$armcxx" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- # Extract the first word of ""$CC"", so it can be a program name with args. --set dummy "$CC"; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_armcc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$armcc"; then -- ac_cv_prog_armcc="$armcc" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_armcc="yes" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -- test -z "$ac_cv_prog_armcc" && ac_cv_prog_armcc="no" --fi --fi --armcc=$ac_cv_prog_armcc --if test -n "$armcc"; then -- echo "$as_me:$LINENO: result: $armcc" >&5 --echo "${ECHO_T}$armcc" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- if test $armcxx = "yes" && test $armcc = "yes" ; then -- ac_cv_prog_CXX="$CXX" -- ac_cv_prog_CC="$CC" -- else -- { { echo "$as_me:$LINENO: error: installation or configuration problem: I cannot find compiler for arm-linux" >&5 --echo "$as_me: error: installation or configuration problem: I cannot find compiler for arm-linux" >&2;} -- { (exit 1); exit 1; }; } -- fi --else -- unset ac_cv_prog_CXX -- unset ac_cv_prog_CC -- unset ac_cv_prog_CXXCPP --fi -- -- --ac_ext=cc --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test -n "$ac_tool_prefix"; then -- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -- do -- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. --set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$CXX"; then -- ac_cv_prog_CXX="$CXX" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --CXX=$ac_cv_prog_CXX --if test -n "$CXX"; then -- echo "$as_me:$LINENO: result: $CXX" >&5 --echo "${ECHO_T}$CXX" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- test -n "$CXX" && break -- done --fi --if test -z "$CXX"; then -- ac_ct_CXX=$CXX -- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CXX"; then -- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CXX="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CXX=$ac_cv_prog_ac_ct_CXX --if test -n "$ac_ct_CXX"; then -- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 --echo "${ECHO_T}$ac_ct_CXX" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- test -n "$ac_ct_CXX" && break --done --test -n "$ac_ct_CXX" || ac_ct_CXX="g++" -- -- CXX=$ac_ct_CXX --fi -- -- --# Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C++ compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 -- (eval $ac_compiler --version </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 -- (eval $ac_compiler -v </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 -- (eval $ac_compiler -V </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -- --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" --# 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 --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 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -- --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out --do -- 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. -- ;; -- [ab].out ) -- # 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;; -- * ) -- break;; -- esac --done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables --See \`config.log' for more details." >&5 --echo "$as_me: error: C++ compiler cannot create executables --See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } --fi -- --ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 -- --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 --echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6 --# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { (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 -- cross_compiling=no -- else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C++ compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- fi -- fi --fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -- --rm -f a.out a.exe conftest$ac_cv_exeext b.out --ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --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); }; then -- # If both `conftest.exe' and `conftest' are `present' (well, observable) --# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will --# work properly (i.e., refer to `conftest.exe'), while it won't with --# `rm'. --for ac_file in conftest.exe conftest conftest.*; do -- test -f "$ac_file" || continue -- 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;; -- * ) break;; -- esac --done --else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi -- --rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -- --rm -f conftest.$ac_ext --EXEEXT=$ac_cv_exeext --ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 --if test "${ac_cv_objext+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 () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -- case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -- *) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'` -- break;; -- esac --done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi -- --rm -f conftest.$ac_cv_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 --OBJEXT=$ac_cv_objext --ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 --if test "${ac_cv_cxx_compiler_gnu+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 () --{ --#ifndef __GNUC__ -- choke me --#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_cxx_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_compiler_gnu=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --ac_cv_cxx_compiler_gnu=$ac_compiler_gnu -- --fi --echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 --GXX=`test $ac_compiler_gnu = yes && echo yes` --ac_test_CXXFLAGS=${CXXFLAGS+set} --ac_save_CXXFLAGS=$CXXFLAGS --CXXFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 --echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cxx_g+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 () --{ -- -- ; -- 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_cxx_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_prog_cxx_g=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_prog_cxx_g=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 --if test "$ac_test_CXXFLAGS" = set; then -- CXXFLAGS=$ac_save_CXXFLAGS --elif test $ac_cv_prog_cxx_g = yes; then -- if test "$GXX" = yes; then -- CXXFLAGS="-g -O2" -- else -- CXXFLAGS="-g" -- fi --else -- if test "$GXX" = yes; then -- CXXFLAGS="-O2" -- else -- CXXFLAGS= -- fi --fi --for ac_declaration in \ -- '' \ -- '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 ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --#include <stdlib.h> --int --main () --{ --exit (42); -- ; -- 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_cxx_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 -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- 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_cxx_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 -- break --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 --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. --set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$CC"; then -- ac_cv_prog_CC="$CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_CC="${ac_tool_prefix}gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --CC=$ac_cv_prog_CC --if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "gcc", so it can be a program name with args. --set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi -- --if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. --set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$CC"; then -- ac_cv_prog_CC="$CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_CC="${ac_tool_prefix}cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --CC=$ac_cv_prog_CC --if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi -- --fi --if test -z "$CC"; then -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$CC"; then -- ac_cv_prog_CC="$CC" # Let the user override the test. --else -- ac_prog_rejected=no --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then -- ac_prog_rejected=yes -- continue -- fi -- ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --if test $ac_prog_rejected = yes; then -- # We found a bogon in the path, so make sure we never use it. -- set dummy $ac_cv_prog_CC -- shift -- if test $# != 0; then -- # We chose a different compiler from the bogus one. -- # However, it has the same basename, so the bogon will be chosen -- # first if we set CC to just the basename; use the full file name. -- shift -- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" -- fi --fi --fi --fi --CC=$ac_cv_prog_CC --if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -- do -- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. --set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$CC"; then -- ac_cv_prog_CC="$CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --CC=$ac_cv_prog_CC --if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- test -n "$CC" && break -- done --fi --if test -z "$CC"; then -- ac_ct_CC=$CC -- for ac_prog in cl --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- test -n "$ac_ct_CC" && break --done -- -- CC=$ac_ct_CC --fi -- --fi -- -- --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- --# Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 -- (eval $ac_compiler --version </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 -- (eval $ac_compiler -v </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 -- (eval $ac_compiler -V </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -- --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 --if test "${ac_cv_c_compiler_gnu+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 () --{ --#ifndef __GNUC__ -- choke me --#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 -- ac_compiler_gnu=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --ac_cv_c_compiler_gnu=$ac_compiler_gnu -- --fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 --GCC=`test $ac_compiler_gnu = yes && echo yes` --ac_test_CFLAGS=${CFLAGS+set} --ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_g+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 () --{ -- -- ; -- 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_prog_cc_g=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_prog_cc_g=no --fi --rm -f conftest.err 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 --if test "$ac_test_CFLAGS" = set; then -- CFLAGS=$ac_save_CFLAGS --elif test $ac_cv_prog_cc_g = yes; then -- if test "$GCC" = yes; then -- CFLAGS="-g -O2" -- else -- CFLAGS="-g" -- fi --else -- if test "$GCC" = yes; then -- CFLAGS="-O2" -- else -- CFLAGS= -- fi --fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_prog_cc_stdc=no --ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdarg.h> --#include <stdio.h> --#include <sys/types.h> --#include <sys/stat.h> --/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ --struct buf { int x; }; --FILE * (*rcsopen) (struct buf *, struct stat *, int); --static char *e (p, i) -- char **p; -- int i; --{ -- return p[i]; --} --static char *f (char * (*g) (char **, int), char **p, ...) --{ -- char *s; -- va_list v; -- va_start (v,p); -- s = g (p, va_arg (v,int)); -- 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);}; --int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); --int argc; --char **argv; --int --main () --{ --return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -- ; -- return 0; --} --_ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" --do -- 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 -- 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_prog_cc_stdc=$ac_arg --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext --done --rm -f conftest.$ac_ext conftest.$ac_objext --CC=$ac_save_CC -- --fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -- *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; --esac -- --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#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 -- for ac_declaration in \ -- '' \ -- '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 ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --#include <stdlib.h> --int --main () --{ --exit (42); -- ; -- 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 -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- 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 -- break --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 --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- --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 --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- --ac_ext=cc --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -- -- -- --ac_aux_dir= --for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do -- if test -f $ac_dir/install-sh; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/install-sh -c" -- break -- elif test -f $ac_dir/install.sh; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/install.sh -c" -- break -- elif test -f $ac_dir/shtool; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/shtool install -c" -- break -- fi --done --if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} -- { (exit 1); exit 1; }; } --fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -- --# Find a good install program. We prefer a C program (faster), --# so one script is as good as another. But avoid the broken or --# incompatible versions: --# SysV /etc/install, /usr/sbin/install --# SunOS /usr/etc/install --# IRIX /sbin/install --# AIX /bin/install --# AmigaOS /C/install, which installs bootblocks on floppy discs --# 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 --if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- # Account for people who put trailing slashes in PATH elements. --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. -- # Don't use installbsd from OSF since it installs stuff as root -- # 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 -- done -- done -- ;; --esac --done -- -- --fi -- if test "${ac_cv_path_install+set}" = set; then -- INSTALL=$ac_cv_path_install -- else -- # As a last resort, use the slow shell script. We don't cache a -- # path for INSTALL within a source directory, because that will -- # break other packages using the cache if that directory is -- # removed, or if the path is relative. -- INSTALL=$ac_install_sh -- fi --fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -- --# Use test -z because SunOS4 sh mishandles braces in ${var-val}. --# It thinks the first close brace ends the variable substitution. --test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -- --test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -- --test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -- -- -- -- --ac_ext=cc --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 --echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 --if test -z "$CXXCPP"; then -- if test "${ac_cv_prog_CXXCPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- # Double quotes because CXXCPP needs to be expanded -- for CXXCPP in "$CXX -E" "/lib/cpp" -- do -- ac_preproc_ok=false --for ac_cxx_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -- # 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 --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_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_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether non-existent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_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_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- # Broken: success on invalid input. --continue --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- break --fi -- -- done -- ac_cv_prog_CXXCPP=$CXXCPP -- --fi -- CXXCPP=$ac_cv_prog_CXXCPP --else -- ac_cv_prog_CXXCPP=$CXXCPP --fi --echo "$as_me:$LINENO: result: $CXXCPP" >&5 --echo "${ECHO_T}$CXXCPP" >&6 --ac_preproc_ok=false --for ac_cxx_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -- # 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 --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_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_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether non-existent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_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_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- # Broken: success on invalid input. --continue --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : --else -- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi -- --ac_ext=cc --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -- -- --echo "$as_me:$LINENO: checking for X" >&5 --echo $ECHO_N "checking for X... $ECHO_C" >&6 -- -- --# Check whether --with-x or --without-x was given. --if test "${with_x+set}" = set; then -- withval="$with_x" -- --fi; --# $have_x is `yes', `no', `disabled', or empty when we do not yet know. --if test "x$with_x" = xno; then -- # The user explicitly disabled X. -- have_x=disabled --else -- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then -- # Both variables are already set. -- have_x=yes -- else -- if test "${ac_cv_have_x+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- # One or both of the vars are not set, and there is no cached value. --ac_x_includes=no ac_x_libraries=no --rm -fr conftest.dir --if mkdir conftest.dir; then -- cd conftest.dir -- # Make sure to not put "make" in the Imakefile rules, since we grep it out. -- cat >Imakefile <<'_ACEOF' --acfindx: -- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' --_ACEOF -- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then -- # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` -- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. -- for ac_extension in a so sl; do -- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && -- test -f $ac_im_libdir/libX11.$ac_extension; then -- ac_im_usrlibdir=$ac_im_libdir; break -- fi -- done -- # Screen out bogus values from the imake configuration. They are -- # bogus both because they are the default anyway, and because -- # using them would break gcc on systems where it needs fixed includes. -- case $ac_im_incroot in -- /usr/include) ;; -- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; -- esac -- case $ac_im_usrlibdir in -- /usr/lib | /lib) ;; -- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; -- esac -- fi -- cd .. -- rm -fr conftest.dir --fi -- --# Standard set of common directories for X headers. --# Check X11 before X11Rn because it is often a symlink to the current release. --ac_x_header_dirs=' --/usr/X11/include --/usr/X11R6/include --/usr/X11R5/include --/usr/X11R4/include -- --/usr/include/X11 --/usr/include/X11R6 --/usr/include/X11R5 --/usr/include/X11R4 -- --/usr/local/X11/include --/usr/local/X11R6/include --/usr/local/X11R5/include --/usr/local/X11R4/include -- --/usr/local/include/X11 --/usr/local/include/X11R6 --/usr/local/include/X11R5 --/usr/local/include/X11R4 -- --/usr/X386/include --/usr/x386/include --/usr/XFree86/include/X11 -- --/usr/include --/usr/local/include --/usr/unsupported/include --/usr/athena/include --/usr/local/x11r5/include --/usr/lpp/Xamples/include -- --/usr/openwin/include --/usr/openwin/share/include' -- --if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Intrinsic.h. -- # First, try using that file with no special directory specified. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <X11/Intrinsic.h> --_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_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- # We can compile using X headers with no special include directory. --ac_x_includes= --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- for ac_dir in $ac_x_header_dirs; do -- if test -r "$ac_dir/X11/Intrinsic.h"; then -- ac_x_includes=$ac_dir -- break -- fi --done --fi --rm -f conftest.err conftest.$ac_ext --fi # $ac_x_includes = no -- --if test "$ac_x_libraries" = no; then -- # Check for the libraries. -- # See if we find them without any special options. -- # Don't add to $LIBS permanently. -- ac_save_LIBS=$LIBS -- LIBS="-lXt $LIBS" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <X11/Intrinsic.h> --int --main () --{ --XtMalloc (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 -- 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_cxx_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 -- LIBS=$ac_save_LIBS --# We can link X programs with no special library path. --ac_x_libraries= --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --LIBS=$ac_save_LIBS --for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` --do -- # Don't even attempt the hair of trying to link an X program! -- for ac_extension in a so sl; do -- if test -r $ac_dir/libXt.$ac_extension; then -- ac_x_libraries=$ac_dir -- break 2 -- fi -- done --done --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi # $ac_x_libraries = no -- --if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then -- # Didn't find X anywhere. Cache the known absence of X. -- ac_cv_have_x="have_x=no" --else -- # Record where we found X for the cache. -- ac_cv_have_x="have_x=yes \ -- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" --fi --fi -- -- fi -- eval "$ac_cv_have_x" --fi # $with_x != no -- --if test "$have_x" != yes; then -- echo "$as_me:$LINENO: result: $have_x" >&5 --echo "${ECHO_T}$have_x" >&6 -- no_x=yes --else -- # If each of the values was on the command line, it overrides each guess. -- test "x$x_includes" = xNONE && x_includes=$ac_x_includes -- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries -- # Update the cache value to reflect the command line values. -- ac_cv_have_x="have_x=yes \ -- ac_x_includes=$x_includes ac_x_libraries=$x_libraries" -- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 --echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 --fi -- --if test "$no_x" = yes; then -- # Not all programs may use this symbol, but it does not hurt to define it. -- --cat >>confdefs.h <<\_ACEOF --#define X_DISPLAY_MISSING 1 --_ACEOF -- -- X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= --else -- if test -n "$x_includes"; then -- X_CFLAGS="$X_CFLAGS -I$x_includes" -- fi -- -- # It would also be nice to do this for all -L options, not just this one. -- if test -n "$x_libraries"; then -- X_LIBS="$X_LIBS -L$x_libraries" -- # For Solaris; some versions of Sun CC require a space after -R and -- # others require no space. Words are not sufficient . . . . -- case `(uname -sr) 2>/dev/null` in -- "SunOS 5"*) -- echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 --echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 -- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- 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_cxx_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_R_nospace=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_R_nospace=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- if test $ac_R_nospace = yes; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- X_LIBS="$X_LIBS -R$x_libraries" -- else -- LIBS="$ac_xsave_LIBS -R $x_libraries" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- 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_cxx_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_R_space=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_R_space=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- if test $ac_R_space = yes; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -- X_LIBS="$X_LIBS -R $x_libraries" -- else -- echo "$as_me:$LINENO: result: neither works" >&5 --echo "${ECHO_T}neither works" >&6 -- fi -- fi -- LIBS=$ac_xsave_LIBS -- esac -- fi -- -- # Check for system-dependent libraries X programs must link with. -- # Do this before checking for the system-independent R6 libraries -- # (-lICE), since we may need -lsocket or whatever for X linking. -- -- if test "$ISC" = yes; then -- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" -- else -- # Martyn Johnson says this is needed for Ultrix, if the X -- # libraries were built with DECnet support. And Karl Berry says -- # the Alpha needs dnet_stub (dnet does not exist). -- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* 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 XOpenDisplay (); --int --main () --{ --XOpenDisplay (); -- ; -- 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_cxx_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 -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 --echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 --if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldnet $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* 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 dnet_ntoa (); --int --main () --{ --dnet_ntoa (); -- ; -- 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_cxx_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_lib_dnet_dnet_ntoa=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_dnet_dnet_ntoa=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 --echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 --if test $ac_cv_lib_dnet_dnet_ntoa = yes; then -- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" --fi -- -- if test $ac_cv_lib_dnet_dnet_ntoa = no; then -- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 --echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 --if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldnet_stub $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* 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 dnet_ntoa (); --int --main () --{ --dnet_ntoa (); -- ; -- 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_cxx_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_lib_dnet_stub_dnet_ntoa=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_dnet_stub_dnet_ntoa=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 --echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 --if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then -- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" --fi -- -- fi --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- LIBS="$ac_xsave_LIBS" -- -- # msh(a)cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, -- # to get the SysV transport functions. -- # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) -- # needs -lnsl. -- # The nsl library prevents programs from opening the X display -- # on Irix 5.2, according to T.E. Dickey. -- # The functions gethostbyname, getservbyname, and inet_addr are -- # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. -- echo "$as_me:$LINENO: checking for gethostbyname" >&5 --echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 --if test "${ac_cv_func_gethostbyname+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 gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define gethostbyname innocuous_gethostbyname -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char gethostbyname (); 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 gethostbyname -- --/* 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 gethostbyname (); --/* 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_gethostbyname) || defined (__stub___gethostbyname) --choke me --#else --char (*f) () = gethostbyname; --#endif --#ifdef __cplusplus --} --#endif -- --int --main () --{ --return f != gethostbyname; -- ; -- 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_cxx_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_gethostbyname=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_func_gethostbyname=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 -- -- if test $ac_cv_func_gethostbyname = no; then -- echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 --echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 --if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lnsl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* 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 gethostbyname (); --int --main () --{ --gethostbyname (); -- ; -- 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_cxx_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_lib_nsl_gethostbyname=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_nsl_gethostbyname=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 --if test $ac_cv_lib_nsl_gethostbyname = yes; then -- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" --fi -- -- if test $ac_cv_lib_nsl_gethostbyname = no; then -- echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 --echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 --if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lbsd $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* 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 gethostbyname (); --int --main () --{ --gethostbyname (); -- ; -- 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_cxx_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_lib_bsd_gethostbyname=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_bsd_gethostbyname=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 --if test $ac_cv_lib_bsd_gethostbyname = yes; then -- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" --fi -- -- fi -- fi -- -- # lieder(a)skyler.mavd.honeywell.com says without -lsocket, -- # socket/setsockopt and other routines are undefined under SCO ODT -- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary -- # on later versions), says Simon Leinen: it contains gethostby* -- # variants that don't use the name server (or something). -lsocket -- # must be given before -lnsl if both are needed. We assume that -- # if connect needs -lnsl, so does gethostbyname. -- echo "$as_me:$LINENO: checking for connect" >&5 --echo $ECHO_N "checking for connect... $ECHO_C" >&6 --if test "${ac_cv_func_connect+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 connect to an innocuous variant, in case <limits.h> declares connect. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define connect innocuous_connect -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char connect (); 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 connect -- --/* 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 connect (); --/* 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_connect) || defined (__stub___connect) --choke me --#else --char (*f) () = connect; --#endif --#ifdef __cplusplus --} --#endif -- --int --main () --{ --return f != connect; -- ; -- 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_cxx_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_connect=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_func_connect=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 --echo "${ECHO_T}$ac_cv_func_connect" >&6 -- -- if test $ac_cv_func_connect = no; then -- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 --echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 --if test "${ac_cv_lib_socket_connect+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lsocket $X_EXTRA_LIBS $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* 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 connect (); --int --main () --{ --connect (); -- ; -- 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_cxx_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_lib_socket_connect=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_socket_connect=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 --echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 --if test $ac_cv_lib_socket_connect = yes; then -- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" --fi -- -- fi -- -- # Guillermo Gomez says -lposix is necessary on A/UX. -- echo "$as_me:$LINENO: checking for remove" >&5 --echo $ECHO_N "checking for remove... $ECHO_C" >&6 --if test "${ac_cv_func_remove+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 remove to an innocuous variant, in case <limits.h> declares remove. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define remove innocuous_remove -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char remove (); 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 remove -- --/* 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 remove (); --/* 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_remove) || defined (__stub___remove) --choke me --#else --char (*f) () = remove; --#endif --#ifdef __cplusplus --} --#endif -- --int --main () --{ --return f != remove; -- ; -- 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_cxx_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_remove=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_func_remove=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 --echo "${ECHO_T}$ac_cv_func_remove" >&6 -- -- if test $ac_cv_func_remove = no; then -- echo "$as_me:$LINENO: checking for remove in -lposix" >&5 --echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 --if test "${ac_cv_lib_posix_remove+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lposix $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* 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 remove (); --int --main () --{ --remove (); -- ; -- 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_cxx_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_lib_posix_remove=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_posix_remove=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 --echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 --if test $ac_cv_lib_posix_remove = yes; then -- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" --fi -- -- fi -- -- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. -- echo "$as_me:$LINENO: checking for shmat" >&5 --echo $ECHO_N "checking for shmat... $ECHO_C" >&6 --if test "${ac_cv_func_shmat+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 shmat to an innocuous variant, in case <limits.h> declares shmat. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define shmat innocuous_shmat -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char shmat (); 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 shmat -- --/* 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 shmat (); --/* 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_shmat) || defined (__stub___shmat) --choke me --#else --char (*f) () = shmat; --#endif --#ifdef __cplusplus --} --#endif -- --int --main () --{ --return f != shmat; -- ; -- 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_cxx_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_shmat=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_func_shmat=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 --echo "${ECHO_T}$ac_cv_func_shmat" >&6 -- -- if test $ac_cv_func_shmat = no; then -- echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 --echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 --if test "${ac_cv_lib_ipc_shmat+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lipc $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* 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 shmat (); --int --main () --{ --shmat (); -- ; -- 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_cxx_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_lib_ipc_shmat=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_ipc_shmat=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 --echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 --if test $ac_cv_lib_ipc_shmat = yes; then -- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" --fi -- -- fi -- fi -- -- # Check for libraries that X11R6 Xt/Xaw programs need. -- ac_save_LDFLAGS=$LDFLAGS -- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" -- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to -- # check for ICE first), but we must link in the order -lSM -lICE or -- # we get undefined symbols. So assume we have SM if we have ICE. -- # These have to be linked with before -lX11, unlike the other -- # libraries we check for below, so use a different variable. -- # John Interrante, Karl Berry -- echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 --echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 --if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lICE $X_EXTRA_LIBS $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* 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 IceConnectionNumber (); --int --main () --{ --IceConnectionNumber (); -- ; -- 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_cxx_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_lib_ICE_IceConnectionNumber=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_ICE_IceConnectionNumber=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 --echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 --if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then -- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" --fi -- -- LDFLAGS=$ac_save_LDFLAGS -- --fi -- -- -- --ac_help="$ac_help -- --with-symbols give -g flag to compiler to produce debug symbols -- --with-info define INFO at compile time to get basic log output -- --with-valgrind clean up allocated buffers to avoid valgrind warnings -- --with-version use this version for produced libraries" -- -- -- -- --echo "$as_me:$LINENO: checking for FreeBSD environment" >&5 --echo $ECHO_N "checking for FreeBSD environment... $ECHO_C" >&6 --if test "${nxconf_cv_freebsd+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 () --{ --return __FreeBSD__; -- ; -- 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_cxx_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 -- nxconf_cv_freebsd=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --nxconf_cv_freebsd=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --rm -f conftest* --fi --echo "$as_me:$LINENO: result: $nxconf_cv_freebsd" >&5 --echo "${ECHO_T}$nxconf_cv_freebsd" >&6 --FreeBSD= --test "$nxconf_cv_freebsd" = yes && FreeBSD=yes -- -- -- --echo "$as_me:$LINENO: checking for Cygwin32 environment" >&5 --echo $ECHO_N "checking for Cygwin32 environment... $ECHO_C" >&6 --if test "${nxconf_cv_cygwin32+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 () --{ --return __CYGWIN32__; -- ; -- 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_cxx_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 -- nxconf_cv_cygwin32=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --nxconf_cv_cygwin32=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --rm -f conftest* --fi --echo "$as_me:$LINENO: result: $nxconf_cv_cygwin32" >&5 --echo "${ECHO_T}$nxconf_cv_cygwin32" >&6 --CYGWIN32= --test "$nxconf_cv_cygwin32" = yes && CYGWIN32=yes -- -- -- --echo "$as_me:$LINENO: checking for Darwin environment" >&5 --echo $ECHO_N "checking for Darwin environment... $ECHO_C" >&6 --if test "${nxconf_cv_darwin+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 () --{ --return __APPLE__; -- ; -- 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_cxx_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 -- nxconf_cv_darwin=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --nxconf_cv_darwin=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --rm -f conftest* --fi --echo "$as_me:$LINENO: result: $nxconf_cv_darwin" >&5 --echo "${ECHO_T}$nxconf_cv_darwin" >&6 --DARWIN= --test "$nxconf_cv_darwin" = yes && DARWIN=yes -- -- -- --echo "$as_me:$LINENO: checking for SunOS environment" >&5 --echo $ECHO_N "checking for SunOS environment... $ECHO_C" >&6 --if test "${nxconf_cv_sun+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 () --{ --return __sun; -- ; -- 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_cxx_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 -- nxconf_cv_sun=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --nxconf_cv_sun=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --rm -f conftest* --fi --echo "$as_me:$LINENO: result: $nxconf_cv_sun" >&5 --echo "${ECHO_T}$nxconf_cv_sun" >&6 --SUN= --test "$nxconf_cv_sun" = yes && SUN=yes -- -- -- -- --if test "${with_version}" = yes; then -- VERSION=${ac_option} --else -- VERSION=`cat VERSION` --fi --echo -e "compiling version ${VERSION}" -- --LIBVERSION=`echo ${VERSION} | cut -d '.' -f 1` -- --CXXFLAGS="$CXXFLAGS -DVERSION=\\\"${VERSION}\\\"" --CPPFLAGS="$CPPFLAGS -DVERSION=\\\"${VERSION}\\\"" -- -- --if test "${with_symbols}" = yes; then -- echo -e "enabling production of debug symbols" -- CXXFLAGS="-g $CXXFLAGS" -- CPPFLAGS="-g $CPPFLAGS" --else -- echo -e "disabling production of debug symbols" --fi -- -- --if test "${with_info}" = yes; then -- echo -e "enabling info output in the log file" -- CXXFLAGS="$CXXFLAGS -DINFO" -- CPPFLAGS="$CPPFLAGS -DINFO" --else -- echo -e "disabling info output in the log file" --fi -- -- --if test "${with_valgrind}" = yes; then -- echo -e "enabling valgrind memory checker workarounds" -- CXXFLAGS="$CXXFLAGS -DVALGRIND" -- CPPFLAGS="$CPPFLAGS -DVALGRIND" --else -- echo -e "disabling valgrind memory checker workarounds" --fi -- -- --if test "$CYGWIN32" = yes; then -- LIBS="$LIBS -L../nxcomp -lXcomp -lstdc++ -Wl,-e,_mainCRTStartup -ljpeg -lpng -lz" --else -- LIBS="$LIBS -L../nxcomp -lXcomp" --fi -- -- -- -- --if test -x "../nx-X11/config/makedepend/makedepend" ; then -- MAKEDEPEND=../nx-X11/config/makedepend/makedepend --else -- if test -x "/usr/X11R6/bin/makedepend" ; then -- MAKEDEPEND=/usr/X11R6/bin/makedepend -- else -- if test -x "/usr/openwin/bin/makedepend" ; then -- MAKEDEPEND=/usr/openwin/bin/makedepend -- else -- MAKEDEPEND=makedepend -- fi -- fi --fi -- -- ac_config_files="$ac_config_files Makefile" --cat >confcache <<\_ACEOF --# This file is a shell script that caches the results of configure --# tests run on this system so they can be shared between configure --# scripts and configure runs, see configure's option --config-cache. --# It is not useful on other systems. If it contains results you don't --# want to keep, you may remove or edit it. --# --# config.status only pays attention to the cache file if you give it --# the --recheck option to rerun configure. --# --# `ac_cv_env_foo' variables (set or unset) will be overridden when --# loading this file, other *unset* `ac_cv_foo' will be assigned the --# following values. -- --_ACEOF -- --# The following way of writing the cache mishandles newlines in values, --# but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. --# Ultrix sh set writes to stderr and can't be redirected directly, --# and sets the high bit in the cache file unless we assign to the vars. --{ -- (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- # `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" -- ;; -- *) -- # `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" -- ;; -- esac; --} | -- sed ' -- t clear -- : clear -- s/^$[^=]*$=$.*[{}].*$$/test "${\1+set}" = set || &/ -- t end -- /^ac_cv_env/!s/^$[^=]*$=$.*$$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -- if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -- cat confcache >$cache_file -- else -- echo "not updating unwritable cache $cache_file" -- fi --fi --rm -f confcache -- --test "x$prefix" = xNONE && prefix=$ac_default_prefix --# Let make expand exec_prefix. --test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -- --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# 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[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^$[^=]*=[ ]*$:*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' --fi -- --# Transform confdefs.h into DEFS. --# Protect against shell expansion while executing Makefile rules. --# Protect against Makefile macro expansion. --# --# If the first sed substitution is executed (which looks for macros that --# take arguments), then we branch to the quote section. Otherwise, --# look for a macro that doesn't take arguments. --cat >confdef2opt.sed <<\_ACEOF --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*$[^ (][^ (]*([^)]*)$[ ]*$.*$,-D\1=\2,g --t quote --s,^[ ]*#[ ]*define[ ][ ]*$[^ ][^ ]*$[ ]*$.*$,-D\1=\2,g --t quote --d --: quote --s,[ `~#$^&*(){}\\|;'"<>?],\\&,g --s,\[,\\&,g --s,\],\\&,g --s,\$,$$,g --p --_ACEOF --# We use echo to avoid assuming a particular line-breaking character. --# The extra dot is to prevent the shell from consuming trailing --# line-breaks from the sub-command output. A line-break within --# single-quotes doesn't work because, if this script is created in a --# platform that uses two characters for line-breaks (e.g., DOS), tr --# would break. --ac_LF_and_DOT=`echo; echo .` --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` --rm -f confdef2opt.sed -- -- --ac_libobjs= --ac_ltlibobjs= --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$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' --done --LIBOBJS=$ac_libobjs -- --LTLIBOBJS=$ac_ltlibobjs -- -- -- --: ${CONFIG_STATUS=./config.status} --ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF --#! $SHELL --# Generated by $as_me. --# Run this file to recreate the current configuration. --# Compiler output produced by configure, useful for debugging --# configure, is in config.log if it exists. -- --debug=false --ac_cs_recheck=false --ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_ACEOF -- --cat >>$CONFIG_STATUS <<\_ACEOF --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -- --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '${1+"$@"}'='"$@"' --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 -- as_unset=unset --else -- as_unset=false --fi -- -- --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH --PS1='$ ' --PS2='> ' --PS4='+ ' -- --# NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- 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 -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -- fi --done -- --# Required to use basename. --if expr a : '$a$' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -- as_basename=basename --else -- as_basename=false --fi -- -- --# Name of the executable. --as_me=`$as_basename "$0" || --$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ -- X"$0" : 'X$//$$' \| \ -- X"$0" : 'X$/$$' \| \ -- . : '$.$' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/; q; } -- /^X\/$\/\/$$/{ s//\1/; q; } -- /^X\/$\/$.*/{ s//\1/; q; } -- s/.*/./; q'` -- -- --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -- --# 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 -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^$['$as_cr_digits']*$$.*$[$]LINENO$[^'$as_cr_alnum'_]$,\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; --esac -- --if expr a : '$a$' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -- as_ln_s='ln -s' -- fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln --else -- as_ln_s='cp -p' --fi --rm -f conf$$ conf$$.exe conf$$.file -- --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'" -- --# Sed expression to map a string onto a valid variable name. --as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -- -- --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- --exec 6>&1 -- --# Open the log real soon, to keep \$[0] and so on meaningful, and to --# report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- --This file was extended by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -- -- CONFIG_FILES = $CONFIG_FILES -- CONFIG_HEADERS = $CONFIG_HEADERS -- CONFIG_LINKS = $CONFIG_LINKS -- CONFIG_COMMANDS = $CONFIG_COMMANDS -- $ $0 $@ -- --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 --_ACEOF -- --# Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -- --cat >>$CONFIG_STATUS <<\_ACEOF -- --ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -- --Usage: $0 [OPTIONS] [FILE]... -- -- -h, --help print this help, then exit -- -V, --version print version number, then exit -- -q, --quiet do not print progress messages -- -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 -- --Configuration files: --$config_files -- --Report bugs to <bug-autoconf(a)gnu.org>." --_ACEOF -- --cat >>$CONFIG_STATUS <<_ACEOF --ac_cs_version="\\ --config.status --configured by $0, generated by GNU Autoconf 2.59, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -- --Copyright (C) 2003 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 --INSTALL="$INSTALL" --_ACEOF -- --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. --ac_need_defaults=: --while test $# != 0 --do -- case $1 in -- --*=*) -- ac_option=`expr "x$1" : 'x$[^=]*$='` -- ac_optarg=`expr "x$1" : 'x[^=]*=$.*$'` -- ac_shift=: -- ;; -- -*) -- ac_option=$1 -- ac_optarg=$2 -- ac_shift=shift -- ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; -- esac -- -- case $ac_option in -- # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -- ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -- debug=: ;; -- --file | --fil | --fi | --f ) -- $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -- ac_need_defaults=false;; -- --header | --heade | --head | --hea ) -- $ac_shift -- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -- ac_need_defaults=false;; -- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -- | -silent | --silent | --silen | --sile | --sil | --si | --s) -- ac_cs_silent=: ;; -- -- # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -- -- *) ac_config_targets="$ac_config_targets $1" ;; -- -- esac -- shift --done -- --ac_configure_extra_args= -- --if $ac_cs_silent; then -- exec 6>/dev/null -- ac_configure_extra_args="$ac_configure_extra_args --silent" --fi -- --_ACEOF --cat >>$CONFIG_STATUS <<_ACEOF --if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion --fi -- --_ACEOF -- -- -- -- -- --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_config_target in $ac_config_targets --do -- case "$ac_config_target" in -- # Handling of arguments. -- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -- esac --done -- --# If the user did not use the arguments to specify the items to instantiate, --# then the envvar interface is used. Set only those that are not. --# We use the long form for the default assignment because of an extremely --# bizarre bug on SunOS 4.1.3. --if $ac_need_defaults; then -- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files --fi -- --# Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, --# creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. --$debug || --{ -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 --} -- --# Create a (secure) tmp directory for tmp files. -- --{ -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -- test -n "$tmp" && test -d "$tmp" --} || --{ -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) --} || --{ -- echo "$me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } --} -- --_ACEOF -- --cat >>$CONFIG_STATUS <<_ACEOF -- --# --# CONFIG_FILES section. --# -- --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@armcxx@,$armcxx,;t t --s,@armcc@,$armcc,;t t --s,@CXX@,$CXX,;t t --s,@CXXFLAGS@,$CXXFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CXX@,$ac_ct_CXX,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t --s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t --s,@INSTALL_DATA@,$INSTALL_DATA,;t t --s,@CXXCPP@,$CXXCPP,;t t --s,@X_CFLAGS@,$X_CFLAGS,;t t --s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t --s,@X_LIBS@,$X_LIBS,;t t --s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t --s,@LIBVERSION@,$LIBVERSION,;t t --s,@VERSION@,$VERSION,;t t --s,@MAKEDEPEND@,$MAKEDEPEND,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF -- --_ACEOF -- -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (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" -- else -- 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 -- ac_end=`expr $ac_end + $ac_max_sed_lines` -- fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -- fi --fi # test -n "$CONFIG_FILES" -- --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # 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,:.*,,'` ;; -- *:* ) ac_file_in=`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 || --echo X"$ac_file" | -- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X$\/\/$[^/].*/{ s//\1/; q; } -- /^X$\/\/$$/{ s//\1/; q; } -- /^X$\/$.*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$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_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -- --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- 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 -- -- -- case $INSTALL in -- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; -- esac -- -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -- else -- configure_input="$ac_file. " -- fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -- -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- 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 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- 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 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } --_ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub --$extrasub --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --:t --/@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --s,@INSTALL@,$ac_INSTALL,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -- --done --_ACEOF -- --cat >>$CONFIG_STATUS <<\_ACEOF -- --{ (exit 0); exit 0; } --_ACEOF --chmod +x $CONFIG_STATUS --ac_clean_files=$ac_clean_files_save -- -- --# configure is writing to config.log, and then calls config.status. --# config.status does its own redirection, appending to config.log. --# Unfortunately, on DOS this fails, as config.log is still kept open --# by configure, so config.status won't be able to write to it; its --# output is simply discarded. So we exec the FD to /dev/null, --# effectively closing config.log, so it can be properly (re)opened and --# appended to by config.status. When coming back to configure, we --# need to make the FD available again. --if test "$no_create" != yes; then -- ac_cs_success=: -- ac_config_status_args= -- test "$silent" = yes && -- ac_config_status_args="$ac_config_status_args --quiet" -- exec 5>/dev/null -- $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false -- exec 5>>config.log -- # Use ||, not &&, to avoid exiting from the if with $? = 1, which -- # would make configure fail if this is the last instruction. -- $ac_cs_success || { (exit 1); exit 1; } --fi -- diff --git a/debian/patches/026_nxcomp_honour-optflags.full+lite.patch b/debian/patches/026_nxcomp_honour-optflags.full+lite.patch new file mode 100644 index 0000000..a2713a1 --- /dev/null +++ b/debian/patches/026_nxcomp_honour-optflags.full+lite.patch @@ -0,0 +1,31 @@ +Description: Honour compiler/linker option flags +Forwarded: pending +Author: Orion Poplawski <orion(a)cora.nwra.com> +diff -up a/nxcomp/configure.in b/nxcomp/configure.in +--- a/nxcomp/configure.in 2012-11-10 06:40:55.000000000 -0700 ++++ b/nxcomp/configure.in 2012-12-11 13:13:19.390229196 -0700 +@@ -7,8 +7,8 @@ AC_PREREQ(2.13) + + dnl Set our default compilation flags. + +-CXXFLAGS="-O3 -fno-rtti -fno-exceptions" +-CFLAGS="-O3" ++CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions" ++CFLAGS="$CFLAGS -O3" + + dnl Reset default linking directives. + +diff -up a/nxproxy/configure.in b/nxproxy/configure.in +--- a/nxproxy/configure.in 2012-11-10 06:40:55.000000000 -0700 ++++ b/nxproxy/configure.in 2012-12-11 13:16:19.955301045 -0700 +@@ -7,8 +7,8 @@ AC_PREREQ(2.13) + + dnl Reset default compilation flags. + +-CXXFLAGS="-O3" +-CPPFLAGS="-O3" ++CXXFLAGS="$CXXFLAGS -O3" ++CPPFLAGS="$CPPFLAGS -O3" + + dnl Prefer headers and libraries from nx-X11 if present. + diff --git a/debian/patches/026_nxcompext_honour-optflags.full.patch b/debian/patches/026_nxcompext_honour-optflags.full.patch new file mode 100644 index 0000000..4d5df3e --- /dev/null +++ b/debian/patches/026_nxcompext_honour-optflags.full.patch @@ -0,0 +1,17 @@ +Description: Honour compiler/linker option flags +Forwarded: pending +Author: Orion Poplawski <orion(a)cora.nwra.com> +diff -up a/nxcompext/configure.in b/nxcompext/configure.in +--- a/nxcompext/configure.in 2012-11-10 06:40:55.000000000 -0700 ++++ b/nxcompext/configure.in 2012-12-11 13:15:26.712576302 -0700 +@@ -7,8 +7,8 @@ AC_PREREQ(2.13) + + dnl Reset default compilation flags. + +-CXXFLAGS="-O3" +-CFLAGS="-O3" ++CXXFLAGS="$CXXFLAGS -O3" ++CFLAGS="$CFLAGS -O3" + + dnl Reset default linking directives. + diff --git a/debian/patches/026_nxcompshad_honour-optflags.full.patch b/debian/patches/026_nxcompshad_honour-optflags.full.patch new file mode 100644 index 0000000..ea1d2ad --- /dev/null +++ b/debian/patches/026_nxcompshad_honour-optflags.full.patch @@ -0,0 +1,17 @@ +Description: Honour compiler/linker option flags +Forwarded: pending +Author: Orion Poplawski <orion(a)cora.nwra.com> +diff -up a/nxcompshad/configure.in b/nxcompshad/configure.in +--- a/nxcompshad/configure.in 2012-11-10 06:40:56.000000000 -0700 ++++ b/nxcompshad/configure.in 2012-12-11 13:13:25.915196300 -0700 +@@ -7,8 +7,8 @@ AC_PREREQ(2.13) + + dnl Reset default compilation flags. + +-CXXFLAGS="-O3" +-CPPFLAGS="-O3" ++CXXFLAGS="$CXXFLAGS -O3" ++CPPFLAGS="$CPPFLAGS -O3" + + dnl Reset default linking directives. + diff --git a/debian/patches/030_nx-X11_configure-args.full.patch b/debian/patches/030_nx-X11_configure-args.full.patch index 8304ca7..67184d3 100644 --- a/debian/patches/030_nx-X11_configure-args.full.patch +++ b/debian/patches/030_nx-X11_configure-args.full.patch @@ -16,7 +16,7 @@ Index: nx-X11/lib/X11/Imakefile includes:: ks_tables.h -+CONFIGURE=./configure ++CONFIGURE ?= ./configure + #if NXLibraries @@ -40,7 +40,7 @@ Index: nx-X11/programs/Xserver/Imakefile NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME) NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status -+CONFIGURE=./configure ++CONFIGURE ?= ./configure + $(NX_XSHADOWCONFIGTARGET): cd $(NX_XSHADOWLIBDIR) && \ diff --git a/debian/patches/031_nx-X11_parallel-make.full.patch b/debian/patches/031_nx-X11_parallel-make.full.patch index 049b213..1bacd1a 100644 --- a/debian/patches/031_nx-X11_parallel-make.full.patch +++ b/debian/patches/031_nx-X11_parallel-make.full.patch @@ -21,7 +21,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 --- a/nx-X11/Makefile +++ b/nx-X11/Makefile -@@ -32,8 +32,8 @@ +@@ -32,8 +32,8 @@ VERSSRC = $(CONFIGSRC)/util/printver.c VERSPROG = $(CONFIGSRC)/util/printver.exe all: @@ -32,7 +32,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 all-initial: @echo Please use make World, or on NT use nmake World.Win32. -@@ -57,8 +57,8 @@ +@@ -57,8 +57,8 @@ World: @date @echo "" @if [ -f xmakefile ]; then \ @@ -43,7 +43,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 $(RM) xmakefile; \ fi @if [ ! -f $(IRULESRC)/host.def ]; then \ -@@ -84,14 +84,14 @@ +@@ -84,14 +84,14 @@ World: # fi cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean $(MAKE) $(MFLAGS) Makefile.boot @@ -65,7 +65,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 @echo "" @date @echo "" -@@ -154,15 +154,15 @@ +@@ -154,15 +154,15 @@ World.Win32: -if exist xmakefile.bak del xmakefile.bak -if exist xmakefile ren xmakefile xmakefile.bak $(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) @@ -87,7 +87,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 @echo : @echo : @echo Full build of $(RELEASE) complete. -@@ -198,38 +198,38 @@ +@@ -198,38 +198,38 @@ World.OS2: # a copy of every rule that might be invoked at top level clean: @@ -143,7 +143,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 + ${MAKE} ${MAKE_OPTS} $@ --- a/nx-X11/config/imake/Makefile.ini +++ b/nx-X11/config/imake/Makefile.ini -@@ -21,7 +21,6 @@ +@@ -21,7 +21,6 @@ IMAKEMDEP_CROSSCOMPILE = -DCROSSCOMPILE_ SHELL = /bin/sh RM = rm -f MV = mv @@ -153,7 +153,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 NPROC = 1 --- a/nx-X11/extras/Mesa/Makefile +++ b/nx-X11/extras/Mesa/Makefile -@@ -12,7 +12,7 @@ +@@ -12,7 +12,7 @@ default: $(TOP)/configs/current doxygen: @@ -174,7 +174,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 CURRENT_DIR=. --- a/nx-X11/extras/drm/linux-core/Makefile +++ b/nx-X11/extras/drm/linux-core/Makefile -@@ -176,7 +176,7 @@ +@@ -176,7 +176,7 @@ endif all: modules modules: includes @@ -183,7 +183,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 ifeq ($(HEADERFROMBOOT),1) -@@ -246,7 +246,7 @@ +@@ -246,7 +246,7 @@ clean cleandir: rm -rf $(CLEANFILES) $(MODULE_LIST):: @@ -194,7 +194,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 --- a/nx-X11/extras/drm/linux/Makefile +++ b/nx-X11/extras/drm/linux/Makefile -@@ -184,7 +184,7 @@ +@@ -184,7 +184,7 @@ endif all: modules modules: includes @@ -203,7 +203,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 ifeq ($(HEADERFROMBOOT),1) -@@ -254,7 +254,7 @@ +@@ -254,7 +254,7 @@ clean cleandir: rm -rf $(CLEANFILES) $(MODULE_LIST):: @@ -214,7 +214,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 --- a/nx-X11/extras/ttf2pt1/Makefile +++ b/nx-X11/extras/ttf2pt1/Makefile -@@ -158,8 +158,8 @@ +@@ -158,8 +158,8 @@ mans: $(MANS) clean: rm -f t1asm ttf2pt1 *.o app/RPM/Makefile app/RPM/*.spec *.core core.* core @@ -227,7 +227,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 rm -f $(DOCS) $(MANS) --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile -@@ -1161,21 +1161,17 @@ +@@ -1161,25 +1161,23 @@ $(NX_XCOMPEXTCONFIGTARGET): #ifdef SunArchitecture $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) @@ -246,16 +246,24 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 - make + ${MAKE} -C $(NX_XCOMPLIBDIR) - $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) +-$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) - cd ../../../nxcompext && \ - make ++$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) $(NX_XCOMPLIBTARGET) lib$(LIBNAME).so.$(SOXLIBREV) + ${MAKE} -C ../../../nxcompext #endif +-depend:: $(NX_XCOMPLIBTARGET) ++depend:: ++ ++lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOMPLIBTARGET) + + all:: $(NX_XCOMPLIBTARGET) + --- a/nx-X11/lib/X11/Imakefile.NX.original +++ b/nx-X11/lib/X11/Imakefile.NX.original -@@ -1159,21 +1159,17 @@ +@@ -1159,21 +1159,17 @@ $(NX_XCOMPEXTCONFIGTARGET): #ifdef SunArchitecture $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) @@ -283,7 +291,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile -@@ -1045,11 +1045,11 @@ +@@ -1045,11 +1045,11 @@ $(NX_XSHADOWCONFIGTARGET): #ifdef SunArchitecture $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) cd $(NX_XSHADOWLIBDIR) && \ diff --git a/debian/patches/302_nxagent_configurable-keystrokes.full.patch b/debian/patches/302_nxagent_configurable-keystrokes.full.patch new file mode 100644 index 0000000..8fb34df --- /dev/null +++ b/debian/patches/302_nxagent_configurable-keystrokes.full.patch @@ -0,0 +1,1031 @@ +Author: Alexander Wuerstlein <arw(a)arw.name> +Description: Make nxagent-specific keyboard bindings configurable + Replaces the hardcoded nxagent keybindings by a configurable + table of keybindings. The default configuration is the same as the + original one, to maintain compatibility. A user/administrator can either + specify a command line parameter, environment variable or place a file + in ~/.nx/config/keystroke.cfg or /etc/nx/keystroke.cfg to reconfigure + these keybindings. + . + The configuration file format is XML, a dependency on libxml2 is added + to allow parsing the configuration. +--- a/nx-X11/programs/Xserver/Imakefile ++++ b/nx-X11/programs/Xserver/Imakefile +@@ -1013,15 +1013,18 @@ + #if defined(SunArchitecture) + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ + -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ +- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp ++ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp \ ++`pkg-config --libs libxml-2.0` + #elif defined(cygwinArchitecture) + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ + -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ +- -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp ++ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp \ ++`pkg-config --libs libxml-2.0` + #else + NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ + -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ +- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp ++ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp \ ++`pkg-config --libs libxml-2.0` + #endif + + #endif +--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile ++++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile +@@ -142,7 +142,8 @@ + -I../../miext/damage -I../../miext/cw \ + -I../../GL/glx -I../../GL/include -I../../../../lib/GL/include -I../../Xext \ + -I$(EXTINCSRC) -I$(XINCLUDESRC) \ +- $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) ++ $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) \ ++ `pkg-config --cflags-only-I libxml-2.0` + #ifdef SunArchitecture + INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \ + -I../../../../extras/Mesa/include \ +@@ -152,7 +153,8 @@ + -I../../GL/glx -I../../GL/include -I../../../../lib/GL/include -I../../Xext \ + -I../../miext/damage -I../../miext/cw \ + -I$(EXTINCSRC) -I$(XINCLUDESRC) \ +- $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) ++ $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) \ ++ `pkg-config --cflags-only-I libxml-2.0` + #else + #ifdef cygwinArchitecture + INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ +@@ -162,7 +164,8 @@ + -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \ + -I../../../../extras/Mesa/include \ + -I$(EXTINCSRC) -I$(XINCLUDESRC) \ +- $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) ++ $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) \ ++ `pkg-config --cflags-only-I libxml-2.0` + #endif + #endif + +--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c +@@ -28,8 +28,15 @@ + #include "Keystroke.h" + #include "Drawable.h" + ++#include <unistd.h> ++ ++#include <libxml/parser.h> ++#include <libxml/tree.h> ++ + extern Bool nxagentWMIsRunning; + extern Bool nxagentIpaq; ++extern char *nxagentKeystrokeFile; ++Bool nxagentKeystrokeFileParsed = False; + + #ifdef NX_DEBUG_INPUT + int nxagentDebugInputDevices = 0; +@@ -47,297 +54,527 @@ + #undef DEBUG + #undef DUMP + +-int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) +-{ +- KeySym sym; +- int index = 0; + +- *result = doNothing; ++/* this table is used to parse actions given on the command line or in the ++ * config file, therefore indices have to match the enum in Keystroke.h */ ++char * nxagentSpecialKeystrokeNames[] = { ++ "end_marker", ++ "close_session", ++ "switch_all_screens", ++ "minimize", ++ "left", ++ "up", ++ "right", ++ "down", ++ "resize", ++ "defer", ++ "ignore", ++ "force_synchronization", ++ ++ "debug_tree", ++ "regions_on_screen", ++ "test_input", ++ "deactivate_input_devices_grab", ++ ++ "fullscreen", ++ "viewport_move_left", ++ "viewport_move_up", ++ "viewport_move_right", ++ "viewport_move_down", ++ NULL, ++}; ++ ++struct nxagentSpecialKeystrokeMap default_map[] = { ++ /* stroke, modifierMask, modifierAltMeta, keysym */ ++ {KEYSTROKE_DEBUG_TREE, ControlMask, 1, XK_q}, ++ {KEYSTROKE_DEBUG_TREE, ControlMask, 1, XK_Q}, ++ {KEYSTROKE_CLOSE_SESSION, ControlMask, 1, XK_t}, ++ {KEYSTROKE_CLOSE_SESSION, ControlMask, 1, XK_T}, ++ {KEYSTROKE_SWITCH_ALL_SCREENS, ControlMask, 1, XK_f}, ++ {KEYSTROKE_SWITCH_ALL_SCREENS, ControlMask, 1, XK_F}, ++ {KEYSTROKE_MINIMIZE, ControlMask, 1, XK_m}, ++ {KEYSTROKE_MINIMIZE, ControlMask, 1, XK_M}, ++ {KEYSTROKE_LEFT, ControlMask, 1, XK_Left}, ++ {KEYSTROKE_LEFT, ControlMask, 1, XK_KP_Left}, ++ {KEYSTROKE_UP, ControlMask, 1, XK_Up}, ++ {KEYSTROKE_UP, ControlMask, 1, XK_KP_Up}, ++ {KEYSTROKE_RIGHT, ControlMask, 1, XK_Right}, ++ {KEYSTROKE_RIGHT, ControlMask, 1, XK_KP_Right}, ++ {KEYSTROKE_DOWN, ControlMask, 1, XK_Down}, ++ {KEYSTROKE_DOWN, ControlMask, 1, XK_KP_Down}, ++ {KEYSTROKE_RESIZE, ControlMask, 1, XK_r}, ++ {KEYSTROKE_RESIZE, ControlMask, 1, XK_R}, ++ {KEYSTROKE_DEFER, ControlMask, 1, XK_e}, ++ {KEYSTROKE_DEFER, ControlMask, 1, XK_E}, ++ {KEYSTROKE_IGNORE, ControlMask, 1, XK_BackSpace}, ++ {KEYSTROKE_IGNORE, 0, 0, XK_Terminate_Server}, ++ {KEYSTROKE_FORCE_SYNCHRONIZATION, ControlMask, 1, XK_j}, ++ {KEYSTROKE_FORCE_SYNCHRONIZATION, ControlMask, 1, XK_J}, ++ {KEYSTROKE_REGIONS_ON_SCREEN, ControlMask, 1, XK_a}, ++ {KEYSTROKE_REGIONS_ON_SCREEN, ControlMask, 1, XK_A}, ++ {KEYSTROKE_TEST_INPUT, ControlMask, 1, XK_x}, ++ {KEYSTROKE_TEST_INPUT, ControlMask, 1, XK_X}, ++ {KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB, ControlMask, 1, XK_y}, ++ {KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB, ControlMask, 1, XK_Y}, ++ {KEYSTROKE_FULLSCREEN, ControlMask | ShiftMask, 1, XK_f}, ++ {KEYSTROKE_FULLSCREEN, ControlMask | ShiftMask, 1, XK_F}, ++ {KEYSTROKE_VIEWPORT_MOVE_LEFT, ControlMask | ShiftMask, 1, XK_Left}, ++ {KEYSTROKE_VIEWPORT_MOVE_LEFT, ControlMask | ShiftMask, 1, XK_KP_Left}, ++ {KEYSTROKE_VIEWPORT_MOVE_UP, ControlMask | ShiftMask, 1, XK_Up}, ++ {KEYSTROKE_VIEWPORT_MOVE_UP, ControlMask | ShiftMask, 1, XK_KP_Up}, ++ {KEYSTROKE_VIEWPORT_MOVE_RIGHT, ControlMask | ShiftMask, 1, XK_Right}, ++ {KEYSTROKE_VIEWPORT_MOVE_RIGHT, ControlMask | ShiftMask, 1, XK_KP_Right}, ++ {KEYSTROKE_VIEWPORT_MOVE_DOWN, ControlMask | ShiftMask, 1, XK_Down}, ++ {KEYSTROKE_VIEWPORT_MOVE_DOWN, ControlMask | ShiftMask, 1, XK_KP_Down}, ++ {KEYSTROKE_END_MARKER, 0, 0, 0}, ++}; ++struct nxagentSpecialKeystrokeMap *map = default_map; + +- /* +- * I don't know how much hard work is doing this operation. +- * Do we need a cache ? ++static int modifier_matches(unsigned int mask, int compare_alt_meta, unsigned int state) ++{ ++ /* nxagentAltMetaMask needs special handling ++ * it seems to me its an and-ed mask of all possible meta and alt keys ++ * somehow... ++ * ++ * otherwise this function would be just a simple bitop + */ ++ int ret = 1; + +- sym = XKeycodeToKeysym(nxagentDisplay, X -> keycode, index); ++ if (compare_alt_meta) { ++ if (! (state & nxagentAltMetaMask)) { ++ ret = 0; ++ } + +- if (sym == XK_VoidSymbol || sym == NoSymbol) +- { +- return 0; ++ mask &= ~nxagentAltMetaMask; + } + +- #ifdef TEST +- fprintf(stderr, "nxagentCheckSpecialKeystroke: got code %x - state %x - sym %lx\n", +- X -> keycode, X -> state, sym); +- #endif +- +- /* +- * Check special keys. +- */ +- +- /* +- * FIXME: We should use the keysym instead that the keycode +- * here. +- */ ++ /* all modifiers except meta/alt have to match exactly, extra bits are evil */ ++ if ((mask & state) != mask) { ++ ret = 0; ++ } + +- if (X -> keycode == 130 && nxagentIpaq) +- { +- *result = doStartKbd; ++ return ret; ++} + +- return 1; +- } ++static int read_binding_from_xmlnode(xmlNode *node, struct nxagentSpecialKeystrokeMap *ret) ++{ ++ int successful = 0; ++ struct nxagentSpecialKeystrokeMap new = {0, 0, 0, 0}; ++ xmlAttr *attr; + +- if ((X -> state & nxagentAltMetaMask) && +- ((X -> state & (ControlMask | ShiftMask)) == ControlMask)) ++ for (attr = node->properties; attr; attr = attr->next) + { +- switch (sym) ++ /* ignore attributes without data (which should never happen anyways) */ ++ if (attr->children->content == NULL) + { +- #ifdef DEBUG_TREE +- +- case XK_q: +- case XK_Q: +- { +- *result = doDebugTree; +- +- break; +- } +- +- #endif /* DEBUG_TREE */ +- +- case XK_t: +- case XK_T: +- { +- *result = doCloseSession; +- +- break; +- } +- case XK_f: +- case XK_F: ++ char *aname = (attr->name)?(attr->name):"unknown"; ++ fprintf(stderr, "attribute %s with NULL value", aname); ++ continue; ++ } ++ if (strcmp((char *)attr->name, "action") == 0) ++ { ++ int i; ++ for (i = 0; nxagentSpecialKeystrokeNames[i] != NULL; i++) + { +- if (nxagentOption(Rootless) == False) ++ if (strcmp(nxagentSpecialKeystrokeNames[i],(char *)attr->children->content) == 0) + { +- *result = doSwitchAllScreens; ++ /* this relies on the values of enum nxagentSpecialKeystroke and the ++ * indices of nxagentSpecialKeystrokeNames being in sync */ ++ new.stroke = i; ++ break; + } +- +- break; + } +- case XK_m: +- case XK_M: ++ continue; ++ } ++ else if (strcmp((char *)attr->name, "key") == 0) ++ { ++ new.keysym = XStringToKeysym((char *)attr->children->content); ++ /* NoSymbol is usually 0, but could there be weird implementations? */ ++ if (new.keysym == NoSymbol) + { +- if (nxagentOption(Rootless) == False) +- { +- *result = doMinimize; +- } +- +- break; ++ new.keysym = 0; + } +- case XK_Left: +- case XK_KP_Left: +- { +- if (nxagentOption(Rootless) == False && +- nxagentOption(DesktopResize) == False) +- { +- *result = doViewportLeft; +- } ++ continue; ++ } + +- break; +- } +- case XK_Up: +- case XK_KP_Up: +- { +- if (nxagentOption(Rootless) == False && +- nxagentOption(DesktopResize) == False) +- { +- *result = doViewportUp; +- } ++ /* ignore attributes with value="0" or "false", everything else is interpreted as true */ ++ if (strcmp((char *)attr->children->content, "0") == 0 || strcmp((char *)attr->children->content, "false") == 0) ++ continue; + +- break; +- } +- case XK_Right: +- case XK_KP_Right: +- { +- if (nxagentOption(Rootless) == False && +- nxagentOption(DesktopResize) == False) +- { +- *result = doViewportRight; +- } ++ if (strcmp((char *)attr->name, "Mod1") == 0) ++ { ++ new.modifierMask |= Mod1Mask; ++ } ++ else if (strcmp((char *)attr->name, "Mod2") == 0) ++ { ++ new.modifierMask |= Mod2Mask; ++ } ++ else if (strcmp((char *)attr->name, "Mod3") == 0) ++ { ++ new.modifierMask |= Mod3Mask; ++ } ++ else if (strcmp((char *)attr->name, "Mod4") == 0) ++ { ++ new.modifierMask |= Mod4Mask; ++ } ++ else if (strcmp((char *)attr->name, "Control") == 0) ++ { ++ new.modifierMask |= ControlMask; ++ } ++ else if (strcmp((char *)attr->name, "Shift") == 0) ++ { ++ new.modifierMask |= ShiftMask; ++ } ++ else if (strcmp((char *)attr->name, "Lock") == 0) ++ { ++ new.modifierMask |= LockMask; ++ } ++ else if (strcmp((char *)attr->name, "AltMeta") == 0) ++ { ++ new.modifierAltMeta = 1; ++ } ++ } + +- break; +- } +- case XK_Down: +- case XK_KP_Down: +- { +- if (nxagentOption(Rootless) == 0 && +- nxagentOption(DesktopResize) == 0) +- { +- *result = doViewportDown; +- } ++ if (new.stroke != 0 && new.keysym != 0) ++ { ++ /* keysym and stroke are required, everything else is optional */ ++ successful = 1; ++ memcpy(ret, &new, sizeof(struct nxagentSpecialKeystrokeMap)); ++ } ++ return successful; ++} + +- break; +- } +- case XK_R: +- case XK_r: +- { +- if (nxagentOption(Rootless) == 0) +- { +- *result = doSwitchResizeMode; +- } ++/* ++ * searches a keystroke xml file ++ * ++ * search order: ++ * - '-keystrokefile' commandline parameter ++ * - $NXAGENT_KEYSTROKEFILE environment variable ++ * - $HOME/.nx/config/keystroke.cfg ++ * - /etc/nx/keystroke.cfg ++ * - hardcoded traditional NX default settings ++ */ ++static void parse_keystroke_file(void) ++{ ++ char *filename = NULL; + +- break; +- } +- case XK_E: +- case XK_e: +- { +- *result = doSwitchDeferMode; ++ char *homefile = "/.nx/config/keystroke.cfg"; ++ char *etcfile = "/etc/nx/keystroke.cfg"; + +- break; ++ if (nxagentKeystrokeFile != NULL && access(nxagentKeystrokeFile, R_OK) == 0) ++ { ++ filename = strdup(nxagentKeystrokeFile); ++ if (filename == NULL) ++ { ++ fprintf(stderr, "malloc failed"); ++ exit(EXIT_FAILURE); ++ } ++ } ++ else if ((filename = getenv("NXAGENT_KEYSTROKEFILE")) != NULL && access(filename, R_OK) == 0) ++ { ++ filename = strdup(filename); ++ if (filename == NULL) ++ { ++ fprintf(stderr, "malloc failed"); ++ exit(EXIT_FAILURE); ++ } ++ } ++ else ++ { ++ char *homedir = getenv("HOME"); ++ filename = NULL; ++ if (homedir != NULL) ++ { ++ homedir = strdup(homedir); ++ if (homedir == NULL) ++ { ++ fprintf(stderr, "malloc failed"); ++exit(EXIT_FAILURE); + } +- case XK_BackSpace: +- case XK_Terminate_Server: ++ filename = calloc(1, strlen(homefile) + strlen(homedir) + 1); ++ if (filename == NULL) + { +- /* +- * Discard Ctrl-Alt-BackSpace key. +- */ +- +- return 1; +- +- break; ++ fprintf(stderr, "malloc failed"); ++ exit(EXIT_FAILURE); + } +- +- case XK_J: +- case XK_j: ++ strcpy(filename, homedir); ++ strcpy(filename + strlen(homedir), homefile); ++ if (homedir) + { +- nxagentForceSynchronization = 1; +- +- return 1; ++ free(homedir); + } ++ } + +- #ifdef DUMP +- +- case XK_A: +- case XK_a: ++ if (access(filename, R_OK) == 0) ++ { ++ /* empty */ ++ } ++ else if (access(etcfile, R_OK == 0)) ++ { ++ if (filename) ++ free(filename); ++ filename = strdup(etcfile); ++ if (filename == NULL) + { +- /* +- * Used to test the lazy encoding. +- */ +- +- nxagentRegionsOnScreen(); +- +- return 1; ++ fprintf(stderr, "malloc failed"); ++ exit(EXIT_FAILURE); + } ++ } ++ else ++ { ++ if (filename) ++free(filename); ++ filename = NULL; ++ } ++ } + +- #endif +- +- #ifdef NX_DEBUG_INPUT ++ /* now we know which file to read, if any */ ++ if (filename) ++ { ++ xmlDoc *doc = NULL; ++ xmlNode *root = NULL; ++ LIBXML_TEST_VERSION ++ doc = xmlReadFile(filename, NULL, 0); ++ if (doc != NULL) ++ { ++ xmlNode *cur = NULL; ++ root = xmlDocGetRootElement(doc); + +- case XK_X: +- case XK_x: ++ for (cur = root; cur; cur = cur->next) + { +- /* +- * Used to test the input devices state. +- */ ++ if (cur->type == XML_ELEMENT_NODE && strcmp((char *)cur->name, "keystrokes") == 0) ++{ ++ xmlNode *bindings = NULL; ++ int num = 0; ++ int idx = 0; + +- if (X -> type == KeyPress) +- { +- if (nxagentDebugInputDevices == 0) ++ for (bindings = cur->children; bindings; bindings = bindings->next) + { +- fprintf(stderr, "Info: Turning input devices debug ON.\n"); +- +- nxagentDebugInputDevices = 1; ++ if (bindings->type == XML_ELEMENT_NODE && strcmp((char *)bindings->name, "keystroke") == 0) ++ { ++ num++; ++ } + } +- else ++ map = calloc((num + 1), sizeof(struct nxagentSpecialKeystrokeMap)); ++ if (map == NULL) + { +- fprintf(stderr, "Info: Turning input devices debug OFF.\n"); +- +- nxagentDebugInputDevices = 0; +- +- nxagentLastInputDevicesDumpTime = 0; ++ fprintf(stderr, "malloc failed"); ++ exit(EXIT_FAILURE); + } +- } +- +- return 1; +- } + +- case XK_Y: +- case XK_y: +- { +- /* +- * Used to deactivate input devices grab. +- */ ++ for (bindings = cur->children; bindings; bindings = bindings->next) ++ { ++ if (bindings->type == XML_ELEMENT_NODE && strcmp((char *)bindings->name, "keystroke") == 0) ++ { ++ int res = 0; ++ res = read_binding_from_xmlnode(bindings, &(map[idx])); ++ if (res) ++ idx++; ++ } ++ } + +- if (X -> type == KeyPress) +- { +- nxagentDeactivateInputDevicesGrabs(); ++ map[idx].stroke = KEYSTROKE_END_MARKER; + } +- +- return 1; + } + ++ xmlFreeDoc(doc); ++ xmlCleanupParser(); ++ } ++ else ++ { ++ #ifdef DEBUG ++ fprintf("XML parsing for %s failed\n", filename); + #endif + } ++ free(filename); + } +- else if ((X -> state & nxagentAltMetaMask) && +- ((X -> state & (ControlMask | ShiftMask)) == (ControlMask | +- ShiftMask))) ++} ++ ++static enum nxagentSpecialKeystroke find_keystroke(XKeyEvent *X) ++{ ++ KeySym keysym = XKeycodeToKeysym(nxagentDisplay, X->keycode, 0); ++ struct nxagentSpecialKeystrokeMap *cur = map; ++ ++ if (! nxagentKeystrokeFileParsed) + { +- switch (sym) +- { +- case XK_f: +- case XK_F: +- { +- if (nxagentOption(Rootless) == 0) +- { +- *result = doSwitchFullscreen; +- } ++ parse_keystroke_file(); ++ nxagentKeystrokeFileParsed = True; ++ } + +- break; +- } +- case XK_Left: +- case XK_KP_Left: +- { +- if (nxagentOption(Rootless) == 0 && +- nxagentOption(DesktopResize) == 0) +- { +- *result = doViewportMoveLeft; +- } ++ enum nxagentSpecialKeystroke ret = KEYSTROKE_NOTHING; + +- break; +- } +- case XK_Up: +- case XK_KP_Up: +- { +- if (nxagentOption(Rootless) == 0 && +- nxagentOption(DesktopResize) == 0) +- { +- *result = doViewportMoveUp; +- } ++ while ((cur++)->stroke != KEYSTROKE_END_MARKER) { ++ if (cur->keysym == keysym && modifier_matches(cur->modifierMask, cur->modifierAltMeta, X->state)) { ++ return cur->stroke; ++ } ++ } + +- break; +- } +- case XK_Right: +- case XK_KP_Right: +- { +- if (nxagentOption(Rootless) == 0 && +- nxagentOption(DesktopResize) == 0) +- { +- *result = doViewportMoveRight; +- } ++ return ret; ++} + +- break; +- } +- case XK_Down: +- case XK_KP_Down: +- { +- if (nxagentOption(Rootless) == 0 && +- nxagentOption(DesktopResize) == 0) +- { +- *result = doViewportMoveDown; +- } ++int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) ++{ ++ KeySym sym; ++ int index = 0; ++ enum nxagentSpecialKeystroke stroke = find_keystroke(X); + +- break; +- } +- } ++ *result = doNothing; ++ ++ /* ++ * I don't know how much hard work is doing this operation. ++ * Do we need a cache ? ++ */ ++ ++ sym = XKeycodeToKeysym(nxagentDisplay, X -> keycode, index); ++ ++ if (sym == XK_VoidSymbol || sym == NoSymbol) ++ { ++ return 0; + } + ++ #ifdef TEST ++ fprintf(stderr, "nxagentCheckSpecialKeystroke: got code %x - state %x - sym %lx\n", ++ X -> keycode, X -> state, sym); ++ #endif ++ ++ /* ++ * Check special keys. ++ */ ++ ++ /* ++ * FIXME: We should use the keysym instead that the keycode ++ * here. ++ */ ++ ++ if (X -> keycode == 130 && nxagentIpaq) ++ { ++ *result = doStartKbd; ++ ++ return 1; ++ } ++ ++ switch (stroke) { ++ case KEYSTROKE_DEBUG_TREE: ++ #ifdef DEBUG_TREE ++ *result = doDebugTree; ++ #endif ++ break; ++ case KEYSTROKE_CLOSE_SESSION: ++ *result = doCloseSession; ++ break; ++ case KEYSTROKE_SWITCH_ALL_SCREENS: ++ if (nxagentOption(Rootless) == False) { ++ *result = doSwitchAllScreens; ++ } ++ break; ++ case KEYSTROKE_MINIMIZE: ++ if (nxagentOption(Rootless) == False) { ++ *result = doMinimize; ++ } ++ break; ++ case KEYSTROKE_LEFT: ++ if (nxagentOption(Rootless) == False && ++ nxagentOption(DesktopResize) == False) { ++ *result = doViewportLeft; ++ } ++ break; ++ case KEYSTROKE_UP: ++ if (nxagentOption(Rootless) == False && ++ nxagentOption(DesktopResize) == False) { ++ *result = doViewportUp; ++ } ++ break; ++ case KEYSTROKE_RIGHT: ++ if (nxagentOption(Rootless) == False && ++ nxagentOption(DesktopResize) == False) { ++ *result = doViewportRight; ++ } ++ break; ++ case KEYSTROKE_DOWN: ++ if (nxagentOption(Rootless) == False && ++ nxagentOption(DesktopResize) == False) { ++ *result = doViewportDown; ++ } ++ break; ++ case KEYSTROKE_RESIZE: ++ if (nxagentOption(Rootless) == False) { ++ *result = doSwitchResizeMode; ++ } ++ break; ++ case KEYSTROKE_DEFER: ++ *result = doSwitchDeferMode; ++ break; ++ case KEYSTROKE_IGNORE: ++ /* this is used e.g. to ignore C-A-Backspace aka XK_Terminate_Server */ ++ return 1; ++ break; ++ case KEYSTROKE_FORCE_SYNCHRONIZATION: ++ nxagentForceSynchronization = 1; ++ break; ++ case KEYSTROKE_REGIONS_ON_SCREEN: ++ #ifdef DUMP ++ nxagentRegionsOnScreen(); ++ #endif ++ break; ++ case KEYSTROKE_TEST_INPUT: ++ /* ++ * Used to test the input devices state. ++ */ ++ #ifdef NX_DEBUG_INPUT ++ if (X -> type == KeyPress) { ++ if (nxagentDebugInputDevices == 0) { ++ fprintf(stderr, "Info: Turning input devices debug ON.\n"); ++ nxagentDebugInputDevices = 1; ++ } else { ++ fprintf(stderr, "Info: Turning input devices debug OFF.\n"); ++ nxagentDebugInputDevices = 0; ++ nxagentLastInputDevicesDumpTime = 0; ++ } ++ } ++ return 1; ++ #endif ++ break; ++ case KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB: ++ #ifdef NX_DEBUG_INPUT ++ if (X->type == KeyPress) { ++ nxagentDeactivateInputDevicesGrab(); ++ } ++ return 1; ++ #endif ++ break; ++ case KEYSTROKE_FULLSCREEN: ++ if (nxagentOption(Rootless) == 0) { ++ *result = doSwitchFullscreen; ++ } ++ break; ++ case KEYSTROKE_VIEWPORT_MOVE_LEFT: ++ if (nxagentOption(Rootless) == 0 && ++ nxagentOption(DesktopResize) == 0) { ++ *result = doViewportMoveLeft; ++ } ++ break; ++ case KEYSTROKE_VIEWPORT_MOVE_UP: ++ if (nxagentOption(Rootless) == 0 && ++ nxagentOption(DesktopResize) == 0) { ++ *result = doViewportMoveUp; ++ } ++ break; ++ case KEYSTROKE_VIEWPORT_MOVE_RIGHT: ++ if (nxagentOption(Rootless) == 0 && ++ nxagentOption(DesktopResize) == 0) { ++ *result = doViewportMoveRight; ++ } ++ break; ++ case KEYSTROKE_VIEWPORT_MOVE_DOWN: ++ if (nxagentOption(Rootless) == 0 && ++ nxagentOption(DesktopResize) == 0) { ++ *result = doViewportMoveDown; ++ } ++ break; ++ case KEYSTROKE_NOTHING: /* do nothing. difference to KEYSTROKE_IGNORE is the return value */ ++ case KEYSTROKE_END_MARKER: /* just to make gcc STFU */ ++ case KEYSTROKE_MAX: ++ break; ++ } + return (*result == doNothing) ? 0 : 1; + } +--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h ++++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h +@@ -24,4 +24,51 @@ + + unsigned int nxagentAltMetaMask; + ++/* keep this sorted, do not rely on any numerical value in this enum, and be aware ++ * that KEYSTROKE_MAX may be used in a malloc */ ++ ++/* also be aware that if changing any numerical values, you also need to change values ++ * Keystroke.c nxagentSpecialKeystrokeNames */ ++enum nxagentSpecialKeystroke { ++ /* 0 is used as end marker */ ++ KEYSTROKE_END_MARKER = 0, ++ KEYSTROKE_CLOSE_SESSION = 1, ++ KEYSTROKE_SWITCH_ALL_SCREENS = 2, ++ KEYSTROKE_MINIMIZE = 3, ++ KEYSTROKE_LEFT = 4, ++ KEYSTROKE_UP = 5, ++ KEYSTROKE_RIGHT = 6, ++ KEYSTROKE_DOWN = 7, ++ KEYSTROKE_RESIZE = 8, ++ KEYSTROKE_DEFER = 9, ++ KEYSTROKE_IGNORE = 10, ++ KEYSTROKE_FORCE_SYNCHRONIZATION = 11, ++ ++ /* stuff used for debugging, probably not useful for most people */ ++ KEYSTROKE_DEBUG_TREE = 12, ++ KEYSTROKE_REGIONS_ON_SCREEN = 13, ++ KEYSTROKE_TEST_INPUT = 14, ++ KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB = 15, ++ ++ KEYSTROKE_FULLSCREEN = 16, ++ KEYSTROKE_VIEWPORT_MOVE_LEFT = 17, ++ KEYSTROKE_VIEWPORT_MOVE_UP = 18, ++ KEYSTROKE_VIEWPORT_MOVE_RIGHT = 19, ++ KEYSTROKE_VIEWPORT_MOVE_DOWN = 20, ++ ++ KEYSTROKE_NOTHING = 21, ++ ++ /* insert more here, increment KEYSTROKE_MAX accordingly. ++ * then update string translation below */ ++ ++ KEYSTROKE_MAX=22, ++}; ++ ++struct nxagentSpecialKeystrokeMap { ++ enum nxagentSpecialKeystroke stroke; ++ unsigned int modifierMask; /* everything except alt/meta */ ++ int modifierAltMeta; /* modifier combination should include alt/meta */ ++ KeySym keysym; ++}; ++ + #endif /* __Keystroke_H__ */ +--- /dev/null ++++ b/README.keystrokes +@@ -0,0 +1,83 @@ ++Configurable keybindings in nxagent ++ ++Keybindings in the redistributed x2go version of nxagent can now be configured ++by the user. This is done via a configuration file. ++ ++File location ++------------- ++ ++nxagent searches for the configuration file in the following order: ++- in the location given by the '-keystrokefile' command line parameter ++- in the location given by the NXAGENT_KEYSTROKEFILE environment variable ++- in ~/.nx/config/keystroke.cfg ++- in /etc/nx/keystroke.cfg ++ ++If none of those files is accessible, the default configuration is used which ++is the same as the old, traditional nxagent keybindings. ++ ++File format ++----------- ++ ++The configuration file is XML with the following format: ++ ++<!DOCTYPE NXKeystroke> ++<keystrokes> ++<keystroke action="fullscreen" AltMeta="1" Control="1" key="b" /> ++<keystroke action="minimize" AltMeta="1" Control="1" key="space" /> ++<keystroke action="minimize" key="Escape" Shift="1" /> ++<keystroke action="close_session" key="F7" /> ++<keystroke action="fullscreen" key="F7" Mod1="1" /> ++<keystroke action="fullscreen" key="F6" Mod1="1" /> ++<keystroke action="force_synchronization" key="f" /> ++<keystroke action="fullscreen" key="space" Mod1="0" Mod2="0" Control="0" Shift="0" AltMeta="0" /> ++</keystrokes> ++ ++Each 'action' defines an action to be executed when receiving that keystroke. A ++list of possible actions is given below. Some of those actions are only ++available with debug builds of nxagent. ++ ++Keys are given as a combination of 'key' and (optionally) a number of ++modifiers. The key attribute is evaluated into a X11 key via the usual ++XStringToKeysym function. A list of possible keys can be found in ++/usr/include/X11/keysymdef.h, the names are specified without the leading ++'XK_'. Evaluation is case-sensitive, so, 'space' and 'Escape' will work while ++'Space' and 'escape' won't. ++ ++Modifiers are given as boolean attributes, possible modifiers are Mod1, Mod2, ++Mod3, Mod4, Control, Shift, Lock. Sensible combinations strongly depend on your ++keyboard configuration, but usually you will need Mod1 and Control. Boolean in ++this context means '0', 'false' and an unspecified attribute are false, anything ++else is considered true. ++ ++Everything in this file is case-sensitive. Unknown lines are ignored. ++Keybindings are evaluated from top to bottom, so if a keybinding matches, other ++keybindings further down will be ignored. The contents of the file replaces the ++default keybindings, and only one file is read, no merging between different ++configuration files is done. This also means that an empty or invalid configuration ++file deactivates all keybindings. ++ ++List of possible 'action' attributes: ++------------------------------------- ++ ++close_session ++switch_all_screens ++minimize ++left ++up ++right ++down ++resize ++defer ++ignore ++fullscreen ++viewport_move_left ++viewport_move_up ++viewport_move_right ++viewport_move_down ++ ++Only in builds with certain debugging options enabled, ignored otherwise: ++force_synchronization ++debug_tree ++regions_on_screen ++test_input ++deactivate_input_devices_grab +--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c +@@ -148,6 +148,8 @@ + + char nxagentVerbose = 0; + ++char *nxagentKeystrokeFile = NULL; ++ + int ddxProcessArgument(int argc, char *argv[], int i) + { + /* +@@ -1021,6 +1023,20 @@ + return 1; + } + ++ if (!strcmp(argv[i], "-keystrokefile")) ++ { ++ if (i + 1 < argc) ++ { ++ if (NULL != (nxagentKeystrokeFile = strdup(argv[i + 1]))) ++ { ++ return 2; ++ } else { ++ FatalError("malloc failed"); ++ } ++ } ++ return 0; ++ } ++ + return 0; + } + +--- a/nx-X11/programs/Xserver/hw/nxagent/Args.h ++++ b/nx-X11/programs/Xserver/hw/nxagent/Args.h +@@ -83,4 +83,6 @@ + + extern int nxagentRemoteMajor; + ++extern char *nxagentKeystrokeFile; ++ + #endif /* __Args_H__ */ + diff --git a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch index 5ca8f5f..eba1708 100644 --- a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch +++ b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch @@ -125,11 +125,9 @@ Last-Update: 2012-02-15 nxcompshad/Makefile.in | 4 103 files changed, 294 insertions(+), 294 deletions(-) -Index: nx-libs_3.5.0.9/nx-X11/config/cf/Imake.rules -=================================================================== --- a/nx-X11/config/cf/Imake.rules +++ b/nx-X11/config/cf/Imake.rules -@@ -2124,9 +2124,9 @@ LintLibReferences(varname,libname,libsou +@@ -2124,9 +2124,9 @@ */ #ifndef ProjectUnsharedFontLibReferences #define ProjectUnsharedFontLibReferences() @@\ @@ -142,7 +140,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/Imake.rules #endif /* -@@ -2142,9 +2142,9 @@ LintLibReferences(XFONT,Xfont,$(FONTLIBS +@@ -2142,9 +2142,9 @@ #ifndef SharedFontLibReferences #define SharedFontLibReferences() @@\ SOFONTREV = SharedFontRev @@\ @@ -155,11 +153,9 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/Imake.rules #endif /* -Index: nx-libs_3.5.0.9/nx-X11/config/cf/Motif.tmpl -=================================================================== --- a/nx-X11/config/cf/Motif.tmpl +++ b/nx-X11/config/cf/Motif.tmpl -@@ -465,9 +465,9 @@ TOP_MOTIF_INCLUDES = -I$(MINCLUDESRC) +@@ -465,9 +465,9 @@ #endif #if SharedLibXm @@ -171,11 +167,9 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/Motif.tmpl #endif #if SharedLibMrm -Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl -=================================================================== --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl -@@ -1835,9 +1835,9 @@ VENDORSUPPORTDEFS = VendorSupportDefines +@@ -1835,9 +1835,9 @@ #ifndef SharedX11Rev #define SharedX11Rev 6.2 #endif @@ -187,7 +181,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif /* Common alternate spellings */ DEPXLIBONLY = $(DEPXONLYLIB) -@@ -2466,9 +2466,9 @@ ProjectUnsharedLibReferences(XONLY,X11,$ +@@ -2466,9 +2466,9 @@ #ifndef SharedXextRev #define SharedXextRev 6.4 #endif @@ -199,7 +193,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif LINTEXTENSIONLIB = $(LINTEXTENSION) DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) -@@ -2480,9 +2480,9 @@ LINTEXTENSIONLIB = $(LINTEXTENSION) +@@ -2480,9 +2480,9 @@ #ifndef SharedXssRev #define SharedXssRev 1.0 #endif @@ -211,7 +205,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc -@@ -2490,9 +2490,9 @@ ProjectUnsharedLibReferences(XSS,Xss,$(X +@@ -2490,9 +2490,9 @@ #ifndef SharedXxf86miscRev #define SharedXxf86miscRev 1.1 #endif @@ -223,7 +217,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm -@@ -2500,9 +2500,9 @@ ProjectUnsharedLibReferences(XXF86MISC,X +@@ -2500,9 +2500,9 @@ #ifndef SharedXxf86vmRev #define SharedXxf86vmRev 1.0 #endif @@ -235,7 +229,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga -@@ -2510,9 +2510,9 @@ ProjectUnsharedLibReferences(XXF86VM,Xxf +@@ -2510,9 +2510,9 @@ #ifndef SharedXxf86dgaRev #define SharedXxf86dgaRev 1.0 #endif @@ -247,7 +241,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #if BuildDmxLibrary -@@ -2544,9 +2544,9 @@ ProjectUnsharedLibReferences(XXF86DGA,Xx +@@ -2544,9 +2544,9 @@ #ifndef SharedXxf86rushRev #define SharedXxf86rushRev 1.0 #endif @@ -259,7 +253,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif -@@ -2555,9 +2555,9 @@ ProjectUnsharedLibReferences(XXF86RUSH,X +@@ -2555,9 +2555,9 @@ #ifndef SharedXvRev #define SharedXvRev 1.0 #endif @@ -271,7 +265,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif -@@ -2566,9 +2566,9 @@ ProjectUnsharedLibReferences(XV,Xv,$(XVL +@@ -2566,9 +2566,9 @@ #ifndef SharedXvMCRev #define SharedXvMCRev 1.0 #endif @@ -283,7 +277,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif XINERAMALIBSRC = $(LIBSRC)/Xinerama -@@ -2576,9 +2576,9 @@ ProjectUnsharedLibReferences(XVMC,XvMC,$ +@@ -2576,9 +2576,9 @@ #ifndef SharedXineramaRev #define SharedXineramaRev 1.0 #endif @@ -295,7 +289,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif XRESLIBSRC = $(LIBSRC)/XRes -@@ -2586,9 +2586,9 @@ ProjectUnsharedLibReferences(XINERAMA,Xi +@@ -2586,9 +2586,9 @@ #ifndef SharedXResRev #define SharedXResRev 1.0 #endif @@ -307,7 +301,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif DMXLIBSRC = $(LIBSRC)/dmx -@@ -2596,9 +2596,9 @@ ProjectUnsharedLibReferences(XRES,XRes,$ +@@ -2596,9 +2596,9 @@ #ifndef SharedDmxRev #define SharedDmxRev 1.0 #endif @@ -319,7 +313,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif DPSLIBSRC = $(LIBSRC)/dps -@@ -2606,9 +2606,9 @@ ProjectUnsharedLibReferences(DMX,dmx,$(D +@@ -2606,9 +2606,9 @@ #ifndef SharedDpsRev #define SharedDpsRev 1.0 #endif @@ -331,7 +325,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif DPSTKLIBSRC = $(LIBSRC)/dpstk -@@ -2616,9 +2616,9 @@ ProjectUnsharedLibReferences(DPS,dps,$(D +@@ -2616,9 +2616,9 @@ #ifndef SharedDpsTkRev #define SharedDpsTkRev 1.0 #endif @@ -343,7 +337,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif PSRESLIBSRC = $(LIBSRC)/psres -@@ -2626,9 +2626,9 @@ ProjectUnsharedLibReferences(DPSTK,dpstk +@@ -2626,9 +2626,9 @@ #ifndef SharedPSResRev #define SharedPSResRev 1.0 #endif @@ -355,7 +349,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif GLULIBSRC = $(LIBSRC)/GLU -@@ -2636,9 +2636,9 @@ ProjectUnsharedLibReferences(PSRES,psres +@@ -2636,9 +2636,9 @@ #ifndef SharedGluRev #define SharedGluRev 1.3 #endif @@ -367,7 +361,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif GLXLIBSRC = $(LIBSRC)/GL -@@ -2646,18 +2646,18 @@ ProjectUnsharedLibReferences(GLU,GLU,$(G +@@ -2646,18 +2646,18 @@ #ifndef SharedGlxRev #define SharedGlxRev 1.2 #endif @@ -390,7 +384,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif XRENDERLIBSRC = $(LIBSRC)/Xrender -@@ -2665,9 +2665,9 @@ ProjectUnsharedLibReferences(GLW,GLw,$(G +@@ -2665,9 +2665,9 @@ #ifndef SharedXrenderRev #define SharedXrenderRev 1.2.2 #endif @@ -402,7 +396,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif XRANDRLIBSRC = $(LIBSRC)/Xrandr -@@ -2675,9 +2675,9 @@ ProjectUnsharedLibReferences(XRENDER,Xre +@@ -2675,9 +2675,9 @@ #ifndef SharedXrandrRev #define SharedXrandrRev 2.0 #endif @@ -414,7 +408,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif XFIXESLIBSRC = $(LIBSRC)/Xfixes -@@ -2685,9 +2685,9 @@ ProjectUnsharedLibReferences(XRANDR,Xran +@@ -2685,9 +2685,9 @@ #ifndef SharedXfixesRev #define SharedXfixesRev 3.0 #endif @@ -426,7 +420,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif XDAMAGELIBSRC = $(LIBSRC)/Xdamage -@@ -2695,9 +2695,9 @@ ProjectUnsharedLibReferences(XFIXES,Xfix +@@ -2695,9 +2695,9 @@ #ifndef SharedXdamageRev #define SharedXdamageRev 1.0 #endif @@ -438,7 +432,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite -@@ -2705,9 +2705,9 @@ XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite +@@ -2705,9 +2705,9 @@ #ifndef SharedXcompositeRev #define SharedXcompositeRev 1.0 #endif @@ -450,7 +444,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif XEVIELIBSRC = $(LIBSRC)/Xevie -@@ -2715,9 +2715,9 @@ XEVIELIBSRC = $(LIBSRC)/Xevie +@@ -2715,9 +2715,9 @@ #ifndef SharedXevieRev #define SharedXevieRev 1.0 #endif @@ -462,7 +456,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif XCURSORLIBSRC = $(LIBSRC)/Xcursor -@@ -2725,9 +2725,9 @@ ProjectUnsharedLibReferences(XEVIE,Xevie +@@ -2725,9 +2725,9 @@ #ifndef SharedXcursorRev #define SharedXcursorRev 1.0.2 #endif @@ -474,7 +468,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif APPLEWMLIBSRC = $(LIBSRC)/apple -@@ -2735,9 +2735,9 @@ ProjectUnsharedLibReferences(XCURSOR,Xcu +@@ -2735,9 +2735,9 @@ #ifndef SharedAppleWMRev #define SharedAppleWMRev 1.0 #endif @@ -486,7 +480,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif WINDOWSWMLIBSRC = $(LIBSRC)/windows -@@ -2745,9 +2745,9 @@ ProjectUnsharedLibReferences(APPLEWM,App +@@ -2745,9 +2745,9 @@ #ifndef SharedWindowsWMRev #define SharedWindowsWMRev 1.0 #endif @@ -498,7 +492,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif # ifndef SharedLibXfontcache -@@ -2768,9 +2768,9 @@ ProjectUnsharedLibReferences(WINDOWSWM,W +@@ -2768,9 +2768,9 @@ #ifndef SharedXfontcacheRev #define SharedXfontcacheRev 1.2 #endif @@ -510,7 +504,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef SharedLibXau -@@ -2790,12 +2790,12 @@ ProjectUnsharedLibReferences(XFONTCACHE, +@@ -2790,12 +2790,12 @@ #ifndef SharedXauRev #define SharedXauRev 6.0 #endif @@ -526,7 +520,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #endif -@@ -2816,12 +2816,12 @@ ProjectUnsharedLibReferences(XAUTH,Xau,$ +@@ -2816,12 +2816,12 @@ #ifndef SharedXdmcpRev #define SharedXdmcpRev 6.0 #endif @@ -542,7 +536,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #endif -@@ -2842,9 +2842,9 @@ ProjectUnsharedLibReferences(XDMCP,Xdmcp +@@ -2842,9 +2842,9 @@ #ifndef SharedXmuRev #define SharedXmuRev 6.2 #endif @@ -554,7 +548,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef SharedLibXmuu -@@ -2864,9 +2864,9 @@ ProjectUnsharedLibReferences(XMU,Xmu,$(X +@@ -2864,9 +2864,9 @@ #ifndef SharedXmuuRev #define SharedXmuuRev 1.0 #endif @@ -566,7 +560,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef SharedOldX -@@ -2886,9 +2886,9 @@ ProjectUnsharedLibReferences(XMUU,Xmuu,$ +@@ -2886,9 +2886,9 @@ #ifndef SharedOldXRev #define SharedOldXRev 6.0 #endif @@ -578,7 +572,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef SharedLibXp -@@ -2908,9 +2908,9 @@ ProjectUnsharedLibReferences(OLDX,oldX,$ +@@ -2908,9 +2908,9 @@ #ifndef SharedXpRev #define SharedXpRev 6.2 #endif @@ -590,7 +584,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef SharedLibXt -@@ -2930,9 +2930,9 @@ ProjectUnsharedLibReferences(XP,Xp,$(XPL +@@ -2930,9 +2930,9 @@ #ifndef SharedXtRev #define SharedXtRev 6.0 #endif @@ -602,7 +596,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) -@@ -2956,9 +2956,9 @@ ProjectUnsharedLibReferences(XTOOLONLY,X +@@ -2956,9 +2956,9 @@ #ifndef SharedXaRev #define SharedXaRev 1.0 #endif @@ -614,7 +608,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef BuildXaw -@@ -2985,9 +2985,9 @@ UnsharedLibReferences(XA,Xa,$(XALIBSRC)) +@@ -2985,9 +2985,9 @@ #ifndef SharedXawRev #define SharedXawRev 8.0 #endif @@ -626,7 +620,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #endif -@@ -3013,14 +3013,14 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(A +@@ -3013,14 +3013,14 @@ #ifndef SharedXaw7Rev #define SharedXaw7Rev 7.0 #endif @@ -645,7 +639,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #endif #endif -@@ -3048,14 +3048,14 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(A +@@ -3048,14 +3048,14 @@ #ifndef SharedXaw6Rev #define SharedXaw6Rev 6.1 #endif @@ -664,7 +658,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #endif #endif -@@ -3077,9 +3077,9 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(A +@@ -3077,9 +3077,9 @@ #ifndef SharedXiRev #define SharedXiRev 6.0 #endif @@ -676,7 +670,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef SharedLibXtst -@@ -3099,12 +3099,12 @@ ProjectUnsharedLibReferences(XI,Xi,$(XIL +@@ -3099,12 +3099,12 @@ #ifndef SharedXtstRev #define SharedXtstRev 6.1 #endif @@ -692,7 +686,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #ifndef SharedLibICE #define SharedLibICE HasSharedLibraries -@@ -3123,9 +3123,9 @@ ProjectUnsharedLibReferences(XBSD,Xbsd,$ +@@ -3123,9 +3123,9 @@ #ifndef SharedICERev #define SharedICERev 6.4 #endif @@ -704,7 +698,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef SharedLibSM -@@ -3145,9 +3145,9 @@ ProjectUnsharedLibReferences(ICE,ICE,$(I +@@ -3145,9 +3145,9 @@ #ifndef SharedSMRev #define SharedSMRev 6.0 #endif @@ -716,7 +710,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef SharedLibXkey -@@ -3167,9 +3167,9 @@ ProjectUnsharedLibReferences(SM,SM,$(SMS +@@ -3167,9 +3167,9 @@ #ifndef SharedXkeyRev #define SharedXkeyRev 6.0 #endif @@ -728,7 +722,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef SharedLibFS -@@ -3189,9 +3189,9 @@ ProjectUnsharedLibReferences(XKEY,Xkey,$ +@@ -3189,9 +3189,9 @@ #ifndef SharedFSRev #define SharedFSRev 6.0 #endif @@ -740,7 +734,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef SharedLibFont -@@ -3212,14 +3212,14 @@ ProjectUnsharedLibReferences(FS,FS,$(FSL +@@ -3212,14 +3212,14 @@ #define SharedFontRev 1.5 #endif SharedFontLibReferences() @@ -758,7 +752,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) -@@ -3241,9 +3241,9 @@ ProjectUnsharedLibReferences(FONTSTUB,fn +@@ -3241,9 +3241,9 @@ #ifndef SharedFontEncRev #define SharedFontEncRev 1.0 #endif @@ -770,7 +764,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef SharedLibXpm -@@ -3263,9 +3263,9 @@ ProjectUnsharedLibReferences(XFONTENC,fo +@@ -3263,9 +3263,9 @@ #ifndef SharedXpmRev #define SharedXpmRev 4.11 #endif @@ -782,7 +776,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #if UseFreetype2 -@@ -3313,9 +3313,9 @@ ProjectUnsharedLibReferences(XPM,Xpm,$(X +@@ -3313,9 +3313,9 @@ #define SharedFreetype2Rev 9.0 #endif #endif @@ -794,7 +788,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifdef UseInstalled -@@ -3470,9 +3470,9 @@ MOTIFINCLUDES = -I$(MOTIFINCDIR) +@@ -3470,9 +3470,9 @@ #define SharedExpatRev 4.0 #endif #endif @@ -806,7 +800,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #if UseExpat -@@ -3552,9 +3552,9 @@ EXPATDEFINES = -DEXPAT +@@ -3552,9 +3552,9 @@ #ifndef SharedXft1Rev #define SharedXft1Rev 1.1 #endif @@ -818,7 +812,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef Xft1ClientDepLibs -@@ -3589,9 +3589,9 @@ ProjectUnsharedLibReferences(XFT1,Xft,$( +@@ -3589,9 +3589,9 @@ #ifndef SharedXftRev #define SharedXftRev 2.1.2 #endif @@ -830,7 +824,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef XftClientDepLibs -@@ -3622,9 +3622,9 @@ ProjectUnsharedLibReferences(XFT,Xft,$(X +@@ -3622,9 +3622,9 @@ #ifndef SharedFontconfigRev #define SharedFontconfigRev 1.0.4 #endif @@ -842,7 +836,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifdef UseInstalled -@@ -3827,9 +3827,9 @@ LIBPNGLIB = -L$(LIBPNGLIBDIR) LinkerRunt +@@ -3827,9 +3827,9 @@ # ifndef SharedxkbfileRev # define SharedxkbfileRev 1.0 # endif @@ -854,7 +848,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #if BuildXKBlib -@@ -3899,9 +3899,9 @@ ProjectUnsharedLibReferences(XKBFILE,xkb +@@ -3899,9 +3899,9 @@ # ifndef SharedxkbuiRev # define SharedxkbuiRev 1.0 # endif @@ -866,7 +860,7 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef XkbuiLibs -@@ -3974,9 +3974,9 @@ EXTRAXAWCLIENTLIBS = ExtraXawClientLibs +@@ -3974,9 +3974,9 @@ #ifndef SharedXTrapRev #define SharedXTrapRev 6.4 #endif @@ -878,11 +872,9 @@ Index: nx-libs_3.5.0.9/nx-X11/config/cf/X11.tmpl #endif #ifndef NeedDefaultDepLibs -Index: nx-X11/config/cf/bsdLib.rules -=================================================================== --- a/nx-X11/config/cf/bsdLib.rules +++ b/nx-X11/config/cf/bsdLib.rules -@@ -134,9 +134,9 @@ LintLibReferences(varname,libname,libsou +@@ -134,9 +134,9 @@ #ifndef SharedFontLibReferences #define SharedFontLibReferences() @@\ SOFONTREV = SharedFontRev @@\ @@ -895,11 +887,9 @@ Index: nx-X11/config/cf/bsdLib.rules #endif /* -Index: nx-X11/config/cf/bsdLib.tmpl -=================================================================== --- a/nx-X11/config/cf/bsdLib.tmpl +++ b/nx-X11/config/cf/bsdLib.tmpl -@@ -38,7 +38,7 @@ XCOMM $XFree86: xc/config/cf/bsdLib.tmpl +@@ -38,7 +38,7 @@ #ifndef FixupLibReferences #define FixupLibReferences() @@\ @@ -908,11 +898,9 @@ Index: nx-X11/config/cf/bsdLib.tmpl XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif -Index: nx-X11/config/cf/bsdiLib.tmpl -=================================================================== --- a/nx-X11/config/cf/bsdiLib.tmpl +++ b/nx-X11/config/cf/bsdiLib.tmpl -@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/config/cf/bsdiLib.tmp +@@ -11,7 +11,7 @@ #ifndef FixupLibReferences #define FixupLibReferences() @@\ @@ -921,11 +909,9 @@ Index: nx-X11/config/cf/bsdiLib.tmpl XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif -Index: nx-X11/config/cf/convex.cf -=================================================================== --- a/nx-X11/config/cf/convex.cf +++ b/nx-X11/config/cf/convex.cf -@@ -90,9 +90,9 @@ DEPMRESOURCELIB = _UseCat($(USRLIBDIR),$ +@@ -90,9 +90,9 @@ LINTMRESOURCELIB= _UseCat($(LINTLIBDIR),$(MRESOURCESRC),/llib-lMrm.ln) XMLIBSRC = $(LIBSRC)/Xm @@ -938,11 +924,9 @@ Index: nx-X11/config/cf/convex.cf UILLIBSRC = $(LIBSRC)/uil DEPUILLIB = _UseCat($(USRLIBDIR),$(UILLIBSRC),/libUil.a) -Index: nx-X11/config/cf/cygwin.tmpl -=================================================================== --- a/nx-X11/config/cf/cygwin.tmpl +++ b/nx-X11/config/cf/cygwin.tmpl -@@ -50,7 +50,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.tmpl +@@ -50,7 +50,7 @@ #ifndef FixupLibReferences # define FixupLibReferences() @@\ @@ -951,11 +935,9 @@ Index: nx-X11/config/cf/cygwin.tmpl XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif -Index: nx-X11/config/cf/darwinLib.tmpl -=================================================================== --- a/nx-X11/config/cf/darwinLib.tmpl +++ b/nx-X11/config/cf/darwinLib.tmpl -@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/config/cf/darwinLib.t +@@ -5,7 +5,7 @@ #ifndef FixupLibReferences #define FixupLibReferences() @@\ @@ -964,11 +946,9 @@ Index: nx-X11/config/cf/darwinLib.tmpl XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif -Index: nx-X11/config/cf/gnuLib.tmpl -=================================================================== --- a/nx-X11/config/cf/gnuLib.tmpl +++ b/nx-X11/config/cf/gnuLib.tmpl -@@ -6,7 +6,7 @@ XCOMM +@@ -6,7 +6,7 @@ #ifndef FixupLibReferences #define FixupLibReferences() @@\ @@ -977,11 +957,9 @@ Index: nx-X11/config/cf/gnuLib.tmpl XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif -Index: nx-X11/config/cf/ibmLib.rules -=================================================================== --- a/nx-X11/config/cf/ibmLib.rules +++ b/nx-X11/config/cf/ibmLib.rules -@@ -127,23 +127,23 @@ LintLibReferences(varname,libname,libsou +@@ -127,23 +127,23 @@ # ifndef SharedFontLibReferences # define SharedFontLibReferences() @@\ DEPFONTLIB = /**/ @@\ @@ -1011,11 +989,9 @@ Index: nx-X11/config/cf/ibmLib.rules # endif # endif -Index: nx-X11/config/cf/ibmLib.tmpl -=================================================================== --- a/nx-X11/config/cf/ibmLib.tmpl +++ b/nx-X11/config/cf/ibmLib.tmpl -@@ -81,7 +81,7 @@ XCOMM $XFree86: xc/config/cf/ibmLib.tmpl +@@ -81,7 +81,7 @@ /* we want this to be defined only when building X */ # ifndef FixupLibReferences # define FixupLibReferences() @@\ @@ -1024,11 +1000,9 @@ Index: nx-X11/config/cf/ibmLib.tmpl # endif #endif -Index: nx-X11/config/cf/lnxLib.rules -=================================================================== --- a/nx-X11/config/cf/lnxLib.rules +++ b/nx-X11/config/cf/lnxLib.rules -@@ -389,7 +389,7 @@ JUMP_LDLIBS_libc = `$(CC) --print-libgcc +@@ -389,7 +389,7 @@ XCOMM libX11.so (X11, SM, ICE) JUMP_ROOT_X11 = $(XLIBSRC) JUMP_IS_HOST_X11 = YES @@ -1037,7 +1011,7 @@ Index: nx-X11/config/cf/lnxLib.rules JUMP_SIBDIRS_X11 = $(JUMP_ROOT_SM) $(JUMP_ROOT_ICE) JUMP_DIR_X11 = $(JUMP_ROOT_X11)/shared JUMP_DEFS_X11 = $(XDMAUTHDEFS) $(XKB_DEFINES) -@@ -400,9 +400,9 @@ JUMP_EXPORT_X11 = $(JUMP_DIR_X11)/jump.v +@@ -400,9 +400,9 @@ JUMP_ADDRESS_X11 = 0x60200000 JUMP_JUMPTABLESIZE_X11 = 0x4000 JUMP_GOTSIZE_X11 = 4096 @@ -1049,7 +1023,7 @@ Index: nx-X11/config/cf/lnxLib.rules JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc) XCOMM libSM (part of libX11.so) -@@ -435,9 +435,9 @@ JUMP_JUMPTABLESIZE_Xt = 0x4000 +@@ -435,9 +435,9 @@ JUMP_GOTSIZE_Xt = 4096 JUMP_STUBNAMES_Xt = libXt libXmu libXext libXi libXtst libXp JUMP_STUBS_IMPORT_Xt = $(JUMP_STUBS_IMPORT_X11) @@ -1062,7 +1036,7 @@ Index: nx-X11/config/cf/lnxLib.rules XCOMM libXmu (part of libXt.so) JUMP_ROOT_Xmu = $(XMUSRC) -@@ -485,8 +485,8 @@ JUMP_JUMPTABLESIZE_Xaw = 0x4000 +@@ -485,8 +485,8 @@ JUMP_GOTSIZE_Xaw = 4096 JUMP_STUBNAMES_Xaw = libXaw JUMP_STUBS_IMPORT_Xaw = $(JUMP_STUBS_IMPORT_X11) @@ -1073,11 +1047,9 @@ Index: nx-X11/config/cf/lnxLib.rules $(JUMP_LDLIBS_libc) # endif /* !UseInstalled */ -Index: nx-X11/config/cf/lnxLib.tmpl -=================================================================== --- a/nx-X11/config/cf/lnxLib.tmpl +++ b/nx-X11/config/cf/lnxLib.tmpl -@@ -9,7 +9,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl +@@ -9,7 +9,7 @@ #ifndef FixupLibReferences #define FixupLibReferences() @@\ @@ -1086,7 +1058,7 @@ Index: nx-X11/config/cf/lnxLib.tmpl XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif -@@ -66,7 +66,7 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLI +@@ -66,7 +66,7 @@ #ifndef FixupLibReferences #define FixupLibReferences() @@\ @@ -1095,11 +1067,9 @@ Index: nx-X11/config/cf/lnxLib.tmpl #endif #endif /* UseElfFormat */ -Index: nx-X11/config/cf/mingw.tmpl -=================================================================== --- a/nx-X11/config/cf/mingw.tmpl +++ b/nx-X11/config/cf/mingw.tmpl -@@ -50,7 +50,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.tmpl +@@ -50,7 +50,7 @@ #ifndef FixupLibReferences # define FixupLibReferences() @@\ @@ -1108,11 +1078,9 @@ Index: nx-X11/config/cf/mingw.tmpl XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif -Index: nx-X11/config/cf/nto.rules -=================================================================== --- a/nx-X11/config/cf/nto.rules +++ b/nx-X11/config/cf/nto.rules -@@ -104,7 +104,7 @@ ComplexHostProgramTarget(program) +@@ -104,7 +104,7 @@ #ifndef FixupLibReferences #define FixupLibReferences() @@\ @@ -1121,11 +1089,9 @@ Index: nx-X11/config/cf/nto.rules XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif -Index: nx-X11/config/cf/os2Lib.tmpl -=================================================================== --- a/nx-X11/config/cf/os2Lib.tmpl +++ b/nx-X11/config/cf/os2Lib.tmpl -@@ -107,35 +107,35 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl +@@ -107,35 +107,35 @@ #endif #if LinkStatically @@ -1189,7 +1155,7 @@ Index: nx-X11/config/cf/os2Lib.tmpl #endif /* -@@ -159,7 +159,7 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl +@@ -159,7 +159,7 @@ #endif #if SharedOldX DEPOLDXLIB = @@ -1198,11 +1164,9 @@ Index: nx-X11/config/cf/os2Lib.tmpl #endif #if SharedLibXt DEPXTOOLLIB = -Index: nx-X11/config/cf/sco5.cf -=================================================================== --- a/nx-X11/config/cf/sco5.cf +++ b/nx-X11/config/cf/sco5.cf -@@ -318,7 +318,7 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1 +@@ -318,7 +318,7 @@ */ #ifndef FixupLibReferences #define FixupLibReferences() @@\ @@ -1211,11 +1175,9 @@ Index: nx-X11/config/cf/sco5.cf XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif -Index: nx-X11/config/cf/sv3Lib.tmpl -=================================================================== --- a/nx-X11/config/cf/sv3Lib.tmpl +++ b/nx-X11/config/cf/sv3Lib.tmpl -@@ -40,31 +40,31 @@ XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl +@@ -40,31 +40,31 @@ * are using shared libraries, we really do not need to depend on anything */ #if SharedLibXext @@ -1259,11 +1221,9 @@ Index: nx-X11/config/cf/sv3Lib.tmpl + XILIB = LoaderLibPrefix _Use(-lNX_Xi_s,$(DEPXILIB)) #endif -Index: nx-X11/config/cf/sv4Lib.tmpl -=================================================================== --- a/nx-X11/config/cf/sv4Lib.tmpl +++ b/nx-X11/config/cf/sv4Lib.tmpl -@@ -7,7 +7,7 @@ XCOMM $Xorg: sv4Lib.tmpl,v 1.3 2000/08/1 +@@ -7,7 +7,7 @@ XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.7 2003/05/29 21:56:57 herrb Exp $ /* SVR4 shared libraries are deficient in link semantics */ @@ -1272,11 +1232,9 @@ Index: nx-X11/config/cf/sv4Lib.tmpl #ifndef FixupLibReferences # define FixupLibReferences() @@\ XMULIB = $(XMULIBONLY) -z nodefs -Index: nx-X11/config/cf/usl.cf -=================================================================== --- a/nx-X11/config/cf/usl.cf +++ b/nx-X11/config/cf/usl.cf -@@ -262,7 +262,7 @@ XCOMM operating system: OSName (OSMajorV +@@ -262,7 +262,7 @@ */ #ifndef FixupLibReferences #define FixupLibReferences() @@\ @@ -1285,8 +1243,6 @@ Index: nx-X11/config/cf/usl.cf XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif -Index: nx-X11/extras/Mesa/src/mesa/main/Imakefile -=================================================================== --- a/nx-X11/extras/Mesa/src/mesa/main/Imakefile +++ b/nx-X11/extras/Mesa/src/mesa/main/Imakefile @@ -2,7 +2,7 @@ @@ -1298,11 +1254,9 @@ Index: nx-X11/extras/Mesa/src/mesa/main/Imakefile #define SoRev SOX11REV #define LibHeaders NO -Index: nx-X11/extras/Xpm/lib/Imakefile -=================================================================== --- a/nx-X11/extras/Xpm/lib/Imakefile +++ b/nx-X11/extras/Xpm/lib/Imakefile -@@ -125,7 +125,7 @@ OS_NAME_DEFINES = OsNameDefines +@@ -125,7 +125,7 @@ STD_DEFINES = LibraryDefines CDEBUGFLAGS = LibraryCDebugFlags #else @@ -1311,33 +1265,27 @@ Index: nx-X11/extras/Xpm/lib/Imakefile #define SoRev SOXPMLIBREV #define IncSubdir X11 /* we have to cheat on Library.tmpl to get what we want... */ -Index: nx-X11/extras/drm/libdrm.pc.in -=================================================================== --- a/nx-X11/extras/drm/libdrm.pc.in +++ b/nx-X11/extras/drm/libdrm.pc.in -@@ -6,5 +6,5 @@ includedir=@includedir@ +@@ -6,5 +6,5 @@ Name: libdrm Description: Userspace interface to kernel DRM services Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -ldrm +Libs: -L${libdir} -lNX_drm Cflags: -I${includedir} -I${includedir}/drm -Index: nx-X11/extras/fontconfig/fontconfig.pc.in -=================================================================== --- a/nx-X11/extras/fontconfig/fontconfig.pc.in +++ b/nx-X11/extras/fontconfig/fontconfig.pc.in -@@ -6,5 +6,5 @@ includedir=@includedir@ +@@ -6,5 +6,5 @@ Name: Fontconfig Description: Font configuration and customization library Version: @VERSION@ -Libs: -L${libdir} -lfontconfig +Libs: -L${libdir} -lNX_fontconfig Cflags: -I${includedir} -Index: nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile -=================================================================== --- a/nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile +++ b/nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile -@@ -36,7 +36,7 @@ XCOMM +@@ -36,7 +36,7 @@ #define DoDebugLib DebugLibGlu #define DoProfileLib ProfileLibGlu #define IHaveSubdirs @@ -1346,11 +1294,9 @@ Index: nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' #define SoRev SOGLUREV -Index: nx-X11/lib/FS/Imakefile -=================================================================== --- a/nx-X11/lib/FS/Imakefile +++ b/nx-X11/lib/FS/Imakefile -@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/FS/Imakefile,v 3. +@@ -11,7 +11,7 @@ #define DoExtraLib SharedLibFS #define DoDebugLib DebugLibFS #define DoProfileLib ProfileLibFS @@ -1359,11 +1305,9 @@ Index: nx-X11/lib/FS/Imakefile #define SoRev SOFSREV #define IncSubdir X11 #define IncSubSubdir fonts -Index: nx-X11/lib/GLw/Imakefile -=================================================================== --- a/nx-X11/lib/GLw/Imakefile +++ b/nx-X11/lib/GLw/Imakefile -@@ -46,7 +46,7 @@ XCOMM MOTIF_LDFLAGS = -L/usr/local/lib +@@ -46,7 +46,7 @@ #define DoProfileLib ProfileLibGLw #define HasSharedData NO @@ -1372,11 +1316,9 @@ Index: nx-X11/lib/GLw/Imakefile #define SoRev SOGLWREV #define IncSubdir GL -Index: nx-X11/lib/ICE/Imakefile -=================================================================== --- a/nx-X11/lib/ICE/Imakefile +++ b/nx-X11/lib/ICE/Imakefile -@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/ICE/Imakefile,v 3 +@@ -10,7 +10,7 @@ #define DoExtraLib SharedLibICE #define DoDebugLib DebugLibICE #define DoProfileLib ProfileLibICE @@ -1385,11 +1327,9 @@ Index: nx-X11/lib/ICE/Imakefile #define SoRev SOICEREV #define IncSubdir X11 #define IncSubSubdir ICE -Index: nx-X11/lib/SM/Imakefile -=================================================================== --- a/nx-X11/lib/SM/Imakefile +++ b/nx-X11/lib/SM/Imakefile -@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/SM/Imakefile,v 1. +@@ -10,7 +10,7 @@ #define DoExtraLib SharedLibSM #define DoDebugLib DebugLibSM #define DoProfileLib ProfileLibSM @@ -1398,11 +1338,9 @@ Index: nx-X11/lib/SM/Imakefile #define SoRev SOSMREV #define IncSubdir X11 #define IncSubSubdir SM -Index: nx-X11/lib/X11/Imakefile -=================================================================== --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile -@@ -83,7 +83,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTL +@@ -83,7 +83,7 @@ #define DoExtraLib SharedLibX11 #define DoDebugLib DebugLibX11 #define DoProfileLib ProfileLibX11 @@ -1411,11 +1349,9 @@ Index: nx-X11/lib/X11/Imakefile #define SoRev SOXLIBREV #define HugeLibrary YES #define IncSubdir X11 -Index: nx-X11/lib/X11/Imakefile.NX.original -=================================================================== --- a/nx-X11/lib/X11/Imakefile.NX.original +++ b/nx-X11/lib/X11/Imakefile.NX.original -@@ -83,7 +83,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTL +@@ -83,7 +83,7 @@ #define DoExtraLib SharedLibX11 #define DoDebugLib DebugLibX11 #define DoProfileLib ProfileLibX11 @@ -1424,11 +1360,9 @@ Index: nx-X11/lib/X11/Imakefile.NX.original #define SoRev SOXLIBREV #define HugeLibrary YES #define IncSubdir X11 -Index: nx-X11/lib/X11/Imakefile.X.original -=================================================================== --- a/nx-X11/lib/X11/Imakefile.X.original +++ b/nx-X11/lib/X11/Imakefile.X.original -@@ -28,7 +28,7 @@ BuildIncludes($(HEADERS),IncSubdir,..) +@@ -28,7 +28,7 @@ #define DoExtraLib SharedLibX11 #define DoDebugLib DebugLibX11 #define DoProfileLib ProfileLibX11 @@ -1437,11 +1371,9 @@ Index: nx-X11/lib/X11/Imakefile.X.original #define SoRev SOXLIBREV #define HugeLibrary YES #define IncSubdir X11 -Index: nx-X11/lib/XRes/Imakefile -=================================================================== --- a/nx-X11/lib/XRes/Imakefile +++ b/nx-X11/lib/XRes/Imakefile -@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/XRes/Imakefile,v +@@ -4,7 +4,7 @@ #define DoSharedLib SharedLibXRes #define DoDebugLib DebugLibXRes #define DoProfileLib ProfileLibXRes @@ -1450,11 +1382,9 @@ Index: nx-X11/lib/XRes/Imakefile #define SoRev SOXRESREV #define LibHeaders NO -Index: nx-X11/lib/XTrap/Imakefile -=================================================================== --- a/nx-X11/lib/XTrap/Imakefile +++ b/nx-X11/lib/XTrap/Imakefile -@@ -4,7 +4,7 @@ XCOMM $XFree86$ +@@ -4,7 +4,7 @@ #define DoSharedLib SharedLibXTrap #define DoDebugLib DebugLibXTrap #define DoProfileLib ProfileLibXTrap @@ -1463,11 +1393,9 @@ Index: nx-X11/lib/XTrap/Imakefile #define SoRev SOXTRAPREV #define LibHeaders NO -Index: nx-X11/lib/Xau/Imakefile -=================================================================== --- a/nx-X11/lib/Xau/Imakefile +++ b/nx-X11/lib/Xau/Imakefile -@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3 +@@ -10,7 +10,7 @@ #define DoExtraLib SharedLibXau #define DoDebugLib DebugLibXau #define DoProfileLib ProfileLibXau @@ -1476,11 +1404,9 @@ Index: nx-X11/lib/Xau/Imakefile #define SoRev SOXAUTHREV #define IncSubdir X11 -Index: nx-X11/lib/Xaw/Imakefile -=================================================================== --- a/nx-X11/lib/Xaw/Imakefile +++ b/nx-X11/lib/Xaw/Imakefile -@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/Xaw/Imakefile,v 1 +@@ -11,7 +11,7 @@ #define DoDebugLib DebugLibXaw #define DoProfileLib ProfileLibXaw #define HasSharedData YES @@ -1489,11 +1415,9 @@ Index: nx-X11/lib/Xaw/Imakefile #define SoRev SOXAWREV #define IncSubdir X11 #define IncSubSubdir Xaw -Index: nx-X11/lib/Xaw6/Imakefile -=================================================================== --- a/nx-X11/lib/Xaw6/Imakefile +++ b/nx-X11/lib/Xaw6/Imakefile -@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/Xaw6/Imakefile,v +@@ -5,7 +5,7 @@ #define DoDebugLib DebugLibXaw6 #define DoProfileLib ProfileLibXaw6 #define HasSharedData YES @@ -1502,11 +1426,9 @@ Index: nx-X11/lib/Xaw6/Imakefile #define SoRev SOXAW6REV #define LibHeaders NO #define NoSoSymlink -Index: nx-X11/lib/Xaw7/Imakefile -=================================================================== --- a/nx-X11/lib/Xaw7/Imakefile +++ b/nx-X11/lib/Xaw7/Imakefile -@@ -5,7 +5,7 @@ XCOMM $Xorg$ +@@ -5,7 +5,7 @@ #define DoDebugLib DebugLibXaw7 #define DoProfileLib ProfileLibXaw7 #define HasSharedData YES @@ -1515,11 +1437,9 @@ Index: nx-X11/lib/Xaw7/Imakefile #define SoRev SOXAW7REV #if BuildXaw -Index: nx-X11/lib/Xcomposite/Imakefile -=================================================================== --- a/nx-X11/lib/Xcomposite/Imakefile +++ b/nx-X11/lib/Xcomposite/Imakefile -@@ -14,7 +14,7 @@ SOXCOMPOSITEREV=1.0.0 +@@ -14,7 +14,7 @@ #define DoDebugLib DebugLibXcomposite #define DoProfileLib ProfileLibXcomposite @@ -1528,21 +1448,17 @@ Index: nx-X11/lib/Xcomposite/Imakefile #define SoRev SOXCOMPOSITEREV #define IncSubdir X11 #define IncSubSubdir extensions -Index: nx-X11/lib/Xcomposite/xcomposite.pc.in -=================================================================== --- a/nx-X11/lib/Xcomposite/xcomposite.pc.in +++ b/nx-X11/lib/Xcomposite/xcomposite.pc.in -@@ -7,4 +7,4 @@ Name: Xcomposite +@@ -7,4 +7,4 @@ Description: X Composite Library Version: @VERSION@ Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ @X_CFLAGS@ -Libs: -L${libdir} -lXcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ +Libs: -L${libdir} -lNX_Xcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ -Index: nx-X11/lib/Xcursor/Imakefile -=================================================================== --- a/nx-X11/lib/Xcursor/Imakefile +++ b/nx-X11/lib/Xcursor/Imakefile -@@ -15,7 +15,7 @@ SOXCURSORREV=1.0.2 +@@ -15,7 +15,7 @@ #define DoDebugLib DebugLibXcursor #define DoProfileLib ProfileLibXcursor @@ -1551,21 +1467,17 @@ Index: nx-X11/lib/Xcursor/Imakefile #define SoRev SOXCURSORREV #define IncSubdir X11 #define IncSubSubdir Xcursor -Index: nx-X11/lib/Xcursor/xcursor.pc.in -=================================================================== --- a/nx-X11/lib/Xcursor/xcursor.pc.in +++ b/nx-X11/lib/Xcursor/xcursor.pc.in -@@ -12,4 +12,4 @@ Description: X Cursor Library +@@ -12,4 +12,4 @@ Version: @VERSION@ Requires: xrender Cflags: -I${includedir} ${xrendercflags} ${xcflags} -Libs: -L${libdir} -lXcursor ${xrenderlibs} ${xlibs} +Libs: -L${libdir} -lNX_Xcursor ${xrenderlibs} ${xlibs} -Index: nx-X11/lib/Xdamage/Imakefile -=================================================================== --- a/nx-X11/lib/Xdamage/Imakefile +++ b/nx-X11/lib/Xdamage/Imakefile -@@ -14,7 +14,7 @@ SOXDAMAGEREV=1.0.1 +@@ -14,7 +14,7 @@ #define DoDebugLib DebugLibXdamage #define DoProfileLib ProfileLibXdamage @@ -1574,21 +1486,17 @@ Index: nx-X11/lib/Xdamage/Imakefile #define SoRev SOXDAMAGEREV #define IncSubdir X11 #define IncSubSubdir extensions -Index: nx-X11/lib/Xdamage/xdamage.pc.in -=================================================================== --- a/nx-X11/lib/Xdamage/xdamage.pc.in +++ b/nx-X11/lib/Xdamage/xdamage.pc.in -@@ -7,4 +7,4 @@ Name: Xdamage +@@ -7,4 +7,4 @@ Description: X Damage Library Version: @VERSION@ Cflags: -I${includedir} @XDAMAGE_CFLAGS@ @X_CFLAGS@ -Libs: -L${libdir} -lXdamage @XDAMAGE_LIBS@ @X_LIBS@ +Libs: -L${libdir} -lNX_Xdamage @XDAMAGE_LIBS@ @X_LIBS@ -Index: nx-X11/lib/Xdmcp/Imakefile -=================================================================== --- a/nx-X11/lib/Xdmcp/Imakefile +++ b/nx-X11/lib/Xdmcp/Imakefile -@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v +@@ -10,7 +10,7 @@ #define DoExtraLib SharedLibXdmcp #define DoDebugLib DebugLibXdmcp #define DoProfileLib ProfileLibXdmcp @@ -1597,11 +1505,9 @@ Index: nx-X11/lib/Xdmcp/Imakefile #define SoRev SOXDMCPREV #define IncSubdir X11 -Index: nx-X11/lib/Xevie/Imakefile -=================================================================== --- a/nx-X11/lib/Xevie/Imakefile +++ b/nx-X11/lib/Xevie/Imakefile -@@ -14,7 +14,7 @@ SOXEVIEREV=1.0.0 +@@ -14,7 +14,7 @@ #define DoDebugLib DebugLibXevie #define DoProfileLib ProfileLibXevie @@ -1610,21 +1516,17 @@ Index: nx-X11/lib/Xevie/Imakefile #define SoRev SOXEVIEREV #define IncSubdir X11 #define IncSubSubdir extensions -Index: nx-X11/lib/Xevie/xevie.pc.in -=================================================================== --- a/nx-X11/lib/Xevie/xevie.pc.in +++ b/nx-X11/lib/Xevie/xevie.pc.in -@@ -9,4 +9,4 @@ Name: Xevie +@@ -9,4 +9,4 @@ Description: X Event Interceptor Library Version: @VERSION@ Cflags: -I${includedir} ${xcflags} -Libs: -L${libdir} -lXevie ${xlibs} +Libs: -L${libdir} -lNX_Xevie ${xlibs} -Index: nx-X11/lib/Xext/Imakefile -=================================================================== --- a/nx-X11/lib/Xext/Imakefile +++ b/nx-X11/lib/Xext/Imakefile -@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xext/Imakefile,v +@@ -10,7 +10,7 @@ #define DoExtraLib SharedLibXext #define DoDebugLib DebugLibXext #define DoProfileLib ProfileLibXext @@ -1633,11 +1535,9 @@ Index: nx-X11/lib/Xext/Imakefile #define SoRev SOXEXTREV #define LibHeaders NO -Index: nx-X11/lib/Xfixes/Imakefile -=================================================================== --- a/nx-X11/lib/Xfixes/Imakefile +++ b/nx-X11/lib/Xfixes/Imakefile -@@ -14,7 +14,7 @@ SOXFIXESREV=3.0.0 +@@ -14,7 +14,7 @@ #define DoDebugLib DebugLibXfixes #define DoProfileLib ProfileLibXfixes @@ -1646,21 +1546,17 @@ Index: nx-X11/lib/Xfixes/Imakefile #define SoRev SOXFIXESREV #define IncSubdir X11 #define IncSubSubdir extensions -Index: nx-X11/lib/Xfixes/xfixes.pc.in -=================================================================== --- a/nx-X11/lib/Xfixes/xfixes.pc.in +++ b/nx-X11/lib/Xfixes/xfixes.pc.in -@@ -7,4 +7,4 @@ Name: Xfixes +@@ -7,4 +7,4 @@ Description: X Fixes Library Version: @VERSION@ Cflags: -I${includedir} @X_CFLAGS@ -Libs: -L${libdir} -lXfixes @X_LIBS@ +Libs: -L${libdir} -lNX_Xfixes @X_LIBS@ -Index: nx-X11/lib/Xfontcache/Imakefile -=================================================================== --- a/nx-X11/lib/Xfontcache/Imakefile +++ b/nx-X11/lib/Xfontcache/Imakefile -@@ -9,7 +9,7 @@ XCOMM $XFree86: xc/lib/Xfontcache/Imakef +@@ -9,7 +9,7 @@ #define DoExtraLib SharedLibXfontcache #define DoDebugLib DebugLibXfontcache #define DoProfileLib ProfileLibXfontcache @@ -1669,11 +1565,9 @@ Index: nx-X11/lib/Xfontcache/Imakefile #define SoRev SOXFONTCACHEREV #define LibHeaders NO -Index: nx-X11/lib/Xft/Imakefile -=================================================================== --- a/nx-X11/lib/Xft/Imakefile +++ b/nx-X11/lib/Xft/Imakefile -@@ -8,7 +8,7 @@ XCOMM $XdotOrg: xc/lib/Xft/Imakefile,v 1 +@@ -8,7 +8,7 @@ #define DoProfileLib ProfileLibXft #define HasSharedData YES @@ -1682,21 +1576,17 @@ Index: nx-X11/lib/Xft/Imakefile #define SoRev SOXFTREV #define IncSubdir X11 #define IncSubSubdir Xft -Index: nx-X11/lib/Xft/xft.pc.in -=================================================================== --- a/nx-X11/lib/Xft/xft.pc.in +++ b/nx-X11/lib/Xft/xft.pc.in -@@ -9,4 +9,4 @@ Version: @VERSION@ +@@ -9,4 +9,4 @@ Requires: xrender, fontconfig, freetype2 Requires.private: xrender, fontconfig, freetype2 Cflags: -I${includedir} -Libs: -L${libdir} -lXft +Libs: -L${libdir} -lNX_Xft -Index: nx-X11/lib/Xft1/Imakefile -=================================================================== --- a/nx-X11/lib/Xft1/Imakefile +++ b/nx-X11/lib/Xft1/Imakefile -@@ -70,7 +70,7 @@ LDPRELIBS=LdPreLibs +@@ -70,7 +70,7 @@ #define DoDebugLib NO #define DoProfileLib NO #define HasSharedData YES @@ -1705,11 +1595,9 @@ Index: nx-X11/lib/Xft1/Imakefile #define SoRev SOXFT1REV #define LibHeaders NO #define NoSoSymlink -Index: nx-X11/lib/Xi/Imakefile -=================================================================== --- a/nx-X11/lib/Xi/Imakefile +++ b/nx-X11/lib/Xi/Imakefile -@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xi/Imakefile,v 1. +@@ -10,7 +10,7 @@ #define DoExtraLib SharedLibXi #define DoDebugLib DebugLibXi #define DoProfileLib ProfileLibXi @@ -1718,11 +1606,9 @@ Index: nx-X11/lib/Xi/Imakefile #define SoRev SOXINPUTREV #define LibHeaders NO -Index: nx-X11/lib/Xinerama/Imakefile -=================================================================== --- a/nx-X11/lib/Xinerama/Imakefile +++ b/nx-X11/lib/Xinerama/Imakefile -@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xinerama/Imakefil +@@ -4,7 +4,7 @@ #define DoSharedLib SharedLibXinerama #define DoDebugLib DebugLibXinerama #define DoProfileLib ProfileLibXinerama @@ -1731,11 +1617,9 @@ Index: nx-X11/lib/Xinerama/Imakefile #define SoRev SOXINERAMAREV #define LibHeaders NO -Index: nx-X11/lib/Xmu/Imakefile -=================================================================== --- a/nx-X11/lib/Xmu/Imakefile +++ b/nx-X11/lib/Xmu/Imakefile -@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/Xmu/Imakefile,v 1 +@@ -11,7 +11,7 @@ #define DoDebugLib DebugLibXmu #define DoProfileLib ProfileLibXmu #define HasSharedData YES @@ -1744,11 +1628,9 @@ Index: nx-X11/lib/Xmu/Imakefile #define SoRev SOXMUREV #define IncSubdir X11 #define IncSubSubdir Xmu -Index: nx-X11/lib/Xmuu/Imakefile -=================================================================== --- a/nx-X11/lib/Xmuu/Imakefile +++ b/nx-X11/lib/Xmuu/Imakefile -@@ -11,7 +11,7 @@ XCOMM other than Xlib and the system C l +@@ -11,7 +11,7 @@ #define DoExtraLib SharedLibXmuu #define DoDebugLib DebugLibXmuu #define DoProfileLib ProfileLibXmuu @@ -1757,11 +1639,9 @@ Index: nx-X11/lib/Xmuu/Imakefile #define SoRev SOXMUUREV #define LibHeaders NO -Index: nx-X11/lib/Xp/Imakefile -=================================================================== --- a/nx-X11/lib/Xp/Imakefile +++ b/nx-X11/lib/Xp/Imakefile -@@ -44,7 +44,7 @@ XCOMM $XFree86: xc/lib/Xp/Imakefile,v 1. +@@ -44,7 +44,7 @@ #define DoExtraLib SharedLibXp #define DoDebugLib DebugLibXp #define DoProfileLib ProfileLibXp @@ -1770,11 +1650,9 @@ Index: nx-X11/lib/Xp/Imakefile #define SoRev SOXPREV #define LibHeaders NO -Index: nx-X11/lib/Xpm/Imakefile -=================================================================== --- a/nx-X11/lib/Xpm/Imakefile +++ b/nx-X11/lib/Xpm/Imakefile -@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1 +@@ -12,7 +12,7 @@ #define DoDebugLib DebugLibXpm #define DoProfileLib ProfileLibXpm #define HasSharedData NO @@ -1783,11 +1661,9 @@ Index: nx-X11/lib/Xpm/Imakefile #define SoRev SOXPMREV #define IncSubdir X11 -Index: nx-X11/lib/Xpm/Imakefile.NX.original -=================================================================== --- a/nx-X11/lib/Xpm/Imakefile.NX.original +++ b/nx-X11/lib/Xpm/Imakefile.NX.original -@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1 +@@ -12,7 +12,7 @@ #define DoDebugLib DebugLibXpm #define DoProfileLib ProfileLibXpm #define HasSharedData NO @@ -1796,11 +1672,9 @@ Index: nx-X11/lib/Xpm/Imakefile.NX.original #define SoRev SOXPMREV #define IncSubdir X11 -Index: nx-X11/lib/Xpm/Imakefile.X.original -=================================================================== --- a/nx-X11/lib/Xpm/Imakefile.X.original +++ b/nx-X11/lib/Xpm/Imakefile.X.original -@@ -8,7 +8,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1 +@@ -8,7 +8,7 @@ #define DoDebugLib DebugLibXpm #define DoProfileLib ProfileLibXpm #define HasSharedData NO @@ -1809,8 +1683,6 @@ Index: nx-X11/lib/Xpm/Imakefile.X.original #define SoRev SOXPMREV #define IncSubdir X11 -Index: nx-X11/lib/XprintAppUtil/Imakefile -=================================================================== --- a/nx-X11/lib/XprintAppUtil/Imakefile +++ b/nx-X11/lib/XprintAppUtil/Imakefile @@ -5,7 +5,7 @@ @@ -1822,8 +1694,6 @@ Index: nx-X11/lib/XprintAppUtil/Imakefile #define SoRev SOZLIBREV #define IncSubdir X11 #define IncSubSubdir XprintAppUtil -Index: nx-X11/lib/XprintUtil/Imakefile -=================================================================== --- a/nx-X11/lib/XprintUtil/Imakefile +++ b/nx-X11/lib/XprintUtil/Imakefile @@ -5,7 +5,7 @@ @@ -1835,11 +1705,9 @@ Index: nx-X11/lib/XprintUtil/Imakefile #define SoRev SOZLIBREV #define IncSubdir X11 #define IncSubSubdir XprintUtil -Index: nx-X11/lib/Xrandr/Imakefile -=================================================================== --- a/nx-X11/lib/Xrandr/Imakefile +++ b/nx-X11/lib/Xrandr/Imakefile -@@ -5,7 +5,7 @@ XCOMM $XdotOrg: xc/lib/Xrandr/Imakefile, +@@ -5,7 +5,7 @@ #define DoSharedLib SharedLibXrandr #define DoDebugLib DebugLibXrandr #define DoProfileLib ProfileLibXrandr @@ -1848,11 +1716,9 @@ Index: nx-X11/lib/Xrandr/Imakefile #define SoRev SOXRANDRREV #define IncSubdir X11 #define IncSubSubdir extensions -Index: nx-X11/lib/Xrender/Imakefile -=================================================================== --- a/nx-X11/lib/Xrender/Imakefile +++ b/nx-X11/lib/Xrender/Imakefile -@@ -74,7 +74,7 @@ clean:: +@@ -74,7 +74,7 @@ #define DoSharedLib SharedLibXrender #define DoDebugLib DebugLibXrender #define DoProfileLib ProfileLibXrender @@ -1861,21 +1727,17 @@ Index: nx-X11/lib/Xrender/Imakefile #define SoRev SOXRENDERREV #ifdef XBuildIncDir -Index: nx-X11/lib/Xrender/xrender.pc.in -=================================================================== --- a/nx-X11/lib/Xrender/xrender.pc.in +++ b/nx-X11/lib/Xrender/xrender.pc.in -@@ -8,4 +8,4 @@ Description: X Render Library +@@ -8,4 +8,4 @@ Version: @VERSION@ Requires: @X_REQUIRES@ Cflags: -I${includedir} @RENDER_CFLAGS@ @X_NON_PKG_CFLAGS@ -Libs: -L${libdir} -lXrender @X_NON_PKG_LIBS@ +Libs: -L${libdir} -lNX_Xrender @X_NON_PKG_LIBS@ -Index: nx-X11/lib/Xss/Imakefile -=================================================================== --- a/nx-X11/lib/Xss/Imakefile +++ b/nx-X11/lib/Xss/Imakefile -@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xss/Imakefile,v 3 +@@ -4,7 +4,7 @@ #define DoExtraLib SharedLibXss #define DoDebugLib DebugLibXss #define DoProfileLib ProfileLibXss @@ -1884,11 +1746,9 @@ Index: nx-X11/lib/Xss/Imakefile #define SoRev SOXSSREV #define LibHeaders NO -Index: nx-X11/lib/Xt/Imakefile -=================================================================== --- a/nx-X11/lib/Xt/Imakefile +++ b/nx-X11/lib/Xt/Imakefile -@@ -42,7 +42,7 @@ NX_DEFINES = -DNX_TRANS_SOCKET +@@ -42,7 +42,7 @@ #define DoDebugLib DebugLibXt #define DoProfileLib ProfileLibXt #define HasSharedData YES @@ -1897,11 +1757,9 @@ Index: nx-X11/lib/Xt/Imakefile #define SoRev SOXTREV #define IncSubdir X11 -Index: nx-X11/lib/Xt/Imakefile.NX.original -=================================================================== --- a/nx-X11/lib/Xt/Imakefile.NX.original +++ b/nx-X11/lib/Xt/Imakefile.NX.original -@@ -42,7 +42,7 @@ NX_DEFINES = -DNX_TRANS_SOCKET +@@ -42,7 +42,7 @@ #define DoDebugLib DebugLibXt #define DoProfileLib ProfileLibXt #define HasSharedData YES @@ -1910,11 +1768,9 @@ Index: nx-X11/lib/Xt/Imakefile.NX.original #define SoRev SOXTREV #define IncSubdir X11 -Index: nx-X11/lib/Xt/Imakefile.X.original -=================================================================== --- a/nx-X11/lib/Xt/Imakefile.X.original +++ b/nx-X11/lib/Xt/Imakefile.X.original -@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/Xt/Imakefile,v 3. +@@ -11,7 +11,7 @@ #define DoDebugLib DebugLibXt #define DoProfileLib ProfileLibXt #define HasSharedData YES @@ -1923,11 +1779,9 @@ Index: nx-X11/lib/Xt/Imakefile.X.original #define SoRev SOXTREV #define IncSubdir X11 -Index: nx-X11/lib/Xtst/Imakefile -=================================================================== --- a/nx-X11/lib/Xtst/Imakefile +++ b/nx-X11/lib/Xtst/Imakefile -@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xtst/Imakefile,v +@@ -10,7 +10,7 @@ #define DoExtraLib SharedLibXtst #define DoDebugLib DebugLibXtst #define DoProfileLib ProfileLibXtst @@ -1936,11 +1790,9 @@ Index: nx-X11/lib/Xtst/Imakefile #define SoRev SOXTESTREV #define LibHeaders NO -Index: nx-X11/lib/Xv/Imakefile -=================================================================== --- a/nx-X11/lib/Xv/Imakefile +++ b/nx-X11/lib/Xv/Imakefile -@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xv/Imakefile,v 1. +@@ -4,7 +4,7 @@ #define DoSharedLib SharedLibXv #define DoDebugLib DebugLibXv #define DoProfileLib ProfileLibXv @@ -1949,11 +1801,9 @@ Index: nx-X11/lib/Xv/Imakefile #define SoRev SOXVREV #define LibHeaders NO -Index: nx-X11/lib/XvMC/Imakefile -=================================================================== --- a/nx-X11/lib/XvMC/Imakefile +++ b/nx-X11/lib/XvMC/Imakefile -@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/XvMC/Imakefile,v +@@ -4,7 +4,7 @@ #define DoSharedLib SharedLibXvMC #define DoDebugLib DebugLibXvMC #define DoProfileLib ProfileLibXvMC @@ -1962,11 +1812,9 @@ Index: nx-X11/lib/XvMC/Imakefile #define SoRev SOXVMCREV #define LibHeaders NO -Index: nx-X11/lib/XvMC/hw/i810/Imakefile -=================================================================== --- a/nx-X11/lib/XvMC/hw/i810/Imakefile +++ b/nx-X11/lib/XvMC/hw/i810/Imakefile -@@ -3,7 +3,7 @@ XCOMM $XFree86: xc/lib/XvMC/hw/i810/Imak +@@ -3,7 +3,7 @@ #define DoSharedLib SharedLibXvMC #define DoDebugLib DebugLibXvMC #define DoProfileLib ProfileLibXvMC @@ -1975,8 +1823,6 @@ Index: nx-X11/lib/XvMC/hw/i810/Imakefile #define SoRev SOXVMCREV #define LibHeaders NO -Index: nx-X11/lib/XvMC/hw/via/unichrome/Imakefile -=================================================================== --- a/nx-X11/lib/XvMC/hw/via/unichrome/Imakefile +++ b/nx-X11/lib/XvMC/hw/via/unichrome/Imakefile @@ -2,7 +2,7 @@ @@ -1988,8 +1834,6 @@ Index: nx-X11/lib/XvMC/hw/via/unichrome/Imakefile #define SoRev SOXVMCREV #define LibHeaders NO -Index: nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile -=================================================================== --- a/nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile +++ b/nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile @@ -2,7 +2,7 @@ @@ -2001,11 +1845,9 @@ Index: nx-X11/lib/XvMC/hw/via/unichromeProA/Imakefile #define SoRev SOXVMCREV #define LibHeaders NO -Index: nx-X11/lib/XvMC/wrapper/Imakefile -=================================================================== --- a/nx-X11/lib/XvMC/wrapper/Imakefile +++ b/nx-X11/lib/XvMC/wrapper/Imakefile -@@ -3,7 +3,7 @@ XCOMM $XFree86: xc/lib/XvMC/wrapper/Imak +@@ -3,7 +3,7 @@ #define DoSharedLib SharedLibXvMC #define DoDebugLib DebugLibXvMC #define DoProfileLib ProfileLibXvMC @@ -2014,11 +1856,9 @@ Index: nx-X11/lib/XvMC/wrapper/Imakefile #define SoRev SOXVMCREV #define LibHeaders NO -Index: nx-X11/lib/Xxf86dga/Imakefile -=================================================================== --- a/nx-X11/lib/Xxf86dga/Imakefile +++ b/nx-X11/lib/Xxf86dga/Imakefile -@@ -6,7 +6,7 @@ XCOMM $XFree86: xc/lib/Xxf86dga/Imakefil +@@ -6,7 +6,7 @@ #define DoExtraLib SharedLibXxf86dga #define DoDebugLib DebugLibXxf86dga #define DoProfileLib ProfileLibXxf86dga @@ -2027,11 +1867,9 @@ Index: nx-X11/lib/Xxf86dga/Imakefile #define SoRev SOXXF86DGAREV #define LibHeaders NO -Index: nx-X11/lib/Xxf86misc/Imakefile -=================================================================== --- a/nx-X11/lib/Xxf86misc/Imakefile +++ b/nx-X11/lib/Xxf86misc/Imakefile -@@ -6,7 +6,7 @@ XCOMM $XdotOrg: xc/lib/Xxf86misc/Imakefi +@@ -6,7 +6,7 @@ #define DoExtraLib SharedLibXxf86misc #define DoDebugLib DebugLibXxf86misc #define DoProfileLib ProfileLibXxf86misc @@ -2040,11 +1878,9 @@ Index: nx-X11/lib/Xxf86misc/Imakefile #define SoRev SOXXF86MISCREV #define LibHeaders NO -Index: nx-X11/lib/Xxf86rush/Imakefile -=================================================================== --- a/nx-X11/lib/Xxf86rush/Imakefile +++ b/nx-X11/lib/Xxf86rush/Imakefile -@@ -3,7 +3,7 @@ XCOMM $XFree86: xc/lib/Xxf86rush/Imakefi +@@ -3,7 +3,7 @@ #define DoSharedLib SharedLibXxf86rush #define DoDebugLib DebugLibXxf86rush #define DoProfileLib ProfileLibXxf86rush @@ -2053,11 +1889,9 @@ Index: nx-X11/lib/Xxf86rush/Imakefile #define SoRev SOXXF86RUSHREV #define LibHeaders NO -Index: nx-X11/lib/Xxf86vm/Imakefile -=================================================================== --- a/nx-X11/lib/Xxf86vm/Imakefile +++ b/nx-X11/lib/Xxf86vm/Imakefile -@@ -6,7 +6,7 @@ XCOMM $XdotOrg: xc/lib/Xxf86vm/Imakefile +@@ -6,7 +6,7 @@ #define DoExtraLib SharedLibXxf86vm #define DoDebugLib DebugLibXxf86vm #define DoProfileLib ProfileLibXxf86vm @@ -2066,11 +1900,9 @@ Index: nx-X11/lib/Xxf86vm/Imakefile #define SoRev SOXXF86VMREV #define LibHeaders NO -Index: nx-X11/lib/apple/Imakefile -=================================================================== --- a/nx-X11/lib/apple/Imakefile +++ b/nx-X11/lib/apple/Imakefile -@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/Xrandr/Imakefile, +@@ -5,7 +5,7 @@ #define DoSharedLib SharedLibAppleWM #define DoDebugLib DebugLibAppleWM #define DoProfileLib ProfileLibAppleWM @@ -2079,11 +1911,9 @@ Index: nx-X11/lib/apple/Imakefile #define SoRev SOAPPLEWMREV #define IncSubdir X11 #define IncSubSubdir extensions -Index: nx-X11/lib/dmx/Imakefile -=================================================================== --- a/nx-X11/lib/dmx/Imakefile +++ b/nx-X11/lib/dmx/Imakefile -@@ -5,7 +5,7 @@ XCOMM $XFree86$ +@@ -5,7 +5,7 @@ #define DoDebugLib DebugLibDmx #define DoProfileLib ProfileLibDmx @@ -2092,11 +1922,9 @@ Index: nx-X11/lib/dmx/Imakefile #define SoRev SODMXREV #define LibHeaders NO -Index: nx-X11/lib/dps/Imakefile -=================================================================== --- a/nx-X11/lib/dps/Imakefile +++ b/nx-X11/lib/dps/Imakefile -@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/dps/Imakefile,v 1 +@@ -5,7 +5,7 @@ #define DoExtraLib SharedLibDps #define DoDebugLib DebugLibDps #define DoProfileLib ProfileLibDps @@ -2105,11 +1933,9 @@ Index: nx-X11/lib/dps/Imakefile #define SoRev SODPSREV #define IncSubdir DPS -Index: nx-X11/lib/dpstk/Imakefile -=================================================================== --- a/nx-X11/lib/dpstk/Imakefile +++ b/nx-X11/lib/dpstk/Imakefile -@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/dpstk/Imakefile,v +@@ -5,7 +5,7 @@ #define DoExtraLib SharedLibDpsTk #define DoDebugLib DebugLibDpsTk #define DoProfileLib ProfileLibDpsTk @@ -2118,11 +1944,9 @@ Index: nx-X11/lib/dpstk/Imakefile #define SoRev SODPSTKREV #define LibHeaders NO -Index: nx-X11/lib/expat/Imakefile -=================================================================== --- a/nx-X11/lib/expat/Imakefile +++ b/nx-X11/lib/expat/Imakefile -@@ -6,7 +6,7 @@ XCOMM $XFree86: xc/lib/expat/Imakefile,v +@@ -6,7 +6,7 @@ #define DoDebugLib DebugLibExpat #define DoProfileLib ProfileLibExpat #define HasSharedData YES @@ -2131,11 +1955,9 @@ Index: nx-X11/lib/expat/Imakefile #define SoRev SOEXPATREV #ifdef SharedLibtoolExpatRev #define SharedLibtoolRev SharedLibtoolExpatRev -Index: nx-X11/lib/font/Imakefile -=================================================================== --- a/nx-X11/lib/font/Imakefile +++ b/nx-X11/lib/font/Imakefile -@@ -31,7 +31,7 @@ XCOMM $XFree86: xc/lib/font/Imakefile,v +@@ -31,7 +31,7 @@ STUBDIRS = stubs #endif @@ -2144,11 +1966,9 @@ Index: nx-X11/lib/font/Imakefile SOREV = $(SOFONTREV) #ifndef SeparateSharedCompile -Index: nx-X11/lib/fontconfig/Imakefile -=================================================================== --- a/nx-X11/lib/fontconfig/Imakefile +++ b/nx-X11/lib/fontconfig/Imakefile -@@ -7,7 +7,7 @@ XCOMM $XFree86: xc/lib/fontconfig/Imakef +@@ -7,7 +7,7 @@ #define DoDebugLib DebugLibFontconfig #define DoProfileLib ProfileLibFontconfig #define HasSharedData YES @@ -2157,11 +1977,9 @@ Index: nx-X11/lib/fontconfig/Imakefile #define SoRev SOFONTCONFIGREV #define LibInstall InstallFontconfigLibrary #define LibHeaders InstallFontconfigLibrary -Index: nx-X11/lib/fontenc/Imakefile -=================================================================== --- a/nx-X11/lib/fontenc/Imakefile +++ b/nx-X11/lib/fontenc/Imakefile -@@ -17,7 +17,7 @@ FONTENCDEFS = -DFONTENC_NO_LIBFONT \ +@@ -17,7 +17,7 @@ #define DoSharedLib SharedLibFontEnc #define DoDebugLib DebugLibFontEnc #define DoProfileLib ProfileLibFontEnc @@ -2170,11 +1988,9 @@ Index: nx-X11/lib/fontenc/Imakefile #define SoRev SOFONTENCREV #define IncSubdir X11 #define IncSubSubdir fonts -Index: nx-X11/lib/freetype2/Imakefile -=================================================================== --- a/nx-X11/lib/freetype2/Imakefile +++ b/nx-X11/lib/freetype2/Imakefile -@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/freetype2/Imakefi +@@ -11,7 +11,7 @@ #define DoDebugLib DebugLibFreetype2 #define DoProfileLib ProfileLibFreetype2 #define HasSharedData YES @@ -2183,11 +1999,9 @@ Index: nx-X11/lib/freetype2/Imakefile #define SoRev SOFREETYPE2REV #ifdef SharedLibtoolFreetype2Rev #define SharedLibtoolRev SharedLibtoolFreetype2Rev -Index: nx-X11/lib/oldX/Imakefile -=================================================================== --- a/nx-X11/lib/oldX/Imakefile +++ b/nx-X11/lib/oldX/Imakefile -@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/oldX/Imakefile,v +@@ -10,7 +10,7 @@ #define DoExtraLib SharedOldX #define DoDebugLib DebugOldX #define DoProfileLib ProfileOldX @@ -2196,11 +2010,9 @@ Index: nx-X11/lib/oldX/Imakefile #define SoRev SOOLDXREV #define IncSubdir X11 -Index: nx-X11/lib/psres/Imakefile -=================================================================== --- a/nx-X11/lib/psres/Imakefile +++ b/nx-X11/lib/psres/Imakefile -@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/psres/Imakefile,v +@@ -5,7 +5,7 @@ #define DoExtraLib SharedLibPSRes #define DoDebugLib DebugLibPSRes #define DoProfileLib ProfileLibPSRes @@ -2209,11 +2021,9 @@ Index: nx-X11/lib/psres/Imakefile #define SoRev SOPSRESREV #define LibHeaders NO -Index: nx-X11/lib/regex/Imakefile -=================================================================== --- a/nx-X11/lib/regex/Imakefile +++ b/nx-X11/lib/regex/Imakefile -@@ -6,7 +6,7 @@ XCOMM $XFree86$ +@@ -6,7 +6,7 @@ #define DoDebugLib NO #define DoProfileLib NO #define HasSharedData NO @@ -2222,8 +2032,6 @@ Index: nx-X11/lib/regex/Imakefile #define LibHeaders NO #define LibInstall NO #define LibInstallBuild YES -Index: nx-X11/lib/windows/Imakefile -=================================================================== --- a/nx-X11/lib/windows/Imakefile +++ b/nx-X11/lib/windows/Imakefile @@ -2,7 +2,7 @@ @@ -2235,11 +2043,9 @@ Index: nx-X11/lib/windows/Imakefile #define SoRev SOWINDOWSWMREV #define IncSubdir X11 #define IncSubSubdir extensions -Index: nx-X11/lib/xkbfile/Imakefile -=================================================================== --- a/nx-X11/lib/xkbfile/Imakefile +++ b/nx-X11/lib/xkbfile/Imakefile -@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/xkbfile/Imakefile +@@ -11,7 +11,7 @@ #define DoDebugLib DebugLibxkbfile #define DoProfileLib ProfileLibxkbfile #define HasSharedData NO @@ -2248,11 +2054,9 @@ Index: nx-X11/lib/xkbfile/Imakefile #define SoRev SOXKBFILEREV #define IncSubdir X11 #define IncSubSubdir extensions -Index: nx-X11/lib/xkbui/Imakefile -=================================================================== --- a/nx-X11/lib/xkbui/Imakefile +++ b/nx-X11/lib/xkbui/Imakefile -@@ -6,7 +6,7 @@ XCOMM $XFree86: xc/lib/xkbui/Imakefile,v +@@ -6,7 +6,7 @@ #define DoDebugLib DebugLibxkbui #define DoProfileLib ProfileLibxkbui #define HasSharedData NO @@ -2261,11 +2065,9 @@ Index: nx-X11/lib/xkbui/Imakefile #define SoRev SOXKBUIREV #define IncSubdir X11 #define IncSubSubdir extensions -Index: nx-X11/lib/zlib/Imakefile -=================================================================== --- a/nx-X11/lib/zlib/Imakefile +++ b/nx-X11/lib/zlib/Imakefile -@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/zlib/Imakefile,v +@@ -12,7 +12,7 @@ #define DoDebugLib NO #define DoProfileLib NO #define HasSharedData NO @@ -2274,11 +2076,9 @@ Index: nx-X11/lib/zlib/Imakefile #define SoRev SOZLIBREV ZLIBDIR = $(TOP)/extras/zlib -Index: nx-X11/programs/Xserver/Imakefile -=================================================================== --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile -@@ -313,7 +313,7 @@ XPFBLIBS = dix/LibraryTargetName(xpstubs +@@ -313,7 +313,7 @@ FONTBASE = $(FONTLIBSRC)/fontbase.o \ $(FONTLIBSRC)/LibraryTargetName(fontbase) #if XserverStaticFontLib @@ -2287,7 +2087,7 @@ Index: nx-X11/programs/Xserver/Imakefile #else FONT = $(LDPRELIB) $(XFONTLIB) $(FREETYPE2LIB) #endif -@@ -994,7 +994,7 @@ NXAGENTOBJS = hw/nxagent/miinitext.o +@@ -994,7 +994,7 @@ dix/main.o #endif @@ -2296,30 +2096,32 @@ Index: nx-X11/programs/Xserver/Imakefile NXAGENT = hw/nxagent/LibraryTargetName(nxagent) NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI) NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) -@@ -1012,16 +1012,16 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTS +@@ -1012,18 +1012,18 @@ #if defined(SunArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ -- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp +- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp \ + -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lNX_Xfixes \ -+ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xdmcp ++ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xdmcp \ + `pkg-config --libs libxml-2.0` #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ - -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ -- -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp -+ -lXcomp -lXcompext -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xcomposite -lNX_Xfixes \ -+ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdmcp +- -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp \ ++ -lXcomp -lXcompext -lNX_Xrender -lX11 -lNX_Xext -lNX_Xcomposite -lNX_Xfixes \ ++ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdmcp \ + `pkg-config --libs libxml-2.0` #else NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ -- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp +- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp \ + -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xfixes \ -+ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lNX_Xdmcp ++ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lNX_Xdmcp \ + `pkg-config --libs libxml-2.0` #endif - #endif -@@ -1075,7 +1075,7 @@ nxagent_static_nolibs: nxagent +@@ -1078,7 +1078,7 @@ else exit 0; fi $(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \ $(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) $(FONTLIBS) \ @@ -2328,8 +2130,6 @@ Index: nx-X11/programs/Xserver/Imakefile #endif /* NXAgentServer */ #if defined(XnonServer) && XnonServer -Index: nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile -=================================================================== --- a/nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile +++ b/nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile @@ -7,7 +7,7 @@ @@ -2341,11 +2141,9 @@ Index: nx-X11/programs/Xserver/hw/xfree86/parser/Imakefile #define UseDBMalloc NO -Index: nxcompext/Makefile.in -=================================================================== --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in -@@ -42,12 +42,12 @@ CCINCLUDES = -I. -I../nxcomp +@@ -42,12 +42,12 @@ CCDEFINES = LDFLAGS = @LDFLAGS@ -L../nxcomp @@ -2360,11 +2158,9 @@ Index: nxcompext/Makefile.in # srcdir = @srcdir@ -Index: nxcompshad/Makefile.in -=================================================================== --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in -@@ -48,7 +48,7 @@ CCINCLUDES = +@@ -48,7 +48,7 @@ CCDEFINES = LDFLAGS = @LDFLAGS@ @@ -2373,7 +2169,7 @@ Index: nxcompshad/Makefile.in # # Only if THREADS is defined. -@@ -139,7 +139,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL) +@@ -139,7 +139,7 @@ else diff --git a/debian/patches/series b/debian/patches/series index b78dbbd..5099b99 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 000_add-NX-redistribution-README.full+lite.patch -001_add-main-makefile.full+lite.patch 002_nxcompshad_build-against-nx-x11-only.full.patch 003_nxcompshad_gcc43.full.patch 004_nx-X11_fix-nxcompshad-build.full.patch @@ -18,13 +17,11 @@ 017_nx-X11_update-autotools-helper-files.full.patch 018_nx-X11_update-libtool-ltmain-script.full.patch 019_nx-X11_expat-build-against-system-libxmltok.full.patch -020_add-nxagent-wrapper.full.patch -021_add-nxauth-wrapper.full.patch -022_add-nxproxy-wrapper.full+lite.patch -023_add-x2goagent-wrapper.full.patch 024_fix-make-clean.full.patch 024_fix-make-clean.full+lite.patch -025_nxproxy_no-configure-file.full+lite.patch +026_nxcompext_honour-optflags.full.patch +026_nxcomp_honour-optflags.full+lite.patch +026_nxcompshad_honour-optflags.full.patch 030_nx-X11_configure-args.full.patch 031_nx-X11_parallel-make.full.patch 051_nxcomp_macos105-fdisset.full+lite.patch @@ -46,6 +43,7 @@ 220_nxproxy-bind-loopback-only.full+lite.patch 300_nxagent_set-wm-class.full.patch 301_nx-X11_use-shared-libs.full.patch +302_nxagent_configurable-keystrokes.full.patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch 016_nx-X11_install-location.debian.patch diff --git a/debian/post-build-nx.sh b/debian/post-build-nx.sh deleted file mode 100755 index 94f18ac..0000000 --- a/debian/post-build-nx.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -ex - -# create nx-X11/.build-exports -mkdir -p nx-X11/.build-exports/include -mkdir -p nx-X11/.build-exports/lib - -# copy headers (libnx-x11-dev) -cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include - -# copy libs (libnx-x11) -find nx-X11/exports/lib/ | egrep "^.*\.so$" | while read libpath; do - libfile=$(basename $libpath) - libdir=$(dirname $libpath) - - mkdir -p ${libdir//exports/.build-exports} - cp -L $libpath ${libdir//exports/.build-exports} - - find $libdir/$libfile.* | while read symlink; do - ln -s $libfile ${libdir//exports/.build-exports}/$(basename $symlink) - done -done - -exit 0 diff --git a/debian/pre-build-nx.sh b/debian/pre-build-nx.sh deleted file mode 100755 index 59a8a47..0000000 --- a/debian/pre-build-nx.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# create copies of upstream changelogs so that names apply to Debian policy... -cp -a nx-X11/CHANGELOG nx-X11/changelog -cp -a nxcomp/CHANGELOG nxcomp/changelog -cp -a nxcompext/CHANGELOG nxcompext/changelog -cp -a nxcompshad/CHANGELOG nxcompshad/changelog -cp -a nx-X11/programs/Xserver/hw/nxagent/CHANGELOG nx-X11/programs/Xserver/hw/nxagent/changelog -cp -a nx-X11/programs/nxauth/CHANGELOG nx-X11/programs/nxauth/changelog -cp -a nxproxy/CHANGELOG nxproxy/changelog - -exit 0 diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh new file mode 100755 index 0000000..b43de4b --- /dev/null +++ b/debian/roll-tarballs.sh @@ -0,0 +1,150 @@ +#!/bin/bash + +# Copyright (C) 2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012 by Reinhard Tartler <siretart(a)tauware.de> +# +# This is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This 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., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +# Thanks to Jonas Smedegaard <dr(a)jones.dk> for inspiration... + +# Formatting/cleanups by siretart in December 2012 + +set -e + +usage() { + echo "To be called at the project root of an nx-libs checkout" + echo "usage: $(basename "$0") {<release-version>,HEAD} {server|client}" + exit 1 +} + +PROJECT="nx-libs" + +test -d .git || usage +test -f debian/Makefile.nx-libs || usage +RELEASE="$1" +test -n "${RELEASE}" || usage +CHECKOUT="$2" +test -n "$CHECKOUT" || usage + +if [ "x$CHECKOUT" = "xserver" ] || [ "x$CHECKOUT" = "xfull" ]; then + MODE="full" + CHECKOUT="redist-server/${RELEASE}" + RELEASE_SUFFIX='-full' +elif [ "x$CHECKOUT" = "xclient" ] || [ "x$CHECKOUT" = "xlite" ]; then + MODE="lite" + CHECKOUT="redist-client/${RELEASE}" + RELEASE_SUFFIX='-lite' +else + usage +fi + +if [ x"$RELEASE" == "xHEAD" ]; then + CHECKOUT=HEAD +fi + +if ! git rev-parse --verify -q "$CHECKOUT" >/dev/null; then + echo " '${RELEASE}' is not a valid release number because there is no git tag named $CHECKOUT." + echo " Please specify one of the following releases:" + echo "HEAD" + git tag -l | grep ^redist | cut -f2 -d/ | sort -u + exit 1 +fi + +TARGETDIR=".." + +MANIFEST="$(mktemp)" +TEMP_DIR="$(mktemp -d)" + +trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 + +# create local copy of Git project at temp location +git archive --format=tar ${CHECKOUT} --prefix=${PROJECT}-${RELEASE}/ | ( cd $TEMP_DIR; tar xf - ) + +echo "Created tarball for $CHECKOUT" + +cd "$TEMP_DIR/${PROJECT}-${RELEASE}/" + +mkdir -p doc/applied-patches + +# prepare patches for lite and full tarball +if [ "x$MODE" = "xfull" ]; then + find debian/patches | sort | egrep "(debian/patches/[0-9]+_.*\.(full|full\+lite)\.patch)" | while read file + do + cp -v $file doc/applied-patches + echo ${file##*/} >> doc/applied-patches/series + done + cp -v debian/rgb debian/VERSION.x2goagent . +else + rm -Rf "nxcompshad"* + rm -Rf "nxcompext"* + rm -Rf "nx-X11"* + find debian/patches | sort | egrep "(debian/patches/[0-9]+_.*\.full\+lite\.patch)" | while read file + do + cp -v $file doc/applied-patches + echo ${file##*/} >> doc/applied-patches/series + done +fi + +# apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball +if [ -s "doc/applied-patches/series" ]; then + QUILT_PATCHES=doc/applied-patches quilt --quiltrc /dev/null push -a -q +else + echo "No patches applied at all. Very old release?" +fi + +# very old release did not add any README +for f in $(ls README* 2>/dev/null); do + mv -v $f doc/; +done + +mkdir -p bin/ +# old releases introude the wrappers via quilt patch +for w in $(ls debian/wrappers/* 2>/dev/null); do + cp -v $w bin/ +done + +mv -v debian/changelog doc/changelog + +# copy the top-level makefile if no quilt patch created it before +test -f Makefile || test -f debian/Makefile.nx-libs && cp -v debian/Makefile.nx-libs Makefile + +# remove folders that we do not want to roll into the tarball +rm -Rf ".pc/" +rm -Rf "debian/" + +# remove files, that we do not want in the tarballs (build cruft) +rm -Rf nx*/configure nx*/autom4te.cache* + +cd $OLDPWD + +# create target location for tarball +mkdir -p "$TARGETDIR/_releases_/source/${PROJECT}/" + +# roll the ball... +cd "$TEMP_DIR" +find "${PROJECT}-${RELEASE}" -type f | sort > "$MANIFEST" +cd $OLDPWD + +tar c -C "$TEMP_DIR" \ + --owner 0 \ + --group 0 \ + --numeric-owner \ + --no-recursion \ + --files-from "$MANIFEST" \ + --gzip \ + > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz" \ + +echo "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz is ready" diff --git a/debian/rules b/debian/rules index f88f0a7..6e0892d 100755 --- a/debian/rules +++ b/debian/rules @@ -9,34 +9,37 @@ else endif %: - LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh $@ --with quilt + CONFIGURE="./configure --prefix=/usr" LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh $@ --with quilt override_dh_auto_clean: rm -Rf nx-X11/.build-exports LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_clean override_dh_clean: - rm -f nx-X11/changelog - rm -f nxcomp/changelog - rm -f nxcompext/changelog - rm -f nxcompshad/changelog + rm -f nx*/configure + rm -f nx*/changelog rm -f nx-X11/programs/Xserver/hw/nxagent/changelog rm -f nx-X11/programs/nxauth/changelog - rm -f nxproxy/changelog + rm -Rf Makefile bin rgb VERSION.x2goagent dh_clean +override_dh_auto_install: + PREFIX=/usr dh_auto_install -Smakefile + override_dh_auto_build: - debian/pre-build-nx.sh + # create copies of upstream changelogs so that names apply to Debian policy... + cp -a nx-X11/CHANGELOG nx-X11/changelog + cp -a nxcomp/CHANGELOG nxcomp/changelog + cp -a nxcompext/CHANGELOG nxcompext/changelog + cp -a nxcompshad/CHANGELOG nxcompshad/changelog + cp -a nx-X11/programs/Xserver/hw/nxagent/CHANGELOG nx-X11/programs/Xserver/hw/nxagent/changelog + cp -a nx-X11/programs/nxauth/CHANGELOG nx-X11/programs/nxauth/changelog + cp -a nxproxy/CHANGELOG nxproxy/changelog + ln -s debian/Makefile.nx-libs Makefile + ln -s debian/wrappers bin + ln -s debian/rgb + ln -s debian/VERSION.x2goagent LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt --parallel - debian/post-build-nx.sh - -override_dh_auto_install: -#override_dh_strip: -# dh_strip -plibnx-x11 --dbg-package=libnx-x11-dbg -# dh_strip -plibxcomp3 --dbg-package=libxcomp-dbg -# dh_strip -plibxcompext3 --dbg-package=libxcompext-dbg -# dh_strip -plibxcompshad3 --dbg-package=libxcompshad-dbg -# dh_strip -pnxagent --dbg-package=nxagent-dbg -# -#.PHONY: override_dh_strip +override_dh_strip: + dh_strip --dbg-package=nx-x11-dbg diff --git a/debian/wrappers/nxagent b/debian/wrappers/nxagent new file mode 100644 index 0000000..0aa75a8 --- /dev/null +++ b/debian/wrappers/nxagent @@ -0,0 +1,32 @@ +#!/bin/bash + +# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# 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, see http://www.gnu.org/licenses/. + +NXAPP=nxagent +NX_LIBS=/usr/lib/nx +NX_LOCAL_LIBS=/usr/local/lib/nx + +# make sure nxagent starts properly with pam_tmpdir.so being in use +NX_TEMP=${NX_TEMP:-/tmp} +export NX_TEMP + +LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH +test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS +test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS + +export LD_LIBRARY_PATH + +exec $NX_LIBS/bin/$NXAPP "$@" diff --git a/debian/wrappers/nxauth b/debian/wrappers/nxauth new file mode 100644 index 0000000..e49e790 --- /dev/null +++ b/debian/wrappers/nxauth @@ -0,0 +1,32 @@ +#!/bin/bash + +# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# 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, see http://www.gnu.org/licenses/. + +NXAPP=nxauth +NX_LIBS=/usr/lib/nx +NX_LOCAL_LIBS=/usr/local/lib/nx + +# make sure nxagent starts properly with pam_tmpdir.so being in use +NX_TEMP=${NX_TEMP:-/tmp} +export NX_TEMP + +LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH +test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS +test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS + +export LD_LIBRARY_PATH + +exec $NX_LIBS/bin/$NXAPP "$@" \ No newline at end of file diff --git a/debian/wrappers/nxproxy b/debian/wrappers/nxproxy new file mode 100644 index 0000000..7dfe2f3 --- /dev/null +++ b/debian/wrappers/nxproxy @@ -0,0 +1,32 @@ +#!/bin/bash + +# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# 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, see http://www.gnu.org/licenses/. + +NXAPP=nxproxy +NX_LIBS=/usr/lib/nx +NX_LOCAL_LIBS=/usr/local/lib/nx + +# make sure nxagent starts properly with pam_tmpdir.so being in use +NX_TEMP=${NX_TEMP:-/tmp} +export NX_TEMP + +LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH +test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS +test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS + +export LD_LIBRARY_PATH + +exec $NX_LIBS/bin/$NXAPP "$@" \ No newline at end of file diff --git a/debian/wrappers/x2goagent b/debian/wrappers/x2goagent new file mode 100644 index 0000000..a74f44c --- /dev/null +++ b/debian/wrappers/x2goagent @@ -0,0 +1,32 @@ +#!/bin/bash + +# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# 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, see http://www.gnu.org/licenses/. + +NXAPP=x2goagent +NX_LIBS=/usr/lib/nx +NX_LOCAL_LIBS=/usr/local/lib/nx + +# make sure nxagent starts properly with pam_tmpdir.so being in use +NX_TEMP=${NX_TEMP:-/tmp} +export NX_TEMP + +LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH +test -x $NX_LOCAL_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS +test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS + +export LD_LIBRARY_PATH + +exec $NX_LIBS/../x2go/bin/$NXAPP "$@" \ No newline at end of file diff --git a/debian/x2goagent.dirs b/debian/x2goagent.dirs index 042e97d..548ecdf 100644 --- a/debian/x2goagent.dirs +++ b/debian/x2goagent.dirs @@ -1,3 +1,3 @@ usr/bin -usr/lib/nx -usr/share/x2go \ No newline at end of file +usr/share/pixmaps +usr/share/x2go diff --git a/debian/x2goagent.install b/debian/x2goagent.install index 20019f1..72058a9 100644 --- a/debian/x2goagent.install +++ b/debian/x2goagent.install @@ -1,4 +1,5 @@ -bin/x2goagent usr/bin -debian/rgb usr/share/x2go -nx-X11/programs/Xserver/hw/nxagent/x2go.xpm usr/share/pixmaps -debian/VERSION.x2goagent usr/share/x2go/versions \ No newline at end of file +usr/bin/x2goagent +usr/lib/x2go/bin/x2goagent +usr/share/pixmaps/x2go.xpm +usr/share/x2go/rgb +usr/share/x2go/versions/VERSION.x2goagent diff --git a/debian/x2goagent.links b/debian/x2goagent.links deleted file mode 100644 index 2aebb6c..0000000 --- a/debian/x2goagent.links +++ /dev/null @@ -1 +0,0 @@ -usr/lib/nx/bin/nxagent usr/lib/x2go/bin/x2goagent diff --git a/nxproxy/configure b/nxproxy/configure deleted file mode 100755 index 9d9f08c..0000000 --- a/nxproxy/configure +++ /dev/null @@ -1,5634 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. -# -# Copyright (C) 2003 Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -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 - as_unset=unset -else - as_unset=false -fi - - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - 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 - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '$a$' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ - X"$0" : 'X$//$$' \| \ - X"$0" : 'X$/$$' \| \ - . : '$.$' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/; q; } - /^X\/$\/\/$$/{ s//\1/; q; } - /^X\/$\/$.*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# 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 - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^$['$as_cr_digits']*$$.*$[$]LINENO$[^'$as_cr_alnum'_]$,\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '$a$' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -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'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -exec 6>&1 - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_config_libobj_dir=. -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - -ac_unique_file="Main.c" -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 armcxx armcc CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CXXCPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBVERSION VERSION MAKEDEPEND LIBOBJS LTLIBOBJS' -ac_subst_files='' - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -ac_prev= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - ac_optarg=`expr "x$ac_option" : 'x[^=]*=$.*$'` - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_option in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-$.*$'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-$[^=]*$'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-$[^=]*$'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-$.*$'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -fi - -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # 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 || -echo X"$0" | - sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X$\/\/$[^/].*/{ s//\1/; q; } - /^X$\/\/$$/{ s//\1/; q; } - /^X$\/$.*/{ s//\1/; q; } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi -fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%$[^\\/]$[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -_ACEOF - - cat <<_ACEOF -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] -_ACEOF - - cat <<\_ACEOF - -X features: - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -_ACEOF -fi - -if test -n "$ac_init_help"; then - - cat <<\_ACEOF - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-x use the X Window System - -Some influential environment variables: - CXX C++ compiler command - CXXFLAGS C++ compiler flags - LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a - nonstandard directory <lib dir> - CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have - headers in a nonstandard directory <include dir> - CC C compiler command - CFLAGS C compiler flags - CXXCPP C++ preprocessor - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -_ACEOF -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - 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 - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir - done -fi - -test -n "$ac_init_help" && exit 0 -if $ac_init_version; then - cat <<\_ACEOF - -Copyright (C) 2003 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit 0 -fi -exec 5>config.log -cat >&5 <<_ACEOF -This file contains any messages produced by compilers while -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 - - $ $0 $@ - -_ACEOF -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_sep= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 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. - 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 - fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -{ - (set) 2>&1 | - 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" - ;; - *) - sed -n \ - "s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1=\\2/p" - ;; - esac; -} - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - fi - - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - sed "/^$/d" confdefs.h | sort - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status - ' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; - esac - fi -else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# 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 - 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" - eval ac_new_val="\$ac_env_${ac_var}_value" - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - 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: error: \`$ac_var' has changed since the previous run:" >&2;} - { 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: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - - - - - - - -CXXFLAGS="-O3" -CPPFLAGS="-O3" - - -if test -d "../nx-X11/exports/include" ; then - CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include" - LIBS="$LIBS -L../nx-X11/exports/lib" -fi - - -if test "${with_ipaq}" = yes; then - echo -e "enabling ipaq configuration" - CXX="arm-linux-c++" - CC="arm-linux-gcc" - unset ac_cv_prog_armcxx - unset ac_cv_prog_armcc - unset ac_cv_prog_CXXCPP - # Extract the first word of ""$CXX"", so it can be a program name with args. -set dummy "$CXX"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_armcxx+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$armcxx"; then - ac_cv_prog_armcxx="$armcxx" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_armcxx="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_armcxx" && ac_cv_prog_armcxx="no" -fi -fi -armcxx=$ac_cv_prog_armcxx -if test -n "$armcxx"; then - echo "$as_me:$LINENO: result: $armcxx" >&5 -echo "${ECHO_T}$armcxx" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of ""$CC"", so it can be a program name with args. -set dummy "$CC"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_armcc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$armcc"; then - ac_cv_prog_armcc="$armcc" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_armcc="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_armcc" && ac_cv_prog_armcc="no" -fi -fi -armcc=$ac_cv_prog_armcc -if test -n "$armcc"; then - echo "$as_me:$LINENO: result: $armcc" >&5 -echo "${ECHO_T}$armcc" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - if test $armcxx = "yes" && test $armcc = "yes" ; then - ac_cv_prog_CXX="$CXX" - ac_cv_prog_CC="$CC" - else - { { echo "$as_me:$LINENO: error: installation or configuration problem: I cannot find compiler for arm-linux" >&5 -echo "$as_me: error: installation or configuration problem: I cannot find compiler for arm-linux" >&2;} - { (exit 1); exit 1; }; } - fi -else - unset ac_cv_prog_CXX - unset ac_cv_prog_CC - unset ac_cv_prog_CXXCPP -fi - - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_CXX" && break -done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - - CXX=$ac_ct_CXX -fi - - -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 - (eval $ac_compiler --version </dev/null >&5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 - (eval $ac_compiler -v </dev/null >&5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 - (eval $ac_compiler -V </dev/null >&5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" -# 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 -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 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -do - 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. - ;; - [ab].out ) - # 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;; - * ) - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 - -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 -echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (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 - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -rm -f a.out a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -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); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - 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;; - * ) break;; - esac -done -else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 -if test "${ac_cv_objext+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 () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 -if test "${ac_cv_cxx_compiler_gnu+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 () -{ -#ifndef __GNUC__ - choke me -#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_cxx_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_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_compiler_gnu=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cxx_g+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 () -{ - - ; - 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_cxx_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_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_prog_cxx_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -for ac_declaration in \ - '' \ - '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 ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include <stdlib.h> -int -main () -{ -exit (42); - ; - 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_cxx_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 - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - 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_cxx_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 - break -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 -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_CC" && break -done - - CC=$ac_ct_CC -fi - -fi - - -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 - (eval $ac_compiler --version </dev/null >&5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 - (eval $ac_compiler -v </dev/null >&5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 - (eval $ac_compiler -V </dev/null >&5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -if test "${ac_cv_c_compiler_gnu+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 () -{ -#ifndef __GNUC__ - choke me -#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 - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_compiler_gnu=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+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 () -{ - - ; - 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_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_prog_cc_g=no -fi -rm -f conftest.err 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 -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdarg.h> -#include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - 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);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - 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 - 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_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC - -fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac - -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#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 - for ac_declaration in \ - '' \ - '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 ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include <stdlib.h> -int -main () -{ -exit (42); - ; - 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 - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - 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 - break -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 -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -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 -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f $ac_dir/shtool; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); exit 1; }; } -fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# 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 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -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. - # Don't use installbsd from OSF since it installs stuff as root - # 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 - done - done - ;; -esac -done - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL=$ac_install_sh - fi -fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - - - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # 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 -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_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_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_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_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # 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 -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_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_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_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_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 - - -# Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" - -fi; -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -_ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -fr conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <X11/Intrinsic.h> -_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_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then - ac_x_includes=$ac_dir - break - fi -done -fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <X11/Intrinsic.h> -int -main () -{ -XtMalloc (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 - 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_cxx_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 - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no - -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi -fi - - fi - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 -fi - -if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - -cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF - - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" - fi - - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - 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_cxx_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_R_nospace=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_nospace=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_nospace = yes; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - X_LIBS="$X_LIBS -R$x_libraries" - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - 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_cxx_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_R_space=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_space=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_space = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - X_LIBS="$X_LIBS -R $x_libraries" - else - echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6 - fi - fi - LIBS=$ac_xsave_LIBS - esac - fi - - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. - - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn Johnson says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And Karl Berry says - # the Alpha needs dnet_stub (dnet does not exist). - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 XOpenDisplay (); -int -main () -{ -XOpenDisplay (); - ; - 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_cxx_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 - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - 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_cxx_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_lib_dnet_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_dnet_ntoa=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - 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_cxx_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_lib_dnet_stub_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_stub_dnet_ntoa=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -fi - - fi -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" - - # msh(a)cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 -if test "${ac_cv_func_gethostbyname+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 gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); 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 gethostbyname - -/* 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 gethostbyname (); -/* 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_gethostbyname) || defined (__stub___gethostbyname) -choke me -#else -char (*f) () = gethostbyname; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != gethostbyname; - ; - 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_cxx_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_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 - - if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 gethostbyname (); -int -main () -{ -gethostbyname (); - ; - 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_cxx_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_lib_nsl_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_nsl_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -fi - - if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 gethostbyname (); -int -main () -{ -gethostbyname (); - ; - 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_cxx_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_lib_bsd_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_bsd_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -if test $ac_cv_lib_bsd_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -fi - - fi - fi - - # lieder(a)skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # variants that don't use the name server (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 -if test "${ac_cv_func_connect+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 connect to an innocuous variant, in case <limits.h> declares connect. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define connect innocuous_connect - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); 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 connect - -/* 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 connect (); -/* 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_connect) || defined (__stub___connect) -choke me -#else -char (*f) () = connect; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != connect; - ; - 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_cxx_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_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 - - if test $ac_cv_func_connect = no; then - echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 connect (); -int -main () -{ -connect (); - ; - 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_cxx_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_lib_socket_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_socket_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -if test $ac_cv_lib_socket_connect = yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 -if test "${ac_cv_func_remove+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 remove to an innocuous variant, in case <limits.h> declares remove. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define remove innocuous_remove - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); 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 remove - -/* 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 remove (); -/* 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_remove) || defined (__stub___remove) -choke me -#else -char (*f) () = remove; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != remove; - ; - 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_cxx_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_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 - - if test $ac_cv_func_remove = no; then - echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 -if test "${ac_cv_lib_posix_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 remove (); -int -main () -{ -remove (); - ; - 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_cxx_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_lib_posix_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_posix_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -if test $ac_cv_lib_posix_remove = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -fi - - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 -if test "${ac_cv_func_shmat+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 shmat to an innocuous variant, in case <limits.h> declares shmat. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define shmat innocuous_shmat - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); 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 shmat - -/* 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 shmat (); -/* 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_shmat) || defined (__stub___shmat) -choke me -#else -char (*f) () = shmat; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != shmat; - ; - 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_cxx_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_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 - - if test $ac_cv_func_shmat = no; then - echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 shmat (); -int -main () -{ -shmat (); - ; - 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_cxx_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_lib_ipc_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ipc_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -if test $ac_cv_lib_ipc_shmat = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -fi - - fi - fi - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry - echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 IceConnectionNumber (); -int -main () -{ -IceConnectionNumber (); - ; - 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_cxx_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_lib_ICE_IceConnectionNumber=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ICE_IceConnectionNumber=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -fi - - LDFLAGS=$ac_save_LDFLAGS - -fi - - - -ac_help="$ac_help - --with-symbols give -g flag to compiler to produce debug symbols - --with-info define INFO at compile time to get basic log output - --with-valgrind clean up allocated buffers to avoid valgrind warnings - --with-version use this version for produced libraries" - - - - -echo "$as_me:$LINENO: checking for FreeBSD environment" >&5 -echo $ECHO_N "checking for FreeBSD environment... $ECHO_C" >&6 -if test "${nxconf_cv_freebsd+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 () -{ -return __FreeBSD__; - ; - 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_cxx_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 - nxconf_cv_freebsd=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -nxconf_cv_freebsd=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -rm -f conftest* -fi -echo "$as_me:$LINENO: result: $nxconf_cv_freebsd" >&5 -echo "${ECHO_T}$nxconf_cv_freebsd" >&6 -FreeBSD= -test "$nxconf_cv_freebsd" = yes && FreeBSD=yes - - - -echo "$as_me:$LINENO: checking for Cygwin32 environment" >&5 -echo $ECHO_N "checking for Cygwin32 environment... $ECHO_C" >&6 -if test "${nxconf_cv_cygwin32+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 () -{ -return __CYGWIN32__; - ; - 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_cxx_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 - nxconf_cv_cygwin32=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -nxconf_cv_cygwin32=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -rm -f conftest* -fi -echo "$as_me:$LINENO: result: $nxconf_cv_cygwin32" >&5 -echo "${ECHO_T}$nxconf_cv_cygwin32" >&6 -CYGWIN32= -test "$nxconf_cv_cygwin32" = yes && CYGWIN32=yes - - - -echo "$as_me:$LINENO: checking for Darwin environment" >&5 -echo $ECHO_N "checking for Darwin environment... $ECHO_C" >&6 -if test "${nxconf_cv_darwin+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 () -{ -return __APPLE__; - ; - 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_cxx_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 - nxconf_cv_darwin=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -nxconf_cv_darwin=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -rm -f conftest* -fi -echo "$as_me:$LINENO: result: $nxconf_cv_darwin" >&5 -echo "${ECHO_T}$nxconf_cv_darwin" >&6 -DARWIN= -test "$nxconf_cv_darwin" = yes && DARWIN=yes - - - -echo "$as_me:$LINENO: checking for SunOS environment" >&5 -echo $ECHO_N "checking for SunOS environment... $ECHO_C" >&6 -if test "${nxconf_cv_sun+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 () -{ -return __sun; - ; - 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_cxx_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 - nxconf_cv_sun=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -nxconf_cv_sun=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -rm -f conftest* -fi -echo "$as_me:$LINENO: result: $nxconf_cv_sun" >&5 -echo "${ECHO_T}$nxconf_cv_sun" >&6 -SUN= -test "$nxconf_cv_sun" = yes && SUN=yes - - - - -if test "${with_version}" = yes; then - VERSION=${ac_option} -else - VERSION=`cat VERSION` -fi -echo -e "compiling version ${VERSION}" - -LIBVERSION=`echo ${VERSION} | cut -d '.' -f 1` - -CXXFLAGS="$CXXFLAGS -DVERSION=\\\"${VERSION}\\\"" -CPPFLAGS="$CPPFLAGS -DVERSION=\\\"${VERSION}\\\"" - - -if test "${with_symbols}" = yes; then - echo -e "enabling production of debug symbols" - CXXFLAGS="-g $CXXFLAGS" - CPPFLAGS="-g $CPPFLAGS" -else - echo -e "disabling production of debug symbols" -fi - - -if test "${with_info}" = yes; then - echo -e "enabling info output in the log file" - CXXFLAGS="$CXXFLAGS -DINFO" - CPPFLAGS="$CPPFLAGS -DINFO" -else - echo -e "disabling info output in the log file" -fi - - -if test "${with_valgrind}" = yes; then - echo -e "enabling valgrind memory checker workarounds" - CXXFLAGS="$CXXFLAGS -DVALGRIND" - CPPFLAGS="$CPPFLAGS -DVALGRIND" -else - echo -e "disabling valgrind memory checker workarounds" -fi - - -if test "$CYGWIN32" = yes; then - LIBS="$LIBS -L../nxcomp -lXcomp -lstdc++ -Wl,-e,_mainCRTStartup -ljpeg -lpng -lz" -else - LIBS="$LIBS -L../nxcomp -lXcomp" -fi - - - - -if test -x "../nx-X11/config/makedepend/makedepend" ; then - MAKEDEPEND=../nx-X11/config/makedepend/makedepend -else - if test -x "/usr/X11R6/bin/makedepend" ; then - MAKEDEPEND=/usr/X11R6/bin/makedepend - else - if test -x "/usr/openwin/bin/makedepend" ; then - MAKEDEPEND=/usr/openwin/bin/makedepend - else - MAKEDEPEND=makedepend - fi - fi -fi - - ac_config_files="$ac_config_files Makefile" -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -{ - (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `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" - ;; - *) - # `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" - ;; - esac; -} | - sed ' - t clear - : clear - s/^$[^=]*$=$.*[{}].*$$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^$[^=]*$=$.*$$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# 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[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^$[^=]*=[ ]*$:*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*$[^ (][^ (]*([^)]*)$[ ]*$.*$,-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*$[^ ][^ ]*$[ ]*$.*$,-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed - - -ac_libobjs= -ac_ltlibobjs= -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$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - - -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -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 - as_unset=unset -else - as_unset=false -fi - - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - 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 - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '$a$' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ - X"$0" : 'X$//$$' \| \ - X"$0" : 'X$/$$' \| \ - . : '$.$' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/; q; } - /^X\/$\/\/$$/{ s//\1/; q; } - /^X\/$\/$.*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# 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 - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^$['$as_cr_digits']*$$.*$[$]LINENO$[^'$as_cr_alnum'_]$,\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '$a$' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -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'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - -exec 6>&1 - -# Open the log real soon, to keep \$[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - -This file was extended by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 -_ACEOF - -# Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi - -cat >>$CONFIG_STATUS <<\_ACEOF - -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -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 - -Configuration files: -$config_files - -Report bugs to <bug-autoconf(a)gnu.org>." -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -config.status -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" - -Copyright (C) 2003 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 -INSTALL="$INSTALL" -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "x$1" : 'x$[^=]*$='` - ac_optarg=`expr "x$1" : 'x[^=]*=$.*$'` - ac_shift=: - ;; - -*) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - -_ACEOF - - - - - -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_config_target in $ac_config_targets -do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. -$debug || -{ - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} - -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - -# -# CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@armcxx@,$armcxx,;t t -s,@armcc@,$armcc,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@CXXCPP@,$CXXCPP,;t t -s,@X_CFLAGS@,$X_CFLAGS,;t t -s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t -s,@X_LIBS@,$X_LIBS,;t t -s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t -s,@LIBVERSION@,$LIBVERSION,;t t -s,@VERSION@,$VERSION,;t t -s,@MAKEDEPEND@,$MAKEDEPEND,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (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" - else - 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 - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat - fi -fi # test -n "$CONFIG_FILES" - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # 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,:.*,,'` ;; - *:* ) ac_file_in=`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 || -echo X"$ac_file" | - sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X$\/\/$[^/].*/{ s//\1/; q; } - /^X$\/\/$$/{ s//\1/; q; } - /^X$\/$.*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$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_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - 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 - - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; - esac - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - 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 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - 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 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -{ (exit 0); exit 0; } -_ACEOF -chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi - hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.16-42-g69c809a
by git-admin＠x2go.org 04 Jan '13

04 Jan '13

The branch, master has been updated via 69c809af9659d1b429d832d05642beb78722f67c (commit) from 1d766945896449579fec1c79696dc6bb9a40c088 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 69c809af9659d1b429d832d05642beb78722f67c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jan 4 13:24:18 2013 +0100 release 3.5.0.17 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a85ed93..52627bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nx-libs (2:3.5.0.17-0) UNRELEASED; urgency=low +nx-libs (2:3.5.0.17-0) unstable; urgency=low [ Jan Engelhardt ] * Fix /bin/Makefile. Add $(DESTDIR) to every install path. @@ -45,7 +45,7 @@ nx-libs (2:3.5.0.17-0) UNRELEASED; urgency=low * Fix and greatly enhance the top-level install and uninstall target for plain makefile installs. - -- Reinhard Tartler <siretart(a)tauware.de> Sat, 15 Dec 2012 14:29:12 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 04 Jan 2013 13:23:57 +0100 nx-libs (2:3.5.0.16-0) unstable; urgency=low hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

python-x2go.git - master (branch) updated: 0.2.1.1-5-gfe173b2
by git-admin＠x2go.org 04 Jan '13

04 Jan '13

The branch, master has been updated via fe173b2649c28ede9348f4ed6bc6a926ffbe303a (commit) via 35f6b967ab1eb0e5b6a9fa7bddc984ecbb16cd16 (commit) from 2a1d3db9b452102cfa6479dc5b8349b08f82eb67 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fe173b2649c28ede9348f4ed6bc6a926ffbe303a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jan 4 12:14:23 2013 +0100 fix typo in SSH port number commit 35f6b967ab1eb0e5b6a9fa7bddc984ecbb16cd16 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 28 07:16:04 2012 +0100 fix link in __doc__ string ----------------------------------------------------------------------- Summary of changes: .../x2go_start_session_with_progress_status.py | 2 +- x2go/client.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/examples/x2go_start_session_with_progress_status.py b/examples/x2go_start_session_with_progress_status.py index 8e7b0e6..e594953 100644 --- a/examples/x2go_start_session_with_progress_status.py +++ b/examples/x2go_start_session_with_progress_status.py @@ -32,7 +32,7 @@ import threading # modify to your needs... server = "server.mydomain.tld" -port = 222 +port = 22 username = "foo" command = "GNOME" diff --git a/x2go/client.py b/x2go/client.py index d160e74..9471cd2 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1309,7 +1309,7 @@ class X2goClient(object): @param sshproxy_password: the SSH proxy user's password @type sshproxy_password: C{str} @param add_to_known_hosts: non-Paramiko option, if C{True} paramiko.AutoAddPolicy() - is used as missing-host-key-policy. If set to C{False} checkhosts.X2goInteractiveAddPolicy() + is used as missing-host-key-policy. If set to C{False} L{checkhosts.X2goInteractiveAddPolicy()} is used @type add_to_known_hosts: C{bool} @param force_password_auth: disable SSH pub/priv key authentication mechanisms hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-10-g490ca0f
by git-admin＠x2go.org 04 Jan '13

04 Jan '13

The branch, master has been updated via 490ca0fd74802eef615fdede4e91ca657822482f (commit) from a28643bee58961bbe0e21e3f48351647a3d343eb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 490ca0fd74802eef615fdede4e91ca657822482f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jan 4 11:42:43 2013 +0100 rebuild i18n files ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 550 -> 550 bytes build/mo/da/LC_MESSAGES/PyHoca-GUI.mo | Bin 23792 -> 23305 bytes build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 25284 -> 24732 bytes build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 23663 -> 23169 bytes build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 25359 -> 24791 bytes build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo | Bin 546 -> 546 bytes build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 24248 -> 23711 bytes build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 23857 -> 23382 bytes build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo | Bin 28873 -> 28307 bytes build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 23644 -> 23151 bytes po/PyHoca-GUI.pot | 246 +++++++------- po/bg.po | 378 ++++++++++----------- po/da.po | 544 ++++++++++++++---------------- po/de.po | 398 +++++++++++----------- po/en.po | 396 +++++++++++----------- po/es.po | 400 +++++++++++----------- po/fr.po | 378 ++++++++++----------- po/nb_NO.po | 396 +++++++++++----------- po/nl.po | 396 +++++++++++----------- po/ru.po | 396 +++++++++++----------- po/sv.po | 396 +++++++++++----------- 21 files changed, 2100 insertions(+), 2224 deletions(-) The diff of changes is: diff --git a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo index b5ce7d3..5471081 100644 Binary files a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo index 70fa26d..1c01a5c 100644 Binary files a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo index 98d92ad..412cee0 100644 Binary files a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo index 03de698..2e84cc3 100644 Binary files a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo index f704fa2..9f97239 100644 Binary files a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo index 231d16f..c9ed645 100644 Binary files a/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo index 69cf40f..f9c20da 100644 Binary files a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo index b1a3ab5..1518189 100644 Binary files a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo index bf36286..42f6368 100644 Binary files a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo index 35f795d..eac298b 100644 Binary files a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index 8d1a34e..139cd29 100644 --- a/po/PyHoca-GUI.pot +++ b/po/PyHoca-GUI.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-20 09:58+0100\n" +"POT-Creation-Date: 2013-01-04 11:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -46,7 +46,7 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:356 #: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" @@ -207,7 +207,7 @@ msgstr "" msgid "Windows Terminal Server (Direct RDP)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:236 msgid "Custom command" msgstr "" @@ -244,466 +244,448 @@ msgid "settings derived from " msgstr "" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Session Title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Session Window" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Session Startup" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Connection Link Speed" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Compression" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:186 msgid "Display" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Keyboard" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Sound" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "Printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "Folder Exports" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "File Import" msgstr "" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Name" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Set session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:192 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Use a default session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "Custom session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Window Icon" msgstr "" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Start session automatically after login" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:231 #, python-format msgid "Login automatically after %s has started" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Type" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "XDMCP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Menu of published applications" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:252 ../pyhoca/wxgui/profilemanager.py:265 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:254 ../pyhoca/wxgui/profilemanager.py:272 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:256 ../pyhoca/wxgui/profilemanager.py:274 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Discover SSH keys or use SSH agent for X2Go authentication" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Enable forwarding of SSH authentication agent connections" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "Use same username for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Use same authentication for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:264 -msgid "SSH Proxy Tunnel" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Discover SSH keys or use SSH agent for proxy authentication" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:285 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Maximized" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Use custom keyboard settings as provided below" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:305 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:307 msgid "Layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Layout variant" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Pulse Audio" msgstr "" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:319 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:315 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Store share list at end of session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:326 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:350 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:327 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:335 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:330 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:332 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:342 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:351 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/profilemanager.py:353 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:348 +#: ../pyhoca/wxgui/profilemanager.py:354 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:401 -#: ../pyhoca/wxgui/profilemanager.py:1124 -#: ../pyhoca/wxgui/profilemanager.py:2268 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:2190 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:403 -#: ../pyhoca/wxgui/profilemanager.py:1126 +#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:1101 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:412 +#: ../pyhoca/wxgui/profilemanager.py:416 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:414 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:416 +#: ../pyhoca/wxgui/profilemanager.py:420 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:797 +#: ../pyhoca/wxgui/profilemanager.py:784 msgid "Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:798 +#: ../pyhoca/wxgui/profilemanager.py:785 msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:799 +#: ../pyhoca/wxgui/profilemanager.py:786 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:800 +#: ../pyhoca/wxgui/profilemanager.py:787 msgid "Link Quality" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:801 +#: ../pyhoca/wxgui/profilemanager.py:788 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:802 +#: ../pyhoca/wxgui/profilemanager.py:789 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:988 +#: ../pyhoca/wxgui/profilemanager.py:963 msgid "<xkbtype>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:989 +#: ../pyhoca/wxgui/profilemanager.py:964 msgid "<xkblayout>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:990 +#: ../pyhoca/wxgui/profilemanager.py:965 msgid "<xkbvariant>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1444 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1447 +#: ../pyhoca/wxgui/profilemanager.py:1416 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1816 +#: ../pyhoca/wxgui/profilemanager.py:1776 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1818 -#: ../pyhoca/wxgui/profilemanager.py:1842 +#: ../pyhoca/wxgui/profilemanager.py:1778 +#: ../pyhoca/wxgui/profilemanager.py:1802 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2220 +#: ../pyhoca/wxgui/profilemanager.py:2142 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2348 -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 -#: ../pyhoca/wxgui/profilemanager.py:2359 -#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117 +#: ../pyhoca/wxgui/profilemanager.py:2270 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 ../pyhoca/wxgui/menus_taskbar.py:117 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2348 +#: ../pyhoca/wxgui/profilemanager.py:2270 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2359 -msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:2369 -#, python-format -msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" -"Please change the SSH proxy settings accordingly." -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:2396 +#: ../pyhoca/wxgui/profilemanager.py:2303 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2397 +#: ../pyhoca/wxgui/profilemanager.py:2304 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2401 +#: ../pyhoca/wxgui/profilemanager.py:2308 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2402 +#: ../pyhoca/wxgui/profilemanager.py:2309 msgid "Changes to profile have been saved." msgstr "" diff --git a/po/bg.po b/po/bg.po index e36baf1..b294d58 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 14:25+0100\n" +"POT-Creation-Date: 2013-01-04 11:42+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -50,8 +50,8 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350 -#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:356 +#: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "" @@ -211,7 +211,7 @@ msgstr "" msgid "Windows Terminal Server (Direct RDP)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:236 msgid "Custom command" msgstr "" @@ -248,466 +248,448 @@ msgid "settings derived from " msgstr "" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Session Title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Session Window" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Session Startup" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Connection Link Speed" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Compression" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:186 msgid "Display" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Keyboard" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Sound" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "Printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "Folder Exports" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "File Import" msgstr "" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Name" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Set session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:192 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Use a default session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "Custom session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Window Icon" msgstr "" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Start session automatically after login" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:231 #, python-format msgid "Login automatically after %s has started" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Type" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "XDMCP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Menu of published applications" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:252 ../pyhoca/wxgui/profilemanager.py:265 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:254 ../pyhoca/wxgui/profilemanager.py:272 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:256 ../pyhoca/wxgui/profilemanager.py:274 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Discover SSH keys or use SSH agent for X2Go authentication" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Enable forwarding of SSH authentication agent connections" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "Use same username for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Use same authentication for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:264 -msgid "SSH Proxy Tunnel" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Discover SSH keys or use SSH agent for proxy authentication" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:285 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Maximized" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Use custom keyboard settings as provided below" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:305 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:307 msgid "Layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Layout variant" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Pulse Audio" msgstr "" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:319 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:315 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Store share list at end of session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:326 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:350 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:327 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:335 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:330 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:332 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:342 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:351 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/profilemanager.py:353 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:348 +#: ../pyhoca/wxgui/profilemanager.py:354 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:401 -#: ../pyhoca/wxgui/profilemanager.py:1124 -#: ../pyhoca/wxgui/profilemanager.py:2268 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:2190 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:403 -#: ../pyhoca/wxgui/profilemanager.py:1126 +#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:1101 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:412 +#: ../pyhoca/wxgui/profilemanager.py:416 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:414 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:416 +#: ../pyhoca/wxgui/profilemanager.py:420 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:797 +#: ../pyhoca/wxgui/profilemanager.py:784 msgid "Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:798 +#: ../pyhoca/wxgui/profilemanager.py:785 msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:799 +#: ../pyhoca/wxgui/profilemanager.py:786 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:800 +#: ../pyhoca/wxgui/profilemanager.py:787 msgid "Link Quality" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:801 +#: ../pyhoca/wxgui/profilemanager.py:788 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:802 +#: ../pyhoca/wxgui/profilemanager.py:789 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:988 +#: ../pyhoca/wxgui/profilemanager.py:963 msgid "<xkbtype>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:989 +#: ../pyhoca/wxgui/profilemanager.py:964 msgid "<xkblayout>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:990 +#: ../pyhoca/wxgui/profilemanager.py:965 msgid "<xkbvariant>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1444 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1447 +#: ../pyhoca/wxgui/profilemanager.py:1416 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1816 +#: ../pyhoca/wxgui/profilemanager.py:1776 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1818 -#: ../pyhoca/wxgui/profilemanager.py:1842 +#: ../pyhoca/wxgui/profilemanager.py:1778 +#: ../pyhoca/wxgui/profilemanager.py:1802 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2220 +#: ../pyhoca/wxgui/profilemanager.py:2142 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2348 -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 -#: ../pyhoca/wxgui/profilemanager.py:2359 -#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117 +#: ../pyhoca/wxgui/profilemanager.py:2270 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 ../pyhoca/wxgui/menus_taskbar.py:117 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2348 +#: ../pyhoca/wxgui/profilemanager.py:2270 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2359 -msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:2369 -#, python-format -msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" -"Please change the SSH proxy settings accordingly." -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:2396 +#: ../pyhoca/wxgui/profilemanager.py:2303 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2397 +#: ../pyhoca/wxgui/profilemanager.py:2304 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2401 +#: ../pyhoca/wxgui/profilemanager.py:2308 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2402 +#: ../pyhoca/wxgui/profilemanager.py:2309 msgid "Changes to profile have been saved." msgstr "" @@ -740,8 +722,8 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:795 +#: ../pyhoca/wxgui/menus_taskbar.py:987 msgid "E&xit" msgstr "" @@ -894,51 +876,51 @@ msgstr "" msgid "Manage Application Menu" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:714 +#: ../pyhoca/wxgui/menus_taskbar.py:726 msgid "Running" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:716 +#: ../pyhoca/wxgui/menus_taskbar.py:728 msgid "Suspended" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:735 +#: ../pyhoca/wxgui/menus_taskbar.py:747 msgid "&Clean all sessions" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:741 +#: ../pyhoca/wxgui/menus_taskbar.py:753 msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:756 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:768 +#: ../pyhoca/wxgui/menus_taskbar.py:780 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:775 +#: ../pyhoca/wxgui/menus_taskbar.py:787 msgid "Suspend Session and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:779 +#: ../pyhoca/wxgui/menus_taskbar.py:791 msgid "Disconnect and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:833 +#: ../pyhoca/wxgui/menus_taskbar.py:845 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:909 +#: ../pyhoca/wxgui/menus_taskbar.py:921 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Connect Server" msgstr "" @@ -1016,7 +998,7 @@ msgstr "" msgid "Unknown session profile, configure before using it..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "%s - session warning" msgstr "" @@ -1043,26 +1025,26 @@ msgstr "" msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1047 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1071 +#: ../pyhoca/wxgui/frontend.py:1075 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1224 +#: ../pyhoca/wxgui/frontend.py:1228 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1071,148 +1053,148 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1232 +#: ../pyhoca/wxgui/frontend.py:1236 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313 -#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1299 ../pyhoca/wxgui/frontend.py:1317 +#: ../pyhoca/wxgui/frontend.py:1319 ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1299 msgid "The session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1313 +#: ../pyhoca/wxgui/frontend.py:1317 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1315 +#: ../pyhoca/wxgui/frontend.py:1319 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2Go/SSH server. Session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1381 ../pyhoca/wxgui/frontend.py:1388 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1377 +#: ../pyhoca/wxgui/frontend.py:1381 msgid "The X2Go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1388 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "%s - client-side printing not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "%s - MIME box not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "%s - client-side folders not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "%s - client resources not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1467 ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1463 +#: ../pyhoca/wxgui/frontend.py:1467 #, python-format msgid "" "%s\n" @@ -1220,7 +1202,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "" "%s\n" @@ -1228,88 +1210,88 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1484 ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1484 #, python-format msgid "" "New X2Go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "" "Another client started X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1514 ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1514 #, python-format msgid "" "Resuming X2Go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "" "Another client resumed X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "" "X2Go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "" "X2Go Session has terminated\n" "%s" msgstr "" -#: ../pyhoca/wxgui/messages.py:73 +#: ../pyhoca/wxgui/messages.py:72 #, python-format msgid "" "Are you really sure you want to\n" "delete the session profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/messages.py:74 +#: ../pyhoca/wxgui/messages.py:73 #, python-format msgid "" "PyHoca-GUI is already running for user ,,%s''!\n" @@ -1319,15 +1301,15 @@ msgid "" "notification area/systray." msgstr "" -#: ../pyhoca/wxgui/messages.py:107 +#: ../pyhoca/wxgui/messages.py:106 msgid "Yes" msgstr "" -#: ../pyhoca/wxgui/messages.py:108 +#: ../pyhoca/wxgui/messages.py:107 msgid "No" msgstr "" -#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "" diff --git a/po/da.po b/po/da.po index 9985b8b..0999421 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI 0.2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 14:25+0100\n" +"POT-Creation-Date: 2013-01-04 11:42+0100\n" "PO-Revision-Date: 2012-12-07 13:16+0100\n" "Last-Translator: Christoffer Krakou <christoffer(a)fleten.net>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -23,13 +23,11 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:90 -#: ../pyhoca/wxgui/logon.py:102 +#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102 msgid "Username" msgstr "Brugernavn" -#: ../pyhoca/wxgui/logon.py:92 -#: ../pyhoca/wxgui/logon.py:104 +#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104 msgid "Password" msgstr "Kodeord" @@ -49,28 +47,23 @@ msgstr "Sessionslogin" msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:127 -#: ../pyhoca/wxgui/profilemanager.py:350 -#: ../pyhoca/wxgui/messages.py:131 -#: ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:356 +#: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Annullér" -#: ../pyhoca/wxgui/logon.py:297 -#: ../pyhoca/wxgui/logon.py:339 +#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339 #: ../pyhoca/wxgui/frontend.py:606 #, python-format msgid "%s - connect failure" msgstr "%s - forbindelsesfejl" -#: ../pyhoca/wxgui/logon.py:298 -#: ../pyhoca/wxgui/frontend.py:606 +#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606 msgid "User is not allowed to start X2Go sessions!" msgstr "Bruger har ikke rettigheder til at starte X2Go sessioner!" -#: ../pyhoca/wxgui/logon.py:303 -#: ../pyhoca/wxgui/frontend.py:613 +#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613 #, python-format msgid "%s - connect" msgstr "%s - forbind" @@ -96,32 +89,29 @@ msgstr "%s - SSH proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Autentificering mod SSH proxy server mislykkedes!" -#: ../pyhoca/wxgui/logon.py:376 -#: ../pyhoca/wxgui/frontend.py:664 +#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664 #, python-format msgid "%s - socket error" msgstr "%s - socket fejl" -#: ../pyhoca/wxgui/logon.py:383 -#: ../pyhoca/wxgui/frontend.py:643 +#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643 #: ../pyhoca/wxgui/frontend.py:650 #, python-format msgid "%s - host key error" msgstr "%s - værtsnøgle fejl" -#: ../pyhoca/wxgui/logon.py:384 -#: ../pyhoca/wxgui/frontend.py:643 -msgid "The remote server's host key is invalid or has not been accepted by the user" -msgstr "Fjernserverens værtsnøgle er ugyldig eller blev ikke accepteret af brugeren" +#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:643 +msgid "" +"The remote server's host key is invalid or has not been accepted by the user" +msgstr "" +"Fjernserverens værtsnøgle er ugyldig eller blev ikke accepteret af brugeren" -#: ../pyhoca/wxgui/logon.py:391 -#: ../pyhoca/wxgui/frontend.py:685 +#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685 #, python-format msgid "%s - missing home directory" msgstr "%s - manglende hjemmemappe" -#: ../pyhoca/wxgui/logon.py:392 -#: ../pyhoca/wxgui/frontend.py:685 +#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685 msgid "The remote user's home directory does not exist." msgstr "Fjernbrugerens hjemmemappe eksisterer ikke" @@ -130,14 +120,12 @@ msgstr "Fjernbrugerens hjemmemappe eksisterer ikke" msgid "%s - key error" msgstr "%s - nøglefejl" -#: ../pyhoca/wxgui/logon.py:407 -#: ../pyhoca/wxgui/frontend.py:692 +#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692 #, python-format msgid "%s - auth error" msgstr "%s - auth fejl" -#: ../pyhoca/wxgui/logon.py:415 -#: ../pyhoca/wxgui/frontend.py:636 +#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636 #, python-format msgid "%s - SSH error" msgstr "%s - SSH fejl" @@ -229,28 +217,23 @@ msgstr "Windows Terminal Server (RDP igennem X2Go-proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (Direkte RDP)" -#: ../pyhoca/wxgui/profilemanager.py:90 -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:236 msgid "Custom command" msgstr "Tilpasset kommando" -#: ../pyhoca/wxgui/profilemanager.py:95 -#: ../pyhoca/wxgui/menus_taskbar.py:393 +#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393 msgid "Internet Browser" msgstr "Internet Browser" -#: ../pyhoca/wxgui/profilemanager.py:96 -#: ../pyhoca/wxgui/menus_taskbar.py:394 +#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394 msgid "Email Client" msgstr "Email Klient" -#: ../pyhoca/wxgui/profilemanager.py:97 -#: ../pyhoca/wxgui/menus_taskbar.py:395 +#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395 msgid "Office" msgstr "Kontorsoftware" -#: ../pyhoca/wxgui/profilemanager.py:98 -#: ../pyhoca/wxgui/menus_taskbar.py:396 +#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396 msgid "Terminal" msgstr "Terminal" @@ -271,470 +254,449 @@ msgid "settings derived from " msgstr "indstillinger taget fra" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Session Title" msgstr "Sesstionstitel" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Session Window" msgstr "Sessionsvindue" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Session Startup" msgstr "Sessionsstart" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Proxy" msgstr "Proxy" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Connection Link Speed" msgstr "Forbindelseshastighed" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Compression" msgstr "Komprimering" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:186 msgid "Display" msgstr "Display" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Keyboard" msgstr "Tastatur" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Sound" msgstr "Lyd" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "Printing" msgstr "Udskrift" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "Folder Exports" msgstr "Mappeeksporteringer" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "File Import" msgstr "Filimporteringer" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Name" msgstr "Navn" -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Set session window title" msgstr "Indstil sessionsvinduets titel" -#: ../pyhoca/wxgui/profilemanager.py:192 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Use a default session window title" msgstr "Brug standardtitel til sessionsvindue" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "Custom session window title" msgstr "Tilpasset titel til sessionsvindue" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Window Icon" msgstr "Vinduesikon" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Start session automatically after login" msgstr "Start session automatisk efter login" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:231 #, python-format msgid "Login automatically after %s has started" msgstr "Log ind automatisk efter at %s er startet" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Application" msgstr "Applikation" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "XDMCP server" msgstr "XDMCP server" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "RDP server" msgstr "RDP server" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "RDP options" msgstr "RDP indstillinger" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "Integrér fjernapplikationer med lokalt skrivebord (rootless mode)" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Menu of published applications" msgstr "Menu med udgivne applikationer" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:240 -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:252 ../pyhoca/wxgui/profilemanager.py:265 msgid "User" msgstr "Bruger" -#: ../pyhoca/wxgui/profilemanager.py:242 -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:254 ../pyhoca/wxgui/profilemanager.py:272 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:244 -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:256 ../pyhoca/wxgui/profilemanager.py:274 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Key" msgstr "Nøgle" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Discover SSH keys or use SSH agent for X2Go authentication" msgstr "Opdag SSH nøgler eller brug SSH agent til X2Go autentificering" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Enable forwarding of SSH authentication agent connections" msgstr "Aktiver forwarding af SSH autentificeringsagentens forbindelser" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Server behind SSH proxy" msgstr "Server bag SSH proxy" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "Use same username for X2Go and proxy host" msgstr "Brug samme brugernavn til X2Go og proxy host" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Use same authentication for X2Go and proxy host" msgstr "Brug samme autentificering til X2Go og proxy host" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Key file" msgstr "Nøglefil" -#: ../pyhoca/wxgui/profilemanager.py:264 -msgid "SSH Proxy Tunnel" -msgstr "SSH Proxy Tunnel" - -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Discover SSH keys or use SSH agent for proxy authentication" msgstr "Opdag SSH nøgler eller brug SSH agent til proxyauthentificering " -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:285 msgid "Method" msgstr "Metode" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Image quality" msgstr "Billedkvalitet" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Fullscreen" msgstr "Fuldskærm" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Maximized" msgstr "Maximeret" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Custom Size" msgstr "TIlpasset størrelse" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "Set display DPI" msgstr "Indstil display-DPI" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Do not set (use server-side tools to configure the keyboard)" -msgstr "Indstil ikke (brug server-side værktøjer til at konfigurere tastaturet)" +msgstr "" +"Indstil ikke (brug server-side værktøjer til at konfigurere tastaturet)" -#: ../pyhoca/wxgui/profilemanager.py:297 -msgid "Automatically detect and use client-side keyboard configuration inside the session" +#: ../pyhoca/wxgui/profilemanager.py:303 +msgid "" +"Automatically detect and use client-side keyboard configuration inside the " +"session" msgstr "Indstil automatisk tastaturet under sessionen" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Use custom keyboard settings as provided below" msgstr "Brug tilpasset tastaturindstillinger som vist nedenfor" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:305 msgid "Keyboard model" msgstr "Tastaturmodel" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:307 msgid "Layout" msgstr "Layout" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Layout variant" msgstr "Layoutvariant" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "Enable sound support" msgstr "Aktiver lyd" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "Arts (not supported)" msgstr "Arts (ikke understøttet)" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:319 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "Use default sound port" msgstr "Brug standardport til lyd" -#: ../pyhoca/wxgui/profilemanager.py:315 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Custom sound port" msgstr "Tilpasset lydport" -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Use local folder sharing" msgstr "Brug lokal mappedeling" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Store share list at end of session" msgstr "Gem delemappeliste når sessionen slutter" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:326 msgid "Path" msgstr "Sti" -#: ../pyhoca/wxgui/profilemanager.py:323 -#: ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:350 msgid "Add" msgstr "Tilføj" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Local Path" msgstr "Local Sti" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Connect Method" msgstr "Forbindelsesmetode" -#: ../pyhoca/wxgui/profilemanager.py:327 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Delete" msgstr "Slet" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:335 msgid "Convert between client and server encodings" msgstr "Konverter encoding mellem klient og server" -#: ../pyhoca/wxgui/profilemanager.py:330 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Client encoding" msgstr "Klient encoding" -#: ../pyhoca/wxgui/profilemanager.py:332 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Use file MIME box for local file import" msgstr "Brug fil MIME box til lokal filimportering" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:342 msgid "Extensions" msgstr "Udvidelser" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Action" msgstr "Handling" -#: ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Client Side printing" msgstr "Klient udskrift" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:351 msgid "Defaults" msgstr "Standard" -#: ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/profilemanager.py:353 msgid "Save" msgstr "Gem" -#: ../pyhoca/wxgui/profilemanager.py:348 +#: ../pyhoca/wxgui/profilemanager.py:354 msgid "Reset" msgstr "Nulstil" -#: ../pyhoca/wxgui/profilemanager.py:401 -#: ../pyhoca/wxgui/profilemanager.py:1124 -#: ../pyhoca/wxgui/profilemanager.py:2268 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:2190 msgid "automatically" msgstr "automatisk" -#: ../pyhoca/wxgui/profilemanager.py:403 -#: ../pyhoca/wxgui/profilemanager.py:1126 +#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:1101 msgid "manually" msgstr "manuelt" -#: ../pyhoca/wxgui/profilemanager.py:412 +#: ../pyhoca/wxgui/profilemanager.py:416 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-Gui Profilmanager - ny profil" -#: ../pyhoca/wxgui/profilemanager.py:414 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profilmanager - %s (forbundet)" -#: ../pyhoca/wxgui/profilemanager.py:416 +#: ../pyhoca/wxgui/profilemanager.py:420 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profilmanager - %s" -#: ../pyhoca/wxgui/profilemanager.py:797 +#: ../pyhoca/wxgui/profilemanager.py:784 msgid "Profile" msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:798 +#: ../pyhoca/wxgui/profilemanager.py:785 msgid "Session" msgstr "Session" -#: ../pyhoca/wxgui/profilemanager.py:799 +#: ../pyhoca/wxgui/profilemanager.py:786 msgid "Connection" msgstr "Forbindelse" -#: ../pyhoca/wxgui/profilemanager.py:800 +#: ../pyhoca/wxgui/profilemanager.py:787 msgid "Link Quality" msgstr "Link Kvalitet" -#: ../pyhoca/wxgui/profilemanager.py:801 +#: ../pyhoca/wxgui/profilemanager.py:788 msgid "Settings" msgstr "Indstillinger" -#: ../pyhoca/wxgui/profilemanager.py:802 +#: ../pyhoca/wxgui/profilemanager.py:789 msgid "Sharing" msgstr "Deling" -#: ../pyhoca/wxgui/profilemanager.py:988 +#: ../pyhoca/wxgui/profilemanager.py:963 msgid "<xkbtype>" msgstr "<xkbtype>" -#: ../pyhoca/wxgui/profilemanager.py:989 +#: ../pyhoca/wxgui/profilemanager.py:964 msgid "<xkblayout>" msgstr "<xkblayout>" -#: ../pyhoca/wxgui/profilemanager.py:990 +#: ../pyhoca/wxgui/profilemanager.py:965 msgid "<xkbvariant>" msgstr "<xkbvariant>" -#: ../pyhoca/wxgui/profilemanager.py:1444 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Ikonfiler (*.png)|*.png|Alle filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1447 +#: ../pyhoca/wxgui/profilemanager.py:1416 msgid "Choose an icon for this session profile" msgstr "Vælg et ikon til denne sessionsprofil" -#: ../pyhoca/wxgui/profilemanager.py:1816 +#: ../pyhoca/wxgui/profilemanager.py:1776 msgid "All files (*.*)|*" msgstr "Alle Filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1818 -#: ../pyhoca/wxgui/profilemanager.py:1842 +#: ../pyhoca/wxgui/profilemanager.py:1778 +#: ../pyhoca/wxgui/profilemanager.py:1802 msgid "Choose a public SSH key" msgstr "Vælg offentlig SSH nøgle" -#: ../pyhoca/wxgui/profilemanager.py:2220 +#: ../pyhoca/wxgui/profilemanager.py:2142 msgid "Choose a folder to share within a session" msgstr "Vælg en mappe som skal deles i en session" -#: ../pyhoca/wxgui/profilemanager.py:2348 -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 -#: ../pyhoca/wxgui/profilemanager.py:2359 -#: ../pyhoca/wxgui/profilemanager.py:2369 -#: ../pyhoca/wxgui/menus_taskbar.py:117 +#: ../pyhoca/wxgui/profilemanager.py:2270 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 ../pyhoca/wxgui/menus_taskbar.py:117 msgid "Profile Manager" msgstr "Profilmanager" -#: ../pyhoca/wxgui/profilemanager.py:2348 +#: ../pyhoca/wxgui/profilemanager.py:2270 msgid "Profile name is missing, profile unusable!!!" msgstr "Profilnavnet mangler, profilen er ubrugelig!" -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profilnavnet %s eksisterer i forvejen" -#: ../pyhoca/wxgui/profilemanager.py:2359 -msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "SSH proxy konfigurationen er ikke komplet. Prøv igen" - -#: ../pyhoca/wxgui/profilemanager.py:2369 -#, python-format -msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" -"Please change the SSH proxy settings accordingly." -msgstr "" -"En anden sessionsprofil (%s) bruger i forvejen [%s]:%s til at binde en lokal proxy.\n" -"Tilpas venligst SSH proxy indstillingerne." - -#: ../pyhoca/wxgui/profilemanager.py:2396 +#: ../pyhoca/wxgui/profilemanager.py:2303 #, python-format msgid "%s - profile added" msgstr "%s - profil tilføjet" -#: ../pyhoca/wxgui/profilemanager.py:2397 +#: ../pyhoca/wxgui/profilemanager.py:2304 msgid "A new session profile has been added." msgstr "A ny sessionsprofil er blevet tilføjet" -#: ../pyhoca/wxgui/profilemanager.py:2401 +#: ../pyhoca/wxgui/profilemanager.py:2308 #, python-format msgid "%s - modified" msgstr "%s - modificeret" -#: ../pyhoca/wxgui/profilemanager.py:2402 +#: ../pyhoca/wxgui/profilemanager.py:2309 msgid "Changes to profile have been saved." msgstr "Ændringerne i profilen er blevet gemt" @@ -767,9 +729,8 @@ msgstr "Printerindstillinger" msgid "Client Options" msgstr "Klientparamentre" -#: ../pyhoca/wxgui/menus_taskbar.py:155 -#: ../pyhoca/wxgui/menus_taskbar.py:783 -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:795 +#: ../pyhoca/wxgui/menus_taskbar.py:987 msgid "E&xit" msgstr "E&xit" @@ -777,8 +738,7 @@ msgstr "E&xit" msgid "Window title" msgstr "Vinduestitel" -#: ../pyhoca/wxgui/menus_taskbar.py:233 -#: ../pyhoca/wxgui/menus_taskbar.py:608 +#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608 msgid "Resume Session" msgstr "Fortsæt Session" @@ -794,38 +754,31 @@ msgstr "Overfør Session" msgid "Transfer Session (not possible)" msgstr "Overfør Session (ikke muligt)" -#: ../pyhoca/wxgui/menus_taskbar.py:252 -#: ../pyhoca/wxgui/menus_taskbar.py:599 +#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599 msgid "Suspend Session (and disconnect/exit)" msgstr "Suspendér Session (og afbryd forbindelse/luk)" -#: ../pyhoca/wxgui/menus_taskbar.py:254 -#: ../pyhoca/wxgui/menus_taskbar.py:601 +#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601 msgid "Suspend Session (and disconnect)" msgstr "Suspendér Session (og afbryd forbindelse)" -#: ../pyhoca/wxgui/menus_taskbar.py:256 -#: ../pyhoca/wxgui/menus_taskbar.py:603 +#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603 msgid "Suspend Session" msgstr "Suspendér Session" -#: ../pyhoca/wxgui/menus_taskbar.py:262 -#: ../pyhoca/wxgui/menus_taskbar.py:612 +#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612 msgid "Terminate Session (and disconnect/exit)" msgstr "Terminér Session (og afbryd forbindelse/luk)" -#: ../pyhoca/wxgui/menus_taskbar.py:264 -#: ../pyhoca/wxgui/menus_taskbar.py:614 +#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614 msgid "Terminate Session (and disconnect)" msgstr "Terminér Session (og afbryd forbindelse)" -#: ../pyhoca/wxgui/menus_taskbar.py:266 -#: ../pyhoca/wxgui/menus_taskbar.py:616 +#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616 msgid "Terminate Session" msgstr "Terminér Session" -#: ../pyhoca/wxgui/menus_taskbar.py:270 -#: ../pyhoca/wxgui/menus_taskbar.py:596 +#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596 msgid "Refresh menu tree" msgstr "Opfrisk menu" @@ -897,8 +850,7 @@ msgstr "Værktøjer" msgid "Other Applications" msgstr "Andre Programmer" -#: ../pyhoca/wxgui/menus_taskbar.py:521 -#: ../pyhoca/wxgui/menus_taskbar.py:533 +#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533 #, python-format msgid "Connect %s" msgstr "Forbind %s" @@ -911,13 +863,11 @@ msgstr "Forbinder..." msgid "Start &new Desktop Session" msgstr "Start &ny Skrivebordssession" -#: ../pyhoca/wxgui/menus_taskbar.py:546 -#: ../pyhoca/wxgui/menus_taskbar.py:684 +#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684 msgid "Retrieving Application Menu..." msgstr "Henter Applikationsmenu" -#: ../pyhoca/wxgui/menus_taskbar.py:550 -#: ../pyhoca/wxgui/menus_taskbar.py:687 +#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687 msgid "Retrieve Application Menu" msgstr "Hent Applikationsmenu" @@ -933,56 +883,55 @@ msgstr "Start en enkelt Applikation" msgid "Manage Application Menu" msgstr "Håndter Applikationsmenu" -#: ../pyhoca/wxgui/menus_taskbar.py:714 +#: ../pyhoca/wxgui/menus_taskbar.py:726 msgid "Running" msgstr "Kører" -#: ../pyhoca/wxgui/menus_taskbar.py:716 +#: ../pyhoca/wxgui/menus_taskbar.py:728 msgid "Suspended" msgstr "Suspenderet" -#: ../pyhoca/wxgui/menus_taskbar.py:735 +#: ../pyhoca/wxgui/menus_taskbar.py:747 msgid "&Clean all sessions" msgstr "&Rens alle sessioner" -#: ../pyhoca/wxgui/menus_taskbar.py:741 +#: ../pyhoca/wxgui/menus_taskbar.py:753 msgid "Customize &profile" msgstr "Tilpas &profil" -#: ../pyhoca/wxgui/menus_taskbar.py:756 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "Shared &folders" msgstr "Delte &mapper" -#: ../pyhoca/wxgui/menus_taskbar.py:768 +#: ../pyhoca/wxgui/menus_taskbar.py:780 msgid "&Disconnect from Server" msgstr "&Afbryd forbindelse til Server" -#: ../pyhoca/wxgui/menus_taskbar.py:775 +#: ../pyhoca/wxgui/menus_taskbar.py:787 msgid "Suspend Session and E&xit application" msgstr "Suspendér Session og L&uk applikation" -#: ../pyhoca/wxgui/menus_taskbar.py:779 +#: ../pyhoca/wxgui/menus_taskbar.py:791 msgid "Disconnect and E&xit application" msgstr "Afbryd forbindese og L&uk programmet" -#: ../pyhoca/wxgui/menus_taskbar.py:833 +#: ../pyhoca/wxgui/menus_taskbar.py:845 msgid "Add Profile" msgstr "Tilføj Profil" -#: ../pyhoca/wxgui/menus_taskbar.py:909 +#: ../pyhoca/wxgui/menus_taskbar.py:921 msgid "No session profiles defined" msgstr "Ingen sessionsprofiler er defineret" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Start/Resume Session" msgstr "Start/Genoptag Session" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Connect Server" msgstr "Forbind Server" -#: ../pyhoca/wxgui/about.py:78 -#: ../pyhoca/wxgui/about.py:80 +#: ../pyhoca/wxgui/about.py:78 ../pyhoca/wxgui/about.py:80 #, python-format msgid "About %s ..." msgstr "Om %s" @@ -1014,8 +963,11 @@ msgid "SSH key authentication has been successful." msgstr "SSH nøgleautentificering lykkedes" #: ../pyhoca/wxgui/frontend.py:650 -msgid "The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "SSH proxy'ens værstnøgle er ugyldig eller er ikke blevet accepteret af brugeren" +msgid "" +"The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "" +"SSH proxy'ens værstnøgle er ugyldig eller er ikke blevet accepteret af " +"brugeren" #: ../pyhoca/wxgui/frontend.py:671 #, python-format @@ -1061,8 +1013,7 @@ msgstr "" msgid "Unknown session profile, configure before using it..." msgstr "Ukendt sessionsprofil, konfigurér den før brug..." -#: ../pyhoca/wxgui/frontend.py:798 -#: ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "%s - session warning" msgstr "%s - sessionsadvarsel" @@ -1089,26 +1040,26 @@ msgstr "X2Go Profil er nu afbrudt" msgid "New Session Profile" msgstr "Ny Sessionsprofil" -#: ../pyhoca/wxgui/frontend.py:1047 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Er du sikker på at du vil slette Sessionsprofilen ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 #, python-format msgid "%s - profile deleted" msgstr "%s - profil slettet" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 msgid "The session profile has been deleted." msgstr "Sessionsprofilen er blevet slettet" -#: ../pyhoca/wxgui/frontend.py:1071 +#: ../pyhoca/wxgui/frontend.py:1075 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - del lokale mappe med sessioner i denne profil" -#: ../pyhoca/wxgui/frontend.py:1224 +#: ../pyhoca/wxgui/frontend.py:1228 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1121,39 +1072,40 @@ msgstr "" "\n" "Are you sure you want to continue connecting?" -#: ../pyhoca/wxgui/frontend.py:1232 +#: ../pyhoca/wxgui/frontend.py:1236 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Bekræft Værtsautorisering" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "%s - channel error" msgstr "%s - kanalfejl" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format -msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -msgstr "Mistede forbindelsen til server %s! Prøv at re-autentificere til serveren..." +msgid "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." +msgstr "" +"Mistede forbindelsen til server %s! Prøv at re-autentificere til serveren..." -#: ../pyhoca/wxgui/frontend.py:1295 -#: ../pyhoca/wxgui/frontend.py:1313 -#: ../pyhoca/wxgui/frontend.py:1315 -#: ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1299 ../pyhoca/wxgui/frontend.py:1317 +#: ../pyhoca/wxgui/frontend.py:1319 ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "%s - session failure" msgstr "%s - sessionen fejlede" -#: ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1299 msgid "The session startup failed." msgstr "Sessionsopstarten fejlede" -#: ../pyhoca/wxgui/frontend.py:1313 +#: ../pyhoca/wxgui/frontend.py:1317 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Kommandoen ,,%s'' er ikke tilgængelig på X2Go server" -#: ../pyhoca/wxgui/frontend.py:1315 +#: ../pyhoca/wxgui/frontend.py:1319 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1162,45 +1114,54 @@ msgstr "" "Kommandoen ,,%s'' er ikke tilgængelig på X2Go server\n" "%s." -#: ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:1336 #, python-format -msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." -msgstr "Omvendt TCP port forwarding forespørgsel for session %s til serverport %s blev afvist" +msgid "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." +msgstr "" +"Omvendt TCP port forwarding forespørgsel for session %s til serverport %s " +"blev afvist" -#: ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1355 #, python-format -msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2Go/SSH server. Session startup failed." -msgstr "Forwarding tunnel forespørgsler til [%s]:%s til session %s blev nægtet af X2Go/SSH fjernserveren. Sessionsstartop fejlede." +msgid "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2Go/SSH server. Session startup failed." +msgstr "" +"Forwarding tunnel forespørgsler til [%s]:%s til session %s blev nægtet af " +"X2Go/SSH fjernserveren. Sessionsstartop fejlede." -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 #, python-format msgid "%s - audio warning" msgstr "%s - lydadvarsel" -#: ../pyhoca/wxgui/frontend.py:1370 -msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions." -msgstr "X2Go PulseAudio systemet er ikke tilgængeligt i Remote Desktop sessioner" +#: ../pyhoca/wxgui/frontend.py:1374 +msgid "" +"The X2Go PulseAudio system is not available within Remote Desktop sessions." +msgstr "" +"X2Go PulseAudio systemet er ikke tilgængeligt i Remote Desktop sessioner" -#: ../pyhoca/wxgui/frontend.py:1377 -#: ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1381 ../pyhoca/wxgui/frontend.py:1388 #, python-format msgid "%s - audio error" msgstr "%s - lydfejl" -#: ../pyhoca/wxgui/frontend.py:1377 +#: ../pyhoca/wxgui/frontend.py:1381 msgid "The X2Go PulseAudio system could not be started." msgstr "X2Go PulseAudio systemet kunne ikke startes" -#: ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1388 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "X2Go PulseAudio systemet døde uforventet" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "%s - audio problem" msgstr "%s - lydproblem" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1209,12 +1170,12 @@ msgstr "" "Lydforbindelsen kunne ikke opsættes for denne session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "%s - client-side printing not available" msgstr "%s - klient-udskrift ikke tilgængeligt" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1223,12 +1184,12 @@ msgstr "" "Serveren nægter klient-udskrift fra denne session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "%s - MIME box not available" msgstr "%s - MIME box ikke tilgængelig" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1237,12 +1198,12 @@ msgstr "" "Serveren undersøtter ikke X2Go MIME boxen.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - klientmapper ikke delbare" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1251,12 +1212,12 @@ msgstr "" "Serveren nægter klientmappe-deling i denne session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "%s - client resources not sharable" msgstr "%s - klientressourcer ikke delbare" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1265,13 +1226,12 @@ msgstr "" "Klientprintere og mapper kan ikke deles i denne session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1463 -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1467 ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "%s - print error" msgstr "%s - printerfejl" -#: ../pyhoca/wxgui/frontend.py:1463 +#: ../pyhoca/wxgui/frontend.py:1467 #, python-format msgid "" "%s\n" @@ -1282,7 +1242,7 @@ msgstr "" "... fejlede på printer %s pga. session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "" "%s\n" @@ -1293,13 +1253,12 @@ msgstr "" "...skyldes session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1484 ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1484 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1308,7 +1267,7 @@ msgstr "" "Ny X2Go session starter...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "" "Another client started X2Go session\n" @@ -1317,13 +1276,12 @@ msgstr "" "En anden klient startede X2Go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 -#: ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1514 ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "%s - resume" msgstr "%s - fortsæt" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1514 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1332,7 +1290,7 @@ msgstr "" "Genoptager X2Go session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1341,12 +1299,12 @@ msgstr "" "En anden klient genoptog X2Go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "%s - running" msgstr "%s - kører" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "" "Found already running session\n" @@ -1355,12 +1313,12 @@ msgstr "" "Fandt igangværende session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "%s - suspend" msgstr "%s - suspender" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1369,12 +1327,12 @@ msgstr "" "X2Go session er blevet suspenderet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "%s - terminate" msgstr "%s - terminer" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1383,7 +1341,7 @@ msgstr "" "X2Go session er blevet termineret\n" "%s" -#: ../pyhoca/wxgui/messages.py:73 +#: ../pyhoca/wxgui/messages.py:72 #, python-format msgid "" "Are you really sure you want to\n" @@ -1392,7 +1350,7 @@ msgstr "" "Er du sikke rpå at du vil \n" "slette sessionsprofilen ,,%s''?" -#: ../pyhoca/wxgui/messages.py:74 +#: ../pyhoca/wxgui/messages.py:73 #, python-format msgid "" "PyHoca-GUI is already running for user ,,%s''!\n" @@ -1407,16 +1365,15 @@ msgstr "" "bruger. PyHoca-GUI ikonet kan findes i dit skrivebord's\n" "notifikationsområde/systray" -#: ../pyhoca/wxgui/messages.py:107 +#: ../pyhoca/wxgui/messages.py:106 msgid "Yes" msgstr "Ja" -#: ../pyhoca/wxgui/messages.py:108 +#: ../pyhoca/wxgui/messages.py:107 msgid "No" msgstr "Nej" -#: ../pyhoca/wxgui/messages.py:125 -#: ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "Ok" @@ -1519,6 +1476,21 @@ msgstr "Skift sessionsitel til" msgid "OK" msgstr "OK" +#~ msgid "SSH Proxy Tunnel" +#~ msgstr "SSH Proxy Tunnel" + +#~ msgid "The SSH proxy configuration is incomplete. Try again." +#~ msgstr "SSH proxy konfigurationen er ikke komplet. Prøv igen" + +#~ msgid "" +#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH " +#~ "proxy to.\n" +#~ "Please change the SSH proxy settings accordingly." +#~ msgstr "" +#~ "En anden sessionsprofil (%s) bruger i forvejen [%s]:%s til at binde en " +#~ "lokal proxy.\n" +#~ "Tilpas venligst SSH proxy indstillingerne." + #, fuzzy #~ msgid "Remember shared folders" #~ msgstr "Delte &mapper" diff --git a/po/de.po b/po/de.po index 14cea70..22b967f 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 14:25+0100\n" +"POT-Creation-Date: 2013-01-04 11:42+0100\n" "PO-Revision-Date: 2012-11-26 14:23+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -49,8 +49,8 @@ msgstr "Sitzungslogin" msgid "SSH proxy server login" msgstr "Anmeldung an SSH Proxy" -#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350 -#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:356 +#: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Abbrechen" @@ -219,7 +219,7 @@ msgstr "Windows Terminalserver (RDP via X2Go-Proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (Direktes RDP)" -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:236 msgid "Custom command" msgstr "Benutzerdef. Kommando" @@ -256,228 +256,224 @@ msgid "settings derived from " msgstr "Einstellungen übernommen von" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Session Title" msgstr "Sitzungstitel" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Session Window" msgstr "Sitzungsfenster" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Session Startup" msgstr "Sitzungsstart" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Proxy" msgstr "Proxy" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Connection Link Speed" msgstr "Verbindungsgeschwindigkeit" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Compression" msgstr "Komprimierung" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:186 msgid "Display" msgstr "Anzeige" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Keyboard" msgstr "Tastatur" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Sound" msgstr "Audio" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "Printing" msgstr "Drucken" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "Folder Exports" msgstr "Ordnerfreigabe" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "File Import" msgstr "Dateiimport" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Name" msgstr "Name" -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Set session window title" msgstr "Sitzungsfenstertitel setzen" -#: ../pyhoca/wxgui/profilemanager.py:192 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Use a default session window title" msgstr "Standardtitel für Sitzungsfenster" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "Custom session window title" msgstr "Sitzungstitel anpassen" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Window Icon" msgstr "Fenstersymbol" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Start session automatically after login" msgstr "Sitzung nach Anmeldung automatisch starten" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:231 #, python-format msgid "Login automatically after %s has started" msgstr "Automatisch anmelden nach %s Programmstart" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Type" msgstr "Typ" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Application" msgstr "Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "XDMCP server" msgstr "XDMCP Server" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "RDP server" msgstr "RDP Server" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "RDP options" msgstr "RDP Optionen" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" "Serverseitige Anwendung(en) in lokalen Desktop integrieren (sog. rootless " "Modus)" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Menu of published applications" msgstr "Menü mit Server-publizierten Anwendungen" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:252 ../pyhoca/wxgui/profilemanager.py:265 msgid "User" msgstr "Benutzer" -#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:254 ../pyhoca/wxgui/profilemanager.py:272 msgid "Host" msgstr "Hostname" -#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:256 ../pyhoca/wxgui/profilemanager.py:274 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Key" msgstr "Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Discover SSH keys or use SSH agent for X2Go authentication" msgstr "Finde SSH Schlüssel oder verwende SSH Agent für X2Go-Anmeldung" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Enable forwarding of SSH authentication agent connections" msgstr "Weiterleitung von SSH Agent Authentifizierungsanfragen" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Server behind SSH proxy" msgstr "Server hinter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "Use same username for X2Go and proxy host" msgstr "Verwende gleichen Anmeldenamen für X2Go Server und Proxy" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Use same authentication for X2Go and proxy host" msgstr "Verwende die gleichen Anmeldeinformationen für X2Go Server und Proxy" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Key file" msgstr "Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:264 -msgid "SSH Proxy Tunnel" -msgstr "SSH-Proxytunnel" - -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Discover SSH keys or use SSH agent for proxy authentication" msgstr "Find SSH Schlüssel oder verwende SSH Agent für Proxy-Anmeldung" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:285 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Image quality" msgstr "Bildqualität" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Fullscreen" msgstr "Vollbild" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Maximized" msgstr "Maximiert" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Custom Size" msgstr "Benutzerdefinierte Größe" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "Set display DPI" msgstr "DPI-Wert für Anzeige setzen" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" "Keine Einstellungen (zum Konfigurieren der Tastatur müssen Server-seitige " "Tools verwendet werden)" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -485,247 +481,229 @@ msgstr "" "Tastaturkonfiguration dieses Computers automatisch erkennen und in der " "Sitzung verwenden" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Use custom keyboard settings as provided below" msgstr "Tastatureinstellungen der Sitzung wie folgt anpassen" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:305 msgid "Keyboard model" msgstr "Tastaturmodell" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:307 msgid "Layout" msgstr "Layout" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Layout variant" msgstr "Layoutvariante" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "Enable sound support" msgstr "Audiounterstützung aktivieren" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "Arts (not supported)" msgstr "Arts (nicht unterstützt)" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:319 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "Use default sound port" msgstr "Standard Audio-Port verwenden" -#: ../pyhoca/wxgui/profilemanager.py:315 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Custom sound port" msgstr "Benutzerdefinierter Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Use local folder sharing" msgstr "Lokale Ordnerfreigabe verwenden" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Store share list at end of session" msgstr "Freigabenliste nach Sitzungsende speichern" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:326 msgid "Path" msgstr "Pfad" -#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:350 msgid "Add" msgstr "Hinzufügen" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Local Path" msgstr "Lokaler Pfad" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Connect Method" msgstr "Verbindungsart" -#: ../pyhoca/wxgui/profilemanager.py:327 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Delete" msgstr "Entfernen" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:335 msgid "Convert between client and server encodings" msgstr "Zeichenkodierung zwischen Server und Client übersetzen" -#: ../pyhoca/wxgui/profilemanager.py:330 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Client encoding" msgstr "Zeichenkodierung Client" -#: ../pyhoca/wxgui/profilemanager.py:332 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Server encoding" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Use file MIME box for local file import" msgstr "MIME-Box für lokalen Dateiimport verwenden" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:342 msgid "Extensions" msgstr "Erweiterungen" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Action" msgstr "Aktion" -#: ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Client Side printing" msgstr "Unterstützung für lokale Druckeranbindung" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:351 msgid "Defaults" msgstr "Standardwerte" -#: ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/profilemanager.py:353 msgid "Save" msgstr "Speichern" -#: ../pyhoca/wxgui/profilemanager.py:348 +#: ../pyhoca/wxgui/profilemanager.py:354 msgid "Reset" msgstr "Zurücksetzen" -#: ../pyhoca/wxgui/profilemanager.py:401 -#: ../pyhoca/wxgui/profilemanager.py:1124 -#: ../pyhoca/wxgui/profilemanager.py:2268 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:2190 msgid "automatically" msgstr "automatisch" -#: ../pyhoca/wxgui/profilemanager.py:403 -#: ../pyhoca/wxgui/profilemanager.py:1126 +#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:1101 msgid "manually" msgstr "manuell" -#: ../pyhoca/wxgui/profilemanager.py:412 +#: ../pyhoca/wxgui/profilemanager.py:416 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profilmanager - neues Sitzungsprofil" -#: ../pyhoca/wxgui/profilemanager.py:414 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profilmanager - %s (verbunden)" -#: ../pyhoca/wxgui/profilemanager.py:416 +#: ../pyhoca/wxgui/profilemanager.py:420 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profilmanager - %s" -#: ../pyhoca/wxgui/profilemanager.py:797 +#: ../pyhoca/wxgui/profilemanager.py:784 msgid "Profile" msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:798 +#: ../pyhoca/wxgui/profilemanager.py:785 msgid "Session" msgstr "Sitzung" -#: ../pyhoca/wxgui/profilemanager.py:799 +#: ../pyhoca/wxgui/profilemanager.py:786 msgid "Connection" msgstr "Verbindung" -#: ../pyhoca/wxgui/profilemanager.py:800 +#: ../pyhoca/wxgui/profilemanager.py:787 msgid "Link Quality" msgstr "Verbindungsqualität" -#: ../pyhoca/wxgui/profilemanager.py:801 +#: ../pyhoca/wxgui/profilemanager.py:788 msgid "Settings" msgstr "Einstellungen" -#: ../pyhoca/wxgui/profilemanager.py:802 +#: ../pyhoca/wxgui/profilemanager.py:789 msgid "Sharing" msgstr "Freigaben" -#: ../pyhoca/wxgui/profilemanager.py:988 +#: ../pyhoca/wxgui/profilemanager.py:963 msgid "<xkbtype>" msgstr "pc105/de" -#: ../pyhoca/wxgui/profilemanager.py:989 +#: ../pyhoca/wxgui/profilemanager.py:964 msgid "<xkblayout>" msgstr "de" -#: ../pyhoca/wxgui/profilemanager.py:990 +#: ../pyhoca/wxgui/profilemanager.py:965 msgid "<xkbvariant>" msgstr "nodeadkeys" -#: ../pyhoca/wxgui/profilemanager.py:1444 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Dateien (*.png)|*.png|Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1447 +#: ../pyhoca/wxgui/profilemanager.py:1416 msgid "Choose an icon for this session profile" msgstr "Sitzungs-Icon für dieses Sitzungsprofil auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1816 +#: ../pyhoca/wxgui/profilemanager.py:1776 msgid "All files (*.*)|*" msgstr "Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1818 -#: ../pyhoca/wxgui/profilemanager.py:1842 +#: ../pyhoca/wxgui/profilemanager.py:1778 +#: ../pyhoca/wxgui/profilemanager.py:1802 msgid "Choose a public SSH key" msgstr "Öffentlichen SSH-Schlüssel auswählen" -#: ../pyhoca/wxgui/profilemanager.py:2220 +#: ../pyhoca/wxgui/profilemanager.py:2142 msgid "Choose a folder to share within a session" msgstr "Ordner zur Freigabe für Sitzungen auswählen" -#: ../pyhoca/wxgui/profilemanager.py:2348 -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 -#: ../pyhoca/wxgui/profilemanager.py:2359 -#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117 +#: ../pyhoca/wxgui/profilemanager.py:2270 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 ../pyhoca/wxgui/menus_taskbar.py:117 msgid "Profile Manager" msgstr "Profilmanager" -#: ../pyhoca/wxgui/profilemanager.py:2348 +#: ../pyhoca/wxgui/profilemanager.py:2270 msgid "Profile name is missing, profile unusable!!!" msgstr "Der Profilname fehlt, Profil so nicht verwendbar!!!" -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 #, python-format msgid "Profile name %s already exists!!!" msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!" -#: ../pyhoca/wxgui/profilemanager.py:2359 -msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "" -"Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." - -#: ../pyhoca/wxgui/profilemanager.py:2369 -#, python-format -msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" -"Please change the SSH proxy settings accordingly." -msgstr "" -"Ein anderes Profil (%s) verwendet die Socketadresse [%s]:%s bereits, um " -"einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy " -"Einstellungen entsprechend ändern." - -#: ../pyhoca/wxgui/profilemanager.py:2396 +#: ../pyhoca/wxgui/profilemanager.py:2303 #, python-format msgid "%s - profile added" msgstr "%s - Profil hinzugefügt" -#: ../pyhoca/wxgui/profilemanager.py:2397 +#: ../pyhoca/wxgui/profilemanager.py:2304 msgid "A new session profile has been added." msgstr "Ein neues Sitzungsprofil wurde hinzugefügt." -#: ../pyhoca/wxgui/profilemanager.py:2401 +#: ../pyhoca/wxgui/profilemanager.py:2308 #, python-format msgid "%s - modified" msgstr "%s - modifiziert" -#: ../pyhoca/wxgui/profilemanager.py:2402 +#: ../pyhoca/wxgui/profilemanager.py:2309 msgid "Changes to profile have been saved." msgstr "Änderungen am Profil wurden übernommen." @@ -758,8 +736,8 @@ msgstr "Druckeinstellungen" msgid "Client Options" msgstr "Optionen" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:795 +#: ../pyhoca/wxgui/menus_taskbar.py:987 msgid "E&xit" msgstr "&Beenden" @@ -912,51 +890,51 @@ msgstr "Einzelne Anwendung starten" msgid "Manage Application Menu" msgstr "Anwendungsmenü verwalten" -#: ../pyhoca/wxgui/menus_taskbar.py:714 +#: ../pyhoca/wxgui/menus_taskbar.py:726 msgid "Running" msgstr "aktiv" -#: ../pyhoca/wxgui/menus_taskbar.py:716 +#: ../pyhoca/wxgui/menus_taskbar.py:728 msgid "Suspended" msgstr "angehalten" -#: ../pyhoca/wxgui/menus_taskbar.py:735 +#: ../pyhoca/wxgui/menus_taskbar.py:747 msgid "&Clean all sessions" msgstr "Alle Sitzungen beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:741 +#: ../pyhoca/wxgui/menus_taskbar.py:753 msgid "Customize &profile" msgstr "Sitzungsprofil anpassen" -#: ../pyhoca/wxgui/menus_taskbar.py:756 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "Shared &folders" msgstr "Freigegebene Ordner" -#: ../pyhoca/wxgui/menus_taskbar.py:768 +#: ../pyhoca/wxgui/menus_taskbar.py:780 msgid "&Disconnect from Server" msgstr "Von Server trennen" -#: ../pyhoca/wxgui/menus_taskbar.py:775 +#: ../pyhoca/wxgui/menus_taskbar.py:787 msgid "Suspend Session and E&xit application" msgstr "Sitzung anhalten und Anwendung beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:779 +#: ../pyhoca/wxgui/menus_taskbar.py:791 msgid "Disconnect and E&xit application" msgstr "Verbindung Trennen und Anwendung schließen" -#: ../pyhoca/wxgui/menus_taskbar.py:833 +#: ../pyhoca/wxgui/menus_taskbar.py:845 msgid "Add Profile" msgstr "Sitzungsprofil hinzufügen" -#: ../pyhoca/wxgui/menus_taskbar.py:909 +#: ../pyhoca/wxgui/menus_taskbar.py:921 msgid "No session profiles defined" msgstr "keine Sitzungsprofile definiert" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Start/Resume Session" msgstr "Sitzung starten/fortsetzen" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Connect Server" msgstr "Serververbindung aufbauen" @@ -1044,7 +1022,7 @@ msgstr "" msgid "Unknown session profile, configure before using it..." msgstr "Unbekanntes Sitzungsprofil, vor Benutzung bitte einrichten..." -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "%s - session warning" msgstr "%s - Sitzungsfunktion eingeschränkt" @@ -1071,26 +1049,26 @@ msgstr "X2Go Profil ist nun nicht mehr verbunden." msgid "New Session Profile" msgstr "Neues Sitzungsprofil" -#: ../pyhoca/wxgui/frontend.py:1047 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Das Sitzungsprofil ,,%s'' wirklich löschen?" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 #, python-format msgid "%s - profile deleted" msgstr "%s - Profil gelöscht" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 msgid "The session profile has been deleted." msgstr "Das Sitzungsprofil wurde gelöscht." -#: ../pyhoca/wxgui/frontend.py:1071 +#: ../pyhoca/wxgui/frontend.py:1075 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - lokalen Ordner für dieses Sitzungsprofile freigeben" -#: ../pyhoca/wxgui/frontend.py:1224 +#: ../pyhoca/wxgui/frontend.py:1228 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1103,17 +1081,17 @@ msgstr "" "\n" "Sind Sie sicher, dass sie fortfahren möchten? " -#: ../pyhoca/wxgui/frontend.py:1232 +#: ../pyhoca/wxgui/frontend.py:1236 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Echtheit des Servers bestätigen" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "%s - channel error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1122,22 +1100,22 @@ msgstr "" "Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen " "Sie, sich neu am Server anzumelden..." -#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313 -#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1299 ../pyhoca/wxgui/frontend.py:1317 +#: ../pyhoca/wxgui/frontend.py:1319 ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "%s - session failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1299 msgid "The session startup failed." msgstr "Der Start der Sitzung ist fehlgeschlagen." -#: ../pyhoca/wxgui/frontend.py:1313 +#: ../pyhoca/wxgui/frontend.py:1317 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Der Befehl ,,%s'' ist auf dem X2Go Server nicht verfügbar." -#: ../pyhoca/wxgui/frontend.py:1315 +#: ../pyhoca/wxgui/frontend.py:1319 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1146,7 +1124,7 @@ msgstr "" "Der Befehl ,,%s'' ist auf dem X2Go Server nicht verfügbar\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1155,7 +1133,7 @@ msgstr "" "Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s " "wurde vom X2Go Server abgelehnt." -#: ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1164,37 +1142,37 @@ msgstr "" "SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2Go/SSH Server " "verweigert. Die Sitzung konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 #, python-format msgid "%s - audio warning" msgstr "%s - Warnung Audiosystem" -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "Das X2Go PulseAudio System ist innerhalb von Remote Desktop Sitzungen nicht " "verfügbar." -#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1381 ../pyhoca/wxgui/frontend.py:1388 #, python-format msgid "%s - audio error" msgstr "%s - Audiofehler" -#: ../pyhoca/wxgui/frontend.py:1377 +#: ../pyhoca/wxgui/frontend.py:1381 msgid "The X2Go PulseAudio system could not be started." msgstr "Das X2Go PulseAudio System konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1388 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "Das X2Go PulseAudio System ist soeben abgestürzt." -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "%s - audio problem" msgstr "%s - Audioproblem" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1203,12 +1181,12 @@ msgstr "" "Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "%s - client-side printing not available" msgstr "%s - Client-seitiges Drucken nicht verfügbar" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1218,12 +1196,12 @@ msgstr "" "Server verweigert die Verbindung.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "%s - MIME box not available" msgstr "%s - MIME box nicht verfügbar" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1232,12 +1210,12 @@ msgstr "" "Der Server unterstützt die X2Go MIME box nicht.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - keine Freigabe Client-seitiger Ordner" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1247,12 +1225,12 @@ msgstr "" "Server verweigert die Verbindung.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "%s - client resources not sharable" msgstr "%s - keine Client-seitigen Ordner- und Druckerfreigaben möglich" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1262,12 +1240,12 @@ msgstr "" "werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1467 ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "%s - print error" msgstr "%s - Druckfehler" -#: ../pyhoca/wxgui/frontend.py:1463 +#: ../pyhoca/wxgui/frontend.py:1467 #, python-format msgid "" "%s\n" @@ -1278,7 +1256,7 @@ msgstr "" "...verursacht an Drucker durch Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "" "%s\n" @@ -1289,12 +1267,12 @@ msgstr "" "...verursacht von Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1484 ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "%s - start" msgstr "%s - starten" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1484 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1303,7 +1281,7 @@ msgstr "" "Neue X2Go Sitzung wird gestartet...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "" "Another client started X2Go session\n" @@ -1312,12 +1290,12 @@ msgstr "" "Ein anderes X2Go Programm hat diese Sitzung gestartet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1514 ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "%s - resume" msgstr "%s - fortsetzen" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1514 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1326,7 +1304,7 @@ msgstr "" "X2Go Sitzung wird fortgesetzt...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1335,12 +1313,12 @@ msgstr "" "Eine andere X2Go Anwendung hat die Sitzung fortgesetzt\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "" "Found already running session\n" @@ -1349,12 +1327,12 @@ msgstr "" "Bereits aktive Sitzung gefunden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "%s - suspend" msgstr "%s - anhalten" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1363,12 +1341,12 @@ msgstr "" "X2Go Sitzung wurde angehalten\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "%s - terminate" msgstr "%s - beenden" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1377,7 +1355,7 @@ msgstr "" "X2Go Sitzung wurde beendet\n" "%s" -#: ../pyhoca/wxgui/messages.py:73 +#: ../pyhoca/wxgui/messages.py:72 #, python-format msgid "" "Are you really sure you want to\n" @@ -1387,7 +1365,7 @@ msgstr "" "das Sitzungsprofil ,,%s''\n" "wirklich löschen möchten?" -#: ../pyhoca/wxgui/messages.py:74 +#: ../pyhoca/wxgui/messages.py:73 #, python-format msgid "" "PyHoca-GUI is already running for user ,,%s''!\n" @@ -1402,15 +1380,15 @@ msgstr "" "gestartet werden. Das PyHoca-GUI Icon befindet sich auf\n" "Ihrem Desktop in der Benachrichtigungsleiste." -#: ../pyhoca/wxgui/messages.py:107 +#: ../pyhoca/wxgui/messages.py:106 msgid "Yes" msgstr "Ja" -#: ../pyhoca/wxgui/messages.py:108 +#: ../pyhoca/wxgui/messages.py:107 msgid "No" msgstr "Nein" -#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "OK" @@ -1513,6 +1491,22 @@ msgstr "Sitzungsfenster umbenennen in" msgid "OK" msgstr "Ok" +#~ msgid "SSH Proxy Tunnel" +#~ msgstr "SSH-Proxytunnel" + +#~ msgid "The SSH proxy configuration is incomplete. Try again." +#~ msgstr "" +#~ "Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." + +#~ msgid "" +#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH " +#~ "proxy to.\n" +#~ "Please change the SSH proxy settings accordingly." +#~ msgstr "" +#~ "Ein anderes Profil (%s) verwendet die Socketadresse [%s]:%s bereits, um " +#~ "einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy " +#~ "Einstellungen entsprechend ändern." + #, fuzzy #~ msgid "Remember shared folders" #~ msgstr "Freigegebene Ordner" diff --git a/po/en.po b/po/en.po index d7a1730..cc2f838 100644 --- a/po/en.po +++ b/po/en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 14:25+0100\n" +"POT-Creation-Date: 2013-01-04 11:42+0100\n" "PO-Revision-Date: 2012-11-26 14:22+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -49,8 +49,8 @@ msgstr "Session login" msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350 -#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:356 +#: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Cancel" @@ -219,7 +219,7 @@ msgstr "Windows Terminal Server (X2Go-proxied RDP)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (Direct RDP)" -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:236 msgid "Custom command" msgstr "Custom command" @@ -256,224 +256,220 @@ msgid "settings derived from " msgstr "settings derived from " #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Session Title" msgstr "Session Title" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Session Window" msgstr "Session Window" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Session Startup" msgstr "Session Startup" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Proxy" msgstr "Proxy" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Connection Link Speed" msgstr "Connection Link Speed" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Compression" msgstr "Compression" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:186 msgid "Display" msgstr "Display" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Keyboard" msgstr "Keyboard" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Sound" msgstr "Sound" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "Printing" msgstr "Printing" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "Folder Exports" msgstr "Folder Exports" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "File Import" msgstr "File Import" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Name" msgstr "Name" -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Set session window title" msgstr "Set session window title" -#: ../pyhoca/wxgui/profilemanager.py:192 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Use a default session window title" msgstr "Use a default session window title" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "Custom session window title" msgstr "Custom session window title" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Window Icon" msgstr "Window Icon" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Start session automatically after login" msgstr "Start session automatically after login" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:231 #, python-format msgid "Login automatically after %s has started" msgstr "Login automatically after %s has started" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Application" msgstr "Application" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "XDMCP server" msgstr "XDMCP server" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "RDP server" msgstr "RDP server" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "RDP options" msgstr "RDP options" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "ntegrate remote application(s) into local desktop (rootless mode)" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Menu of published applications" msgstr "Menu of published applications" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:252 ../pyhoca/wxgui/profilemanager.py:265 msgid "User" msgstr "User" -#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:254 ../pyhoca/wxgui/profilemanager.py:272 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:256 ../pyhoca/wxgui/profilemanager.py:274 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Key" msgstr "Key" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Discover SSH keys or use SSH agent for X2Go authentication" msgstr "Discover SSH keys or use SSH agent for X2Go authentication" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Enable forwarding of SSH authentication agent connections" msgstr "Enable forwarding of SSH authentication agent connections" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Server behind SSH proxy" msgstr "Server behind SSH proxy" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "Use same username for X2Go and proxy host" msgstr "Use same username for X2Go and proxy host" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Use same authentication for X2Go and proxy host" msgstr "Use same authentication for X2Go and proxy host" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Key file" msgstr "Key file" -#: ../pyhoca/wxgui/profilemanager.py:264 -msgid "SSH Proxy Tunnel" -msgstr "SSH Proxy Tunnel" - -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Discover SSH keys or use SSH agent for proxy authentication" msgstr "Discover SSH keys or use SSH agent for proxy authentication" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:285 msgid "Method" msgstr "Method" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Image quality" msgstr "Image quality" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Maximized" msgstr "Maximized" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Custom Size" msgstr "Custom Size" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "Set display DPI" msgstr "Set display DPI" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Do not set (use server-side tools to configure the keyboard)" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -481,246 +477,229 @@ msgstr "" "Automatically detect and use client-side keyboard configuration inside the " "session" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Use custom keyboard settings as provided below" msgstr "Use custom keyboard settings as provided below" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:305 msgid "Keyboard model" msgstr "Keyboard model" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:307 msgid "Layout" msgstr "Layout" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Layout variant" msgstr "Layout variant" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "Enable sound support" msgstr "Enable sound support" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "Arts (not supported)" msgstr "Arts (not supported)" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:319 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "Use default sound port" msgstr "Use default sound port" -#: ../pyhoca/wxgui/profilemanager.py:315 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Custom sound port" msgstr "Custom sound port" -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Use local folder sharing" msgstr "Use local folder sharing" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Store share list at end of session" msgstr "Store share list at end of session" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:326 msgid "Path" msgstr "Path" -#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:350 msgid "Add" msgstr "Add" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Local Path" msgstr "Local Path" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Connect Method" msgstr "Connect Method" -#: ../pyhoca/wxgui/profilemanager.py:327 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Delete" msgstr "Delete" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:335 msgid "Convert between client and server encodings" msgstr "Convert between client and server encodings" -#: ../pyhoca/wxgui/profilemanager.py:330 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:332 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Use file MIME box for local file import" msgstr "Use file MIME box for local file import" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:342 msgid "Extensions" msgstr "Extensions" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Action" msgstr "Action" -#: ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Client Side printing" msgstr "Client Side printing" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:351 msgid "Defaults" msgstr "Defaults" -#: ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/profilemanager.py:353 msgid "Save" msgstr "Save" -#: ../pyhoca/wxgui/profilemanager.py:348 +#: ../pyhoca/wxgui/profilemanager.py:354 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:401 -#: ../pyhoca/wxgui/profilemanager.py:1124 -#: ../pyhoca/wxgui/profilemanager.py:2268 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:2190 msgid "automatically" msgstr "automatically" -#: ../pyhoca/wxgui/profilemanager.py:403 -#: ../pyhoca/wxgui/profilemanager.py:1126 +#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:1101 msgid "manually" msgstr "manually" -#: ../pyhoca/wxgui/profilemanager.py:412 +#: ../pyhoca/wxgui/profilemanager.py:416 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profile Manager - new profile" -#: ../pyhoca/wxgui/profilemanager.py:414 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profile Manager - %s (connected)" -#: ../pyhoca/wxgui/profilemanager.py:416 +#: ../pyhoca/wxgui/profilemanager.py:420 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profile Manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:797 +#: ../pyhoca/wxgui/profilemanager.py:784 msgid "Profile" msgstr "Profile" -#: ../pyhoca/wxgui/profilemanager.py:798 +#: ../pyhoca/wxgui/profilemanager.py:785 msgid "Session" msgstr "Session" -#: ../pyhoca/wxgui/profilemanager.py:799 +#: ../pyhoca/wxgui/profilemanager.py:786 msgid "Connection" msgstr "Connection" -#: ../pyhoca/wxgui/profilemanager.py:800 +#: ../pyhoca/wxgui/profilemanager.py:787 msgid "Link Quality" msgstr "Link Quality" -#: ../pyhoca/wxgui/profilemanager.py:801 +#: ../pyhoca/wxgui/profilemanager.py:788 msgid "Settings" msgstr "Settings" -#: ../pyhoca/wxgui/profilemanager.py:802 +#: ../pyhoca/wxgui/profilemanager.py:789 msgid "Sharing" msgstr "Sharing" -#: ../pyhoca/wxgui/profilemanager.py:988 +#: ../pyhoca/wxgui/profilemanager.py:963 msgid "<xkbtype>" msgstr "pc105/us" -#: ../pyhoca/wxgui/profilemanager.py:989 +#: ../pyhoca/wxgui/profilemanager.py:964 msgid "<xkblayout>" msgstr "us" -#: ../pyhoca/wxgui/profilemanager.py:990 +#: ../pyhoca/wxgui/profilemanager.py:965 msgid "<xkbvariant>" msgstr "basic" -#: ../pyhoca/wxgui/profilemanager.py:1444 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Files (*.png)|*.png|All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1447 +#: ../pyhoca/wxgui/profilemanager.py:1416 msgid "Choose an icon for this session profile" msgstr "Choose an icon for this session profile" -#: ../pyhoca/wxgui/profilemanager.py:1816 +#: ../pyhoca/wxgui/profilemanager.py:1776 msgid "All files (*.*)|*" msgstr "All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1818 -#: ../pyhoca/wxgui/profilemanager.py:1842 +#: ../pyhoca/wxgui/profilemanager.py:1778 +#: ../pyhoca/wxgui/profilemanager.py:1802 msgid "Choose a public SSH key" msgstr "Choose a public SSH key" -#: ../pyhoca/wxgui/profilemanager.py:2220 +#: ../pyhoca/wxgui/profilemanager.py:2142 msgid "Choose a folder to share within a session" msgstr "Choose a folder to share within a session" -#: ../pyhoca/wxgui/profilemanager.py:2348 -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 -#: ../pyhoca/wxgui/profilemanager.py:2359 -#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117 +#: ../pyhoca/wxgui/profilemanager.py:2270 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 ../pyhoca/wxgui/menus_taskbar.py:117 msgid "Profile Manager" msgstr "Profile Manager" -#: ../pyhoca/wxgui/profilemanager.py:2348 +#: ../pyhoca/wxgui/profilemanager.py:2270 msgid "Profile name is missing, profile unusable!!!" msgstr "Profile name is missing, profile unusable!!!" -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profile name %s already exists!!!" -#: ../pyhoca/wxgui/profilemanager.py:2359 -msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "The SSH proxy configuration is incomplete. Try again." - -#: ../pyhoca/wxgui/profilemanager.py:2369 -#, python-format -msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" -"Please change the SSH proxy settings accordingly." -msgstr "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" -"Please change the SSH proxy settings accordingly." - -#: ../pyhoca/wxgui/profilemanager.py:2396 +#: ../pyhoca/wxgui/profilemanager.py:2303 #, python-format msgid "%s - profile added" msgstr "%s - profile added" -#: ../pyhoca/wxgui/profilemanager.py:2397 +#: ../pyhoca/wxgui/profilemanager.py:2304 msgid "A new session profile has been added." msgstr "A new session profile has been added." -#: ../pyhoca/wxgui/profilemanager.py:2401 +#: ../pyhoca/wxgui/profilemanager.py:2308 #, python-format msgid "%s - modified" msgstr "%s - modified" -#: ../pyhoca/wxgui/profilemanager.py:2402 +#: ../pyhoca/wxgui/profilemanager.py:2309 msgid "Changes to profile have been saved." msgstr "Changes to profile have been saved." @@ -753,8 +732,8 @@ msgstr "Printing Preferences" msgid "Client Options" msgstr "Client Options" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:795 +#: ../pyhoca/wxgui/menus_taskbar.py:987 msgid "E&xit" msgstr "E&xit" @@ -907,51 +886,51 @@ msgstr "Launch Single Application" msgid "Manage Application Menu" msgstr "Manage Application Menu" -#: ../pyhoca/wxgui/menus_taskbar.py:714 +#: ../pyhoca/wxgui/menus_taskbar.py:726 msgid "Running" msgstr "Running" -#: ../pyhoca/wxgui/menus_taskbar.py:716 +#: ../pyhoca/wxgui/menus_taskbar.py:728 msgid "Suspended" msgstr "Suspended" -#: ../pyhoca/wxgui/menus_taskbar.py:735 +#: ../pyhoca/wxgui/menus_taskbar.py:747 msgid "&Clean all sessions" msgstr "&Clean all sessions" -#: ../pyhoca/wxgui/menus_taskbar.py:741 +#: ../pyhoca/wxgui/menus_taskbar.py:753 msgid "Customize &profile" msgstr "Customize &profile" -#: ../pyhoca/wxgui/menus_taskbar.py:756 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "Shared &folders" msgstr "Shared &folders" -#: ../pyhoca/wxgui/menus_taskbar.py:768 +#: ../pyhoca/wxgui/menus_taskbar.py:780 msgid "&Disconnect from Server" msgstr "&Disconnect from Server" -#: ../pyhoca/wxgui/menus_taskbar.py:775 +#: ../pyhoca/wxgui/menus_taskbar.py:787 msgid "Suspend Session and E&xit application" msgstr "Suspend Session and E&xit application" -#: ../pyhoca/wxgui/menus_taskbar.py:779 +#: ../pyhoca/wxgui/menus_taskbar.py:791 msgid "Disconnect and E&xit application" msgstr "Disconnect and E&xit application" -#: ../pyhoca/wxgui/menus_taskbar.py:833 +#: ../pyhoca/wxgui/menus_taskbar.py:845 msgid "Add Profile" msgstr "Add Profile" -#: ../pyhoca/wxgui/menus_taskbar.py:909 +#: ../pyhoca/wxgui/menus_taskbar.py:921 msgid "No session profiles defined" msgstr "No session profiles defined" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Start/Resume Session" msgstr "Start/Resume Session" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Connect Server" msgstr "Connect Server" @@ -1036,7 +1015,7 @@ msgstr "" msgid "Unknown session profile, configure before using it..." msgstr "Unknown session profile, configure before using it..." -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "%s - session warning" msgstr "%s - session warning" @@ -1063,26 +1042,26 @@ msgstr "X2Go Profile is now disconnected." msgid "New Session Profile" msgstr "New Session Profile" -#: ../pyhoca/wxgui/frontend.py:1047 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Really Delete Session Profile ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 #, python-format msgid "%s - profile deleted" msgstr "%s - profile deleted" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 msgid "The session profile has been deleted." msgstr "The session profile has been deleted." -#: ../pyhoca/wxgui/frontend.py:1071 +#: ../pyhoca/wxgui/frontend.py:1075 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - share local folder with sessions of this profile" -#: ../pyhoca/wxgui/frontend.py:1224 +#: ../pyhoca/wxgui/frontend.py:1228 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1095,17 +1074,17 @@ msgstr "" "\n" "Are you sure you want to continue connecting?" -#: ../pyhoca/wxgui/frontend.py:1232 +#: ../pyhoca/wxgui/frontend.py:1236 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Confirm Host Authorization" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "%s - channel error" msgstr "%s - channel error" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1114,22 +1093,22 @@ msgstr "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." -#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313 -#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1299 ../pyhoca/wxgui/frontend.py:1317 +#: ../pyhoca/wxgui/frontend.py:1319 ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "%s - session failure" msgstr "%s - session failure" -#: ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1299 msgid "The session startup failed." msgstr "The session startup failed." -#: ../pyhoca/wxgui/frontend.py:1313 +#: ../pyhoca/wxgui/frontend.py:1317 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "The command ,,%s'' is not available on X2Go server." -#: ../pyhoca/wxgui/frontend.py:1315 +#: ../pyhoca/wxgui/frontend.py:1319 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1138,7 +1117,7 @@ msgstr "" "The command ,,%s'' is not available on X2Go server\n" "%s." -#: ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1147,7 +1126,7 @@ msgstr "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." -#: ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1156,36 +1135,36 @@ msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2Go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 #, python-format msgid "%s - audio warning" msgstr "%s - audio warning" -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." -#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1381 ../pyhoca/wxgui/frontend.py:1388 #, python-format msgid "%s - audio error" msgstr "%s - audio error" -#: ../pyhoca/wxgui/frontend.py:1377 +#: ../pyhoca/wxgui/frontend.py:1381 msgid "The X2Go PulseAudio system could not be started." msgstr "The X2Go PulseAudio system could not be started." -#: ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1388 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "The X2Go PulseAudio system has died unexpectedly." -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "%s - audio problem" msgstr "%s - audio problem" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1194,12 +1173,12 @@ msgstr "" "The audio connection could not be set up for this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "%s - client-side printing not available" msgstr "%s - client-side printing not available" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1208,12 +1187,12 @@ msgstr "" "The server denies client-side printing from within this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "%s - MIME box not available" msgstr "%s - MIME box not available" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1222,12 +1201,12 @@ msgstr "" "The server does not support the X2Go MIME box.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - client-side folders not sharable" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1236,12 +1215,12 @@ msgstr "" "The server denies client-side folder sharing with this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "%s - client resources not sharable" msgstr "%s - client resources not sharable" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1250,12 +1229,12 @@ msgstr "" "Client-side folders and printers cannot be shared with this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1467 ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "%s - print error" msgstr "%s - print error" -#: ../pyhoca/wxgui/frontend.py:1463 +#: ../pyhoca/wxgui/frontend.py:1467 #, python-format msgid "" "%s\n" @@ -1266,7 +1245,7 @@ msgstr "" "...caused on printer %s by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "" "%s\n" @@ -1277,12 +1256,12 @@ msgstr "" "...caused by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1484 ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1484 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1291,7 +1270,7 @@ msgstr "" "New X2Go session starting up...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "" "Another client started X2Go session\n" @@ -1300,12 +1279,12 @@ msgstr "" "Another client started X2Go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1514 ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "%s - resume" msgstr "%s - resume" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1514 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1314,7 +1293,7 @@ msgstr "" "Resuming X2Go session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1323,12 +1302,12 @@ msgstr "" "Another client resumed X2Go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "%s - running" msgstr "%s - running" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "" "Found already running session\n" @@ -1337,12 +1316,12 @@ msgstr "" "Found already running session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1351,12 +1330,12 @@ msgstr "" "X2Go Session has been suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "%s - terminate" msgstr "%s - terminate" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1365,7 +1344,7 @@ msgstr "" "X2Go Session has terminated\n" "%s" -#: ../pyhoca/wxgui/messages.py:73 +#: ../pyhoca/wxgui/messages.py:72 #, python-format msgid "" "Are you really sure you want to\n" @@ -1374,7 +1353,7 @@ msgstr "" "Are you really sure you want to\n" "delete the session profile ,,%s''?" -#: ../pyhoca/wxgui/messages.py:74 +#: ../pyhoca/wxgui/messages.py:73 #, python-format msgid "" "PyHoca-GUI is already running for user ,,%s''!\n" @@ -1389,15 +1368,15 @@ msgstr "" "user. The PyHoca-GUI icon can be found in your desktops's\n" "notification area/systray." -#: ../pyhoca/wxgui/messages.py:107 +#: ../pyhoca/wxgui/messages.py:106 msgid "Yes" msgstr "Yes" -#: ../pyhoca/wxgui/messages.py:108 +#: ../pyhoca/wxgui/messages.py:107 msgid "No" msgstr "No" -#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "Ok" @@ -1500,6 +1479,21 @@ msgstr "Change session title to" msgid "OK" msgstr "OK" +#~ msgid "SSH Proxy Tunnel" +#~ msgstr "SSH Proxy Tunnel" + +#~ msgid "The SSH proxy configuration is incomplete. Try again." +#~ msgstr "The SSH proxy configuration is incomplete. Try again." + +#~ msgid "" +#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH " +#~ "proxy to.\n" +#~ "Please change the SSH proxy settings accordingly." +#~ msgstr "" +#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH " +#~ "proxy to.\n" +#~ "Please change the SSH proxy settings accordingly." + #, fuzzy #~ msgid "Remember shared folders" #~ msgstr "Shared &folders" diff --git a/po/es.po b/po/es.po index 1ee3659..ff29e52 100644 --- a/po/es.po +++ b/po/es.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 14:25+0100\n" +"POT-Creation-Date: 2013-01-04 11:42+0100\n" "PO-Revision-Date: 2012-11-26 14:23+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -54,8 +54,8 @@ msgstr "Inicio de sesión" msgid "SSH proxy server login" msgstr "Inicio de sesión en el servidor proxy SSH" -#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350 -#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:356 +#: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Cancelar" @@ -226,7 +226,7 @@ msgstr "Windows Terminal Server (RDP sobre X2Go)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (RDP Directo)" -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:236 msgid "Custom command" msgstr "Comando personalizado" @@ -263,228 +263,224 @@ msgid "settings derived from " msgstr "configuraciones recuperadas de " #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Session Title" msgstr "Título de la Sesión" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Session Window" msgstr "Ventana de Sesión" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Session Startup" msgstr "Inicio de Sesión" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Server" msgstr "Servidor" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Proxy" msgstr "Proxy" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Connection Link Speed" msgstr "Velocidad de conexión" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Compression" msgstr "Compresión" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:186 msgid "Display" msgstr "Pantalla" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Keyboard" msgstr "Teclado" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Sound" msgstr "Sonido" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "Printing" msgstr "Impresora" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "Folder Exports" msgstr "Carpeta de Exportaciones" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "File Import" msgstr "Importar Archivo" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Name" msgstr "Nombre" -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Set session window title" msgstr "Establecer título de la sesión" -#: ../pyhoca/wxgui/profilemanager.py:192 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Use a default session window title" msgstr "Usar título de sesión por defecto" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "Custom session window title" msgstr "Título de sesión personalizado" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Window Icon" msgstr "Icono de la ventana" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Start session automatically after login" msgstr "Iniciar sesión automáticamente tras el login" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:231 #, python-format msgid "Login automatically after %s has started" msgstr "El inicio de sesión automático ha comenzado tras %s" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Type" msgstr "Tipo" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "XDMCP server" msgstr "Servidor XDMCP" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "RDP server" msgstr "Servidor RDP" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "RDP options" msgstr "Opciones RDP" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "Integrar aplicaciones en el escritorio local (modo rootless)" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Menu of published applications" msgstr "Menú de aplicaciones publicadas" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:252 ../pyhoca/wxgui/profilemanager.py:265 msgid "User" msgstr "Usuario" -#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:254 ../pyhoca/wxgui/profilemanager.py:272 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:256 ../pyhoca/wxgui/profilemanager.py:274 msgid "Port" msgstr "Puerto" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Key" msgstr "Clave" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Discover SSH keys or use SSH agent for X2Go authentication" msgstr "Descubrir clave SSH o usar el agente SSH para la autenticación X2Go" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Enable forwarding of SSH authentication agent connections" msgstr "Activar reenvío de autenticación SSH a través del agente de conexiones" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Server behind SSH proxy" msgstr "Servidor detrás del proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "Use same username for X2Go and proxy host" msgstr "Usar el mismo nombre de usuario para los servidores proxy y X2Go" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Use same authentication for X2Go and proxy host" msgstr "Usar la misma autenticación para los servidores proxy y X2Go" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Key file" msgstr "Clave" -#: ../pyhoca/wxgui/profilemanager.py:264 -msgid "SSH Proxy Tunnel" -msgstr "Tunel Proxy SSH" - -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Discover SSH keys or use SSH agent for proxy authentication" msgstr "" "Descubrir las claves SSH o usar el agente SSH para la autenticación en el " "proxy" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "Modem" msgstr "Módem" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:285 msgid "Method" msgstr "Método" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Image quality" msgstr "Calidad de imagen" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Fullscreen" msgstr "Pantalla Completa" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Maximized" msgstr "Maximizada" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Custom Size" msgstr "Tamaño Personalizado" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "Set display DPI" msgstr "Establecer DPI" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" "No establecido (usar las herramientas del lado del servidor para configurar " "el teclado)" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -492,248 +488,229 @@ msgstr "" "Detectar automáticamente y usar la configuración de teclado del lado del " "cliente en la sesión remota" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Use custom keyboard settings as provided below" msgstr "Ussar configuración de teclado personalizada" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:305 msgid "Keyboard model" msgstr "Modelo de teclado" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:307 msgid "Layout" msgstr "Capa" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Layout variant" msgstr "Variante de la capa" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "Enable sound support" msgstr "Activar soporte de sonido" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "Arts (not supported)" msgstr "Arts (sin soporte)" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:319 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "Use default sound port" msgstr "Usar puerto de sonido por defecto" -#: ../pyhoca/wxgui/profilemanager.py:315 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Custom sound port" msgstr "Puerto de sonido personalizado" -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Use local folder sharing" msgstr "Compartir carpetas locales" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Store share list at end of session" msgstr "Almacenar la lista de comparticiones al final de la sesión%s" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:326 msgid "Path" msgstr "Ruta" -#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:350 msgid "Add" msgstr "Añadir" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Local Path" msgstr "Ruta Local" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Connect Method" msgstr "Método de Conexión" -#: ../pyhoca/wxgui/profilemanager.py:327 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Delete" msgstr "Eliminar" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:335 msgid "Convert between client and server encodings" msgstr "Convertir codificaciones entre cliente y servidor" -#: ../pyhoca/wxgui/profilemanager.py:330 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Client encoding" msgstr "Codificación del cliente" -#: ../pyhoca/wxgui/profilemanager.py:332 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Server encoding" msgstr "Codificación del Servidor" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Use file MIME box for local file import" msgstr "Usar tipo de archivo MIME para la importación local" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:342 msgid "Extensions" msgstr "Extensiones" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Action" msgstr "Acción" -#: ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Client Side printing" msgstr "Impresión local" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:351 msgid "Defaults" msgstr "Valores por defecto" -#: ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/profilemanager.py:353 msgid "Save" msgstr "Guardar" -#: ../pyhoca/wxgui/profilemanager.py:348 +#: ../pyhoca/wxgui/profilemanager.py:354 msgid "Reset" msgstr "Reiniciar" -#: ../pyhoca/wxgui/profilemanager.py:401 -#: ../pyhoca/wxgui/profilemanager.py:1124 -#: ../pyhoca/wxgui/profilemanager.py:2268 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:2190 msgid "automatically" msgstr "automáticamente" -#: ../pyhoca/wxgui/profilemanager.py:403 -#: ../pyhoca/wxgui/profilemanager.py:1126 +#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:1101 msgid "manually" msgstr "manualmente" -#: ../pyhoca/wxgui/profilemanager.py:412 +#: ../pyhoca/wxgui/profilemanager.py:416 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Gestor de Perfiles - nuevo perfil" -#: ../pyhoca/wxgui/profilemanager.py:414 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Gestor de Perfiles - %s (conectado)" -#: ../pyhoca/wxgui/profilemanager.py:416 +#: ../pyhoca/wxgui/profilemanager.py:420 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Gestor de Perfiles - %s" -#: ../pyhoca/wxgui/profilemanager.py:797 +#: ../pyhoca/wxgui/profilemanager.py:784 msgid "Profile" msgstr "Perfil" -#: ../pyhoca/wxgui/profilemanager.py:798 +#: ../pyhoca/wxgui/profilemanager.py:785 msgid "Session" msgstr "Sesión" -#: ../pyhoca/wxgui/profilemanager.py:799 +#: ../pyhoca/wxgui/profilemanager.py:786 msgid "Connection" msgstr "Conexión" -#: ../pyhoca/wxgui/profilemanager.py:800 +#: ../pyhoca/wxgui/profilemanager.py:787 msgid "Link Quality" msgstr "Calidad del enlace" -#: ../pyhoca/wxgui/profilemanager.py:801 +#: ../pyhoca/wxgui/profilemanager.py:788 msgid "Settings" msgstr "Opciones" -#: ../pyhoca/wxgui/profilemanager.py:802 +#: ../pyhoca/wxgui/profilemanager.py:789 msgid "Sharing" msgstr "Compartir" -#: ../pyhoca/wxgui/profilemanager.py:988 +#: ../pyhoca/wxgui/profilemanager.py:963 msgid "<xkbtype>" msgstr "<xkbtype>" -#: ../pyhoca/wxgui/profilemanager.py:989 +#: ../pyhoca/wxgui/profilemanager.py:964 msgid "<xkblayout>" msgstr "<xkblayout>" -#: ../pyhoca/wxgui/profilemanager.py:990 +#: ../pyhoca/wxgui/profilemanager.py:965 msgid "<xkbvariant>" msgstr "<xkbvariant>" -#: ../pyhoca/wxgui/profilemanager.py:1444 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Iconos (*.png)|*.png|Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1447 +#: ../pyhoca/wxgui/profilemanager.py:1416 msgid "Choose an icon for this session profile" msgstr "Elige un icono para este perfil de sesión" -#: ../pyhoca/wxgui/profilemanager.py:1816 +#: ../pyhoca/wxgui/profilemanager.py:1776 msgid "All files (*.*)|*" msgstr "Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1818 -#: ../pyhoca/wxgui/profilemanager.py:1842 +#: ../pyhoca/wxgui/profilemanager.py:1778 +#: ../pyhoca/wxgui/profilemanager.py:1802 msgid "Choose a public SSH key" msgstr "Elige una clave pública SSH" -#: ../pyhoca/wxgui/profilemanager.py:2220 +#: ../pyhoca/wxgui/profilemanager.py:2142 msgid "Choose a folder to share within a session" msgstr "Elige la carpeta que quieres compartir en la conexión" -#: ../pyhoca/wxgui/profilemanager.py:2348 -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 -#: ../pyhoca/wxgui/profilemanager.py:2359 -#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117 +#: ../pyhoca/wxgui/profilemanager.py:2270 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 ../pyhoca/wxgui/menus_taskbar.py:117 msgid "Profile Manager" msgstr "Gestor de Perfiles" -#: ../pyhoca/wxgui/profilemanager.py:2348 +#: ../pyhoca/wxgui/profilemanager.py:2270 msgid "Profile name is missing, profile unusable!!!" msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!" -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 #, python-format msgid "Profile name %s already exists!!!" msgstr "El perfil de usuario %s ya existe!!!" -#: ../pyhoca/wxgui/profilemanager.py:2359 -msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "" -"El protocolo de autenticación de comunicaciones está incompleto. Inténtalo " -"otra vez." - -#: ../pyhoca/wxgui/profilemanager.py:2369 -#, python-format -msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" -"Please change the SSH proxy settings accordingly." -msgstr "" -"Existe otro perfil de sesión (%s) que ya está usando [%s]:%s para el enlace " -"al proxy SSH local.\n" -"Por favor, cambia los parámetros del proxy SSH en base a esta información." - -#: ../pyhoca/wxgui/profilemanager.py:2396 +#: ../pyhoca/wxgui/profilemanager.py:2303 #, python-format msgid "%s - profile added" msgstr "%s - perfil añadido" -#: ../pyhoca/wxgui/profilemanager.py:2397 +#: ../pyhoca/wxgui/profilemanager.py:2304 msgid "A new session profile has been added." msgstr "Se ha añadido un nuevo perfil de sesión." -#: ../pyhoca/wxgui/profilemanager.py:2401 +#: ../pyhoca/wxgui/profilemanager.py:2308 #, python-format msgid "%s - modified" msgstr "%s - modificado" -#: ../pyhoca/wxgui/profilemanager.py:2402 +#: ../pyhoca/wxgui/profilemanager.py:2309 msgid "Changes to profile have been saved." msgstr "Se han guardado los cambios en el perfil." @@ -766,8 +743,8 @@ msgstr "Preferencias de impresión" msgid "Client Options" msgstr "Opciones del Cliente" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:795 +#: ../pyhoca/wxgui/menus_taskbar.py:987 msgid "E&xit" msgstr "S&alir" @@ -920,51 +897,51 @@ msgstr "Ejecutar la aplicación" msgid "Manage Application Menu" msgstr "Gestionar el Menú de la Aplicación" -#: ../pyhoca/wxgui/menus_taskbar.py:714 +#: ../pyhoca/wxgui/menus_taskbar.py:726 msgid "Running" msgstr "Activa" -#: ../pyhoca/wxgui/menus_taskbar.py:716 +#: ../pyhoca/wxgui/menus_taskbar.py:728 msgid "Suspended" msgstr "Suspendida" -#: ../pyhoca/wxgui/menus_taskbar.py:735 +#: ../pyhoca/wxgui/menus_taskbar.py:747 msgid "&Clean all sessions" msgstr "&Limpiar el registro de sesiones" -#: ../pyhoca/wxgui/menus_taskbar.py:741 +#: ../pyhoca/wxgui/menus_taskbar.py:753 msgid "Customize &profile" msgstr "Configurar &perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:756 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "Shared &folders" msgstr "Compartir &carpetas" -#: ../pyhoca/wxgui/menus_taskbar.py:768 +#: ../pyhoca/wxgui/menus_taskbar.py:780 msgid "&Disconnect from Server" msgstr "&Desconectar del servidor" -#: ../pyhoca/wxgui/menus_taskbar.py:775 +#: ../pyhoca/wxgui/menus_taskbar.py:787 msgid "Suspend Session and E&xit application" msgstr "Suspender Sesión y Salir (e&xit) de la aplicación" -#: ../pyhoca/wxgui/menus_taskbar.py:779 +#: ../pyhoca/wxgui/menus_taskbar.py:791 msgid "Disconnect and E&xit application" msgstr "Desconectar y Salir (e&xit) de la aplicación" -#: ../pyhoca/wxgui/menus_taskbar.py:833 +#: ../pyhoca/wxgui/menus_taskbar.py:845 msgid "Add Profile" msgstr "Añadir Perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:909 +#: ../pyhoca/wxgui/menus_taskbar.py:921 msgid "No session profiles defined" msgstr "No se han definido perfiles de sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Start/Resume Session" msgstr "Iniciar/Retomar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Connect Server" msgstr "Conectar con el Servidor" @@ -1052,7 +1029,7 @@ msgstr "" msgid "Unknown session profile, configure before using it..." msgstr "Perfil de Sesión Desconocido, configúralo antes de usar..." -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "%s - session warning" msgstr "%s - advertencia de la sesión" @@ -1079,26 +1056,26 @@ msgstr "Se ha desconectado el Perfil X2Go." msgid "New Session Profile" msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:1047 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Eliminar el Perfil de Sesión \"%s''?" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 #, python-format msgid "%s - profile deleted" msgstr "%s - perfil eliminado" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 msgid "The session profile has been deleted." msgstr "Se ha eliminado el perfil de sesión." -#: ../pyhoca/wxgui/frontend.py:1071 +#: ../pyhoca/wxgui/frontend.py:1075 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - compartir carpetas locales con las sesiones de este perfil" -#: ../pyhoca/wxgui/frontend.py:1224 +#: ../pyhoca/wxgui/frontend.py:1228 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1111,17 +1088,17 @@ msgstr "" "\n" "¿Continuar con la conexión?" -#: ../pyhoca/wxgui/frontend.py:1232 +#: ../pyhoca/wxgui/frontend.py:1236 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Se confirma la autorización del equipo" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "%s - channel error" msgstr "%s - error en el canal" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1130,22 +1107,22 @@ msgstr "" "¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta " "iniciar sesión nuevamente..." -#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313 -#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1299 ../pyhoca/wxgui/frontend.py:1317 +#: ../pyhoca/wxgui/frontend.py:1319 ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "%s - session failure" msgstr "%s - fallo en la sesión" -#: ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1299 msgid "The session startup failed." msgstr "El inicio de sesión ha fallado" -#: ../pyhoca/wxgui/frontend.py:1313 +#: ../pyhoca/wxgui/frontend.py:1317 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "El comando \"%s'' no está presente en el servidor X2Go." -#: ../pyhoca/wxgui/frontend.py:1315 +#: ../pyhoca/wxgui/frontend.py:1319 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1154,7 +1131,7 @@ msgstr "" "El comando \"%s\" no está disponible en el servidor X2Go\n" "%s." -#: ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1163,7 +1140,7 @@ msgstr "" "Se ha denegado la redirección del túnel TCP inverso para la sesión %s al " "puerto %s del servidor X2Go." -#: ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1172,37 +1149,37 @@ msgstr "" "La solicitud de túnel a %s:%s para la sesión %s ha sido denegada por el " "servidor X2Go/SSH . Fallo en el inicio de sesión." -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 #, python-format msgid "%s - audio warning" msgstr "%s - advertencia en el sistema de audio" -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "El sistema X2Go PulseAudio no está disponible en las sesiones del tipo " "Remote Desktop" -#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1381 ../pyhoca/wxgui/frontend.py:1388 #, python-format msgid "%s - audio error" msgstr "%s - error en el audio" -#: ../pyhoca/wxgui/frontend.py:1377 +#: ../pyhoca/wxgui/frontend.py:1381 msgid "The X2Go PulseAudio system could not be started." msgstr "El sistema X2Go PulseAudio no puede iniciarse" -#: ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1388 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "El sistema X2Go PulseAudio ha finalizado inesperadamente" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "%s - audio problem" msgstr "%s - problema en el audio" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1211,13 +1188,13 @@ msgstr "" "La conexión de audio puede que no esté configurada para esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "%s - client-side printing not available" msgstr "" "%s - el sistema de impresión en el lado del cliente no está disponible -" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1226,12 +1203,12 @@ msgstr "" "El servidor no permite la impresión del lado del cliente para esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "%s - MIME box not available" msgstr "%s - No está disponible el contexto MIME" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1240,12 +1217,12 @@ msgstr "" "El servidor no soporta el contexto X2Go MIME.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - las carpetas del lado del cliente no están compartidas" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1255,12 +1232,12 @@ msgstr "" "sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "%s - client resources not sharable" msgstr "%s - el recurso del cliente no está marcado como compartido" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1270,12 +1247,12 @@ msgstr "" "permitidas en esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1467 ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "%s - print error" msgstr "%s - error de impresión" -#: ../pyhoca/wxgui/frontend.py:1463 +#: ../pyhoca/wxgui/frontend.py:1467 #, python-format msgid "" "%s\n" @@ -1286,7 +1263,7 @@ msgstr "" "...provocado en la impresora %s por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "" "%s\n" @@ -1297,12 +1274,12 @@ msgstr "" "...provocado por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1484 ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "%s - start" msgstr "%s - inicio" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1484 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1311,7 +1288,7 @@ msgstr "" "Iniciando nueva sesión X2Go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "" "Another client started X2Go session\n" @@ -1320,12 +1297,12 @@ msgstr "" "Otro cliente ha iniciado sesión X2Go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1514 ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "%s - resume" msgstr "%s - retornar a la sesión" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1514 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1334,7 +1311,7 @@ msgstr "" "Retornando sesión X2Go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1343,12 +1320,12 @@ msgstr "" "Otro cliente retornó a la sesión X2Go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "%s - running" msgstr "%s - en ejecución" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "" "Found already running session\n" @@ -1357,12 +1334,12 @@ msgstr "" "La sesión ya está en ejecución\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "%s - suspend" msgstr "%s - suspender" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1371,12 +1348,12 @@ msgstr "" "Se ha suspendido la Sesión X2Go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "%s - terminate" msgstr "%s - finalizar" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1385,14 +1362,14 @@ msgstr "" "Se ha finalizado la sesión X2Go\n" "%s" -#: ../pyhoca/wxgui/messages.py:73 +#: ../pyhoca/wxgui/messages.py:72 #, python-format msgid "" "Are you really sure you want to\n" "delete the session profile ,,%s''?" msgstr "¿Eliminar el perfil de sesión \"%s\"?" -#: ../pyhoca/wxgui/messages.py:74 +#: ../pyhoca/wxgui/messages.py:73 #, python-format msgid "" "PyHoca-GUI is already running for user ,,%s''!\n" @@ -1406,15 +1383,15 @@ msgstr "" "Sólo se permite una instancia de PyHoca-GUI por usuario.\n" "El icono de PyHoca-GUI se encuentra en el area de notificación." -#: ../pyhoca/wxgui/messages.py:107 +#: ../pyhoca/wxgui/messages.py:106 msgid "Yes" msgstr "Sí" -#: ../pyhoca/wxgui/messages.py:108 +#: ../pyhoca/wxgui/messages.py:107 msgid "No" msgstr "No" -#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "Ok" @@ -1517,6 +1494,23 @@ msgstr "Cambiar título de la sesión a" msgid "OK" msgstr "Ok" +#~ msgid "SSH Proxy Tunnel" +#~ msgstr "Tunel Proxy SSH" + +#~ msgid "The SSH proxy configuration is incomplete. Try again." +#~ msgstr "" +#~ "El protocolo de autenticación de comunicaciones está incompleto. " +#~ "Inténtalo otra vez." + +#~ msgid "" +#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH " +#~ "proxy to.\n" +#~ "Please change the SSH proxy settings accordingly." +#~ msgstr "" +#~ "Existe otro perfil de sesión (%s) que ya está usando [%s]:%s para el " +#~ "enlace al proxy SSH local.\n" +#~ "Por favor, cambia los parámetros del proxy SSH en base a esta información." + #, fuzzy #~ msgid "Remember shared folders" #~ msgstr "Compartir &carpetas" diff --git a/po/fr.po b/po/fr.po index edc7156..7b26890 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 14:25+0100\n" +"POT-Creation-Date: 2013-01-04 11:42+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -50,8 +50,8 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350 -#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:356 +#: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "" @@ -211,7 +211,7 @@ msgstr "" msgid "Windows Terminal Server (Direct RDP)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:236 msgid "Custom command" msgstr "" @@ -248,466 +248,448 @@ msgid "settings derived from " msgstr "" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Session Title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Session Window" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Session Startup" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Connection Link Speed" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Compression" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:186 msgid "Display" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Keyboard" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Sound" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "Printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "Folder Exports" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "File Import" msgstr "" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Name" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Set session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:192 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Use a default session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "Custom session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Window Icon" msgstr "" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Start session automatically after login" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:231 #, python-format msgid "Login automatically after %s has started" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Type" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "XDMCP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Menu of published applications" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:252 ../pyhoca/wxgui/profilemanager.py:265 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:254 ../pyhoca/wxgui/profilemanager.py:272 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:256 ../pyhoca/wxgui/profilemanager.py:274 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Discover SSH keys or use SSH agent for X2Go authentication" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Enable forwarding of SSH authentication agent connections" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "Use same username for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Use same authentication for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:264 -msgid "SSH Proxy Tunnel" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Discover SSH keys or use SSH agent for proxy authentication" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:285 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Maximized" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Use custom keyboard settings as provided below" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:305 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:307 msgid "Layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Layout variant" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Pulse Audio" msgstr "" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:319 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:315 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Store share list at end of session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:326 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:350 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:327 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:335 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:330 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:332 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:342 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:351 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/profilemanager.py:353 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:348 +#: ../pyhoca/wxgui/profilemanager.py:354 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:401 -#: ../pyhoca/wxgui/profilemanager.py:1124 -#: ../pyhoca/wxgui/profilemanager.py:2268 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:2190 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:403 -#: ../pyhoca/wxgui/profilemanager.py:1126 +#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:1101 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:412 +#: ../pyhoca/wxgui/profilemanager.py:416 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:414 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:416 +#: ../pyhoca/wxgui/profilemanager.py:420 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:797 +#: ../pyhoca/wxgui/profilemanager.py:784 msgid "Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:798 +#: ../pyhoca/wxgui/profilemanager.py:785 msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:799 +#: ../pyhoca/wxgui/profilemanager.py:786 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:800 +#: ../pyhoca/wxgui/profilemanager.py:787 msgid "Link Quality" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:801 +#: ../pyhoca/wxgui/profilemanager.py:788 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:802 +#: ../pyhoca/wxgui/profilemanager.py:789 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:988 +#: ../pyhoca/wxgui/profilemanager.py:963 msgid "<xkbtype>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:989 +#: ../pyhoca/wxgui/profilemanager.py:964 msgid "<xkblayout>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:990 +#: ../pyhoca/wxgui/profilemanager.py:965 msgid "<xkbvariant>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1444 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1447 +#: ../pyhoca/wxgui/profilemanager.py:1416 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1816 +#: ../pyhoca/wxgui/profilemanager.py:1776 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1818 -#: ../pyhoca/wxgui/profilemanager.py:1842 +#: ../pyhoca/wxgui/profilemanager.py:1778 +#: ../pyhoca/wxgui/profilemanager.py:1802 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2220 +#: ../pyhoca/wxgui/profilemanager.py:2142 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2348 -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 -#: ../pyhoca/wxgui/profilemanager.py:2359 -#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117 +#: ../pyhoca/wxgui/profilemanager.py:2270 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 ../pyhoca/wxgui/menus_taskbar.py:117 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2348 +#: ../pyhoca/wxgui/profilemanager.py:2270 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2359 -msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:2369 -#, python-format -msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" -"Please change the SSH proxy settings accordingly." -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:2396 +#: ../pyhoca/wxgui/profilemanager.py:2303 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2397 +#: ../pyhoca/wxgui/profilemanager.py:2304 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2401 +#: ../pyhoca/wxgui/profilemanager.py:2308 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2402 +#: ../pyhoca/wxgui/profilemanager.py:2309 msgid "Changes to profile have been saved." msgstr "" @@ -740,8 +722,8 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:795 +#: ../pyhoca/wxgui/menus_taskbar.py:987 msgid "E&xit" msgstr "" @@ -894,51 +876,51 @@ msgstr "" msgid "Manage Application Menu" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:714 +#: ../pyhoca/wxgui/menus_taskbar.py:726 msgid "Running" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:716 +#: ../pyhoca/wxgui/menus_taskbar.py:728 msgid "Suspended" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:735 +#: ../pyhoca/wxgui/menus_taskbar.py:747 msgid "&Clean all sessions" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:741 +#: ../pyhoca/wxgui/menus_taskbar.py:753 msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:756 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:768 +#: ../pyhoca/wxgui/menus_taskbar.py:780 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:775 +#: ../pyhoca/wxgui/menus_taskbar.py:787 msgid "Suspend Session and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:779 +#: ../pyhoca/wxgui/menus_taskbar.py:791 msgid "Disconnect and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:833 +#: ../pyhoca/wxgui/menus_taskbar.py:845 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:909 +#: ../pyhoca/wxgui/menus_taskbar.py:921 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Connect Server" msgstr "" @@ -1016,7 +998,7 @@ msgstr "" msgid "Unknown session profile, configure before using it..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "%s - session warning" msgstr "" @@ -1043,26 +1025,26 @@ msgstr "" msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1047 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1071 +#: ../pyhoca/wxgui/frontend.py:1075 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1224 +#: ../pyhoca/wxgui/frontend.py:1228 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1071,148 +1053,148 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1232 +#: ../pyhoca/wxgui/frontend.py:1236 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313 -#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1299 ../pyhoca/wxgui/frontend.py:1317 +#: ../pyhoca/wxgui/frontend.py:1319 ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1299 msgid "The session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1313 +#: ../pyhoca/wxgui/frontend.py:1317 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1315 +#: ../pyhoca/wxgui/frontend.py:1319 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2Go/SSH server. Session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1381 ../pyhoca/wxgui/frontend.py:1388 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1377 +#: ../pyhoca/wxgui/frontend.py:1381 msgid "The X2Go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1388 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "%s - client-side printing not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "%s - MIME box not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "%s - client-side folders not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "%s - client resources not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1467 ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1463 +#: ../pyhoca/wxgui/frontend.py:1467 #, python-format msgid "" "%s\n" @@ -1220,7 +1202,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "" "%s\n" @@ -1228,88 +1210,88 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1484 ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1484 #, python-format msgid "" "New X2Go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "" "Another client started X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1514 ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1514 #, python-format msgid "" "Resuming X2Go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "" "Another client resumed X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "" "X2Go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "" "X2Go Session has terminated\n" "%s" msgstr "" -#: ../pyhoca/wxgui/messages.py:73 +#: ../pyhoca/wxgui/messages.py:72 #, python-format msgid "" "Are you really sure you want to\n" "delete the session profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/messages.py:74 +#: ../pyhoca/wxgui/messages.py:73 #, python-format msgid "" "PyHoca-GUI is already running for user ,,%s''!\n" @@ -1319,15 +1301,15 @@ msgid "" "notification area/systray." msgstr "" -#: ../pyhoca/wxgui/messages.py:107 +#: ../pyhoca/wxgui/messages.py:106 msgid "Yes" msgstr "" -#: ../pyhoca/wxgui/messages.py:108 +#: ../pyhoca/wxgui/messages.py:107 msgid "No" msgstr "" -#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index c3deebe..22edb59 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 14:25+0100\n" +"POT-Creation-Date: 2013-01-04 11:42+0100\n" "PO-Revision-Date: 2012-11-26 14:24+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -49,8 +49,8 @@ msgstr "Sesjons innlogging" msgid "SSH proxy server login" msgstr "logg inn via en SSH mellomtjener" -#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350 -#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:356 +#: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Avbryt" @@ -220,7 +220,7 @@ msgstr "Windows Terminal Server (RDP via X2Go-proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (Direkte RDP)" -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:236 msgid "Custom command" msgstr "Selvvalgt kommando" @@ -257,226 +257,222 @@ msgid "settings derived from " msgstr "innstillinger arvet fra" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Session Title" msgstr "Sesjonstittel" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Session Window" msgstr "Sesjonsvindu" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Session Startup" msgstr "Sesjon oppstart" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Proxy" msgstr "Proxy" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Connection Link Speed" msgstr "Tilkoblingens forbindelseshastighet" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Compression" msgstr "Kompresjon" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:186 msgid "Display" msgstr "Skjerm" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Keyboard" msgstr "Tastatur" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Sound" msgstr "Lyd" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "Printing" msgstr "Utskrift" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "Folder Exports" msgstr "Mappe eksporter" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "File Import" msgstr "Fil import" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Name" msgstr "Navn" -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Set session window title" msgstr "Angi sesjons vindustittel" -#: ../pyhoca/wxgui/profilemanager.py:192 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Use a default session window title" msgstr "Benytt standard sesjons vindustittel" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "Custom session window title" msgstr "Tilpasset sesjon vindustittel" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Window Icon" msgstr "Vindusikon" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Start session automatically after login" msgstr "Start sesjonen automatisk etter innlogging" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:231 #, python-format msgid "Login automatically after %s has started" msgstr "Logg inn automatisk etter at %s har startet" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Application" msgstr "Applikasjon" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "XDMCP server" msgstr "XDMCP server" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "RDP server" msgstr "RDP server" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "RDP options" msgstr "RDP alternativer" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" "Integrer eksterne applikasjon(er) inn i det lokale skrivebordet (rotløs " "modus)" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Menu of published applications" msgstr "Meny med publiserte applikasjoner" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:252 ../pyhoca/wxgui/profilemanager.py:265 msgid "User" msgstr "Bruker" -#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:254 ../pyhoca/wxgui/profilemanager.py:272 msgid "Host" msgstr "Vert" -#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:256 ../pyhoca/wxgui/profilemanager.py:274 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Key" msgstr "Nøkkel" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Discover SSH keys or use SSH agent for X2Go authentication" msgstr "Oppdag SSH nøkler, eller bruk SSH agent for X2Go autentisering" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Enable forwarding of SSH authentication agent connections" msgstr "Aktiver videresending av SSH autentiseringen for agent tilkoblinger" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Server behind SSH proxy" msgstr "Server bak SSH mellomtjeneren" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "Use same username for X2Go and proxy host" msgstr "Bruk samme brukernavn for X2Go og proxyserveren" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Use same authentication for X2Go and proxy host" msgstr "Bruk samme autentisering for X2Go og proxyserveren" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Key file" msgstr "Nøkkelfil" -#: ../pyhoca/wxgui/profilemanager.py:264 -msgid "SSH Proxy Tunnel" -msgstr "SSH mellomtjener tunnel" - -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Discover SSH keys or use SSH agent for proxy authentication" msgstr "Oppdag SSH nøkler, eller bruk SSH agent for proxy autentisering" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:285 msgid "Method" msgstr "Metode" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Image quality" msgstr "Bildekvalitet" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Fullscreen" msgstr "Fullskjerm" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Maximized" msgstr "Maksimert" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Custom Size" msgstr "Egentilpasset størrelse" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "Set display DPI" msgstr "Sett skjermens DPI" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Ikke angi (benytt server-side verktøy for å konfigurere tastaturet)" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -484,246 +480,229 @@ msgstr "" "Automatisk oppdag og benytt klient-side konfigurasjon for tastaturet inne i " "sesjonen" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Use custom keyboard settings as provided below" msgstr "Benytt tilpasset innstillinger for tastaturoppsett som gitt nedenfor" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:305 msgid "Keyboard model" msgstr "Tastaturmodell" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:307 msgid "Layout" msgstr "Utforming" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Layout variant" msgstr "Utformingsvariant" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "Enable sound support" msgstr "Aktiver lydstøtte" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "Arts (not supported)" msgstr "Arts (ikke supportert)" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:319 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "Use default sound port" msgstr "Benytt standard lydport" -#: ../pyhoca/wxgui/profilemanager.py:315 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Custom sound port" msgstr "Selvvalgt lydport" -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Use local folder sharing" msgstr "Benytt lokal mappedeling" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Store share list at end of session" msgstr "Lagre listen over delte mapper ved sesjonsavslutning%s" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:326 msgid "Path" msgstr "Sti" -#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:350 msgid "Add" msgstr "Legg til" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Local Path" msgstr "Lokal sti" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Connect Method" msgstr "Tilkoblingsmetode" -#: ../pyhoca/wxgui/profilemanager.py:327 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Delete" msgstr "Slett" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:335 msgid "Convert between client and server encodings" msgstr "Konverter tegnkodingen mellom klient og server" -#: ../pyhoca/wxgui/profilemanager.py:330 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Client encoding" msgstr "Klientens tegnkode" -#: ../pyhoca/wxgui/profilemanager.py:332 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Server encoding" msgstr "Serverens tegnkode" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Use file MIME box for local file import" msgstr "Benytt filens MIME boks for lokal fil import" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:342 msgid "Extensions" msgstr "Utvidelser" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Action" msgstr "Handling" -#: ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Client Side printing" msgstr "Klientside utskrift" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:351 msgid "Defaults" msgstr "Standard" -#: ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/profilemanager.py:353 msgid "Save" msgstr "Lagre" -#: ../pyhoca/wxgui/profilemanager.py:348 +#: ../pyhoca/wxgui/profilemanager.py:354 msgid "Reset" msgstr "Resett" -#: ../pyhoca/wxgui/profilemanager.py:401 -#: ../pyhoca/wxgui/profilemanager.py:1124 -#: ../pyhoca/wxgui/profilemanager.py:2268 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:2190 msgid "automatically" msgstr "automatisk" -#: ../pyhoca/wxgui/profilemanager.py:403 -#: ../pyhoca/wxgui/profilemanager.py:1126 +#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:1101 msgid "manually" msgstr "manuelt" -#: ../pyhoca/wxgui/profilemanager.py:412 +#: ../pyhoca/wxgui/profilemanager.py:416 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profil håndterer - ny profil" -#: ../pyhoca/wxgui/profilemanager.py:414 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profil håndterer - %s (tilkoblet)" -#: ../pyhoca/wxgui/profilemanager.py:416 +#: ../pyhoca/wxgui/profilemanager.py:420 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profil håndterer - %s" -#: ../pyhoca/wxgui/profilemanager.py:797 +#: ../pyhoca/wxgui/profilemanager.py:784 msgid "Profile" msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:798 +#: ../pyhoca/wxgui/profilemanager.py:785 msgid "Session" msgstr "Sesjon" -#: ../pyhoca/wxgui/profilemanager.py:799 +#: ../pyhoca/wxgui/profilemanager.py:786 msgid "Connection" msgstr "Tilkobling" -#: ../pyhoca/wxgui/profilemanager.py:800 +#: ../pyhoca/wxgui/profilemanager.py:787 msgid "Link Quality" msgstr "Koblingskvalitet" -#: ../pyhoca/wxgui/profilemanager.py:801 +#: ../pyhoca/wxgui/profilemanager.py:788 msgid "Settings" msgstr "Innstillinger" -#: ../pyhoca/wxgui/profilemanager.py:802 +#: ../pyhoca/wxgui/profilemanager.py:789 msgid "Sharing" msgstr "Deling" -#: ../pyhoca/wxgui/profilemanager.py:988 +#: ../pyhoca/wxgui/profilemanager.py:963 msgid "<xkbtype>" msgstr "<xkbtype>" -#: ../pyhoca/wxgui/profilemanager.py:989 +#: ../pyhoca/wxgui/profilemanager.py:964 msgid "<xkblayout>" msgstr "<xkblayout>" -#: ../pyhoca/wxgui/profilemanager.py:990 +#: ../pyhoca/wxgui/profilemanager.py:965 msgid "<xkbvariant>" msgstr "<xkbvariant>" -#: ../pyhoca/wxgui/profilemanager.py:1444 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Ikonfiler(*.png)|*.png|Alle filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1447 +#: ../pyhoca/wxgui/profilemanager.py:1416 msgid "Choose an icon for this session profile" msgstr "Velg et ikon for denne sesjonsprofilen" -#: ../pyhoca/wxgui/profilemanager.py:1816 +#: ../pyhoca/wxgui/profilemanager.py:1776 msgid "All files (*.*)|*" msgstr "Alle filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1818 -#: ../pyhoca/wxgui/profilemanager.py:1842 +#: ../pyhoca/wxgui/profilemanager.py:1778 +#: ../pyhoca/wxgui/profilemanager.py:1802 msgid "Choose a public SSH key" msgstr "Velg en offentlig SSH nøkkel" -#: ../pyhoca/wxgui/profilemanager.py:2220 +#: ../pyhoca/wxgui/profilemanager.py:2142 msgid "Choose a folder to share within a session" msgstr "Velg en mappe som skal deles i en sesjon" -#: ../pyhoca/wxgui/profilemanager.py:2348 -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 -#: ../pyhoca/wxgui/profilemanager.py:2359 -#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117 +#: ../pyhoca/wxgui/profilemanager.py:2270 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 ../pyhoca/wxgui/menus_taskbar.py:117 msgid "Profile Manager" msgstr "Profil håndterer" -#: ../pyhoca/wxgui/profilemanager.py:2348 +#: ../pyhoca/wxgui/profilemanager.py:2270 msgid "Profile name is missing, profile unusable!!!" msgstr "Profilnavnet mangler, profilen er ubrukelig!" -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profilnavnet %s eksisterer allerede!" -#: ../pyhoca/wxgui/profilemanager.py:2359 -msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "SSH mellomtjener konfigurasjonen er ufullstendig. Forsøk igjen." - -#: ../pyhoca/wxgui/profilemanager.py:2369 -#, python-format -msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" -"Please change the SSH proxy settings accordingly." -msgstr "" -"En annen sesjonsprofil (%s) benytter allerede [%s]:%s for å portbinde en " -"lokal SSH mellomtjener.\n" -"Vennligst endre SSH mellomtjener innstillingene tilsvarende." - -#: ../pyhoca/wxgui/profilemanager.py:2396 +#: ../pyhoca/wxgui/profilemanager.py:2303 #, python-format msgid "%s - profile added" msgstr "%s - profil lagt til" -#: ../pyhoca/wxgui/profilemanager.py:2397 +#: ../pyhoca/wxgui/profilemanager.py:2304 msgid "A new session profile has been added." msgstr "En ny sesjonsprofil har blitt lagt til." -#: ../pyhoca/wxgui/profilemanager.py:2401 +#: ../pyhoca/wxgui/profilemanager.py:2308 #, python-format msgid "%s - modified" msgstr "%s - endret" -#: ../pyhoca/wxgui/profilemanager.py:2402 +#: ../pyhoca/wxgui/profilemanager.py:2309 msgid "Changes to profile have been saved." msgstr "Endringer til profilen har blitt lagret." @@ -756,8 +735,8 @@ msgstr "Utksriftsinnstillinger" msgid "Client Options" msgstr "Klient alternativer" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:795 +#: ../pyhoca/wxgui/menus_taskbar.py:987 msgid "E&xit" msgstr "&Avslutt" @@ -910,51 +889,51 @@ msgstr "Start enkelt applikasjon" msgid "Manage Application Menu" msgstr "Administrer applkasjonsmenyen" -#: ../pyhoca/wxgui/menus_taskbar.py:714 +#: ../pyhoca/wxgui/menus_taskbar.py:726 msgid "Running" msgstr "Aktiv" -#: ../pyhoca/wxgui/menus_taskbar.py:716 +#: ../pyhoca/wxgui/menus_taskbar.py:728 msgid "Suspended" msgstr "Frakoblet" -#: ../pyhoca/wxgui/menus_taskbar.py:735 +#: ../pyhoca/wxgui/menus_taskbar.py:747 msgid "&Clean all sessions" msgstr "&Rensk opp alle sesjoner" -#: ../pyhoca/wxgui/menus_taskbar.py:741 +#: ../pyhoca/wxgui/menus_taskbar.py:753 msgid "Customize &profile" msgstr "TIlpass &profil" -#: ../pyhoca/wxgui/menus_taskbar.py:756 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "Shared &folders" msgstr "Delte &mapper" -#: ../pyhoca/wxgui/menus_taskbar.py:768 +#: ../pyhoca/wxgui/menus_taskbar.py:780 msgid "&Disconnect from Server" msgstr "&Koble fra serveren" -#: ../pyhoca/wxgui/menus_taskbar.py:775 +#: ../pyhoca/wxgui/menus_taskbar.py:787 msgid "Suspend Session and E&xit application" msgstr "Koble fra sesjonen og &Avslutt applikasjonen" -#: ../pyhoca/wxgui/menus_taskbar.py:779 +#: ../pyhoca/wxgui/menus_taskbar.py:791 msgid "Disconnect and E&xit application" msgstr "Koble fra sesjonen og &Avslutt applikasjonen" -#: ../pyhoca/wxgui/menus_taskbar.py:833 +#: ../pyhoca/wxgui/menus_taskbar.py:845 msgid "Add Profile" msgstr "Legg til profil" -#: ../pyhoca/wxgui/menus_taskbar.py:909 +#: ../pyhoca/wxgui/menus_taskbar.py:921 msgid "No session profiles defined" msgstr "Ingen sesjonsprofiler er definert" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Start/Resume Session" msgstr "Start/gjenoppta sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Connect Server" msgstr "Koble til server" @@ -1041,7 +1020,7 @@ msgstr "" msgid "Unknown session profile, configure before using it..." msgstr "Ukjent sesjonsprofil, konfigurer den først..." -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "%s - session warning" msgstr "%s - advarsel om sesjon" @@ -1068,26 +1047,26 @@ msgstr "X2Go profilen er nå frakoblet." msgid "New Session Profile" msgstr "Ny sesjonsprofil" -#: ../pyhoca/wxgui/frontend.py:1047 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Virkelig slette sesjonsprofilen \"%s\"?" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 #, python-format msgid "%s - profile deleted" msgstr "%s - profilen er slettet" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 msgid "The session profile has been deleted." msgstr "Sesjonsprofilen har blitt slettet." -#: ../pyhoca/wxgui/frontend.py:1071 +#: ../pyhoca/wxgui/frontend.py:1075 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - del lokal mappe med sesjoner av denne profilen" -#: ../pyhoca/wxgui/frontend.py:1224 +#: ../pyhoca/wxgui/frontend.py:1228 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1100,17 +1079,17 @@ msgstr "" "\n" "Er du sikker på at du vil fortsette tilkoblingen?" -#: ../pyhoca/wxgui/frontend.py:1232 +#: ../pyhoca/wxgui/frontend.py:1236 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Verifiser vert autorisasjonen" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "%s - channel error" msgstr "%s - feil med kanalen" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1119,22 +1098,22 @@ msgstr "" "Mistet uventet forbindelsen til server %s ! Forsøk å autentisiere deg på " "nytt til serveren..." -#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313 -#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1299 ../pyhoca/wxgui/frontend.py:1317 +#: ../pyhoca/wxgui/frontend.py:1319 ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "%s - session failure" msgstr "%s - sesjonsfeil" -#: ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1299 msgid "The session startup failed." msgstr "Oppstart av sesjonen feilet." -#: ../pyhoca/wxgui/frontend.py:1313 +#: ../pyhoca/wxgui/frontend.py:1317 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Kommandoen \"%s\" er ikke tilgjengelig på X2Go serveren." -#: ../pyhoca/wxgui/frontend.py:1315 +#: ../pyhoca/wxgui/frontend.py:1319 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1143,7 +1122,7 @@ msgstr "" "Kommandoen \"%s\" er ikke tilgjengelig på X2Go server\n" "%s." -#: ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1152,7 +1131,7 @@ msgstr "" "Revers TCP port videresendingsforespørselen for sesjon %s til server port %s " "har blitt avvist." -#: ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1161,37 +1140,37 @@ msgstr "" "Tunnel videresendingsforespørsel til [%s]:%s for sesjon %s ble avvist av den " "eksterne X2Go/SSH serveren. Oppstart av sesjonen feilet." -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 #, python-format msgid "%s - audio warning" msgstr "%s - advarsel om lyd" -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "X2Go PulseAudio systemet er ikke tilgjengelig inne i Terminal server " "sesjoner (RDP)." -#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1381 ../pyhoca/wxgui/frontend.py:1388 #, python-format msgid "%s - audio error" msgstr "%s - feil med lyden" -#: ../pyhoca/wxgui/frontend.py:1377 +#: ../pyhoca/wxgui/frontend.py:1381 msgid "The X2Go PulseAudio system could not be started." msgstr "X2Go PulseAudio systemet kan ikke bli startet." -#: ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1388 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "X2Go PulseAudio systemet har uventet stoppet." -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "%s - audio problem" msgstr "%s - problem med lyden" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1200,12 +1179,12 @@ msgstr "" "Klarte ikke å sette opp lydforbindelsen for denne sesjonen.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "%s - client-side printing not available" msgstr "%s - klient-side utskrift er ikke tilgjengelig" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1214,12 +1193,12 @@ msgstr "" "Serveren nekter klient-side utskrift innenfra denne sesjonen.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "%s - MIME box not available" msgstr "%s - MIME boks ikke tilgjengelig" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1228,12 +1207,12 @@ msgstr "" "Serveren støtter ikke X2Go MIME boks.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - klient-side mapper er ikke mulig å dele" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1242,12 +1221,12 @@ msgstr "" "Serveren nekter klient-side mapperdeling med denne sesjonen.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "%s - client resources not sharable" msgstr "%s - klient ressurser er ikke mulig å dele" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1256,12 +1235,12 @@ msgstr "" "Klient-side mapper og skrivere kan ikke bli delt med denne sesjonen.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1467 ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "%s - print error" msgstr "%s - feil ved utskrift" -#: ../pyhoca/wxgui/frontend.py:1463 +#: ../pyhoca/wxgui/frontend.py:1467 #, python-format msgid "" "%s\n" @@ -1272,7 +1251,7 @@ msgstr "" "...oppstod på skriver %s fra sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "" "%s\n" @@ -1283,12 +1262,12 @@ msgstr "" "...oppstod fra sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1484 ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1484 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1297,7 +1276,7 @@ msgstr "" "Ny X2Go sesjon starter opp...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "" "Another client started X2Go session\n" @@ -1306,12 +1285,12 @@ msgstr "" "En annen klient startet X2Go sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1514 ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "%s - resume" msgstr "%s - gjenoppta" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1514 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1320,7 +1299,7 @@ msgstr "" "Gjenopptar X2Go sesjon...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1329,12 +1308,12 @@ msgstr "" "En annen klient gjenopptok X2Go sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "" "Found already running session\n" @@ -1343,12 +1322,12 @@ msgstr "" "Fant allerede kjørende sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "%s - suspend" msgstr "%s - koble fra" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1357,12 +1336,12 @@ msgstr "" "X2Go sesjonen har blitt frakoblet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "%s - terminate" msgstr "%s - avslutt" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1371,7 +1350,7 @@ msgstr "" "X2Go sesjonen har blitt avsluttet\n" "%s" -#: ../pyhoca/wxgui/messages.py:73 +#: ../pyhoca/wxgui/messages.py:72 #, python-format msgid "" "Are you really sure you want to\n" @@ -1380,7 +1359,7 @@ msgstr "" "Er du helt sikker på at du ønser å\n" "slette valgt sesjonsprofil \"%s\"?" -#: ../pyhoca/wxgui/messages.py:74 +#: ../pyhoca/wxgui/messages.py:73 #, python-format msgid "" "PyHoca-GUI is already running for user ,,%s''!\n" @@ -1395,15 +1374,15 @@ msgstr "" "bruker. PyHoca-GUI ikonet kan bli funnet i ditt\n" "skrivebords systemkurv område." -#: ../pyhoca/wxgui/messages.py:107 +#: ../pyhoca/wxgui/messages.py:106 msgid "Yes" msgstr "Ja" -#: ../pyhoca/wxgui/messages.py:108 +#: ../pyhoca/wxgui/messages.py:107 msgid "No" msgstr "Nei" -#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "Ok" @@ -1506,6 +1485,21 @@ msgstr "Endre sesjonstittelen til" msgid "OK" msgstr "OK" +#~ msgid "SSH Proxy Tunnel" +#~ msgstr "SSH mellomtjener tunnel" + +#~ msgid "The SSH proxy configuration is incomplete. Try again." +#~ msgstr "SSH mellomtjener konfigurasjonen er ufullstendig. Forsøk igjen." + +#~ msgid "" +#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH " +#~ "proxy to.\n" +#~ "Please change the SSH proxy settings accordingly." +#~ msgstr "" +#~ "En annen sesjonsprofil (%s) benytter allerede [%s]:%s for å portbinde en " +#~ "lokal SSH mellomtjener.\n" +#~ "Vennligst endre SSH mellomtjener innstillingene tilsvarende." + #, fuzzy #~ msgid "Remember shared folders" #~ msgstr "Delte &mapper" diff --git a/po/nl.po b/po/nl.po index 7609837..9dc3cf7 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 14:25+0100\n" +"POT-Creation-Date: 2013-01-04 11:42+0100\n" "PO-Revision-Date: 2012-11-26 14:23+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -49,8 +49,8 @@ msgstr "Sessie login" msgid "SSH proxy server login" msgstr "Login via SSH Proxy" -#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350 -#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:356 +#: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Afbreken" @@ -218,7 +218,7 @@ msgstr "Windows Terminalserver (via X2Go-proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminalserver (via X2Go-proxy)" -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:236 msgid "Custom command" msgstr "Speciaal Commando" @@ -255,472 +255,451 @@ msgid "settings derived from " msgstr "configuratie afgeleid van" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Session Title" msgstr "Sessie naam" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Session Window" msgstr "Sessie Window" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Session Startup" msgstr "Sessie start" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Proxy" msgstr "Proxy" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Connection Link Speed" msgstr "Verbindings snelheid" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Compression" msgstr "Compressie" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:186 msgid "Display" msgstr "Display" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Keyboard" msgstr "Toetsenbord" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Sound" msgstr "Geluid" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "Printing" msgstr "Afdrukken" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "Folder Exports" msgstr "Map export" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "File Import" msgstr "Bestands import" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Name" msgstr "Naam" -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Set session window title" msgstr "Stel sessiescherm titel in" -#: ../pyhoca/wxgui/profilemanager.py:192 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Use a default session window title" msgstr "Gebruik een standaard sessienaam" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "Custom session window title" msgstr "Aangepaste sessienaam" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Window Icon" msgstr "Scherm icoon" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Start session automatically after login" msgstr "Start sessie automatisch na login" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:231 #, python-format msgid "Login automatically after %s has started" msgstr "Login automatisch nadat %s is gestart" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Application" msgstr "Applicatie" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "XDMCP server" msgstr "XDMCP Server" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "RDP server" msgstr "RDP Server" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "RDP options" msgstr "RDP Opties" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "Integreer remote toepassing in de lokale desktop (rootless mode)" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Menu of published applications" msgstr "Menu met gepubliceerde applicaties" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:252 ../pyhoca/wxgui/profilemanager.py:265 msgid "User" msgstr "Gebruiker" -#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:254 ../pyhoca/wxgui/profilemanager.py:272 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:256 ../pyhoca/wxgui/profilemanager.py:274 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Key" msgstr "Sleutel" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Discover SSH keys or use SSH agent for X2Go authentication" msgstr "Gebruik SSH agent voor authenticatie of zoek SSH sleutels" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Enable forwarding of SSH authentication agent connections" msgstr "Gebruik SSH forwarding van SSH authenticatie agent" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Server behind SSH proxy" msgstr "Server achter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "Use same username for X2Go and proxy host" msgstr "Gebruik zelfde gebruikersnaam voor X2Go en de SSH Proxy" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Use same authentication for X2Go and proxy host" msgstr "Gebruik dezelfde authenticatie voor X2Go en de SSH Proxy" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Key file" msgstr "Sleutel" -#: ../pyhoca/wxgui/profilemanager.py:264 -msgid "SSH Proxy Tunnel" -msgstr "SSH Proxy Tunnel" - -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Discover SSH keys or use SSH agent for proxy authentication" msgstr "Gebruik SSH agent voor proxy authenticatie of zoek SSH sleutels" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:285 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Image quality" msgstr "Beeldkwaliteit" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Maximized" msgstr "Maximaliseered" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Custom Size" msgstr "Grootte instellen" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "Set display DPI" msgstr "DPI-waarde instellen" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Uitzetten (gebruik server-side tools om het toetsenbord in te stellen)" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "Gebruik automatisch gedetecteerd toetsenbord in de sessie" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Use custom keyboard settings as provided below" msgstr "Gebruik de onderstaande speciale toetsenbord instellingen" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:305 msgid "Keyboard model" msgstr "Toetsenbord model" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:307 msgid "Layout" msgstr "Layout" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Layout variant" msgstr "Layout variant" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "Enable sound support" msgstr "Geluid gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "Arts (not supported)" msgstr "Arts (niet ondersteund)" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:319 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "Use default sound port" msgstr "Standaard Audio-Port gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:315 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Custom sound port" msgstr "Speciale Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Use local folder sharing" msgstr "Delen van lokale mappen" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:325 #, fuzzy msgid "Store share list at end of session" msgstr "" "Een andere X2Go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:326 msgid "Path" msgstr "Pad" -#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:350 msgid "Add" msgstr "Toevoegen" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Local Path" msgstr "Lokaal Pad" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Connect Method" msgstr "Verbindingsmethode" -#: ../pyhoca/wxgui/profilemanager.py:327 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Delete" msgstr "Verwijderen" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:335 msgid "Convert between client and server encodings" msgstr "Encoding tussen client en server vertalen" -#: ../pyhoca/wxgui/profilemanager.py:330 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:332 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Use file MIME box for local file import" msgstr "Importeren lokale bestanden via MIME box" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:342 msgid "Extensions" msgstr "Uitbreidingen" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Action" msgstr "Actie" -#: ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Client Side printing" msgstr "Afdrukken via deze computer" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:351 msgid "Defaults" msgstr "Standaardwaarden" -#: ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/profilemanager.py:353 msgid "Save" msgstr "Opslaan" -#: ../pyhoca/wxgui/profilemanager.py:348 +#: ../pyhoca/wxgui/profilemanager.py:354 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:401 -#: ../pyhoca/wxgui/profilemanager.py:1124 -#: ../pyhoca/wxgui/profilemanager.py:2268 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:2190 msgid "automatically" msgstr "automatisch" -#: ../pyhoca/wxgui/profilemanager.py:403 -#: ../pyhoca/wxgui/profilemanager.py:1126 +#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:1101 msgid "manually" msgstr "handmatig" -#: ../pyhoca/wxgui/profilemanager.py:412 +#: ../pyhoca/wxgui/profilemanager.py:416 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profiel manager - nieuw profiel" -#: ../pyhoca/wxgui/profilemanager.py:414 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profiel manager - %s (verbonden)" -#: ../pyhoca/wxgui/profilemanager.py:416 +#: ../pyhoca/wxgui/profilemanager.py:420 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profiel manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:797 +#: ../pyhoca/wxgui/profilemanager.py:784 msgid "Profile" msgstr "Profiel" -#: ../pyhoca/wxgui/profilemanager.py:798 +#: ../pyhoca/wxgui/profilemanager.py:785 msgid "Session" msgstr "Sessie" -#: ../pyhoca/wxgui/profilemanager.py:799 +#: ../pyhoca/wxgui/profilemanager.py:786 msgid "Connection" msgstr "Verbinding" -#: ../pyhoca/wxgui/profilemanager.py:800 +#: ../pyhoca/wxgui/profilemanager.py:787 msgid "Link Quality" msgstr "Verbindingskwaliteit" -#: ../pyhoca/wxgui/profilemanager.py:801 +#: ../pyhoca/wxgui/profilemanager.py:788 msgid "Settings" msgstr "Instellingen" -#: ../pyhoca/wxgui/profilemanager.py:802 +#: ../pyhoca/wxgui/profilemanager.py:789 msgid "Sharing" msgstr "Delen" -#: ../pyhoca/wxgui/profilemanager.py:988 +#: ../pyhoca/wxgui/profilemanager.py:963 msgid "<xkbtype>" msgstr "pc105/us" -#: ../pyhoca/wxgui/profilemanager.py:989 +#: ../pyhoca/wxgui/profilemanager.py:964 msgid "<xkblayout>" msgstr "us" -#: ../pyhoca/wxgui/profilemanager.py:990 +#: ../pyhoca/wxgui/profilemanager.py:965 msgid "<xkbvariant>" msgstr "intl" -#: ../pyhoca/wxgui/profilemanager.py:1444 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Bestanden (*.png)|*.png|Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1447 +#: ../pyhoca/wxgui/profilemanager.py:1416 msgid "Choose an icon for this session profile" msgstr "Icon voor dit Profiel kiezen" -#: ../pyhoca/wxgui/profilemanager.py:1816 +#: ../pyhoca/wxgui/profilemanager.py:1776 msgid "All files (*.*)|*" msgstr "Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1818 -#: ../pyhoca/wxgui/profilemanager.py:1842 +#: ../pyhoca/wxgui/profilemanager.py:1778 +#: ../pyhoca/wxgui/profilemanager.py:1802 msgid "Choose a public SSH key" msgstr "Kies een public SSH-key" -#: ../pyhoca/wxgui/profilemanager.py:2220 +#: ../pyhoca/wxgui/profilemanager.py:2142 msgid "Choose a folder to share within a session" msgstr "Kies een map om te delen" -#: ../pyhoca/wxgui/profilemanager.py:2348 -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 -#: ../pyhoca/wxgui/profilemanager.py:2359 -#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117 +#: ../pyhoca/wxgui/profilemanager.py:2270 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 ../pyhoca/wxgui/menus_taskbar.py:117 msgid "Profile Manager" msgstr "Profiel manager" -#: ../pyhoca/wxgui/profilemanager.py:2348 +#: ../pyhoca/wxgui/profilemanager.py:2270 msgid "Profile name is missing, profile unusable!!!" msgstr "Profiel naam ontbreekt, kan niet gebruikt worden!!!" -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profiel %s bestaat al" -#: ../pyhoca/wxgui/profilemanager.py:2359 -msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." - -#: ../pyhoca/wxgui/profilemanager.py:2369 -#, python-format -msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" -"Please change the SSH proxy settings accordingly." -msgstr "" -"Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale " -"SSH proxy.\n" -"Verander de SSH proxy instelling om dit probleem te verhelpen." - -#: ../pyhoca/wxgui/profilemanager.py:2396 +#: ../pyhoca/wxgui/profilemanager.py:2303 #, python-format msgid "%s - profile added" msgstr "%s - Profiel toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:2397 +#: ../pyhoca/wxgui/profilemanager.py:2304 msgid "A new session profile has been added." msgstr "Een nieuw Profiel is toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:2401 +#: ../pyhoca/wxgui/profilemanager.py:2308 #, python-format msgid "%s - modified" msgstr "%s - gewijzigd" -#: ../pyhoca/wxgui/profilemanager.py:2402 +#: ../pyhoca/wxgui/profilemanager.py:2309 msgid "Changes to profile have been saved." msgstr "Wijzigingen in het profiel zijn opgeslagen." @@ -753,8 +732,8 @@ msgstr "Voorkeur voor afdrukken" msgid "Client Options" msgstr "Opties" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:795 +#: ../pyhoca/wxgui/menus_taskbar.py:987 msgid "E&xit" msgstr "&Beeindigen" @@ -907,51 +886,51 @@ msgstr "Enkelvoudige Applicatie starten" msgid "Manage Application Menu" msgstr "Onderhoud applicatie menu" -#: ../pyhoca/wxgui/menus_taskbar.py:714 +#: ../pyhoca/wxgui/menus_taskbar.py:726 msgid "Running" msgstr "Aktief" -#: ../pyhoca/wxgui/menus_taskbar.py:716 +#: ../pyhoca/wxgui/menus_taskbar.py:728 msgid "Suspended" msgstr "Suspended" -#: ../pyhoca/wxgui/menus_taskbar.py:735 +#: ../pyhoca/wxgui/menus_taskbar.py:747 msgid "&Clean all sessions" msgstr "Alle Sessies beëindigen" -#: ../pyhoca/wxgui/menus_taskbar.py:741 +#: ../pyhoca/wxgui/menus_taskbar.py:753 msgid "Customize &profile" msgstr "Sessieprofiel wijzigen" -#: ../pyhoca/wxgui/menus_taskbar.py:756 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "Shared &folders" msgstr "Delen &mappen" -#: ../pyhoca/wxgui/menus_taskbar.py:768 +#: ../pyhoca/wxgui/menus_taskbar.py:780 msgid "&Disconnect from Server" msgstr "&Verbinding verbreken" -#: ../pyhoca/wxgui/menus_taskbar.py:775 +#: ../pyhoca/wxgui/menus_taskbar.py:787 msgid "Suspend Session and E&xit application" msgstr "Suspend Sessie en e&xit" -#: ../pyhoca/wxgui/menus_taskbar.py:779 +#: ../pyhoca/wxgui/menus_taskbar.py:791 msgid "Disconnect and E&xit application" msgstr "verbinding verbreken en e&xit" -#: ../pyhoca/wxgui/menus_taskbar.py:833 +#: ../pyhoca/wxgui/menus_taskbar.py:845 msgid "Add Profile" msgstr "Profiel toevoegen" -#: ../pyhoca/wxgui/menus_taskbar.py:909 +#: ../pyhoca/wxgui/menus_taskbar.py:921 msgid "No session profiles defined" msgstr "Geen Profiel gedefinieerd" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Start/Resume Session" msgstr "Sessie starten/hervatten" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Connect Server" msgstr "Verbinden met Server" @@ -1037,7 +1016,7 @@ msgstr "" msgid "Unknown session profile, configure before using it..." msgstr "Onekend sessie profiel, stel dit in voordat je het gebruikt..." -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "%s - session warning" msgstr "%s - sessie waarschuwing" @@ -1064,26 +1043,26 @@ msgstr "X2Go Profiel is nu niet meer verbonden." msgid "New Session Profile" msgstr "Nieuw Profiel" -#: ../pyhoca/wxgui/frontend.py:1047 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Verwijder sessie profiel ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 #, python-format msgid "%s - profile deleted" msgstr "%s - Profiel is verwijderd!" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 msgid "The session profile has been deleted." msgstr "Het sessie profiel is verwijderd." -#: ../pyhoca/wxgui/frontend.py:1071 +#: ../pyhoca/wxgui/frontend.py:1075 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - deel lokale map met dit Profiel" -#: ../pyhoca/wxgui/frontend.py:1224 +#: ../pyhoca/wxgui/frontend.py:1228 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1096,17 +1075,17 @@ msgstr "" "\n" "Weet u zeker dat u de verbinding wilt maken?" -#: ../pyhoca/wxgui/frontend.py:1232 +#: ../pyhoca/wxgui/frontend.py:1236 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Bevestig dat de Host geautoriseerd is" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "%s - channel error" msgstr "%s - Verbindingsfout (channel error)" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1115,22 +1094,22 @@ msgstr "" "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " "opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313 -#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1299 ../pyhoca/wxgui/frontend.py:1317 +#: ../pyhoca/wxgui/frontend.py:1319 ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "%s - session failure" msgstr "%s - sessie fout" -#: ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1299 msgid "The session startup failed." msgstr "Opstarten van de sessie is mislukt" -#: ../pyhoca/wxgui/frontend.py:1313 +#: ../pyhoca/wxgui/frontend.py:1317 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Het commando ,,%s'' is niet beschikbaar op de X2Go server." -#: ../pyhoca/wxgui/frontend.py:1315 +#: ../pyhoca/wxgui/frontend.py:1319 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1139,7 +1118,7 @@ msgstr "" "Het commando ,,%s'' is niet beschikbaar op de X2Go server\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1148,7 +1127,7 @@ msgstr "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." -#: ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1157,36 +1136,36 @@ msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2Go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 #, python-format msgid "%s - audio warning" msgstr "%s - audio waarschuwing" -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" -#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1381 ../pyhoca/wxgui/frontend.py:1388 #, python-format msgid "%s - audio error" msgstr "%s - audio fout" -#: ../pyhoca/wxgui/frontend.py:1377 +#: ../pyhoca/wxgui/frontend.py:1381 msgid "The X2Go PulseAudio system could not be started." msgstr "Het X2Go PulseAudio systeem kon niet gestart worden" -#: ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1388 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "Het X2Go PulseAudio systeem is gecrashed" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "%s - audio problem" msgstr "%s - audio probleem" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1195,36 +1174,36 @@ msgstr "" "De audio verbinding kon niet worden gemaakt voor deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "%s - client-side printing not available" msgstr "%s - client-side print systeem niet beschikbaar" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "De server staat client-side printing niet toe" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "%s - MIME box not available" msgstr "%s- MIME box is niet beschikbaar" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "De server ondersteunt geen X2Go MIME box" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - client-side mappen worden niet gedeeld" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1233,12 +1212,12 @@ msgstr "" "De server staat client-side mappen deling in deze sessie niet toe.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "%s - client resources not sharable" msgstr "%s - client bronnen kunnen niet gedeeld worden" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1247,12 +1226,12 @@ msgstr "" "Client-side mappen en printers kunnen niet gedeeld worden in deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1467 ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "%s - print error" msgstr "%s - Printfout" -#: ../pyhoca/wxgui/frontend.py:1463 +#: ../pyhoca/wxgui/frontend.py:1467 #, python-format msgid "" "%s\n" @@ -1263,7 +1242,7 @@ msgstr "" "...veroorzaakt door printer %s in sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "" "%s\n" @@ -1274,12 +1253,12 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1484 ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "%s - start" msgstr "%s - Start" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1484 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1288,7 +1267,7 @@ msgstr "" "Nieuwe X2Go sessie wordt gestart...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "" "Another client started X2Go session\n" @@ -1297,12 +1276,12 @@ msgstr "" "Een andere X2Go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1514 ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "%s - resume" msgstr "%s - hervatten" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1514 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1311,7 +1290,7 @@ msgstr "" "X2Go Sessie wordt hervat...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1320,12 +1299,12 @@ msgstr "" "Een andere X2Go-client heeft de Sessie hervat\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "%s - running" msgstr "%s - actief" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "" "Found already running session\n" @@ -1334,12 +1313,12 @@ msgstr "" "Reeds actieve sessie gevonden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1348,12 +1327,12 @@ msgstr "" "X2Go Sessie is suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "%s - terminate" msgstr "%s - beëindigen" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1362,7 +1341,7 @@ msgstr "" "X2Go Sessie wordt beëindigd\n" "%s" -#: ../pyhoca/wxgui/messages.py:73 +#: ../pyhoca/wxgui/messages.py:72 #, python-format msgid "" "Are you really sure you want to\n" @@ -1371,7 +1350,7 @@ msgstr "" "Weet u zeker dat u het sessie\n" "profiel ,,%s'' wilt verwijderen??" -#: ../pyhoca/wxgui/messages.py:74 +#: ../pyhoca/wxgui/messages.py:73 #, python-format msgid "" "PyHoca-GUI is already running for user ,,%s''!\n" @@ -1386,15 +1365,15 @@ msgstr "" "Het Pyhoca-GUI icoontje kan gevonden worden in de\n" "taakbalk van uw desktop." -#: ../pyhoca/wxgui/messages.py:107 +#: ../pyhoca/wxgui/messages.py:106 msgid "Yes" msgstr "Ja" -#: ../pyhoca/wxgui/messages.py:108 +#: ../pyhoca/wxgui/messages.py:107 msgid "No" msgstr "Nee" -#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "Ok" @@ -1497,6 +1476,21 @@ msgstr "Wijzig sessie naam naar" msgid "OK" msgstr "OK" +#~ msgid "SSH Proxy Tunnel" +#~ msgstr "SSH Proxy Tunnel" + +#~ msgid "The SSH proxy configuration is incomplete. Try again." +#~ msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." + +#~ msgid "" +#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH " +#~ "proxy to.\n" +#~ "Please change the SSH proxy settings accordingly." +#~ msgstr "" +#~ "Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale " +#~ "SSH proxy.\n" +#~ "Verander de SSH proxy instelling om dit probleem te verhelpen." + #, fuzzy #~ msgid "Remember shared folders" #~ msgstr "Delen &mappen" diff --git a/po/ru.po b/po/ru.po index 5d48cde..8f3775b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 14:25+0100\n" +"POT-Creation-Date: 2013-01-04 11:42+0100\n" "PO-Revision-Date: 2012-11-19 13:51+0100\n" "Last-Translator: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -55,8 +55,8 @@ msgstr "Логин сессии" msgid "SSH proxy server login" msgstr "Логин SSH прокси сервера" -#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350 -#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:356 +#: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Отмена" @@ -222,7 +222,7 @@ msgstr "Сервер терминалов Windows (RDP через X2Go прок msgid "Windows Terminal Server (Direct RDP)" msgstr "Сервер терминалов Windows (прямое RDP соединение)" -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:236 msgid "Custom command" msgstr "Команда пользователя" @@ -259,476 +259,455 @@ msgid "settings derived from " msgstr "настройки импортированы из " #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Session Title" msgstr "Заголовок сессии" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Session Window" msgstr "Окно сессии" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Session Startup" msgstr "Запуск сессии" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Server" msgstr "Сервер" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Proxy" msgstr "Прокси" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Connection Link Speed" msgstr "Скорость соединения" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Compression" msgstr "Сжатие" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:186 msgid "Display" msgstr "Дисплей" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Keyboard" msgstr "Клавиатура" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Sound" msgstr "Звук" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "Printing" msgstr "Печать" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "Folder Exports" msgstr "Экспорт каталогов" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "File Import" msgstr "Импорт файлов" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Name" msgstr "Имя" -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Set session window title" msgstr "Установить заголовок окна сессии" -#: ../pyhoca/wxgui/profilemanager.py:192 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Use a default session window title" msgstr "Использовать заголовок окна сессии по умолчанию" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "Custom session window title" msgstr "Произвольный заголовок окна сессии" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Window Icon" msgstr "Пиктограмма" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Start session automatically after login" msgstr "Запускать сессию автоматически после входа" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:231 #, python-format msgid "Login automatically after %s has started" msgstr "Автоматический вход после запуска %s" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Type" msgstr "Тип" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Application" msgstr "Приложение" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "XDMCP server" msgstr "XDMCP сервер" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "RDP server" msgstr "RDP сервер" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "RDP options" msgstr "Опции RDP" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "Интегрировать удаленное приложение в локальный десктоп" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Menu of published applications" msgstr "Меню удаленных приложений" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:252 ../pyhoca/wxgui/profilemanager.py:265 msgid "User" msgstr "Пользователь" -#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:254 ../pyhoca/wxgui/profilemanager.py:272 msgid "Host" msgstr "Хост" -#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:256 ../pyhoca/wxgui/profilemanager.py:274 msgid "Port" msgstr "Порт" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Key" msgstr "Ключ" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Discover SSH keys or use SSH agent for X2Go authentication" msgstr "" "Автоматически определять SSH ключи или использовать SSH агент для " "аутентификации" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Enable forwarding of SSH authentication agent connections" msgstr "Разрешить ретрансляцию соединений агента SSH" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Server behind SSH proxy" msgstr "Сервер за SSH прокси" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "Use same username for X2Go and proxy host" msgstr "Использовать то же имя пользователя, что и на сервере X2Go" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Use same authentication for X2Go and proxy host" msgstr "Использовать тот же пароль, что и на сервере X2Go" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Key file" msgstr "Файл ключа" -#: ../pyhoca/wxgui/profilemanager.py:264 -msgid "SSH Proxy Tunnel" -msgstr "SSH прокси туннель" - -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Discover SSH keys or use SSH agent for proxy authentication" msgstr "" "Автоматически определять SSH ключи или использовать SSH агент для " "аутентификации на прокси сервере" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "Modem" msgstr "Модем" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:285 msgid "Method" msgstr "Метод" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Image quality" msgstr "Качество изображения" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Fullscreen" msgstr "Полноэкранный режим" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Maximized" msgstr "Максимальный размер" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Custom Size" msgstr "Другой размер" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "Set display DPI" msgstr "Установить DPI" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Не устанавливать (конфигурация на стороне сервера)" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "автоматически определять и использовать установки на стороне сервера" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Use custom keyboard settings as provided below" msgstr "Использовать следующие установки" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:305 msgid "Keyboard model" msgstr "Модель" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:307 msgid "Layout" msgstr "Раскладка" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Layout variant" msgstr "Вариант раскладки" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "Enable sound support" msgstr "Активировать звук" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "Arts (not supported)" msgstr "Arts (не поддерживается)" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:319 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "Use default sound port" msgstr "Звуковой порт по умолчанию" -#: ../pyhoca/wxgui/profilemanager.py:315 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Custom sound port" msgstr "Другой звуковой порт" -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Use local folder sharing" msgstr "Доступ к локальным каталогам" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:325 #, fuzzy msgid "Store share list at end of session" msgstr "" "Другой клиент запускает сессию X2Go\n" "%s" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:326 msgid "Path" msgstr "Путь" -#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:350 msgid "Add" msgstr "Добавить" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Local Path" msgstr "Локальный путь" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Connect Method" msgstr "Метод подключения" -#: ../pyhoca/wxgui/profilemanager.py:327 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Delete" msgstr "Удалить" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:335 msgid "Convert between client and server encodings" msgstr "Кодировка имен файлов" -#: ../pyhoca/wxgui/profilemanager.py:330 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Client encoding" msgstr "На стороне клиента" -#: ../pyhoca/wxgui/profilemanager.py:332 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Server encoding" msgstr "На стороне сервера" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Use file MIME box for local file import" msgstr "Использовать MIME box для импорта локальных файлов" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:342 msgid "Extensions" msgstr "Расширения" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Action" msgstr "Действие" -#: ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Client Side printing" msgstr "Печать на стороне клиента" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:351 msgid "Defaults" msgstr "По умолчанию" -#: ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/profilemanager.py:353 msgid "Save" msgstr "Сохранить" -#: ../pyhoca/wxgui/profilemanager.py:348 +#: ../pyhoca/wxgui/profilemanager.py:354 msgid "Reset" msgstr "Восстановить" -#: ../pyhoca/wxgui/profilemanager.py:401 -#: ../pyhoca/wxgui/profilemanager.py:1124 -#: ../pyhoca/wxgui/profilemanager.py:2268 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:2190 msgid "automatically" msgstr "автоматически" -#: ../pyhoca/wxgui/profilemanager.py:403 -#: ../pyhoca/wxgui/profilemanager.py:1126 +#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:1101 msgid "manually" msgstr "вручную" -#: ../pyhoca/wxgui/profilemanager.py:412 +#: ../pyhoca/wxgui/profilemanager.py:416 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profile Manager - новый профиль" -#: ../pyhoca/wxgui/profilemanager.py:414 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profile Manager - %s (соединение)" -#: ../pyhoca/wxgui/profilemanager.py:416 +#: ../pyhoca/wxgui/profilemanager.py:420 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profile Manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:797 +#: ../pyhoca/wxgui/profilemanager.py:784 msgid "Profile" msgstr "Профиль" -#: ../pyhoca/wxgui/profilemanager.py:798 +#: ../pyhoca/wxgui/profilemanager.py:785 msgid "Session" msgstr "Сессия" -#: ../pyhoca/wxgui/profilemanager.py:799 +#: ../pyhoca/wxgui/profilemanager.py:786 msgid "Connection" msgstr "Соединение" -#: ../pyhoca/wxgui/profilemanager.py:800 +#: ../pyhoca/wxgui/profilemanager.py:787 msgid "Link Quality" msgstr "Качество соединения" -#: ../pyhoca/wxgui/profilemanager.py:801 +#: ../pyhoca/wxgui/profilemanager.py:788 msgid "Settings" msgstr "Установки" -#: ../pyhoca/wxgui/profilemanager.py:802 +#: ../pyhoca/wxgui/profilemanager.py:789 msgid "Sharing" msgstr "Доступ" -#: ../pyhoca/wxgui/profilemanager.py:988 +#: ../pyhoca/wxgui/profilemanager.py:963 msgid "<xkbtype>" msgstr "<xkbtype>" -#: ../pyhoca/wxgui/profilemanager.py:989 +#: ../pyhoca/wxgui/profilemanager.py:964 msgid "<xkblayout>" msgstr "<xkblayout>" -#: ../pyhoca/wxgui/profilemanager.py:990 +#: ../pyhoca/wxgui/profilemanager.py:965 msgid "<xkbvariant>" msgstr "<xkbvariant>" -#: ../pyhoca/wxgui/profilemanager.py:1444 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Графические файлы (*.png)|*.png|Все файлы (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1447 +#: ../pyhoca/wxgui/profilemanager.py:1416 msgid "Choose an icon for this session profile" msgstr "Выбрать пиктограмму" -#: ../pyhoca/wxgui/profilemanager.py:1816 +#: ../pyhoca/wxgui/profilemanager.py:1776 msgid "All files (*.*)|*" msgstr "Все файлы (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1818 -#: ../pyhoca/wxgui/profilemanager.py:1842 +#: ../pyhoca/wxgui/profilemanager.py:1778 +#: ../pyhoca/wxgui/profilemanager.py:1802 msgid "Choose a public SSH key" msgstr "Выбрать публичный ключ SSH" -#: ../pyhoca/wxgui/profilemanager.py:2220 +#: ../pyhoca/wxgui/profilemanager.py:2142 msgid "Choose a folder to share within a session" msgstr "Выбрать экспортируемый каталог" -#: ../pyhoca/wxgui/profilemanager.py:2348 -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 -#: ../pyhoca/wxgui/profilemanager.py:2359 -#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117 +#: ../pyhoca/wxgui/profilemanager.py:2270 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 ../pyhoca/wxgui/menus_taskbar.py:117 msgid "Profile Manager" msgstr "Profile Manager" -#: ../pyhoca/wxgui/profilemanager.py:2348 +#: ../pyhoca/wxgui/profilemanager.py:2270 msgid "Profile name is missing, profile unusable!!!" msgstr "Имя профиля не установлено!!!" -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 #, python-format msgid "Profile name %s already exists!!!" msgstr "Профиль с именем %s уже существует!!!" -#: ../pyhoca/wxgui/profilemanager.py:2359 -msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "Конфигурация SSH прокси не завершена. Попробуйте еще раз." - -#: ../pyhoca/wxgui/profilemanager.py:2369 -#, python-format -msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" -"Please change the SSH proxy settings accordingly." -msgstr "" -"Другой профиль (%s) использует [%s]:%s для привязки к локальному SSH " -"прокси.\n" -"Измените настройки SSH прокси." - -#: ../pyhoca/wxgui/profilemanager.py:2396 +#: ../pyhoca/wxgui/profilemanager.py:2303 #, python-format msgid "%s - profile added" msgstr "%s - профиль добавлен" -#: ../pyhoca/wxgui/profilemanager.py:2397 +#: ../pyhoca/wxgui/profilemanager.py:2304 msgid "A new session profile has been added." msgstr "Новый профиль сессии добавлен." -#: ../pyhoca/wxgui/profilemanager.py:2401 +#: ../pyhoca/wxgui/profilemanager.py:2308 #, python-format msgid "%s - modified" msgstr "%s - модифицирован" -#: ../pyhoca/wxgui/profilemanager.py:2402 +#: ../pyhoca/wxgui/profilemanager.py:2309 msgid "Changes to profile have been saved." msgstr "Изменения в профиле сохранены." @@ -761,8 +740,8 @@ msgstr "Установки печати" msgid "Client Options" msgstr "Опции клиента" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:795 +#: ../pyhoca/wxgui/menus_taskbar.py:987 msgid "E&xit" msgstr "Вы&ход" @@ -915,51 +894,51 @@ msgstr "Запустить приложение" msgid "Manage Application Menu" msgstr "Управление меню приложений" -#: ../pyhoca/wxgui/menus_taskbar.py:714 +#: ../pyhoca/wxgui/menus_taskbar.py:726 msgid "Running" msgstr "Выполняется" -#: ../pyhoca/wxgui/menus_taskbar.py:716 +#: ../pyhoca/wxgui/menus_taskbar.py:728 msgid "Suspended" msgstr "Приостановлено" -#: ../pyhoca/wxgui/menus_taskbar.py:735 +#: ../pyhoca/wxgui/menus_taskbar.py:747 msgid "&Clean all sessions" msgstr "&Очистить все сессии" -#: ../pyhoca/wxgui/menus_taskbar.py:741 +#: ../pyhoca/wxgui/menus_taskbar.py:753 msgid "Customize &profile" msgstr "Изменить &профиль" -#: ../pyhoca/wxgui/menus_taskbar.py:756 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "Shared &folders" msgstr "Экспорт &каталогов" -#: ../pyhoca/wxgui/menus_taskbar.py:768 +#: ../pyhoca/wxgui/menus_taskbar.py:780 msgid "&Disconnect from Server" msgstr "&Отсоединить от сервера" -#: ../pyhoca/wxgui/menus_taskbar.py:775 +#: ../pyhoca/wxgui/menus_taskbar.py:787 msgid "Suspend Session and E&xit application" msgstr "&Прервать сессию и покинуть программу" -#: ../pyhoca/wxgui/menus_taskbar.py:779 +#: ../pyhoca/wxgui/menus_taskbar.py:791 msgid "Disconnect and E&xit application" msgstr "&Разъединить и покинуть программу" -#: ../pyhoca/wxgui/menus_taskbar.py:833 +#: ../pyhoca/wxgui/menus_taskbar.py:845 msgid "Add Profile" msgstr "Добавить профиль" -#: ../pyhoca/wxgui/menus_taskbar.py:909 +#: ../pyhoca/wxgui/menus_taskbar.py:921 msgid "No session profiles defined" msgstr "Профили не определены" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Start/Resume Session" msgstr "Запуск/восстановление сессии" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Connect Server" msgstr "Соединить с сервером" @@ -1044,7 +1023,7 @@ msgstr "" msgid "Unknown session profile, configure before using it..." msgstr "Неизвестный профиль сессии..." -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "%s - session warning" msgstr "%s - предупреждение" @@ -1071,26 +1050,26 @@ msgstr "X2Go Профиль отсоединен." msgid "New Session Profile" msgstr "Новый профиль" -#: ../pyhoca/wxgui/frontend.py:1047 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Удалить профиль ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 #, python-format msgid "%s - profile deleted" msgstr "%s - профиль удален" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 msgid "The session profile has been deleted." msgstr "Профиль был удален." -#: ../pyhoca/wxgui/frontend.py:1071 +#: ../pyhoca/wxgui/frontend.py:1075 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - экспортируемый каталог" -#: ../pyhoca/wxgui/frontend.py:1224 +#: ../pyhoca/wxgui/frontend.py:1228 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1103,39 +1082,39 @@ msgstr "" "\n" "Продолжить соединение?" -#: ../pyhoca/wxgui/frontend.py:1232 +#: ../pyhoca/wxgui/frontend.py:1236 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Подтвердите авторизацию хоста" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "%s - channel error" msgstr "%s - ошибка канала" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "Соединение с сервером %s утрачено. Попытайтесь соединиться еще раз..." -#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313 -#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1299 ../pyhoca/wxgui/frontend.py:1317 +#: ../pyhoca/wxgui/frontend.py:1319 ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "%s - session failure" msgstr "%s - ошибка сессии" -#: ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1299 msgid "The session startup failed." msgstr "Запуск сессии не удался." -#: ../pyhoca/wxgui/frontend.py:1313 +#: ../pyhoca/wxgui/frontend.py:1317 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Команда ,,%s'' недоступна на сервере X2Go." -#: ../pyhoca/wxgui/frontend.py:1315 +#: ../pyhoca/wxgui/frontend.py:1319 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1144,7 +1123,7 @@ msgstr "" "Команда ,,%s'' недоступна на сервере X2Go\n" "%s." -#: ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1152,7 +1131,7 @@ msgid "" msgstr "" "Запрос ретрансляции порта TCP для сессии %s к порту сервера %S был отклонен." -#: ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1161,35 +1140,35 @@ msgstr "" "Запрос туннеля к серверу [%s]:%s для сессии %s был отклонен удаленным " "сервером X2Go/SSH. Запуск сессии не удался." -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 #, python-format msgid "%s - audio warning" msgstr "%s - предупреждение audio" -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "Система X2Go PulseAudio недоступна в сессиях удаленного десктопа." -#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1381 ../pyhoca/wxgui/frontend.py:1388 #, python-format msgid "%s - audio error" msgstr "%s - ошибка audio" -#: ../pyhoca/wxgui/frontend.py:1377 +#: ../pyhoca/wxgui/frontend.py:1381 msgid "The X2Go PulseAudio system could not be started." msgstr "Система X2Go PulseAudio не может быть запущена." -#: ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1388 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "Сбой системы X2Go PulseAudio." -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "%s - audio problem" msgstr "%s - ошибка audio" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1199,12 +1178,12 @@ msgstr "" "%s" # %s - печать недоступна -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "%s - client-side printing not available" msgstr "%s - печать недоступна" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1213,12 +1192,12 @@ msgstr "" "Сервер отклонил печать внутри этой сессии.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "%s - MIME box not available" msgstr "%s - MIME box недоступен" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1227,12 +1206,12 @@ msgstr "" "Сервер не поддерживает X2Go MIME box.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - клиентские каталоги не экспотируемы" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1241,12 +1220,12 @@ msgstr "" "Сервер отклонил экспорт каталогов внутри этой сессии.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "%s - client resources not sharable" msgstr "%s - клиентские ресурсы не экспортируемы" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1256,12 +1235,12 @@ msgstr "" "этой сессии.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1467 ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "%s - print error" msgstr "%s - ошибка печати" -#: ../pyhoca/wxgui/frontend.py:1463 +#: ../pyhoca/wxgui/frontend.py:1467 #, python-format msgid "" "%s\n" @@ -1272,7 +1251,7 @@ msgstr "" "...на принтере %s в сессии\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "" "%s\n" @@ -1283,12 +1262,12 @@ msgstr "" "...в сессии\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1484 ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "%s - start" msgstr "%s - пуск" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1484 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1297,7 +1276,7 @@ msgstr "" "Новая сессия X2Go запускается...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "" "Another client started X2Go session\n" @@ -1306,12 +1285,12 @@ msgstr "" "Другой клиент запускает сессию X2Go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1514 ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "%s - resume" msgstr "%s - восстановить" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1514 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1320,7 +1299,7 @@ msgstr "" "Восстанавливаем X2Go сессию...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1329,12 +1308,12 @@ msgstr "" "Другой клиент восстанавливает сессию X2Go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "%s - running" msgstr "%s - выполняется" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "" "Found already running session\n" @@ -1343,12 +1322,12 @@ msgstr "" "Найдена уже запущенная сессия\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "%s - suspend" msgstr "%s - прервать" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1357,12 +1336,12 @@ msgstr "" "X2Go сессия прервана\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "%s - terminate" msgstr "%s - завершить" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1371,14 +1350,14 @@ msgstr "" "X2Go сессия завершена\n" "%s" -#: ../pyhoca/wxgui/messages.py:73 +#: ../pyhoca/wxgui/messages.py:72 #, python-format msgid "" "Are you really sure you want to\n" "delete the session profile ,,%s''?" msgstr "Удалить профиль ,,%s''?" -#: ../pyhoca/wxgui/messages.py:74 +#: ../pyhoca/wxgui/messages.py:73 #, python-format msgid "" "PyHoca-GUI is already running for user ,,%s''!\n" @@ -1392,15 +1371,15 @@ msgstr "" "Лишь одна версия PyHoca-GUI может быть запущена\n" " пользователем." -#: ../pyhoca/wxgui/messages.py:107 +#: ../pyhoca/wxgui/messages.py:106 msgid "Yes" msgstr "Да" -#: ../pyhoca/wxgui/messages.py:108 +#: ../pyhoca/wxgui/messages.py:107 msgid "No" msgstr "Нет" -#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "ОК" @@ -1503,6 +1482,21 @@ msgstr "Изменить заголовок сессии на" msgid "OK" msgstr "ОК" +#~ msgid "SSH Proxy Tunnel" +#~ msgstr "SSH прокси туннель" + +#~ msgid "The SSH proxy configuration is incomplete. Try again." +#~ msgstr "Конфигурация SSH прокси не завершена. Попробуйте еще раз." + +#~ msgid "" +#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH " +#~ "proxy to.\n" +#~ "Please change the SSH proxy settings accordingly." +#~ msgstr "" +#~ "Другой профиль (%s) использует [%s]:%s для привязки к локальному SSH " +#~ "прокси.\n" +#~ "Измените настройки SSH прокси." + #~ msgid "RSA/DSA private key" #~ msgstr "личный ключ RSA/DSA" diff --git a/po/sv.po b/po/sv.po index 6116dbf..2c73b8b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 14:25+0100\n" +"POT-Creation-Date: 2013-01-04 11:42+0100\n" "PO-Revision-Date: 2012-11-26 14:24+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -50,8 +50,8 @@ msgstr "Sessionsinloggning" msgid "SSH proxy server login" msgstr "SSH proxyserverinloggning" -#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350 -#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:356 +#: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Avbryt" @@ -219,7 +219,7 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (RDP-proxy)" -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:236 msgid "Custom command" msgstr "Anpassat kommando" @@ -256,225 +256,221 @@ msgid "settings derived from " msgstr "inställningar hämtade från" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Session Title" msgstr "Sessionsnamn" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Session Window" msgstr "Sessionsfönster" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Session Startup" msgstr "Sessionsstart" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Proxy" msgstr "Proxy" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Connection Link Speed" msgstr "Anslutningshastighet" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Compression" msgstr "Komprimering" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:186 msgid "Display" msgstr "Skärm" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Keyboard" msgstr "Tangentbord" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Sound" msgstr "Ljud" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "Printing" msgstr "Utskrifter" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "Folder Exports" msgstr "Delade mappar" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "File Import" msgstr "Filimport" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Name" msgstr "Namn" -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Set session window title" msgstr "Ange fönstertitel för session" -#: ../pyhoca/wxgui/profilemanager.py:192 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Use a default session window title" msgstr "Använd standard fönstertitel för session" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "Custom session window title" msgstr "Anpassad fönstertitel för session" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Window Icon" msgstr "Fönsterikon" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Start session automatically after login" msgstr "Starta session automatiskt efter inloggning" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:231 #, python-format msgid "Login automatically after %s has started" msgstr "Logga in automatiskt när %s har startat" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Type" msgstr "Typ" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Application" msgstr "Applikation" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "XDMCP server" msgstr "XDMCP-server" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "RDP server" msgstr "RDP-server" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "RDP options" msgstr "RDP-alternativ" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "Integrera fjärrapplikation i lokalt Skrivbord (rootless)" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Menu of published applications" msgstr "Meny med publicerade applikationer" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:252 ../pyhoca/wxgui/profilemanager.py:265 msgid "User" msgstr "Användare" -#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:254 ../pyhoca/wxgui/profilemanager.py:272 msgid "Host" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:256 ../pyhoca/wxgui/profilemanager.py:274 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Key" msgstr "Nyckel" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Discover SSH keys or use SSH agent for X2Go authentication" msgstr "Upptäck SSH-nycklar eller använd SSH agent för X2Go autentisering" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:263 msgid "Enable forwarding of SSH authentication agent connections" msgstr "Aktivera vidarebefordran av anslutningar för SSH autentiseringsagent" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Server behind SSH proxy" msgstr "Server bakom SSH-proxy" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "Use same username for X2Go and proxy host" msgstr "Använd samma användarnamn för X2Go och proxyserver" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Use same authentication for X2Go and proxy host" msgstr "Använd samma autentisering för X2Go och proxyserver" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Key file" msgstr "Nyckelfil" -#: ../pyhoca/wxgui/profilemanager.py:264 -msgid "SSH Proxy Tunnel" -msgstr "SSH proxytunnel" - -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Discover SSH keys or use SSH agent for proxy authentication" msgstr "Upptäck SSH-nycklar eller använd SSH agent för proxyautentisering" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:285 msgid "Method" msgstr "Metod" -#: ../pyhoca/wxgui/profilemanager.py:281 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Image quality" msgstr "Bildkvalitet" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:293 msgid "Fullscreen" msgstr "Fullskärm" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Maximized" msgstr "Maximerad" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "Custom Size" msgstr "Anpassad storlek" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "Set display DPI" msgstr "Ange skärmupplösning (DPI)" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" "Konfigurera inte (använd verktyg på server för att konfigurera tangentbord)" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -482,246 +478,229 @@ msgstr "" "Detektera automatiskt och använd klientinställningar för tangentbord i " "session" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Use custom keyboard settings as provided below" msgstr "Använd nedan angivna tangentbordsinställningar" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:305 msgid "Keyboard model" msgstr "Tangentbordsmodell" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:307 msgid "Layout" msgstr "Tangentbordslayout" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Layout variant" msgstr "Variant" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "Enable sound support" msgstr "Aktivera ljudstöd" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "Arts (not supported)" msgstr "Arts (stöds ej)" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:319 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "Use default sound port" msgstr "Använd standardport för ljud" -#: ../pyhoca/wxgui/profilemanager.py:315 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Custom sound port" msgstr "Anpassad ljudport" -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Use local folder sharing" msgstr "Använd lokal mappdelning" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Store share list at end of session" msgstr "Spara lista med delade mappar när sessionen avslutas" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:326 msgid "Path" msgstr "Sökväg" -#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:350 msgid "Add" msgstr "Lägg till" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Local Path" msgstr "Lokal sökväg" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Connect Method" msgstr "Anslutningsmetod" -#: ../pyhoca/wxgui/profilemanager.py:327 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Delete" msgstr "Radera" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:335 msgid "Convert between client and server encodings" msgstr "Konvertera kodtabell mellan klient och server" -#: ../pyhoca/wxgui/profilemanager.py:330 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Client encoding" msgstr "Kodtabell klient" -#: ../pyhoca/wxgui/profilemanager.py:332 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Server encoding" msgstr "Kodtabell server" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Use file MIME box for local file import" msgstr "Använd MIME för lokal filimport" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:342 msgid "Extensions" msgstr "Filändelser" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Action" msgstr "Hantering" -#: ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Client Side printing" msgstr "Stöd för utskrifter via klienten" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:351 msgid "Defaults" msgstr "Standard" -#: ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/profilemanager.py:353 msgid "Save" msgstr "Spara" -#: ../pyhoca/wxgui/profilemanager.py:348 +#: ../pyhoca/wxgui/profilemanager.py:354 msgid "Reset" msgstr "Återställ" -#: ../pyhoca/wxgui/profilemanager.py:401 -#: ../pyhoca/wxgui/profilemanager.py:1124 -#: ../pyhoca/wxgui/profilemanager.py:2268 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:2190 msgid "automatically" msgstr "automatisk" -#: ../pyhoca/wxgui/profilemanager.py:403 -#: ../pyhoca/wxgui/profilemanager.py:1126 +#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:1101 msgid "manually" msgstr "manuellt" -#: ../pyhoca/wxgui/profilemanager.py:412 +#: ../pyhoca/wxgui/profilemanager.py:416 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profilhanterare - ny profil" -#: ../pyhoca/wxgui/profilemanager.py:414 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr " PyHoca-GUI Profilhanterare - %s (ansluten)" -#: ../pyhoca/wxgui/profilemanager.py:416 +#: ../pyhoca/wxgui/profilemanager.py:420 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profilhanterare - %s" -#: ../pyhoca/wxgui/profilemanager.py:797 +#: ../pyhoca/wxgui/profilemanager.py:784 msgid "Profile" msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:798 +#: ../pyhoca/wxgui/profilemanager.py:785 msgid "Session" msgstr "Session" -#: ../pyhoca/wxgui/profilemanager.py:799 +#: ../pyhoca/wxgui/profilemanager.py:786 msgid "Connection" msgstr "Anslutning" -#: ../pyhoca/wxgui/profilemanager.py:800 +#: ../pyhoca/wxgui/profilemanager.py:787 msgid "Link Quality" msgstr "Länkkvalitet" -#: ../pyhoca/wxgui/profilemanager.py:801 +#: ../pyhoca/wxgui/profilemanager.py:788 msgid "Settings" msgstr "Inställningar" -#: ../pyhoca/wxgui/profilemanager.py:802 +#: ../pyhoca/wxgui/profilemanager.py:789 msgid "Sharing" msgstr "Delning" -#: ../pyhoca/wxgui/profilemanager.py:988 +#: ../pyhoca/wxgui/profilemanager.py:963 msgid "<xkbtype>" msgstr "pc105" -#: ../pyhoca/wxgui/profilemanager.py:989 +#: ../pyhoca/wxgui/profilemanager.py:964 msgid "<xkblayout>" msgstr "se" -#: ../pyhoca/wxgui/profilemanager.py:990 +#: ../pyhoca/wxgui/profilemanager.py:965 msgid "<xkbvariant>" msgstr "se" -#: ../pyhoca/wxgui/profilemanager.py:1444 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Ikonfiler (*.png)|*.png|Alla filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1447 +#: ../pyhoca/wxgui/profilemanager.py:1416 msgid "Choose an icon for this session profile" msgstr "Välj en ikon för denna sessionsprofil" -#: ../pyhoca/wxgui/profilemanager.py:1816 +#: ../pyhoca/wxgui/profilemanager.py:1776 msgid "All files (*.*)|*" msgstr "Alla filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1818 -#: ../pyhoca/wxgui/profilemanager.py:1842 +#: ../pyhoca/wxgui/profilemanager.py:1778 +#: ../pyhoca/wxgui/profilemanager.py:1802 msgid "Choose a public SSH key" msgstr "Välj en public SSH-nyckel" -#: ../pyhoca/wxgui/profilemanager.py:2220 +#: ../pyhoca/wxgui/profilemanager.py:2142 msgid "Choose a folder to share within a session" msgstr "Välj en mapp att dela i en session" -#: ../pyhoca/wxgui/profilemanager.py:2348 -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 -#: ../pyhoca/wxgui/profilemanager.py:2359 -#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117 +#: ../pyhoca/wxgui/profilemanager.py:2270 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 ../pyhoca/wxgui/menus_taskbar.py:117 msgid "Profile Manager" msgstr "Profilhanterare" -#: ../pyhoca/wxgui/profilemanager.py:2348 +#: ../pyhoca/wxgui/profilemanager.py:2270 msgid "Profile name is missing, profile unusable!!!" msgstr "Profilnamn saknas, profil oanvändbar!" -#: ../pyhoca/wxgui/profilemanager.py:2351 -#: ../pyhoca/wxgui/profilemanager.py:2354 +#: ../pyhoca/wxgui/profilemanager.py:2273 +#: ../pyhoca/wxgui/profilemanager.py:2276 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profilen %s finns redan!" -#: ../pyhoca/wxgui/profilemanager.py:2359 -msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "Konfigurationen av SSH-proxy är inte komplett. Försök igen." - -#: ../pyhoca/wxgui/profilemanager.py:2369 -#, python-format -msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" -"Please change the SSH proxy settings accordingly." -msgstr "" -"En annan session (%s) använder redan [%s]:%s för att ansluta till lokal SSH-" -"proxy.\n" -"Ändra konfiguration för SSH-proxy ." - -#: ../pyhoca/wxgui/profilemanager.py:2396 +#: ../pyhoca/wxgui/profilemanager.py:2303 #, python-format msgid "%s - profile added" msgstr "%s - profil tillagd" -#: ../pyhoca/wxgui/profilemanager.py:2397 +#: ../pyhoca/wxgui/profilemanager.py:2304 msgid "A new session profile has been added." msgstr "En ny sessionsprofil har lagts till." -#: ../pyhoca/wxgui/profilemanager.py:2401 +#: ../pyhoca/wxgui/profilemanager.py:2308 #, python-format msgid "%s - modified" msgstr "%s - ändrad" -#: ../pyhoca/wxgui/profilemanager.py:2402 +#: ../pyhoca/wxgui/profilemanager.py:2309 msgid "Changes to profile have been saved." msgstr "Ändringar av profil har sparats." @@ -754,8 +733,8 @@ msgstr "Utskriftspreferenser" msgid "Client Options" msgstr "Klientalternativ" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:795 +#: ../pyhoca/wxgui/menus_taskbar.py:987 msgid "E&xit" msgstr "&Avsluta" @@ -908,51 +887,51 @@ msgstr "Starta applikation" msgid "Manage Application Menu" msgstr "Hantera applikationsmeny" -#: ../pyhoca/wxgui/menus_taskbar.py:714 +#: ../pyhoca/wxgui/menus_taskbar.py:726 msgid "Running" msgstr "Aktiv" -#: ../pyhoca/wxgui/menus_taskbar.py:716 +#: ../pyhoca/wxgui/menus_taskbar.py:728 msgid "Suspended" msgstr "Vilande" -#: ../pyhoca/wxgui/menus_taskbar.py:735 +#: ../pyhoca/wxgui/menus_taskbar.py:747 msgid "&Clean all sessions" msgstr "&Rensa alla sessioner" -#: ../pyhoca/wxgui/menus_taskbar.py:741 +#: ../pyhoca/wxgui/menus_taskbar.py:753 msgid "Customize &profile" msgstr "Anpassa &profil" -#: ../pyhoca/wxgui/menus_taskbar.py:756 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "Shared &folders" msgstr "Delade &mappar" -#: ../pyhoca/wxgui/menus_taskbar.py:768 +#: ../pyhoca/wxgui/menus_taskbar.py:780 msgid "&Disconnect from Server" msgstr "&Koppla från server" -#: ../pyhoca/wxgui/menus_taskbar.py:775 +#: ../pyhoca/wxgui/menus_taskbar.py:787 msgid "Suspend Session and E&xit application" msgstr "Försätt session i vila och avsluta" -#: ../pyhoca/wxgui/menus_taskbar.py:779 +#: ../pyhoca/wxgui/menus_taskbar.py:791 msgid "Disconnect and E&xit application" msgstr "Kopplar från och &avsluta" -#: ../pyhoca/wxgui/menus_taskbar.py:833 +#: ../pyhoca/wxgui/menus_taskbar.py:845 msgid "Add Profile" msgstr "Lägg till profil" -#: ../pyhoca/wxgui/menus_taskbar.py:909 +#: ../pyhoca/wxgui/menus_taskbar.py:921 msgid "No session profiles defined" msgstr "Inga sessionsprofiler har definierats" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Start/Resume Session" msgstr "Starta/återanslut session" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Connect Server" msgstr "Anslut till server" @@ -1037,7 +1016,7 @@ msgstr "" msgid "Unknown session profile, configure before using it..." msgstr "Okänd sessionsprofil, konfigurera före användning..." -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "%s - session warning" msgstr "%s - sessionsvarning" @@ -1064,26 +1043,26 @@ msgstr "X2Go-profil är nu frånkopplad" msgid "New Session Profile" msgstr "Ny sessionsprofil" -#: ../pyhoca/wxgui/frontend.py:1047 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Är du säker på att du vill radera profil ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 #, python-format msgid "%s - profile deleted" msgstr "%s - profil raderad" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 msgid "The session profile has been deleted." msgstr "Profilen har raderats." -#: ../pyhoca/wxgui/frontend.py:1071 +#: ../pyhoca/wxgui/frontend.py:1075 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - dela lokal mapp med sessioner som använder denna profil" -#: ../pyhoca/wxgui/frontend.py:1224 +#: ../pyhoca/wxgui/frontend.py:1228 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1096,17 +1075,17 @@ msgstr "" "\n" "Litar du på denna nyckel?" -#: ../pyhoca/wxgui/frontend.py:1232 +#: ../pyhoca/wxgui/frontend.py:1236 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Bekräfta tillägg av server" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "%s - channel error" msgstr "%s - kanalfel" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1114,22 +1093,22 @@ msgid "" msgstr "" "Anslutning till %s avslutades oväntat! Försök återansluta till server..." -#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313 -#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1299 ../pyhoca/wxgui/frontend.py:1317 +#: ../pyhoca/wxgui/frontend.py:1319 ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "%s - session failure" msgstr "%s - session misslyckades" -#: ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1299 msgid "The session startup failed." msgstr "Sessionsstart misslyckades." -#: ../pyhoca/wxgui/frontend.py:1313 +#: ../pyhoca/wxgui/frontend.py:1317 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Kommandot ,,%s'' finns inte på X2Go-server." -#: ../pyhoca/wxgui/frontend.py:1315 +#: ../pyhoca/wxgui/frontend.py:1319 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1138,7 +1117,7 @@ msgstr "" "Kommandot ,,%s'' finns inte på X2Go-server\n" "%s." -#: ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1146,7 +1125,7 @@ msgid "" msgstr "" "Omvänd TCP port forwarding för session %s till serverport %s har nekats." -#: ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1155,35 +1134,35 @@ msgstr "" "Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. " "Sessionsstart misslyckades." -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 #, python-format msgid "%s - audio warning" msgstr "%s - ljudvarning" -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "X2Go PulseAudio är inte tillgängligt i Remote Desktop-sessioner." -#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1381 ../pyhoca/wxgui/frontend.py:1388 #, python-format msgid "%s - audio error" msgstr "%s - ljudfel" -#: ../pyhoca/wxgui/frontend.py:1377 +#: ../pyhoca/wxgui/frontend.py:1381 msgid "The X2Go PulseAudio system could not be started." msgstr "X2Go PulseAudio kunde ej startas." -#: ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1388 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "X2Go PulseAudio avslutades oväntat." -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "%s - audio problem" msgstr "%s - ljudproblem" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1192,12 +1171,12 @@ msgstr "" "Anslutning för ljud kunde ej genomföras för denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "%s - client-side printing not available" msgstr "%s - klientdelade utskrifter ej tillgängliga" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1206,12 +1185,12 @@ msgstr "" "Servern tillåter ej utskrifter via klient från denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "%s - MIME box not available" msgstr "%s - MIME ej tillgängligt" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1220,12 +1199,12 @@ msgstr "" "Servern stöder ej X2Go MIME.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - klientmappar ej delningsbara" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1234,12 +1213,12 @@ msgstr "" "Servern tillåter ej klientdelade mappar i denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "%s - client resources not sharable" msgstr "%s - klientresurser ej delningsbara" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1248,12 +1227,12 @@ msgstr "" "Klientdelade mappar och utskrifter kan ej delas med denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1467 ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "%s - print error" msgstr "%s - utskriftsfel" -#: ../pyhoca/wxgui/frontend.py:1463 +#: ../pyhoca/wxgui/frontend.py:1467 #, python-format msgid "" "%s\n" @@ -1264,7 +1243,7 @@ msgstr "" "... orsakat på skrivare %s av session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "" "%s\n" @@ -1275,12 +1254,12 @@ msgstr "" "...orsakat av session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1484 ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "%s - start" msgstr "%s - startar" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1484 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1289,7 +1268,7 @@ msgstr "" "Ny X2Go-session startar ...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "" "Another client started X2Go session\n" @@ -1298,12 +1277,12 @@ msgstr "" "En annan klient startade X2Go-session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1514 ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "%s - resume" msgstr "%s - återanslut" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1514 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1312,7 +1291,7 @@ msgstr "" "Återansluter X2Go-session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1321,12 +1300,12 @@ msgstr "" "En annan klient återanslöt X2Go-session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "" "Found already running session\n" @@ -1335,12 +1314,12 @@ msgstr "" "Hittade aktiv session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "%s - suspend" msgstr "%s - vila" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1349,12 +1328,12 @@ msgstr "" "X2Go-session har försatts i vila\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "%s - terminate" msgstr "%s - avsluta" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1363,7 +1342,7 @@ msgstr "" "X2Go-session har avslutats\n" "%s" -#: ../pyhoca/wxgui/messages.py:73 +#: ../pyhoca/wxgui/messages.py:72 #, python-format msgid "" "Are you really sure you want to\n" @@ -1372,7 +1351,7 @@ msgstr "" "Är du säker på att du vill\n" "radera sessionsprofilen ,,%s''?" -#: ../pyhoca/wxgui/messages.py:74 +#: ../pyhoca/wxgui/messages.py:73 #, python-format msgid "" "PyHoca-GUI is already running for user ,,%s''!\n" @@ -1386,15 +1365,15 @@ msgstr "" "Bara en instans av PyHoca-GUI kan startas per\n" "användare. PyHoca-GUI-ikonen finns i systemfältet." -#: ../pyhoca/wxgui/messages.py:107 +#: ../pyhoca/wxgui/messages.py:106 msgid "Yes" msgstr "Ja" -#: ../pyhoca/wxgui/messages.py:108 +#: ../pyhoca/wxgui/messages.py:107 msgid "No" msgstr "Nej" -#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "OK" @@ -1497,6 +1476,21 @@ msgstr "Ändra sessionstitel till" msgid "OK" msgstr "OK" +#~ msgid "SSH Proxy Tunnel" +#~ msgstr "SSH proxytunnel" + +#~ msgid "The SSH proxy configuration is incomplete. Try again." +#~ msgstr "Konfigurationen av SSH-proxy är inte komplett. Försök igen." + +#~ msgid "" +#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH " +#~ "proxy to.\n" +#~ "Please change the SSH proxy settings accordingly." +#~ msgstr "" +#~ "En annan session (%s) använder redan [%s]:%s för att ansluta till lokal " +#~ "SSH-proxy.\n" +#~ "Ändra konfiguration för SSH-proxy ." + #, fuzzy #~ msgid "Remember shared folders" #~ msgstr "Delade &mappar" hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-9-ga28643b
by git-admin＠x2go.org 04 Jan '13

04 Jan '13

The branch, master has been updated via a28643bee58961bbe0e21e3f48351647a3d343eb (commit) via 180484c4a26461ce3916920af70a3d496d3f58b4 (commit) from 052916c4ea0d523a6db253b4f0ffe394d932aab9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a28643bee58961bbe0e21e3f48351647a3d343eb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jan 4 11:41:28 2013 +0100 fix __doc__ strings commit 180484c4a26461ce3916920af70a3d496d3f58b4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jan 4 11:40:25 2013 +0100 replace all remaining occurrences of X2go with X2Go ----------------------------------------------------------------------- Summary of changes: man/man1/pyhoca-gui.1 | 2 +- nsis_template.py | 2 +- po/PyHoca-GUI.pot | 20 ++--- po/bg.po | 6 +- po/da.po | 10 +-- po/de.po | 12 +-- po/en.po | 12 +-- po/es.po | 26 +++--- po/fr.po | 6 +- po/nb_NO.po | 10 +-- po/nl.po | 14 ++-- po/ru.po | 12 +-- po/sv.po | 6 +- pyhoca-gui | 2 +- pyhoca/wxgui/about.py | 2 +- pyhoca/wxgui/frontend.py | 14 ++-- pyhoca/wxgui/logon.py | 2 +- pyhoca/wxgui/profilemanager.py | 175 ++++++++++------------------------------ pyhoca/wxgui/sessiontitle.py | 2 +- pyhoca/wxgui/taskbar.py | 6 +- 20 files changed, 124 insertions(+), 217 deletions(-) The diff of changes is: diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1 index 1f73aff..790b2de 100644 --- a/man/man1/pyhoca-gui.1 +++ b/man/man1/pyhoca-gui.1 @@ -54,7 +54,7 @@ Enable debugging output. Enable debugging code of the unterlying Python X2Go module. .TP \*(T<\fB\-\-libdebug-sftpxfer\fR\*(T> -Enable debugging code of Python X2go's sFTP server code (very verbose, and it may even reveal promiscuous data). +Enable debugging code of Python X2Go's sFTP server code (very verbose, and it may even reveal promiscuous data). .SH GUI OPTIONS .TP \*(T<\fB\-P, \-\-session-profile\fR\*(T> diff --git a/nsis_template.py b/nsis_template.py index e9db9eb..d4b35c0 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -266,7 +266,7 @@ Section "$STARTMENU_LINKS" CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name} ($WITHOUT_PULSEAUDIO).lnk" "$INSTDIR\\{program_name}.exe" "--quiet --start-xserver --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0 CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name} (debug).lnk" "$INSTDIR\\{program_name}.exe" "--debug --libdebug --start-xserver --start-pulseaudio --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0 CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name} ($WITHOUT_PULSEAUDIO, debug).lnk" "$INSTDIR\\{program_name}.exe" "--debug --libdebug --start-xserver --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0 - CreateShortCut "$SMPROGRAMS\\{program_name}\\X2go Website.lnk" "http://www.x2go.org" "" "$INSTDIR\\icons\\pyhoca_x2go-logo-ubuntu.ico" 0 + CreateShortCut "$SMPROGRAMS\\{program_name}\\X2Go Website.lnk" "http://www.x2go.org" "" "$INSTDIR\\icons\\pyhoca_x2go-logo-ubuntu.ico" 0 CreateShortCut "$SMPROGRAMS\\{program_name}\\Uninstall.lnk" "$INSTDIR\\uninstall.exe" "" "$INSTDIR\\uninstall.exe" 0 SectionEnd diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index fd05fc8..8d1a34e 100644 --- a/po/PyHoca-GUI.pot +++ b/po/PyHoca-GUI.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-20 09:07+0100\n" +"POT-Creation-Date: 2012-12-20 09:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -47,7 +47,7 @@ msgid "SSH proxy server login" msgstr "" #: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350 -#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "" @@ -147,7 +147,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" @@ -159,7 +159,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" @@ -1117,7 +1117,7 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" #: ../pyhoca/wxgui/frontend.py:1374 @@ -1298,14 +1298,14 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/messages.py:73 +#: ../pyhoca/wxgui/messages.py:72 #, python-format msgid "" "Are you really sure you want to\n" "delete the session profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/messages.py:74 +#: ../pyhoca/wxgui/messages.py:73 #, python-format msgid "" "PyHoca-GUI is already running for user ,,%s''!\n" @@ -1315,15 +1315,15 @@ msgid "" "notification area/systray." msgstr "" -#: ../pyhoca/wxgui/messages.py:107 +#: ../pyhoca/wxgui/messages.py:106 msgid "Yes" msgstr "" -#: ../pyhoca/wxgui/messages.py:108 +#: ../pyhoca/wxgui/messages.py:107 msgid "No" msgstr "" -#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "" diff --git a/po/bg.po b/po/bg.po index 194fc9c..e36baf1 100644 --- a/po/bg.po +++ b/po/bg.po @@ -151,7 +151,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" @@ -163,7 +163,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" @@ -1121,7 +1121,7 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" #: ../pyhoca/wxgui/frontend.py:1370 diff --git a/po/da.po b/po/da.po index ab9e1af..9985b8b 100644 --- a/po/da.po +++ b/po/da.po @@ -163,10 +163,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Forbinder dig til X2Go server ,,%s''" #: ../pyhoca/wxgui/taskbar.py:103 @@ -179,10 +179,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Klient til at forbinde dig til en X2Go server" #: ../pyhoca/wxgui/profilemanager.py:79 @@ -1169,7 +1169,7 @@ msgstr "Omvendt TCP port forwarding forespørgsel for session %s til serverport #: ../pyhoca/wxgui/frontend.py:1351 #, python-format -msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." +msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2Go/SSH server. Session startup failed." msgstr "Forwarding tunnel forespørgsler til [%s]:%s til session %s blev nægtet af X2Go/SSH fjernserveren. Sessionsstartop fejlede." #: ../pyhoca/wxgui/frontend.py:1370 diff --git a/po/de.po b/po/de.po index 3ee236d..14cea70 100644 --- a/po/de.po +++ b/po/de.po @@ -155,10 +155,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Verbindungsaufbau zu X2Go Server ,,%s'' läuft" #: ../pyhoca/wxgui/taskbar.py:103 @@ -169,10 +169,10 @@ msgstr "Verbinden mit X2Go Server..." #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Verbindungen zu entferntem X2Go Server aufbauen" #: ../pyhoca/wxgui/profilemanager.py:79 @@ -1159,9 +1159,9 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" -"SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2go/SSH Server " +"SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2Go/SSH Server " "verweigert. Die Sitzung konnte nicht gestartet werden." #: ../pyhoca/wxgui/frontend.py:1370 diff --git a/po/en.po b/po/en.po index f706bbb..d7a1730 100644 --- a/po/en.po +++ b/po/en.po @@ -153,10 +153,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" #: ../pyhoca/wxgui/taskbar.py:103 @@ -169,10 +169,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" #: ../pyhoca/wxgui/profilemanager.py:79 @@ -1151,10 +1151,10 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." #: ../pyhoca/wxgui/frontend.py:1370 #, python-format diff --git a/po/es.po b/po/es.po index 1574d9f..1ee3659 100644 --- a/po/es.po +++ b/po/es.po @@ -68,7 +68,7 @@ msgstr "%s - fallo en la conexión" #: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606 msgid "User is not allowed to start X2Go sessions!" -msgstr "¡El usuario no tiene permisos para iniciar sesiones X2go!" +msgstr "¡El usuario no tiene permisos para iniciar sesiones X2Go!" #: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613 #, python-format @@ -160,10 +160,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Conectando con tu servidor remoto X2Go \"%s\"" #: ../pyhoca/wxgui/taskbar.py:103 @@ -176,11 +176,11 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" -"Cliente para conexiones remotas a servidores X2go" +"PyHoca-GUI (Python X2Go Client)\n" +"Cliente para conexiones remotas a servidores X2Go" #: ../pyhoca/wxgui/profilemanager.py:79 msgid "GNOME Desktop (GNOME)" @@ -1151,7 +1151,7 @@ msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -"El comando \"%s\" no está disponible en el servidor X2go\n" +"El comando \"%s\" no está disponible en el servidor X2Go\n" "%s." #: ../pyhoca/wxgui/frontend.py:1332 @@ -1167,10 +1167,10 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" "La solicitud de túnel a %s:%s para la sesión %s ha sido denegada por el " -"servidor X2go/SSH . Fallo en el inicio de sesión." +"servidor X2Go/SSH . Fallo en el inicio de sesión." #: ../pyhoca/wxgui/frontend.py:1370 #, python-format @@ -1317,7 +1317,7 @@ msgid "" "Another client started X2Go session\n" "%s" msgstr "" -"Otro cliente ha iniciado sesión X2go\n" +"Otro cliente ha iniciado sesión X2Go\n" "%s" #: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525 @@ -1340,7 +1340,7 @@ msgid "" "Another client resumed X2Go session\n" "%s" msgstr "" -"Otro cliente retornó a la sesión X2go\n" +"Otro cliente retornó a la sesión X2Go\n" "%s" #: ../pyhoca/wxgui/frontend.py:1540 @@ -1368,7 +1368,7 @@ msgid "" "X2Go Session has been suspended\n" "%s" msgstr "" -"Se ha suspendido la Sesión X2go\n" +"Se ha suspendido la Sesión X2Go\n" "%s" #: ../pyhoca/wxgui/frontend.py:1587 @@ -1382,7 +1382,7 @@ msgid "" "X2Go Session has terminated\n" "%s" msgstr "" -"Se ha finalizado la sesión X2go\n" +"Se ha finalizado la sesión X2Go\n" "%s" #: ../pyhoca/wxgui/messages.py:73 diff --git a/po/fr.po b/po/fr.po index 636eff8..edc7156 100644 --- a/po/fr.po +++ b/po/fr.po @@ -151,7 +151,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" @@ -163,7 +163,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" @@ -1121,7 +1121,7 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" #: ../pyhoca/wxgui/frontend.py:1370 diff --git a/po/nb_NO.po b/po/nb_NO.po index 0a8c4cd..c3deebe 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -154,10 +154,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Holder på med å koble deg til X2Go serveren ,,%s''" #: ../pyhoca/wxgui/taskbar.py:103 @@ -170,10 +170,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Klient for å koble deg til en ekstern X2Go server" #: ../pyhoca/wxgui/profilemanager.py:79 @@ -1156,7 +1156,7 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" "Tunnel videresendingsforespørsel til [%s]:%s for sesjon %s ble avvist av den " "eksterne X2Go/SSH serveren. Oppstart av sesjonen feilet." diff --git a/po/nl.po b/po/nl.po index af1e219..7609837 100644 --- a/po/nl.po +++ b/po/nl.po @@ -154,10 +154,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Verbinding met X2Go server ,,%s'' wordt gemaakt" #: ../pyhoca/wxgui/taskbar.py:103 @@ -168,10 +168,10 @@ msgstr "Bezig je te verbinden met X2Go ..." #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Verbinding met remote X2Go server aan het opbouwen" #: ../pyhoca/wxgui/profilemanager.py:79 @@ -980,7 +980,7 @@ msgstr "%s - server waarschuwing" #: ../pyhoca/wxgui/frontend.py:562 msgid "The X2Go Server does not publish an application menu." -msgstr "De X2go server publiceert geen applicatie menu" +msgstr "De X2Go server publiceert geen applicatie menu" #: ../pyhoca/wxgui/frontend.py:613 msgid "SSH key authentication has been successful." @@ -1152,10 +1152,10 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." #: ../pyhoca/wxgui/frontend.py:1370 #, python-format diff --git a/po/ru.po b/po/ru.po index 531b6c0..5d48cde 100644 --- a/po/ru.po +++ b/po/ru.po @@ -158,10 +158,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Соединяет Вас с удаленным сервером X2Go ,,%s''" #: ../pyhoca/wxgui/taskbar.py:103 @@ -172,10 +172,10 @@ msgstr "Соединяет Вас с X2Go..." #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Для соединения с удаленным сервером X2Go" #: ../pyhoca/wxgui/profilemanager.py:79 @@ -1156,10 +1156,10 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" "Запрос туннеля к серверу [%s]:%s для сессии %s был отклонен удаленным " -"сервером X2go/SSH. Запуск сессии не удался." +"сервером X2Go/SSH. Запуск сессии не удался." #: ../pyhoca/wxgui/frontend.py:1370 #, python-format diff --git a/po/sv.po b/po/sv.po index c956385..6116dbf 100644 --- a/po/sv.po +++ b/po/sv.po @@ -153,7 +153,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" "PyHoca-GUI (Python X2Go-klient)\n" @@ -169,7 +169,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" "PyHoca-GUI (Python X2Go-klient)\n" @@ -1150,7 +1150,7 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" "Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. " "Sessionsstart misslyckades." diff --git a/pyhoca-gui b/pyhoca-gui index 0486314..c077301 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -193,7 +193,7 @@ debug_options = [ {'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable application debugging code', }, {'args':['--quiet'], 'default': False, 'action': 'store_true', 'help': 'disable any kind of log output', }, {'args':['--libdebug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of the underlying Python X2Go module', }, - {'args':['--libdebug-sftpxfer'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of Python X2go\'s sFTP server code (very verbose, and even promiscuous)', }, + {'args':['--libdebug-sftpxfer'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of Python X2Go\'s sFTP server code (very verbose, and even promiscuous)', }, {'args':['-V', '--version'], 'default': False, 'action': 'store_true', 'help': 'print version number and exit', }, ] x2go_gui_options = [ diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index 07ea039..5003972 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -32,7 +32,7 @@ try: wxversion.select('2.8') except: pass -# Python X2go +# Python X2Go import x2go # wxPython diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index a77672b..328941c 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -36,7 +36,7 @@ except: pass import os -# Python X2go +# Python X2Go import x2go import gevent import gevent.monkey @@ -126,10 +126,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient): @param args: a class with properties representing the command-line options that are available to L{PyHocaGUI} instances. @type args: C{argparse.ArgumentParser} (or similar) @param logger: you can pass an L{X2goLogger} object to the - L{PyHocaCLI} constructor for logging application events + L{PyHocaGUI} constructor for logging application events @type logger: Python X2Go C{X2goLogger} instance @param liblogger: you can pass an L{X2goLogger} object to the - L{PyHocaCLI} constructor for logging application events, this object is forwarded to the C{X2goClient} class in Python X2Go + L{PyHocaGUI} constructor for logging application events, this object is forwarded to the C{X2goClient. class in Python X2Go. @type liblogger: Python X2Go C{X2goLogger} instance @param appname: name of the application instance @type appname: C{str} @@ -1204,7 +1204,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self.OnExit(evt) ## - ## Python X2Go (X2goClient) interactive HOOK's... + ## Python X2Go (X2Go Client) interactive HOOK's... ## def HOOK_check_host_dialog(self, profile_name='UNKNOWN', host='UNKNOWN', port=22, fingerprint='no fingerprint', fingerprint_type='RSA', **kwargs): """\ @@ -1266,7 +1266,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): return _print_action ## - ## Python X2Go (X2goClient) notification HOOK's... + ## Python X2Go (X2Go Client) notification HOOK's... ## # this hook gets called from Python X2Go classes if profile_name's control session has died... @@ -1352,7 +1352,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): @type chain_port: C{str} """ - self.notifier.send(_(u'%s - session failure') % profile_name, _(u'Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed.') % (chain_host, chain_port, session_name), icon='session_error', timeout=10000) + self.notifier.send(_(u'%s - session failure') % profile_name, _(u'Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2Go/SSH server. Session startup failed.') % (chain_host, chain_port, session_name), icon='session_error', timeout=10000) if not self._hide_notifications_map.has_key(profile_name): self._hide_notifications_map[profile_name] = [] self._hide_notifications_map[profile_name].append(session_name) @@ -1582,7 +1582,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ self._enable_session_name(profile_name, session_name) - # avoid notification if X2goClient.clean_sessions has been used to terminate sessions + # avoid notification if X2Go Client.clean_sessions has been used to terminate sessions if self._hide_notifications_map.has_key(profile_name) and session_name in self._hide_notifications_map[profile_name]: self._hide_notifications_map[profile_name].remove(session_name) if not self._hide_notifications_map[profile_name]: diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index fca8600..36ac3d9 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -30,7 +30,7 @@ try: wxversion.select('2.8') except: pass -# Python X2go +# Python X2Go import x2go # gevent diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 0d3dde5..0a05d91 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -149,19 +149,31 @@ class PyHocaGUI_ProfileManager(wx.Dialog): # allow localization of the default keyboard settings self.profile_name = self.profile_config['name'] = profile_name + # this code block is for compatibility of session profiles prior to 0.2.2.0: + _from_host = _from_port = _to_host = _to_port = None + if self.profile_config.has_key('sshproxytunnel'): + if self.profile_config['sshproxytunnel'].count(':') == 2: + _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':') + _from_host = 'localhost' + elif self.profile_config['sshproxytunnel'].count(':') == 3: + _from_host, _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':') + + if _to_host: self.profile_config['host'] = _to_host + if _to_port: self.profile_config['sshport'] = int(_to_port) + # we create a backup dict of our profile_config immediately (for being able to reset erroneously made changes) self.profile_config_bak = copy.deepcopy(self.profile_config) self._last_rdpclient = self.profile_config['rdpclient'] self._last_application = self.applicationChoices['TERMINAL'] - self.X2goTabs = wx.Notebook(self, -1, style=0) - self.tab_Profile = wx.Panel(self.X2goTabs, -1) - self.tab_Session = wx.Panel(self.X2goTabs, -1) - self.tab_Connection = wx.Panel(self.X2goTabs, -1) - self.tab_LinkQuality = wx.Panel(self.X2goTabs, -1) - self.tab_Settings = wx.Panel(self.X2goTabs, -1) - self.tab_SharedResources = wx.Panel(self.X2goTabs, -1) + self.X2GoTabs = wx.Notebook(self, -1, style=0) + self.tab_Profile = wx.Panel(self.X2GoTabs, -1) + self.tab_Session = wx.Panel(self.X2GoTabs, -1) + self.tab_Connection = wx.Panel(self.X2GoTabs, -1) + self.tab_LinkQuality = wx.Panel(self.X2GoTabs, -1) + self.tab_Settings = wx.Panel(self.X2GoTabs, -1) + self.tab_SharedResources = wx.Panel(self.X2GoTabs, -1) # boxes for all tabs self.staticbox_Profile = wx.StaticBox(self.tab_Profile, -1, ' %s ' % _(u'Session Title')) @@ -261,12 +273,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) self.SSHProxyPortLabel = wx.StaticText(self.tab_Connection, -1, _(u"Port")+": ") self.SSHProxyPort = wx.SpinCtrl(self.tab_Connection, -1, "22", min=1, max=65534) - self.SSHProxyTunnelLabel = wx.StaticText(self.tab_Connection, -1, _(u"SSH Proxy Tunnel")+": ") - self.SSHProxyTunnelFromHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) - self.SSHProxyTunnelFromPort = wx.SpinCtrl(self.tab_Connection, -1, "44444", min=1, max=65534) - self.SSHProxyTunnelBetweenLabel = wx.StaticText(self.tab_Connection, -1, " -> ") - self.SSHProxyTunnelToHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) - self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "22", min=1, max=65534) self.SSHProxyAutoLogin = wx.CheckBox(self.tab_Connection, -1, _(u"Discover SSH keys or use SSH agent for proxy authentication")) self.LinkSpeed = wx.Slider(self.tab_LinkQuality, -1, 0, 0, 4) @@ -367,8 +373,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxySameUser, self.SSHProxySameUser) self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxySamePassword, self.SSHProxySamePassword) self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxyAutoLogin, self.SSHProxyAutoLogin) - self.Bind(wx.EVT_TEXT, self.OnUpdateSSHProxyTunnelFromHost, self.SSHProxyTunnelFromHost) - self.Bind(wx.EVT_TEXT, self.OnUpdateSSHProxyTunnelFromPort, self.SSHProxyTunnelFromPort) self.Bind(wx.EVT_COMBOBOX, self.OnCompressionSelected, self.Compression) self.Bind(wx.EVT_RADIOBUTTON, self.OnSetDisplayFullscreen, self.DisplayTypeFullscreen) self.Bind(wx.EVT_RADIOBUTTON, self.OnSetDisplayMaximize, self.DisplayTypeMaximize) @@ -458,11 +462,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyPortLabel.SetMinSize((-1, 16)) self.SSHProxyPort.SetMinSize((65, self._textfield_height)) self.SSHProxyKeyFile.SetMinSize((220, self._textfield_height)) - self.SSHProxyTunnelLabel.SetMinSize((-1, 16)) - self.SSHProxyTunnelFromPort.SetMinSize((65, self._textfield_height)) - self.SSHProxyTunnelToPort.SetMinSize((65, self._textfield_height)) - self.SSHProxyTunnelFromHost.SetMinSize((140, self._textfield_height)) - self.SSHProxyTunnelToHost.SetMinSize((140, self._textfield_height)) if X2GOCLIENT_OS == 'Windows': self.LinkSpeed.SetMinSize((425, self._textfield_height)) else: @@ -602,18 +601,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_3_2_1.Add(self.SSHProxyPort, pos=(3,4), span=(1,2), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_2_1.Add(self.SSHProxyAutoLogin, pos=(4,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_2_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_2_1_1.Add(self.SSHProxyTunnelLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1_1.Add(self.SSHProxyTunnelFromHost, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1_1.Add((4, 0)) - sizer_3_2_1_1.Add(self.SSHProxyTunnelFromPort, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1_1.Add((8, 0)) - sizer_3_2_1_1.Add(self.SSHProxyTunnelBetweenLabel, flag=wx.ALIGN_CENTRE_VERTICAL|wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_2_1_1.Add((8, 0)) - sizer_3_2_1_1.Add(self.SSHProxyTunnelToHost, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1_1.Add((4, 0)) - sizer_3_2_1_1.Add(self.SSHProxyTunnelToPort, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1_1.Add((0,32)) - sizer_3_2_1.Add(sizer_3_2_1_1, pos=(5,0), span=(1,6)) sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7) sizer_3.Add(sizer_3_1, flag=wx.EXPAND|wx.ALL, border=5) @@ -794,12 +781,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.tab_SharedResources.SetSizerAndFit(sizer_6) self.tab_SharedResources.Layout() - self.X2goTabs.AddPage(self.tab_Profile, _(u"Profile")) - self.X2goTabs.AddPage(self.tab_Session, _(u"Session")) - self.X2goTabs.AddPage(self.tab_Connection, _(u"Connection")) - self.X2goTabs.AddPage(self.tab_LinkQuality, _(u"Link Quality")) - self.X2goTabs.AddPage(self.tab_Settings, _(u"Settings")) - self.X2goTabs.AddPage(self.tab_SharedResources, _(u"Sharing")) + self.X2GoTabs.AddPage(self.tab_Profile, _(u"Profile")) + self.X2GoTabs.AddPage(self.tab_Session, _(u"Session")) + self.X2GoTabs.AddPage(self.tab_Connection, _(u"Connection")) + self.X2GoTabs.AddPage(self.tab_LinkQuality, _(u"Link Quality")) + self.X2GoTabs.AddPage(self.tab_Settings, _(u"Settings")) + self.X2GoTabs.AddPage(self.tab_SharedResources, _(u"Sharing")) # the bottom area with OK, Defaults and Cancel buttons sizer_B = wx.BoxSizer(wx.HORIZONTAL) @@ -811,7 +798,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): # put it all together... MainSizer = wx.BoxSizer(wx.VERTICAL) - MainSizer.Add(self.X2goTabs, proportion=1, flag=wx.EXPAND|wx.FIXED_MINSIZE) + MainSizer.Add(self.X2GoTabs, proportion=1, flag=wx.EXPAND|wx.FIXED_MINSIZE) MainSizer.Add(sizer_B, flag=wx.ALIGN_RIGHT) self.SetSizerAndFit(MainSizer) @@ -822,7 +809,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): max5_x, max5_y = self.tab_Settings.GetBestSize() max6_x, max6_y = self.tab_SharedResources.GetBestSize() - #self.SetSize(self.GetBestSize() + self.X2goTabs.GetBestSize()) + #self.SetSize(self.GetBestSize() + self.X2GoTabs.GetBestSize()) if X2GOCLIENT_OS == "Windows": self.SetSize((max(max1_x, max2_x, max3_x, max4_x, max5_x) * 1.05, max(max1_y, max2_y, max3_y, max4_y, max5_y) * 1.10 + 50)) @@ -881,18 +868,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser']) self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile']) - _from_host = _from_port = _to_host = _to_port = None - if self.profile_config['sshproxytunnel'].count(':') == 2: - _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':') - _from_host = 'localhost' - elif self.profile_config['sshproxytunnel'].count(':') == 3: - _from_host, _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':') - - if _from_host: self.SSHProxyTunnelFromHost.SetValue(_from_host) - if _from_port: self.SSHProxyTunnelFromPort.SetValue(int(_from_port)) - if _to_host: self.SSHProxyTunnelToHost.SetValue(_to_host) - if _to_port: self.SSHProxyTunnelToPort.SetValue(int(_to_port)) - self.UseSSHProxy.SetValue(_ssh_proxy) self.SSHProxySameUser.SetValue(self.profile_config['sshproxysameuser']) self.SSHProxySamePassword.SetValue(self.profile_config['sshproxysamepass']) @@ -1246,12 +1221,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyHost.Enable(False) self.SSHProxyPortLabel.Enable(False) self.SSHProxyPort.Enable(False) - self.SSHProxyTunnelLabel.Enable(False) - self.SSHProxyTunnelFromHost.Enable(False) - self.SSHProxyTunnelFromPort.Enable(False) - self.SSHProxyTunnelBetweenLabel.Enable(False) - self.SSHProxyTunnelToHost.Enable(False) - self.SSHProxyTunnelToPort.Enable(False) + #self.SSHProxyTunnelLabel.Enable(False) + #self.SSHProxyTunnelFromHost.Enable(False) + #self.SSHProxyTunnelFromPort.Enable(False) + #self.SSHProxyTunnelBetweenLabel.Enable(False) + #self.SSHProxyTunnelToHost.Enable(False) + #self.SSHProxyTunnelToPort.Enable(False) self.SSHProxyAutoLogin.Enable(False) @@ -1281,13 +1256,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['icon'] = ':icons/128x128/x2gosession.png' self.profile_config['user'] = self.UserName.GetValue() self.profile_config['key'] = self.SSHKeyFile.GetValue() + self.profile_config['host'] = self.Host.GetValue() if self.UseSSHProxy.GetValue(): self.profile_config['usesshproxy'] = True - self.profile_config['host'] = self.SSHProxyTunnelFromHost.GetValue() - self.profile_config['sshport'] = self.SSHProxyTunnelFromPort.GetValue() else: self.profile_config['usesshproxy'] = False - self.profile_config['host'] = self.Host.GetValue() if _session_type != 'DirectRDP': self.profile_config['sshport'] = self.SSHPort.GetValue() self.profile_config['sshproxysameuser'] = self.SSHProxySameUser.GetValue() @@ -1295,11 +1268,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['sshproxyhost'] = self.SSHProxyHost.GetValue() self.profile_config['sshproxyport'] = self.SSHProxyPort.GetValue() - self.profile_config['sshproxytunnel'] = '%s:%s:%s:%s' % (self.SSHProxyTunnelFromHost.GetValue(), - self.SSHProxyTunnelFromPort.GetValue(), - self.SSHProxyTunnelToHost.GetValue(), - self.SSHProxyTunnelToPort.GetValue(), - ) + self.profile_config['sshproxytunnel'] = 'DEPRECATED_CAN_BE_REMOVED' self.profile_config['sshproxyautologin'] = self.SSHProxyAutoLogin.GetValue() if self.profile_config['sshproxysameuser']: self.profile_config['sshproxyuser'] = '' @@ -1521,12 +1490,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyHost.Enable(False) self.SSHProxyPortLabel.Enable(False) self.SSHProxyPort.Enable(False) - self.SSHProxyTunnelLabel.Enable(False) - self.SSHProxyTunnelFromHost.Enable(False) - self.SSHProxyTunnelFromPort.Enable(False) - self.SSHProxyTunnelBetweenLabel.Enable(False) - self.SSHProxyTunnelToHost.Enable(False) - self.SSHProxyTunnelToPort.Enable(False) self.SSHProxyAutoLogin.Enable(False) self.LinkSpeed.Enable(False) self.ModemLabel.Enable(False) @@ -1566,14 +1529,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): @type event: C{obj} """ - if not self.UseSSHProxy.GetValue(): - self.HostLabel.Enable(True) - self.Host.Enable(True) - self.SSHPortLabel.Enable(True) - self.SSHPort.Enable(True) - self.SSHPort.SetValue(self.profile_config_bak['sshport']) - else: - self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue()) + self.HostLabel.Enable(True) + self.Host.Enable(True) + self.SSHPortLabel.Enable(True) + self.SSHPort.Enable(True) + self.SSHPort.SetValue(self.profile_config_bak['sshport']) self.SSHAutoLogin.Enable(True) if PARAMIKO_FEATURE['forward-ssh-agent']: self.SSHForwardAuthAgent.Enable(True) @@ -1956,18 +1916,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): if self.SSHProxyAutoLogin.GetValue(): self.SSHProxyKeyFileLabel.Enable(False) self.SSHProxyAutoLogin.Enable(True) - self.SSHProxyTunnelLabel.Enable(True) - self.SSHProxyTunnelFromHost.Enable(True) - self.SSHProxyTunnelFromPort.Enable(True) - self.SSHProxyTunnelBetweenLabel.Enable(True) - self.SSHProxyTunnelToHost.Enable(True) - self.SSHProxyTunnelToPort.Enable(True) - self.Host.Enable(False) - self.HostLabel.Enable(False) - self.Host.SetValue(self.SSHProxyTunnelFromHost.GetValue()) - self.SSHPort.Enable(False) - self.SSHPortLabel.Enable(False) - self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue()) else: self.staticbox_Proxy.Enable(False) self.SSHProxySameUser.Enable(False) @@ -1988,32 +1936,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyTunnelToHost.Enable(False) self.SSHProxyTunnelToPort.Enable(False) self.SSHProxyAutoLogin.Enable(False) - self.Host.Enable(True) - self.HostLabel.Enable(True) - self.Host.SetValue(self.profile_config_bak['host']) - self.SSHPort.Enable(True) - self.SSHPortLabel.Enable(True) - self.SSHPort.SetValue(self.profile_config_bak['sshport']) - - def OnUpdateSSHProxyTunnelFromHost(self, event): - """\ - Gets called whenever the ssh-proxy-tunnel-from-host gets modified. - - @param event: event - @type event: C{obj} - - """ - self.Host.SetValue(self.SSHProxyTunnelFromHost.GetValue()) - - def OnUpdateSSHProxyTunnelFromPort(self, event): - """\ - Gets called whenever the ssh-proxy-tunnel-from-port gets modified. - - @param event: event - @type event: C{obj} - - """ - self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue()) def OnSetKeyboard(self, event): """\ @@ -2048,7 +1970,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.KeyboardModel.Enable(False) self.KeyboardVariant.Enable(False) - def OnSoundEnable(self, event): # wxGlade: X2goMaintProfile.<event_handler> + def OnSoundEnable(self, event): """\ Gets called whenever the enable-sound checkbox gets marked. @@ -2352,21 +2274,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): elif self.profile_config['name'].strip() != self.profile_config_bak['name'] and self.profile_config['name'] in self.session_profiles.profile_names: validateOk = False self._PyHocaGUI.notifier.send(title=_(u'Profile Manager'), text=_(u'Profile name %s already exists!!!') % self.profile_config['name'].strip(), icon='profile_error') - elif self.profile_config['usesshproxy'] and self.profile_config['name'] == self.profile_config_bak['name']: - try: - (from_host, from_port) = self.profile_config['sshproxytunnel'].split(':')[0:2] - except ValueError: - self._PyHocaGUI.notifier.send(title=_(u'Profile Manager'), text=_(u'The SSH proxy configuration is incomplete. Try again.'), icon='profile_error') - for profile_name in [ p for p in self._PyHocaGUI.profile_names if p != self.profile_config['name'] ]: - test_profile_config = self.session_profiles.get_profile_config(profile_name) - if test_profile_config['usesshproxy']: - try: - (test_from_host, test_from_port) = test_profile_config['sshproxytunnel'].split(':')[0:2] - except ValueError: - continue - if (from_host, from_port) == (test_from_host, test_from_port): - validateOk = False - self._PyHocaGUI.notifier.send(title=_(u'Profile Manager'), text=_(u'Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\nPlease change the SSH proxy settings accordingly.' % (profile_name.strip(), from_host, from_port)), icon='profile_warning') return validateOk def OnOKButton(self, event): diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py index 144380f..975c52d 100644 --- a/pyhoca/wxgui/sessiontitle.py +++ b/pyhoca/wxgui/sessiontitle.py @@ -30,7 +30,7 @@ try: wxversion.select('2.8') except: pass -# Python X2go +# Python X2Go import x2go # gevent diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index f79feca..d9763d7 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -30,7 +30,7 @@ try: wxversion.select('2.8') except: pass -# Python X2go +# Python X2Go import x2go import gevent @@ -90,7 +90,7 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): else: icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon self.icon = self.MakeIcon(icon_name=icon_name, fallback_name='pyhoca-trayicon') - self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nCurrently connecting you to remote X2Go server ,,%s\'\'") % profile_name) + self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2Go Client)\nCurrently connecting you to remote X2Go server ,,%s\'\'") % profile_name) def SetIconIdle(self): """\ @@ -104,7 +104,7 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): else: icon_name = self._PyHocaGUI.tray_icon self.icon = self.MakeIcon(icon_name=icon_name, fallback_name='pyhoca-trayicon') - self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nClient for connecting you to a remote X2Go server")) + self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2Go Client)\nClient for connecting you to a remote X2Go server")) def CreateSessionManagerPopupMenu(self, evt): """\ hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.8-68-g719d561
by git-admin＠x2go.org 03 Jan '13

03 Jan '13

The branch, master has been updated via 719d5615fb68c4a7480364e429687d844578199f (commit) from df05dba7a9a5f3b183a88af780c25fb6030c0f58 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 719d5615fb68c4a7480364e429687d844578199f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jan 3 16:09:04 2013 +0100 x2gothinclient_create: syntax fix, spotted by Thomas Güttler (Fixes: #95). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c9ad056..1771cdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - x2gothinclient_create: replace /home by /var/lib/x2gothinclient in /etc/fstab template. - x2gothinclient_update: make sure config target folders exist. + - x2gothinclient_create: syntax fix, spotted by Thomas Güttler (Fixes: #95). * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Priority: optional. diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 647a65e..75edd56 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -175,7 +175,7 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && sed -e 's/BOOT=local/BOOT=nfs/' -i /etc/initramfs-tools/initramfs.conf [ \$? -eq 0 ] && rm -f /etc/udev/rules.d/*-persistent-*.rules -[ \$? -eq 0 ] && if getent passwd x2gothinclient 1>/dev/null; adduser --system --disabled-password --disabled-login --shell /bin/bash --group --home /var/lib/x2gothinclient x2gothinclient; fi +[ \$? -eq 0 ] && if getent passwd x2gothinclient 1>/dev/null; then adduser --system --disabled-password --disabled-login --shell /bin/bash --group --home /var/lib/x2gothinclient x2gothinclient; fi [ \$? -eq 0 ] && adduser x2gothinclient audio [ \$? -eq 0 ] && adduser x2gothinclient pulse [ \$? -eq 0 ] && adduser pulse audio hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.16-41-g1d76694
by git-admin＠x2go.org 03 Jan '13

03 Jan '13

The branch, master has been updated via 1d766945896449579fec1c79696dc6bb9a40c088 (commit) via abc2ce3f89346dae54cd595ed980540b52245652 (commit) via 17371711fcc8afb9824b4bb8db103e9709de9be1 (commit) via 62f66b02af0ee9e2366ac6cf672da42c367aff98 (commit) from bfe6f4349e15fe2ae70e773552e1dc080f04b68d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1d766945896449579fec1c79696dc6bb9a40c088 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jan 3 08:03:46 2013 +0100 let nx-x11-dbg depend on libnx-x11 and nxagent commit abc2ce3f89346dae54cd595ed980540b52245652 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jan 3 08:02:57 2013 +0100 fix multiple binaries-have-file-conflicts lintian issue commit 17371711fcc8afb9824b4bb8db103e9709de9be1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 2 17:41:04 2013 +0100 add misc:Depends to nx-x11-dbg commit 62f66b02af0ee9e2366ac6cf672da42c367aff98 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 2 17:40:49 2013 +0100 fix multiple binaries-have-file-conflicts lintian issue ----------------------------------------------------------------------- Summary of changes: debian/control | 4 ++++ debian/libnx-x11-dev.install | 9 ++++++--- debian/libnx-x11.install | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/control b/debian/control index 1fe5142..541eeff 100644 --- a/debian/control +++ b/debian/control @@ -238,6 +238,10 @@ Description: NX shadowing library headers Package: nx-x11-dbg Section: debug Architecture: any +Depends: + libnx-x11 (= ${binary:Version}), + nxagent (= ${binary:Version}), + ${misc:Depends}, Description: Debug Symbols for nx-x11 libraries NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install index a026d08..09379b9 100644 --- a/debian/libnx-x11-dev.install +++ b/debian/libnx-x11-dev.install @@ -1,3 +1,6 @@ -usr/include/nx - - +usr/include/nx/expat.h +usr/include/nx/ft2build.h +usr/include/nx/GL +usr/include/nx/X11 +usr/include/nx/fontconfig +usr/include/nx/freetype2 diff --git a/debian/libnx-x11.install b/debian/libnx-x11.install index 4a17019..fb609cc 100644 --- a/debian/libnx-x11.install +++ b/debian/libnx-x11.install @@ -1,3 +1,2 @@ -usr/lib/nx/lib* usr/lib/nx/X11 usr/share/nx hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.16-37-gbfe6f43
by git-admin＠x2go.org 02 Jan '13

02 Jan '13

The branch, master has been updated via bfe6f4349e15fe2ae70e773552e1dc080f04b68d (commit) via 36a2247e0e65d7b30f95687aaa43f51c373fcc24 (commit) from 300bafb1af567620df502cacb8bab7cac1ce9bf3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bfe6f4349e15fe2ae70e773552e1dc080f04b68d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 2 15:55:33 2013 +0100 Continue Reinhard's work on top-level install/uninstall. Esp. integrate debian/post-nx-build.sh into main Makefile. Make value of CONFIGURE variable traversable through the Makefile tree. commit 36a2247e0e65d7b30f95687aaa43f51c373fcc24 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 2 14:58:22 2013 +0100 fix lintian: missing-separator-between-items in x2goagent depends field between nxagent (>= ${source:Version}) and ${misc:Depends} ----------------------------------------------------------------------- Summary of changes: debian/Makefile.nx-libs | 81 ++++++++++++++++++-- debian/changelog | 3 + debian/control | 4 +- debian/libnx-x11-dev.dirs | 2 - debian/libnx-x11-dev.install | 3 +- debian/libnx-x11.dirs | 1 - debian/libnx-x11.install | 5 +- .../patches/030_nx-X11_configure-args.full.patch | 4 +- debian/post-build-nx.sh | 25 ------ debian/rules | 5 +- 10 files changed, 89 insertions(+), 44 deletions(-) delete mode 100644 debian/libnx-x11-dev.dirs delete mode 100755 debian/post-build-nx.sh The diff of changes is: diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index d50d699..5cfc96e 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -3,6 +3,7 @@ INSTALL_DIR=install -d -m 755 INSTALL_FILE=install -m 644 INSTALL_PROGRAM=install -m 755 +COPY_SYMLINK=cp -a RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty @@ -10,7 +11,9 @@ PREFIX ?= /usr/local BINDIR=$(PREFIX)/bin NXLIBDIR=$(PREFIX)/lib/nx X2GOLIBDIR=$(PREFIX)/lib/x2go -CONFIGURE=./configure +CONFIGURE ?= ./configure + +SHELL:=/bin/bash %: if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi @@ -46,40 +49,108 @@ build: fi install: + $(MAKE) install-lite + [ ! -d nx-X11 ] || $(MAKE) install-full + +install-lite: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - for f in nxagent nxauth nxproxy x2goagent; do \ + for f in nxproxy; do \ $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done for d in nxcomp nxproxy; do \ $(MAKE) -C $$d install; done - [ ! -d nx-X11 ] || for d in nxcompext nxcompshad; do \ + $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin + $(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(NXLIBDIR)/bin + +install-full: + for f in nxagent nxauth x2goagent; do \ + $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done + for d in nxcompext nxcompshad; do \ $(MAKE) -C $$d install; done + $(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf ../../nx/bin/nxagent x2goagent + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps $(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/x2go.xpm $(DESTDIR)$(PREFIX)/share/pixmaps + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go $(INSTALL_FILE) rgb $(DESTDIR)$(PREFIX)/share/x2go + + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/nx + $(INSTALL_FILE) nx-X11/programs/Xserver/Xext/SecurityPolicy $(DESTDIR)$(PREFIX)/share/nx + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go/versions $(INSTALL_FILE) VERSION.x2goagent $(DESTDIR)$(PREFIX)/share/x2go/versions + $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin $(INSTALL_PROGRAM) nx-X11/programs/nxauth/nxauth $(DESTDIR)$(NXLIBDIR)/bin - $(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(NXLIBDIR)/bin + $(INSTALL_PROGRAM) nx-X11/programs/Xserver/nxagent $(DESTDIR)$(NXLIBDIR)/bin + + # create a clean nx-X11/.build-exports space + rm -Rf nx-X11/.build-exports + mkdir -p nx-X11/.build-exports/include + mkdir -p nx-X11/.build-exports/lib + + # copy headers (for libnx-x11-dev) + cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include + + # copy libs (for libnx-x11) + find nx-X11/exports/lib/ | egrep "^.*\.so$$" | while read libpath; do \ + libfile=$$(basename $$libpath); \ + libdir=$$(dirname $$libpath); \ + \ + mkdir -p $${libdir//exports/.build-exports}; \ + cp -L $$libpath $${libdir//exports/.build-exports}; \ + \ + find $$libdir/$$libfile.* | while read symlink; do \ + ln -s $$libfile $${libdir//exports/.build-exports}/$$(basename $$symlink); \ + done; \ + done; + + $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11 + $(INSTALL_FILE) nx-X11/.build-exports/lib/*.so $(DESTDIR)$(NXLIBDIR)/X11/ + $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so.* $(DESTDIR)$(NXLIBDIR)/X11/ + + find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \ + while read dirname; do \ + $(INSTALL_DIR) $${dirname//"nx-X11/.build-exports/include"/"$(DESTDIR)$(PREFIX)/include/nx"}; \ + $(INSTALL_FILE) $${dirname}/*.h \ + $${dirname//"nx-X11/.build-exports/include"/"$(DESTDIR)$(PREFIX)/include/nx"}/ || true; \ + done; \ + + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/X11/bitmaps + $(INSTALL_FILE) nx-X11/.build-exports/include/X11/bitmaps/* \ + $(DESTDIR)$(PREFIX)/include/nx/X11/bitmaps/ + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GL/internal $(INSTALL_FILE) nx-X11/extras/Mesa/include/GL/*.h \ $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GL/ + $(INSTALL_FILE) nx-X11/extras/Mesa/include/GL/internal/*.h \ $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GL/internal/ + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GLES/ $(INSTALL_FILE) nx-X11/extras/Mesa/include/GLES/*.h \ $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GLES/ uninstall: - for f in nxagent nxauth nxproxy x2goagent; do \ + $(MAKE) uninstall-lite + [ ! -d nx-X11 ] || $(MAKE) uninstall-full + +uninstall-lite: + for f in nxproxy; do \ $(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done + +uninstall-full: + for f in nxagent nxauth x2goagent; do \ + $(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done + $(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent $(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ + if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi + if test -d nx-X11; then \ if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ diff --git a/debian/changelog b/debian/changelog index 335bc7d..a85ed93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ nx-libs (2:3.5.0.17-0) UNRELEASED; urgency=low * Add README.keystrokes to doc section of bin:package nxagent. * Add libxml2-dev to build dependencies. * Add pkg-config to build dependencies. + * Continue Reinhard's work on top-level install/uninstall. Esp. + integrate debian/post-nx-build.sh into main Makefile. Make + value of CONFIGURE variable traversable through the Makefile tree. [ Orion Poplawski ] * Add patches: 026_nxcomp*_honour-optflags.full*.patch. (Closes upstream diff --git a/debian/control b/debian/control index 369c05e..1fe5142 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: nx-libs Section: x11 -Priority: optional +Priority: extra Maintainer: X2Go Developers <x2go-dev(a)lists.berlios.de> Uploaders: Reinhard Tartler <siretart(a)tauware.de>, @@ -101,7 +101,7 @@ Description: NX agent Package: x2goagent Architecture: all Depends: - nxagent (>= ${source:Version}) + nxagent (>= ${source:Version}), ${misc:Depends}, Suggests: x2goserver diff --git a/debian/libnx-x11-dev.dirs b/debian/libnx-x11-dev.dirs deleted file mode 100644 index 4496244..0000000 --- a/debian/libnx-x11-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/nx/X11 -usr/include/nx/X11/extensions diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install index 47fca29..a026d08 100644 --- a/debian/libnx-x11-dev.install +++ b/debian/libnx-x11-dev.install @@ -1,4 +1,3 @@ -nx-X11/.build-exports/include/* usr/include/nx/ -nx-X11/include/extensions/Xinerama.h usr/include/nx/X11/extensions/ +usr/include/nx diff --git a/debian/libnx-x11.dirs b/debian/libnx-x11.dirs index 72f9ea3..339b13b 100644 --- a/debian/libnx-x11.dirs +++ b/debian/libnx-x11.dirs @@ -1,4 +1,3 @@ -usr/lib/nx/X11 usr/lib/nx/X11/Xinerama usr/lib/nx/X11/Xrandr usr/share/nx diff --git a/debian/libnx-x11.install b/debian/libnx-x11.install index 7838d08..4a17019 100644 --- a/debian/libnx-x11.install +++ b/debian/libnx-x11.install @@ -1,2 +1,3 @@ -nx-X11/.build-exports/lib/* usr/lib/nx/X11 -nx-X11/programs/Xserver/Xext/SecurityPolicy usr/share/nx +usr/lib/nx/lib* +usr/lib/nx/X11 +usr/share/nx diff --git a/debian/patches/030_nx-X11_configure-args.full.patch b/debian/patches/030_nx-X11_configure-args.full.patch index 8304ca7..67184d3 100644 --- a/debian/patches/030_nx-X11_configure-args.full.patch +++ b/debian/patches/030_nx-X11_configure-args.full.patch @@ -16,7 +16,7 @@ Index: nx-X11/lib/X11/Imakefile includes:: ks_tables.h -+CONFIGURE=./configure ++CONFIGURE ?= ./configure + #if NXLibraries @@ -40,7 +40,7 @@ Index: nx-X11/programs/Xserver/Imakefile NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME) NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status -+CONFIGURE=./configure ++CONFIGURE ?= ./configure + $(NX_XSHADOWCONFIGTARGET): cd $(NX_XSHADOWLIBDIR) && \ diff --git a/debian/post-build-nx.sh b/debian/post-build-nx.sh deleted file mode 100755 index 94f18ac..0000000 --- a/debian/post-build-nx.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -ex - -# create nx-X11/.build-exports -mkdir -p nx-X11/.build-exports/include -mkdir -p nx-X11/.build-exports/lib - -# copy headers (libnx-x11-dev) -cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include - -# copy libs (libnx-x11) -find nx-X11/exports/lib/ | egrep "^.*\.so$" | while read libpath; do - libfile=$(basename $libpath) - libdir=$(dirname $libpath) - - mkdir -p ${libdir//exports/.build-exports} - cp -L $libpath ${libdir//exports/.build-exports} - - find $libdir/$libfile.* | while read symlink; do - ln -s $libfile ${libdir//exports/.build-exports}/$(basename $symlink) - done -done - -exit 0 diff --git a/debian/rules b/debian/rules index c1f0294..6e0892d 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ else endif %: - LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh $@ --with quilt + CONFIGURE="./configure --prefix=/usr" LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh $@ --with quilt override_dh_auto_clean: rm -Rf nx-X11/.build-exports @@ -20,7 +20,7 @@ override_dh_clean: rm -f nx*/changelog rm -f nx-X11/programs/Xserver/hw/nxagent/changelog rm -f nx-X11/programs/nxauth/changelog - rm -f Makefile bin rgb VERSION.x2goagent + rm -Rf Makefile bin rgb VERSION.x2goagent dh_clean override_dh_auto_install: @@ -40,7 +40,6 @@ override_dh_auto_build: ln -s debian/rgb ln -s debian/VERSION.x2goagent LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt --parallel - debian/post-build-nx.sh override_dh_strip: dh_strip --dbg-package=nx-x11-dbg hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

x2goclient.git - build-baikal (branch) created: 4.0.0.0-3-g2647cbe
by git-admin＠x2go.org 02 Jan '13

02 Jan '13

The branch, build-baikal has been created at 2647cbe5a04b3589e875404cb2de198dab7a55dc (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits