--- xosd-2.2.14.orig/debian/xmms-osd-plugin.dirs +++ xosd-2.2.14/debian/xmms-osd-plugin.dirs @@ -0,0 +1,2 @@ +usr/share/pixmaps/xmms-osd-plugin +usr/lib/xmms/General --- xosd-2.2.14.orig/debian/compat +++ xosd-2.2.14/debian/compat @@ -0,0 +1 @@ +4 --- xosd-2.2.14.orig/debian/libxosd2.docs +++ xosd-2.2.14/debian/libxosd2.docs @@ -0,0 +1,2 @@ +AUTHORS +README --- xosd-2.2.14.orig/debian/libxosd-dev.install +++ xosd-2.2.14/debian/libxosd-dev.install @@ -0,0 +1,8 @@ +usr/lib/libxosd.so +usr/lib/libxosd.a +usr/lib/libxosd.la +usr/share/aclocal/libxosd.m4 +usr/include/xosd.h +usr/bin/xosd-config +usr/share/man/man3 +usr/share/man/man1/xosd-config.1 --- xosd-2.2.14.orig/debian/libxosd2.preinst +++ xosd-2.2.14/debian/libxosd2.preinst @@ -0,0 +1,17 @@ +#!/bin/sh +# preinst script for libxosd + +set -e + +# Fix blunder from 0.3.0-1 - Aagh! +if [ -L /usr/share/doc/libxosd/libxosd-dev ]; then + rm -f /usr/share/doc/libxosd/libxosd-dev +fi + +if [ -L /usr/share/doc/libxosd/xmms-osd-plugin ]; then + rm -f /usr/share/doc/libxosd/xmms-osd-plugin +fi + +#DEBHELPER# + +exit 0 --- xosd-2.2.14.orig/debian/xosd-bin.install +++ xosd-2.2.14/debian/xosd-bin.install @@ -0,0 +1,2 @@ +usr/bin/osd_cat +usr/share/man/man1/osd_cat.1 --- xosd-2.2.14.orig/debian/README.Debian +++ xosd-2.2.14/debian/README.Debian @@ -0,0 +1,23 @@ +Documentation +------------- + +Have a look at the "XOSD Guide and Reference" at http://ldots.org/xosd-guide/. +If you really want a Debian package of it, file a RFP or wishlist bug. + +Fonts and locales +----------------- + +For full unicode, you need a lot of glyphs. Since many old fonts only include +glyphs for ASCII or ISO-8859-*, this is a major problem. X11 does therefor use +multiple fonts to combine them to a FontSet. Most of the time you needn't have +a full set of all unicode glyphs, but only use a small subset. This subset +depends on your locale setting, which specified which glyphs must be available +for a FontSet to be complete. + +Therefor you should use wildcards in your font-specification, else X11 might +not be able to find all required glyphs and doesn't create a font at all. It's +a good idea to install additional fonts with other encodings, for example, the +xfonts-{75dpi,100dpi,base}-transcoded are a good idea. + +If it still doesn't work, try to revert back to an non-UTF8 (LANG=de_DE) +encoding or use good old ASCII (LANG=C). --- xosd-2.2.14.orig/debian/changelog +++ xosd-2.2.14/debian/changelog @@ -0,0 +1,604 @@ +xosd (2.2.14-1.4) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/20_underquoted_definition.diff: + + New patch. Fix underquoted definition of AM_PATH_LIBXOSD in libxosd.m4 + (Closes: #286156). + + -- Sam Hocevar (Debian packages) Thu, 25 Oct 2007 15:51:06 +0000 + +xosd (2.2.14-1.3) unstable; urgency=high + + * Non-maintainer upload. + * Deleted packages removed during X.org 7 transition from build-deps and + -dev package deps, added x11proto-core-dev, x11proto-xinerama-dev and + x11proto-xext-dev to build-deps for some headers (Closes: #362882) + + -- Marcin Owsiany Thu, 27 Apr 2006 21:03:37 +0100 + +xosd (2.2.14-1.2) unstable; urgency=high + + * Non-maintainer upload. + * Rebuilt to catch new Xinerama.so from x.org (Closes: #318150) + * Added libxinerama-dev to build-deps and -dev package deps + + -- Marcin Owsiany Thu, 14 Jul 2005 23:37:48 +0300 + +xosd (2.2.14-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Add build dependencies on libx11-dev and libxext-dev and + regenerate configure to fix FTBFS (Closes: #307794) + + -- Luk Claes Mon, 9 May 2005 20:16:06 +0200 + +xosd (2.2.14-1) unstable; urgency=medium + + * New upstream version. + - Applied my 5[123] patches. (closes: #281190) + * Urgency medium because prior versions are buggy and a lot of packages need + a working version. + + -- Philipp Matthias Hahn Wed, 17 Nov 2004 22:45:15 +0100 + +xosd (2.2.13-2) experimental; urgency=low + + * 51_timeout.diff: Fix timeout code again. + * 52_bmp.diff: Fix buffer overflow also in duplicate code. + * 53_documentation.diff: Fix one type and one missed change. + + -- Philipp Matthias Hahn Wed, 10 Nov 2004 16:32:19 +0100 + +xosd (2.2.13-1) unstable; urgency=medium + + * New upstream version. + - Applied my 44..50 patches. + - Beep Media Player support. (Disabled for Debian) + * Urgency medium because of important bug fixes. + * Tighten dependencies in debian/shlibs. + + -- Philipp Matthias Hahn Tue, 9 Nov 2004 09:48:23 +0100 + +xosd (2.2.12-2) experimental; urgency=low + + * 50_autoconf_xt.diff: Remove dependency on libxt-dev (closes: #279513) + + -- Philipp Matthias Hahn Wed, 3 Nov 2004 18:08:16 +0100 + +xosd (2.2.12-1) experimental; urgency=low + + * New upstream version. + - Applied my 4[0123] patches. + * 44_endofhex.diff: Fix potential buffer overflow. (closes: #273374) + * 45_timeout.diff: Fix negative timeouts. (closes: #277027) + * 46_event.diff: Fix hang. (closes: #269671,#279406,#271807,#272692) + * 47_exposure.diff: Reduce events to improve speed. + * 48_update.diff: Fix lost update problem. + * 49_debug.diff: Debug X11 events. + + -- Philipp Matthias Hahn Wed, 3 Nov 2004 14:26:21 +0100 + +xosd (2.2.11-3) unstable; urgency=medium + + * 43_hang.diff: Hangs on init. (closes: #271131) + * Still urgency medium because of #270722. + + -- Philipp Matthias Hahn Mon, 13 Sep 2004 16:23:22 +0200 + +xosd (2.2.11-2) unstable; urgency=medium + + * 40_close_pipe.diff: Close pipes on destroy (closes: #270722) + * 41_manpage.diff: Default is left not center (closes: #270902) + * 42_align.diff: Fix center alignment (closes: #270738) + * Urgency medium because of #270722. + + -- Philipp Matthias Hahn Mon, 13 Sep 2004 16:20:23 +0200 + +xosd (2.2.11-1) unstable; urgency=medium + + * New upstream version. + - Applied my 38_one_line.diff and 39_reorder.diff. + * Urgency medium because of #269345 and closes: #269671 + + -- Philipp Matthias Hahn Fri, 3 Sep 2004 09:08:30 +0200 + +xosd (2.2.10-2) unstable; urgency=medium + + * Urgency medium because of #269345. + * 38_one_line.diff: Revert 26_one_line.diff again (closes: #269345) + * 39_reorder.diff: Reorder event_thread. + + -- Philipp Matthias Hahn Thu, 2 Sep 2004 20:56:29 +0200 + +xosd (2.2.10-1) unstable; urgency=medium + + * New upstream version. + - Applied my 36_string_with.diff and 37_setlocale.diff + * Urgency medium because of grave #252170. + + -- Philipp Matthias Hahn Fri, 27 Aug 2004 08:11:16 +0200 + +xosd (2.2.9.0-1) unstable; urgency=low + + * New upstream version. + - 26_one_line.diff/26_one_line_addon.diff: Merged upstream + - 35_synchronous.diff: Work on tpb related #265757. + * 36_string_with.diff: Fix alignment problem (#265561) + * 37_setlocale.diff: Re-add setlocale() in osd_cat (closes: #268182) + * Tighten dependencies in debian/shlibs. (Thanks to Julien Danjou) + + -- Philipp Matthias Hahn Thu, 26 Aug 2004 20:42:50 +0200 + +xosd (2.2.9-pre3-1) experimental; urgency=low + + * New upstream version. + - 32_osd_cat_age.diff: Work on "osd_cat --age" functionality. + - 33_automake.diff: Update autoconf files. + - 34_docs.diff: Update package documentation. + * Fix spelling in README.Debian (Thanks to Markus Braun) + * 26_one_line.diff/26_one_line_addon.diff: Fix broken merge. + * 35_synchronous.diff: Work on tpb related #265757. + + -- Philipp Matthias Hahn Fri, 20 Aug 2004 10:54:48 +0200 + +xosd (2.2.9-pre1-1) experimental; urgency=low + + * New upstream version. + - Applied my 0..30/26 patches, remove all expect 26_one_line.diff. + * 31_segv.diff: Crashes xmms after a short time (closes: #265561) + + -- Philipp Matthias Hahn Mon, 16 Aug 2004 17:57:56 +0200 + +xosd (2.2.8-7) unstable; urgency=low + + * 30_yield_fix.diff: Don't do busy waiting AKA #177551 + * 06_ChangeLog.diff: Optimization + + -- Philipp Matthias Hahn Fri, 13 Aug 2004 10:57:57 +0200 + +xosd (2.2.8-6) unstable; urgency=low + + * 29_flicker_fix.diff: Init XShape-Bitmap on initialization + + -- Philipp Matthias Hahn Fri, 13 Aug 2004 08:26:08 +0200 + +xosd (2.2.8-5) unstable; urgency=low + + * 28_shadow_text_fix.diff: [ij] mixup + + -- Philipp Matthias Hahn Thu, 12 Aug 2004 10:58:09 +0200 + +xosd (2.2.8-4) unstable; urgency=low + + * 27_clear_blank_fix.diff (closes: #265010) + + -- Philipp Matthias Hahn Wed, 11 Aug 2004 18:16:15 +0200 + +xosd (2.2.8-3) unstable; urgency=medium + + * Reupload to unstable after successful testing in experimental. + * Urgency medium because of grave #252170. + + -- Philipp Matthias Hahn Tue, 10 Aug 2004 08:10:39 +0200 + +xosd (2.2.8-2) experimental; urgency=low + + * Rewrite xosd to use only one thread calling X11 (closes: #252170). + * Install README.Debian in all packages, because it contains important + informations about common font problems. + * Suggest xfonts-base-transcoded, see README.Debian on why. + + -- Philipp Matthias Hahn Thu, 5 Aug 2004 00:43:18 +0200 + +xosd (2.2.8-1) unstable; urgency=low + + * New upstream version: + - new version of osd_cat that can do percentage and slider bars + - speed optimisation + * Bump standards to 3.6.1.1 + - No changes. + * Replace dependency on xlibs-{dev,pic} with new dependencies. + (closes: #253332) + * Remove setlocale() from src/libxosd/xosd.c (closes: #258142) + + -- Philipp Matthias Hahn Thu, 8 Jul 2004 09:51:50 +0200 + +xosd (2.2.7-1) unstable; urgency=low + + * New upstream version: + - Fix 100% CPU upsage in lineakd. + + -- Philipp Matthias Hahn Wed, 1 Oct 2003 08:50:58 +0200 + +xosd (2.2.6-1) unstable; urgency=low + + * New upstream version: + - Includes debian/patches/01_XFreeFontSet.patch + - Includes debian/patches/02_set_font.patch + - Includes debian/patches/03_titlechange.patch + - Includes debian/patches/04_title_with_time.patch + - Includes debian/patches/05_state_rewrite.patch + - Fix redisplay after config change. + + -- Philipp Matthias Hahn Tue, 30 Sep 2003 10:32:49 +0200 + +xosd (2.2.5-1) unstable; urgency=low + + * New upstream version: + - Includes debian/patches/01_xmms_osd_set_font.patch + - Includes debian/patches/02_libxosd_draw_bar.patch + * Fix XFreeFontSet() after invalid font. (closes: #210680) + * Stay with old font if new font doesn't exist. + * Don't display volume-slider during title-change. + * Fix memory leak in xmms_osd.c:timeout_func(). + * Rewrite timeout_func() again: + - Next after Pause without show.track displayed Unpause, not Play. + - Display time at Unpause. + - Less xmms_remote_*() function calls. + - Check for buffer overflows using snprintf(). + - Easier to read and understand (Thanks to ascii-art :-). + + -- Philipp Matthias Hahn Sun, 28 Sep 2003 23:27:55 +0200 + +xosd (2.2.4-3) unstable; urgency=low + + * Rework debian/patches/02_libxosd_draw_bar. (closes: #212599) + * Rerun auto* stuff, because updating libtool isn't sufficient. + + -- Philipp Matthias Hahn Thu, 25 Sep 2003 14:09:41 +0200 + +xosd (2.2.4-2) unstable; urgency=low + + * Ack NMU. + * Fix initial position. (closes: #202162) + Move xosd_set_font() first in xmms_osd.c:apply_config. + Thanks to Joachim Breitner for the fix. + + -- Philipp Matthias Hahn Mon, 22 Sep 2003 16:49:23 +0200 + +xosd (2.2.4-1.3) unstable; urgency=low + + * NMU + * Run libtool 1.5-2 to fix build on arm. + + -- Sebastien Bacher Thu, 11 Sep 2003 14:39:59 +0000 + +xosd (2.2.4-1.2) unstable; urgency=low + + * NMU to fix some RC bugs. + * debian/control + + make libxosd-dev depends on libxosd2 (closes: #210298). + * Updated libtool (closes: #210295). + + -- Sebastien Bacher Wed, 10 Sep 2003 19:13:07 +0200 + +xosd (2.2.4-1.1) unstable; urgency=low + + * NMU. + * debian/control + + Added ${shlibs:Depend} to Depends (Closes: #206954) + * Bump standards to 3.6.1.0 + + -- Julien Danjou Thu, 28 Aug 2003 19:07:08 +0200 + +xosd (2.2.4-1) unstable; urgency=low + + * New upstream version. + - patches/01_update_pos.patch + - patches/02_xinerama_pic.patch + + -- Philipp Matthias Hahn Tue, 8 Jul 2003 08:30:30 +0200 + +xosd (2.2.2-2) unstable; urgency=low + + * "Happy birthday release". + * Use Homepage-keyword in debian/control. + * Fix Xinerama_pic dependencies in xosd-config. + + -- Philipp Matthias Hahn Tue, 1 Jul 2003 21:33:10 +0200 + +xosd (2.2.2-1) unstable; urgency=low + + * New upstream version. + * Standards-Version 3.5.10 (no changes). + * Also force redraw after chaning alignment/position. (closes: #194599) + * Switch to cdbs in debian/rules. + + -- Philipp Matthias Hahn Fri, 27 Jun 2003 09:06:35 +0200 + +xosd (2.2.1-3) unstable; urgency=low + + * libxosd-dev should depend on xlibs-pic for xinerama_pic. closes: #191773 + * Update libtool, because m68k and arm are broken. + + -- Philipp Matthias Hahn Wed, 14 May 2003 15:20:18 +0200 + +xosd (2.2.1-2) unstable; urgency=low + + * Call update_pos() instead of force_redraw(). closes: #189731 + * Link xinerama_pic. closes: #189476 + + -- Philipp Matthias Hahn Mon, 28 Apr 2003 23:06:16 +0200 + +xosd (2.2.1-1) unstable; urgency=low + + * New upstream version. + + -- Philipp Matthias Hahn Tue, 15 Apr 2003 09:35:52 +0200 + +xosd (2.2.1-0pre2) experimental; urgency=low + + * Rework old xmms-plugin too. + + -- Philipp Matthias Hahn Sat, 12 Apr 2003 22:44:00 +0200 + +xosd (2.2.1-0pre1) experimental; urgency=low + + * New prerelease. + - Rework whole xmms-plugin. (closes: #141811) + + -- Philipp Matthias Hahn Thu, 3 Apr 2003 11:49:55 +0200 + +xosd (2.2.0-1) unstable; urgency=low + + * New upstream version. + - Add Xinerama-awareness. (closes: #185538) + - Apply patch from James Roberts-Thomson to substitute _ by space. + - Spelling fixes + - Flickering fix for osd_cat + - Added shadow-colour and outline-colour + * Standards-Version 3.5.9 (no changes). + * Move libxosd-dev to libdevel-section. + + -- Philipp Matthias Hahn Tue, 1 Apr 2003 09:16:11 +0200 + +xosd (2.1.3-1) unstable; urgency=low + + * New upstream version. + - Includes old xmms plugin again. + - Includes my patches from 2.1.2-1 + - automake-1.7 transition + + -- Philipp Matthias Hahn Mon, 3 Mar 2003 14:01:10 +0100 + +xosd (2.1.2-1) unstable; urgency=low + + * New upstream version. + - Fix wrong deprecation. + - Small manual page fix. + * Also update last_pause on stop in xmms plugin (closes: #170643) + * Move pixmaps for new xmms plugin to /usr/share/pixmaps/xmms-osd-plugin. + Add configure option and rerun auto* stuff. + + -- Philipp Matthias Hahn Wed, 26 Feb 2003 20:53:25 +0100 + +xosd (2.1.1-1) unstable; urgency=low + + * New upstream version. + - Includes my patches from 2.1.0-1 + - New configure options for xmms plugin selection. + * Include pixmaps. + + -- Philipp Matthias Hahn Tue, 18 Feb 2003 08:37:52 +0100 + +xosd (2.1.0-1) unstable; urgency=low + + * New upstream version. + - New old xmms plugin (not packaged, file a wishlist bug). + * Fix library versioning. + * Fix segfault with insufficient fontset (closes: #167587). + * Change timeout loop from "busy loop" to proper event mechanism. + * Don't do "busy waiting" in X11 event loop (closes: #177551) + The xmms plugin is still doing busy things. + + -- Philipp Matthias Hahn Mon, 17 Feb 2003 14:00:54 +0100 + +xosd (2.0.2-1) unstable; urgency=low + + * New upstream version. + - Fix several segfaults. + + -- Philipp Matthias Hahn Mon, 20 Jan 2003 09:57:39 +0100 + +xosd (2.0.1-1) unstable; urgency=low + + * New upstream version. (closes: #170343) + * Fix build of xmms plugin. + - Conflict with older versions of libxosd-dev during build. + * Standards-Version 3.5.8. + + -- Philipp Matthias Hahn Wed, 4 Dec 2002 16:39:16 +0100 + +xosd (1.1.1-1) unstable; urgency=low + + * New upstream version: + - Fix asynchronous X problem. + - Change "immediate" to "wait" in helptext. (closes: #163886) + - Fix manual page, memory leaks, centered sliders. + + -- Philipp Matthias Hahn Wed, 16 Oct 2002 09:12:50 +0200 + +xosd (1.0.4-2) unstable; urgency=low + + * Fix memory leaks in osd_cat. + * non-NMU upload really closes: #157702, #139455 + + -- Philipp Matthias Hahn Tue, 1 Oct 2002 13:44:23 +0200 + +xosd (1.0.4-1) unstable; urgency=low + + * New upstream version: + - closes: #157702 100% CPU hog problem (Thanks Christian for debugging) + - closes: #139455 Var. bitrate problem can no longer be reproduced. + * Increment library version info (should have happend in 1.0.3) + (Upstream will follow in it's next release.) + * Standards-Version 3.5.7: + - Support DEB_BUILD_OPTIONS noopt instead of debug. + - Always build with -g. + - Build depend on debhelper (>= 4.1.0). + + -- Philipp Matthias Hahn Thu, 19 Sep 2002 10:04:56 +0200 + +xosd (1.0.3-1) unstable; urgency=low + + * New upstream version. + - Fix more memory leaks. + - Plugin segfault fix on disable. + * Change default font to fix FontSet creation. + + -- Philipp Matthias Hahn Fri, 30 Aug 2002 09:21:49 +0200 + +xosd (1.0.2-1) unstable; urgency=low + + * New upstream version. + - Includes man-page. + - Includes memory-leak fix. + * Fix linking of libxmms_osd. (closes: #156869) + + -- Philipp Matthias Hahn Fri, 16 Aug 2002 11:46:50 +0200 + +xosd (1.0.1-2) unstable; urgency=low + + * Applied the wrong memory-leak-fix. Now fixed. + * Hide output on disable. (closes: #128537) + + -- Philipp Matthias Hahn Wed, 14 Aug 2002 21:31:25 +0200 + +xosd (1.0.1-1) unstable; urgency=low + + * New upstream version. (closes: #154847,#143901) + * Fix memory leak (closes: #145356) + * Adopt package from Martijn van de Streek. (closes: #156543) + * Drop patches because upstream includes them: + - fontset + - shadow + * Increment standards to 3.5.6.0 without changes. + * Use debhelper to build package. + + -- Philipp Matthias Hahn Tue, 13 Aug 2002 15:27:28 +0200 + +xosd (0.7.0-4) unstable; urgency=low + + * Make libxosd-dev depend on xlibs-dev (closes: #123160) + + -- Martijn van de Streek Mon, 10 Dec 2001 08:26:33 +0100 + +xosd (0.7.0-3) unstable; urgency=low + + * Fix the "font doesn't exists" segfault (Closes: #94935) + + -- Martijn van de Streek Thu, 14 Jun 2001 13:58:13 +0200 + +xosd (0.7.0-2) unstable; urgency=low + + * Updated shlibs file -- oops :) + + -- Martijn van de Streek Tue, 27 Mar 2001 22:18:34 +0200 + +xosd (0.7.0-1) unstable; urgency=low + + * New upstream release + * Added '-s' option to osd_cat to set shadow offset + + -- Martijn van de Streek Mon, 26 Mar 2001 19:49:54 +0200 + +xosd (0.6.1-3) unstable; urgency=low + + * Add static library (libxosd.a). Closes: #85169 + + -- Martijn van de Streek Wed, 7 Feb 2001 20:32:59 +0100 + +xosd (0.6.1-2) unstable; urgency=low + + * Fix override disparity + + -- Martijn van de Streek Fri, 19 Jan 2001 09:35:53 +0100 + +xosd (0.6.1-1) unstable; urgency=low + + * New upstream version + * Upstream applied Shaleh's patch for non-gnome compliant WMs. + Closes: #81953 + + -- Martijn van de Streek Thu, 18 Jan 2001 21:52:59 +0100 + +xosd (0.6.0-1) unstable; urgency=low + + * New upstream version + * Patch from 0.5.0-2 applied upstream + * Included upstream README file + + -- Martijn van de Streek Thu, 11 Jan 2001 16:15:04 +0100 + +xosd (0.5.0-2) unstable; urgency=low + + * New binary package: xosd-bin which closes: #80803 + (thanks Philipp Matthias Hahn ) + * Makefile and manpage cleanups (thanks again :) + + -- Martijn van de Streek Wed, 10 Jan 2001 19:50:08 +0100 + +xosd (0.5.0-1) unstable; urgency=low + + * New upstream version + * All patches accepted upstream + + -- Martijn van de Streek Tue, 9 Jan 2001 09:35:06 +0100 + +xosd (0.4.0-3) unstable; urgency=low + + * Oops. libxosd-dev should conflict with the old libxosd package + + -- Martijn van de Streek Mon, 8 Jan 2001 20:07:56 +0100 + +xosd (0.4.0-2) unstable; urgency=low + + * Modified build system to use a soname + * Added a manual page (xosd(3xosd)) + * Resize xosd->bitmap on set_font. Closes: #77868,#79175 + * Fix positioning of osd on xmms restart. Closes: #79177 + + -- Martijn van de Streek Mon, 1 Jan 2001 13:50:11 +0100 + +xosd (0.4.0-1) unstable; urgency=low + + * New upstream version: + - FontSet patch + - Better error reporting if the SHAPE is missing + - New configuration dialog + + -- Martijn van de Streek Wed, 27 Dec 2000 19:48:29 +0100 + +xosd (0.3.0-3) unstable; urgency=low + + * Applied Isaac Kar-Keung To's FontSet patch (closes: #79242) + + -- Martijn van de Streek Sun, 10 Dec 2000 11:28:20 +0100 + +xosd (0.3.0-2) unstable; urgency=low + + * Packaging updates (closes: #77873) + + -- Martijn van de Streek Fri, 24 Nov 2000 09:24:57 +0100 + +xosd (0.3.0-1) unstable; urgency=low + + * New upstream version + * Fixes a LOT of segfault bugs + * Rewrite of the "percentage-bar" code + + -- Martijn van de Streek Wed, 22 Nov 2000 15:33:49 +0100 + +xosd (0.2.0-1) unstable; urgency=low + + * Last version was never installed, so this one closes: #76854 + too. + * New upstream version + + -- Martijn van de Streek Mon, 13 Nov 2000 19:47:42 +0100 + +xosd (0.1.0-1) unstable; urgency=low + + * Initial packaging (closes: #76854) + + -- Martijn van de Streek Sun, 12 Nov 2000 14:38:37 +0100 --- xosd-2.2.14.orig/debian/shlibs +++ xosd-2.2.14/debian/shlibs @@ -0,0 +1 @@ +libxosd 2 libxosd2 (>= 2.2.13) --- xosd-2.2.14.orig/debian/test/01timeout.c +++ xosd-2.2.14/debian/test/01timeout.c @@ -0,0 +1,9 @@ +#include "xosd.h" +int main(void) { + xosd *osd = xosd_create(2); + xosd_set_timeout(osd, 2); + xosd_display(osd, 0, XOSD_string, "foo"); + sleep(1); + xosd_set_timeout(osd, -1); + xosd_display(osd, 1, XOSD_string, "bar"); +} --- xosd-2.2.14.orig/debian/libxosd2.install +++ xosd-2.2.14/debian/libxosd2.install @@ -0,0 +1,2 @@ +usr/lib/libxosd.so.2 +usr/lib/libxosd.so.2.* --- xosd-2.2.14.orig/debian/patches/20_underquoted_definition.diff +++ xosd-2.2.14/debian/patches/20_underquoted_definition.diff @@ -0,0 +1,12 @@ +diff -puriN xosd-2.2.14/libxosd.m4 xosd-2.2.14.new/libxosd.m4 +--- xosd-2.2.14/libxosd.m4 2004-08-19 22:39:40.000000000 +0000 ++++ xosd-2.2.14.new/libxosd.m4 2007-10-25 15:52:22.000000000 +0000 +@@ -6,7 +6,7 @@ + dnl AM_PATH_LIBXOSD([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) + dnl Test to see if libxosd is installed, and define LIBXOSD_CFLAGS, LIBXOSDLIBS + dnl +-AC_DEFUN(AM_PATH_LIBXOSD, ++AC_DEFUN([AM_PATH_LIBXOSD], + [dnl + dnl Get the cflags and libraries from the xosd-config script + dnl --- xosd-2.2.14.orig/debian/patches/53_bmp.diff.UNRESOLVED +++ xosd-2.2.14/debian/patches/53_bmp.diff.UNRESOLVED @@ -0,0 +1,156 @@ +#DPATCHLEVEL=0 +--- xmms_plugin/dlg_colour.c 2004-08-20 00:39:31.000000000 +0200 ++++ bmp_plugin/dlg_colour.c 2004-11-08 21:03:23.000000000 +0100 +@@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg + + #include + +-#include "xmms_osd.h" ++#include "bmp_osd.h" + + GtkWidget *colour_entry; + +--- xmms_plugin/dlg_config.c 2004-08-20 00:39:32.000000000 +0200 ++++ bmp_plugin/dlg_config.c 2004-11-08 21:03:23.000000000 +0100 +@@ -20,7 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg + #include + #include + +-#include "xmms_osd.h" ++#include "bmp_osd.h" + + #include + +@@ -182,6 +182,7 @@ position_icons_new(void) + GdkPixmap *icon_pixmap = NULL; + GdkBitmap *icon_mask = NULL; + GtkWidget *icon_widget = NULL; ++ GError **pixbuferror = NULL; + + DEBUG("creating icons..."); + +@@ -211,7 +212,7 @@ position_icons_new(void) + DEBUG("Icon file name %s", icon_file_name); + + // Load the file, render it, and create the widget. +- icon_pixbuf = gdk_pixbuf_new_from_file(icon_file_name); ++ icon_pixbuf = gdk_pixbuf_new_from_file(icon_file_name,pixbuferror); + gdk_pixbuf_render_pixmap_and_mask(icon_pixbuf, + &icon_pixmap, &icon_mask, 128); + icon_widget = gtk_pixmap_new(icon_pixmap, icon_mask); +@@ -278,7 +279,7 @@ configure(void) + + read_config(); + +- configure_win = gtk_window_new(GTK_WINDOW_DIALOG); ++ configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL); + + gtk_signal_connect(GTK_OBJECT(configure_win), "destroy", + GTK_SIGNAL_FUNC(gtk_widget_destroyed), &configure_win); +--- xmms_plugin/dlg_config_old.c 2004-08-20 00:39:31.000000000 +0200 ++++ bmp_plugin/dlg_config_old.c 2004-11-08 21:03:23.000000000 +0100 +@@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg + + #include + +-#include "xmms_osd.h" ++#include "bmp_osd.h" + + #include + +@@ -154,7 +154,7 @@ configure(void) + + read_config(); + +- configure_win = gtk_window_new(GTK_WINDOW_DIALOG); ++ configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL); + + gtk_signal_connect(GTK_OBJECT(configure_win), "destroy", + GTK_SIGNAL_FUNC(gtk_widget_destroyed), &configure_win); +--- xmms_plugin/dlg_font.c 2004-08-20 00:39:31.000000000 +0200 ++++ bmp_plugin/dlg_font.c 2004-11-08 21:03:23.000000000 +0100 +@@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg + + #include + +-#include "xmms_osd.h" ++#include "bmp_osd.h" + + GtkWidget *font_entry; + +--- xmms_plugin/Makefile.am 2004-08-20 00:39:31.000000000 +0200 ++++ bmp_plugin/Makefile.am 2004-11-08 21:34:39.000000000 +0100 +@@ -1,25 +1,27 @@ + # XMMS library + +-AM_CFLAGS = @XMMS_CFLAGS@ @GTK_CFLAGS@ @GDK_PIXBUF_CFLAGS@ \ +- -I$(top_srcdir)/src -DXMMS_PIXMAPDIR=\"$(XMMS_PIXMAPDIR)\" ++AM_CFLAGS = @BMP_CFLAGS@ -I$(top_srcdir)/src -DXMMS_PIXMAPDIR=\"$(XMMS_PIXMAPDIR)\" + +-xmmsplugindir = @XMMS_PLUGIN_DIR@ ++bmpplugindir = @BMP_GENERAL_PLUGIN_DIR@ + + # Don't build a static library + LIBTOOL = $(top_builddir)/libtool-disable-static +- ++ ++if BUILD_BEEP_MEDIA_PLUGIN + if BUILD_NEW_PLUGIN +-NEW_xmmsplugin = libxmms_osd.la ++NEW_bmpplugin = libbmp_osd.la + endif + if BUILD_OLD_PLUGIN +-OLD_xmmsplugin = libxmms_osd_old.la ++OLD_bmpplugin = libbmp_osd_old.la ++endif + endif +-xmmsplugin_LTLIBRARIES = $(NEW_xmmsplugin) $(OLD_xmmsplugin) + +-libxmms_osd_la_SOURCES = xmms_osd.c dlg_config.c dlg_font.c dlg_colour.c xmms_osd.h +-libxmms_osd_la_LIBADD = $(top_builddir)/src/libxosd/libxosd.la +-libxmms_osd_la_LDFLAGS = -module -avoid-version @GDK_PIXBUF_LIBS@ +- +-libxmms_osd_old_la_SOURCES = xmms_osd.c dlg_config_old.c dlg_font.c dlg_colour.c xmms_osd.h +-libxmms_osd_old_la_LIBADD = $(top_builddir)/src/libxosd/libxosd.la +-libxmms_osd_old_la_LDFLAGS = -module -avoid-version ++bmpplugin_LTLIBRARIES = $(NEW_bmpplugin) $(OLD_bmpplugin) ++ ++libbmp_osd_la_SOURCES = bmp_osd.c dlg_config.c dlg_font.c dlg_colour.c bmp_osd.h ++libbmp_osd_la_LIBADD = $(top_builddir)/src/libxosd/libxosd.la ++libbmp_osd_la_LDFLAGS = -module -avoid-version @GDK_PIXBUF_LIBS@ ++ ++libbmp_osd_old_la_SOURCES = bmp_osd.c dlg_config_old.c dlg_font.c dlg_colour.c bmp_osd.h ++libbmp_osd_old_la_LIBADD = $(top_builddir)/src/libxosd/libxosd.la ++libbmp_osd_old_la_LDFLAGS = -module -avoid-version +--- xmms_plugin/xmms_osd.c 2004-11-04 20:47:50.000000000 +0100 ++++ bmp_plugin/bmp_osd.c 2004-11-08 21:03:23.000000000 +0100 +@@ -17,10 +17,9 @@ along with this program; if not, write t + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +-#include + #include + +-#include "xmms_osd.h" ++#include "bmp_osd.h" + + #include + #include +@@ -288,15 +287,14 @@ replace_hexcodes(gchar * text) + xmms_cfg_free(cfgfile); + } + +- for (head = tail = text; *head; head++, tail++) { ++ for (head = tail = text; *tail; head++, tail++) { + /* replace underscors with spaces if necessary */ + if (conv_underscore && *head == '_') { + *tail = ' '; + continue; + } + /* replace hex with character if necessary */ +- if (*head == '%' && isxdigit(head[1]) && isxdigit(head[2])) { +- sscanf(head + 1, "%2x", &c); ++ if (*head == '%' && sscanf(head + 1, "%2x", &c)) { + *tail = (char) c; + head += 2; + continue; --- xosd-2.2.14.orig/debian/xmms-osd-plugin.install +++ xosd-2.2.14/debian/xmms-osd-plugin.install @@ -0,0 +1,2 @@ +usr/share/pixmaps/xmms-osd-plugin/*.png +usr/lib/xmms/General/libxmms_osd.so --- xosd-2.2.14.orig/debian/control +++ xosd-2.2.14/debian/control @@ -0,0 +1,50 @@ +Source: xosd +Section: x11 +Priority: optional +Maintainer: Philipp Matthias Hahn +Build-Depends: libgtk1.2-dev, xmms-dev (>= 1.2.0-1), libtool, debhelper (>= 4.1.0), libgdk-pixbuf-dev, libx11-dev, libxext-dev, x11proto-core-dev, x11proto-xinerama-dev, x11proto-xext-dev, libxinerama-dev, cdbs +Build-Conflicts: libxosd-dev (<< ${Source-Version}) +Standards-Version: 3.6.1.1 + +Package: libxosd2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: libxosd +Replaces: libxosd, libxosd0 +Suggests: xfonts-base-transcoded +Description: X On-Screen Display library - runtime + A library for displaying a TV-like on-screen display in X. + . + Homepage: http://www.ignavus.net/software.html + +Package: libxosd-dev +Section: libdevel +Architecture: any +Depends: libxosd2 (= ${Source-Version}), libx11-dev, libxext-dev, ${shlibs:Depends}, libxinerama-dev +Conflicts: libxosd +Description: X On-Screen Display library - development + A library for displaying a TV-like on-screen display in X. + . + This package contains the development headers needed for compiling + programs against libxosd. + +Package: xosd-bin +Architecture: any +Depends: ${shlibs:Depends} +Description: X On-Screen Display library - binary files + This package contains binary files shipped with the X OSD library: + osd_cat - a 'cat' like program which will display its output in an + OSD-like window + . + Homepage: http://www.ignavus.net/software.html + +Package: xmms-osd-plugin +Section: sound +Architecture: any +Depends: xmms (>= 1.2.0), ${shlibs:Depends} +Description: XMMS plugin using xosd + An XMMS plugin which displays volume and track information like + on-screen displays on TVs and monitors. + . + Homepage: http://www.ignavus.net/software.html --- xosd-2.2.14.orig/debian/rules +++ xosd-2.2.14/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f +# debian/rules that uses cdbs and debhelper. + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk + +DEB_CONFIGURE_EXTRA_FLAGS := --with-pixmapdir=/usr/share/pixmaps/xmms-osd-plugin --disable-beep_media_player_plugin +DEB_DH_INSTALL_SOURCEDIR := debian/tmp +DEB_INSTALL_CHANGELOGS_ALL := ChangeLog +DEB_INSTALL_DOCS_ALL := debian/README.Debian +DEB_SHLIBDEPS_INCLUDE := debian/libxosd2/usr/lib --- xosd-2.2.14.orig/debian/copyright +++ xosd-2.2.14/debian/copyright @@ -0,0 +1,12 @@ +This package was debianized by Martijn van de Streek +on Sun, 12 Nov 2000 14:38:37 +0100. It is now maintained by Philipp Hahn +. + +It was downloaded from http://www.ignavus.net/software.html + +Upstream author: Andre Renaud +Maintainer: Tim Wright + +Copyright: + +See /usr/share/common-licenses/GPL --- xosd-2.2.14.orig/configure +++ xosd-2.2.14/configure @@ -1171,7 +1171,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -2561,8 +2561,7 @@ 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' + { 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=$? @@ -2620,8 +2619,7 @@ 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' + { 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=$? @@ -2737,8 +2735,7 @@ 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' + { 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=$? @@ -2792,8 +2789,7 @@ 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' + { 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=$? @@ -2838,8 +2834,7 @@ 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' + { 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=$? @@ -2883,8 +2878,7 @@ 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' + { 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=$? @@ -3784,7 +3778,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3787 "configure"' > conftest.$ac_ext + echo '#line 3781 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3904,8 +3898,7 @@ 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' + { 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=$? @@ -4214,8 +4207,7 @@ 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' + { 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=$? @@ -4385,8 +4377,7 @@ 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' + { 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=$? @@ -4453,8 +4444,7 @@ 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' + { 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=$? @@ -4714,8 +4704,7 @@ 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' + { 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=$? @@ -4773,8 +4762,7 @@ 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' + { 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=$? @@ -4845,8 +4833,7 @@ 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' + { 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=$? @@ -4890,8 +4877,7 @@ 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' + { 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=$? @@ -5356,7 +5342,7 @@ # Provide some information about the compiler. -echo "$as_me:5359:" \ +echo "$as_me:5345:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5402,8 +5388,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5452,8 +5437,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6390,11 +6374,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6393: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6377: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6397: \$? = $ac_status" >&5 + echo "$as_me:6381: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6623,11 +6607,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6626: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6610: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6630: \$? = $ac_status" >&5 + echo "$as_me:6614: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6683,11 +6667,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6686: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6670: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6690: \$? = $ac_status" >&5 + echo "$as_me:6674: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7074,8 +7058,7 @@ 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' + { 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=$? @@ -7135,8 +7118,7 @@ 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' + { 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=$? @@ -8017,7 +7999,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8020 "configure"' > conftest.$ac_ext + echo '#line 8002 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8348,8 +8330,7 @@ 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' + { 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=$? @@ -8452,8 +8433,7 @@ 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' + { 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=$? @@ -8518,8 +8498,7 @@ 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' + { 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=$? @@ -8612,8 +8591,7 @@ 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' + { 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=$? @@ -8678,8 +8656,7 @@ 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' + { 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=$? @@ -8745,8 +8722,7 @@ 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' + { 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=$? @@ -8812,8 +8788,7 @@ 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' + { 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=$? @@ -8888,7 +8863,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { 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=$? @@ -10120,8 +10094,7 @@ 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' + { 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=$? @@ -11165,11 +11138,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11168: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11141: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11172: \$? = $ac_status" >&5 + echo "$as_me:11145: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11225,11 +11198,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11228: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11201: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11232: \$? = $ac_status" >&5 + echo "$as_me:11205: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11736,7 +11709,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 11739 "configure"' > conftest.$ac_ext + echo '#line 11712 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12067,8 +12040,7 @@ 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' + { 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=$? @@ -12171,8 +12143,7 @@ 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' + { 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=$? @@ -12237,8 +12208,7 @@ 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' + { 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=$? @@ -12331,8 +12301,7 @@ 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' + { 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=$? @@ -12397,8 +12366,7 @@ 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' + { 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=$? @@ -12464,8 +12432,7 @@ 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' + { 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=$? @@ -12531,8 +12498,7 @@ 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' + { 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=$? @@ -12607,7 +12573,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13501: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13539: \$? = $ac_status" >&5 + echo "$as_me:13505: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13592,11 +13558,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13595: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13561: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13599: \$? = $ac_status" >&5 + echo "$as_me:13565: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13973,8 +13939,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14024,8 +13989,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14906,7 +14870,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14909 "configure"' > conftest.$ac_ext + echo '#line 14873 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15647,11 +15611,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15650: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15614: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15654: \$? = $ac_status" >&5 + echo "$as_me:15618: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15880,11 +15844,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15883: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15847: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15887: \$? = $ac_status" >&5 + echo "$as_me:15851: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15940,11 +15904,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15943: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15907: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15947: \$? = $ac_status" >&5 + echo "$as_me:15911: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16331,8 +16295,7 @@ 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' + { 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=$? @@ -16392,8 +16355,7 @@ 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' + { 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=$? @@ -17274,7 +17236,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17277 "configure"' > conftest.$ac_ext + echo '#line 17239 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -17605,8 +17567,7 @@ 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' + { 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=$? @@ -17709,8 +17670,7 @@ 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' + { 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=$? @@ -17775,8 +17735,7 @@ 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' + { 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=$? @@ -17869,8 +17828,7 @@ 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' + { 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=$? @@ -17935,8 +17893,7 @@ 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' + { 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=$? @@ -18002,8 +17959,7 @@ 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' + { 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=$? @@ -18069,8 +18025,7 @@ 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' + { 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=$? @@ -18145,7 +18100,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 + +if test "x$ac_path_x_has_been_run" != xyes; then + echo "$as_me:$LINENO: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 +ac_path_x_has_been_run=yes # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -19352,7 +19310,7 @@ /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for a specified header file. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -19360,7 +19318,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -19387,7 +19345,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -19401,18 +19359,18 @@ # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" + LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize() ; return 0; } @@ -19426,8 +19384,7 @@ 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' + { 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=$? @@ -19451,7 +19408,7 @@ 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 + if test -r $ac_dir/libX11.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi @@ -19487,10 +19444,15 @@ # 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 + # It might be that x_includes is empty (headers are found in the + # standard search path. Then output the corresponding message + ac_out_x_includes=$x_includes + test "x$x_includes" = x && ac_out_x_includes="in standard search path" + echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 fi +fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. @@ -19538,8 +19500,7 @@ 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' + { 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=$? @@ -19590,8 +19551,7 @@ 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' + { 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=$? @@ -19667,8 +19627,7 @@ 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' + { 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=$? @@ -19723,8 +19682,7 @@ 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' + { 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=$? @@ -19792,8 +19750,7 @@ 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' + { 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=$? @@ -19901,8 +19858,7 @@ 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' + { 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=$? @@ -19966,8 +19922,7 @@ 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' + { 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=$? @@ -20035,8 +19990,7 @@ 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' + { 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=$? @@ -20140,8 +20094,7 @@ 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' + { 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=$? @@ -20205,8 +20158,7 @@ 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' + { 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=$? @@ -20303,8 +20255,7 @@ 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' + { 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=$? @@ -20368,8 +20319,7 @@ 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' + { 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=$? @@ -20466,8 +20416,7 @@ 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' + { 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=$? @@ -20531,8 +20480,7 @@ 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' + { 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=$? @@ -20611,8 +20559,7 @@ 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' + { 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=$? @@ -20920,8 +20867,7 @@ 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' + { 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=$? @@ -21010,8 +20956,7 @@ 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' + { 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=$? @@ -21088,8 +21033,7 @@ 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' + { 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=$? @@ -21166,8 +21110,7 @@ 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' + { 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=$? @@ -21239,8 +21182,7 @@ 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' + { 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=$? @@ -21406,8 +21348,7 @@ 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' + { 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=$? @@ -21552,8 +21493,7 @@ 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' + { 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=$? @@ -21739,8 +21679,7 @@ 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' + { 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=$? @@ -21834,8 +21773,7 @@ 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' + { 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=$? @@ -21921,8 +21859,7 @@ 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' + { 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=$? @@ -21994,8 +21931,7 @@ 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' + { 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=$? @@ -22614,8 +22550,7 @@ 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' + { 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=$? @@ -23733,11 +23668,6 @@ *) 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. */ @@ -23776,6 +23706,12 @@ fi;; esac done` || { (exit 1); exit 1; } + + 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 _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub