--- sabre-0.2.4b.orig/debian/xsabre.desktop +++ sabre-0.2.4b/debian/xsabre.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=SABRE +GenericName=sabre +Comment=Fly a combat flight simulator +Icon=xsabre +Exec=XRunSabre +Terminal=false +Categories=Game;Simulation; --- sabre-0.2.4b.orig/debian/sabre.menu +++ sabre-0.2.4b/debian/sabre.menu @@ -0,0 +1,3 @@ +?package(sabre):needs="vc" section="Games/Action" title="Sabre" \ + command="/usr/games/RunSabre" \ + longtitle="The Sabre flight simulator" --- sabre-0.2.4b.orig/debian/control +++ sabre-0.2.4b/debian/control @@ -0,0 +1,56 @@ +Source: sabre +Section: games +Priority: optional +Maintainer: Debian Games Team +Uploaders: Sam Hocevar (Debian packages) , Barry deFreese , Evgeni Golov , Gonéri Le Bouder +Build-Depends: debhelper (>= 5.0), quilt, libncurses-dev, libsdl1.2-dev (>= 1.2.2-3.1), libsvga1-dev [i386] +Standards-Version: 3.8.2 +Homepage: http://sabre.cobite.com/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/sabre/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/sabre/?op=log + +Package: sabre-common +Architecture: all +Recommends: sabre | xsabre +Conflicts: sabre (<< 0.2.4-3) +Description: data for the SABRE fighter plane simulator + SABRE is an on-going game development for the Linux Operating System, + worked on as a labor of love by flight-simulation enthusiasts. + . + For now, SABRE is focusing on the older jets and piston-engined + fighters of the Korean War / Cold War era. Featured are F-86 SabreJet, + MiG-15, F-84 ThunderJet, F-51 Mustang, and Yak-9. All of the planes in + the game can be flown by the player as well as the computer pilots. + . + This package contains binaries and data common to both svgalib and X version + of sabre. + +Package: sabre +Architecture: i386 +Depends: sabre-common (>= 0.2.4b-9), dialog (>= 0.9a), ${shlibs:Depends} +Conflicts: suidmanager (<< 0.50) +Suggests: xsabre +Description: fighter plane simulator for svgalib + SABRE is an on-going game development for the Linux Operating System, + worked on as a labor of love by flight-simulation enthusiasts. + . + For now, SABRE is focusing on the older jets and piston-engined + fighters of the Korean War / Cold War era. Featured are F-86 SabreJet, + MiG-15, F-84 ThunderJet, F-51 Mustang, and Yak-9. All of the planes in + the game can be flown by the player as well as the computer pilots. + . + This package contains the svgalib binary. + +Package: xsabre +Architecture: any +Depends: sabre-common (>= 0.2.4b-9), dialog (>= 0.9a), xterm | x-terminal-emulator, ${shlibs:Depends} +Description: fighter plane simulator for X11 + SABRE is an on-going game development for the Linux Operating System, + worked on as a labor of love by flight-simulation enthusiasts. + . + For now, SABRE is focusing on the older jets and piston-engined + fighters of the Korean War / Cold War era. Featured are F-86 SabreJet, + MiG-15, F-84 ThunderJet, F-51 Mustang, and Yak-9. All of the planes in + the game can be flown by the player as well as the computer pilots. + . + This package contains the X binary. --- sabre-0.2.4b.orig/debian/sabre.6 +++ sabre-0.2.4b/debian/sabre.6 @@ -0,0 +1,23 @@ +.TH SABRE 6 +.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection +.\" other parms are allowed: see man(7), man(1) +.SH NAME +sabre \- SVGAlib fighter plane simulator +.SH SYNOPSIS +.B sabre +.br +.B RunSabre +.SH "DESCRIPTION" +Unfortunately, there is no standard documentation for the +.BR sabre +and +.B RunSabre +programs. +However there is some online documentation, just run +.BR RunSabre . +See also files in the +.I /usr/share/doc/sabre +directory. +.SH AUTHOR +This manual page was written by Milan Zamazal , +for the Debian GNU/Linux system (but may be used by others). --- sabre-0.2.4b.orig/debian/compat +++ sabre-0.2.4b/debian/compat @@ -0,0 +1 @@ +5 --- sabre-0.2.4b.orig/debian/xsabre.menu +++ sabre-0.2.4b/debian/xsabre.menu @@ -0,0 +1,4 @@ +?package(xsabre):needs="text" section="Games/Action" title="Sabre" \ + icon="/usr/share/pixmaps/xsabre.xpm" \ + command="/usr/games/XRunSabre" \ + longtitle="The Sabre flight simulator" --- sabre-0.2.4b.orig/debian/changelog +++ sabre-0.2.4b/debian/changelog @@ -0,0 +1,384 @@ +sabre (0.2.4b-26.1) unstable; urgency=low + + [ Gonéri Le Bouder ] + * Add myself as upload + * FTBFS with GCC 4.4: missing #include, thanks Martin Michlmayr + (Closes: #505374) + * New standard version 3.8.2 + * Use Barry deFreese @debian.org address + * Calls dh_md5sums after dh_gencontrol + * add -f flag to 'ln -s' so it's now possible to + run 'fakeroot make - f debian/rules binary' two times in a row + + [ Christoph Egger ] + * Actually download + add gcc4.4 patch + * Import README.source from supertuxkart + + -- Christoph Egger Fri, 25 Dec 2009 22:53:28 +0100 + +sabre (0.2.4b-26) unstable; urgency=low + + * debian/sabre.postinst: + + Call dpkg-statoverride with --force (Closes: #501958). + + SUID root ist 4755, not 1755. + * debian/rules: + + Remove .pc dir from quilt on clean. + + -- Evgeni Golov Tue, 14 Oct 2008 14:19:37 +0200 + +sabre (0.2.4b-25) unstable; urgency=low + + [ Evgeni Golov ] + * debian/patches/030_launch_scripts.diff: + + Update the patch and use mktemp for creating temporary files. + Closes: #433996. + Fixes: CVE-2008-4407 (insecure temp file). + * debian/sabre.postinst: + + Fix the call to dpkg-statoverride in the postinst. + + Call "set -e" first. + * debian/sabre.postem: + + Call "set -e" first. + * debian/control: + + Add myself to uploaders + + [ Barry deFreese ] + * Add .desktop file. (Closes: #478984). + + Call dh_desktop + + -- Evgeni Golov Sun, 05 Oct 2008 10:33:06 +0200 + +sabre (0.2.4b-24) unstable; urgency=low + + [ Jon Dowland ] + * update menu section to "Games/Action" for menu policy transition. + Thanks Linas Žvirblis. + * add Homepage: control field to source stanza + + [ Barry deFreese ] + * Bump debhelper build-dep to 5 to match compat. + * Remove Homepage from package descriptions. + * Make distclean not ignore errors. + * 000_cflags.diff - Remove -m486 and -fforce-mem. + + Deprecated in gcc-4.3. + * Build with gcc-4.3. (Closes: #461694). + + 035_gcc43_1.diff. + + 040_gcc43_2.diff. + + 041_gcc43.diff. + * Bump Standards Version to 3.7.3. (Menu policy changes). + * Add myself to uploaders. + * Replace `pwd` with $(CURDIR) in rules. + * Remove empty dirs from sabre-common package. + + [ Cyril Brulebois ] + * Fix trailer line in the changelog entry for 0.2.4b-23. + + [ Eddy Petrișor ] + * add missing Vcs-Svn headers + + -- Barry deFreese Sun, 23 Mar 2008 18:53:35 -0400 + +sabre (0.2.4b-23) unstable; urgency=high + + [ Sam Hocevar (Debian packages) ] + * debian/patches/025_endianness.diff: + + Fix endianness issues in file import/export routines (Closes: #397830). + + -- Sam Hocevar (Debian packages) Fri, 17 Nov 2006 00:41:39 +0100 + +sabre (0.2.4b-22) unstable; urgency=low + + * Moved packaging to the Debian Games Team. + * Use quilt for patch management. + * debian/control: + + Set policy to 3.7.2. + + Build-depend on quilt. + * debian/copyright: + + Fixed FSF address. + + * debian/patches/000_autotools.diff: + + New patch from old diff.gz -- patch build files to fix compilation + with SDL and without SVGAlib. + + * debian/patches/000_cflags.diff: + + New patch from old diff.gz -- fix cflags to work around m68k gcc bugs. + + * debian/patches/010_rebootstrap.diff: + + New patch from old diff.gz -- rebootstrap all package. + + * debian/patches/020_bugfixes.diff: + + New patch from old diff.gz -- various code bugfixes. + + * debian/patches/030_launch_scripts.diff: + + New patch from old diff.gz -- fix launch scripts for the Debian + directory hierarchy. + + -- Sam Hocevar (Debian packages) Mon, 15 May 2006 16:23:19 -0500 + +sabre (0.2.4b-21) unstable; urgency=low + + * debian/control: + + Set policy to 3.6.2.1. + + Build-depend on libsvga1-dev instead of svgalibg1-dev. + * debian/rules: + + Build the binary:all package in binary-indep (Closes: #276194). + + Use dh_compress instead of manually compressing files. + * debian/compat: + + Set debhelper compat to 4. + * Re-ran "rm -f config.sub config.guess configure install-sh missing \ + mkinstalldirs && aclocal && automake --copy --add-missing && autoconf". + * src/rendpoly.h: patch by Aurélien Jarno to fix the build with gcc-4.0 + (Closes: #321323). + * cflags: + + Replaced -malign-* with -falign-*. + + -- Sam Hocevar (Debian packages) Wed, 24 Aug 2005 16:54:03 +0200 + +sabre (0.2.4b-20) unstable; urgency=low + + * debian/control: + + Set policy to 3.6.1.1. + * debian/rules: + + Install icon in /usr/share/pixmaps, not /usr/X11R6/include/X11/pixmaps. + + Do not copy the GPL in /usr/share, it's already in common-licenses. + + Removed lintian overrides. + * src/obj_3d.C: + + gcc-3.4 build fix, courtesy of Andreas Jochens (Closes: #259843). + + -- Sam Hocevar (Debian packages) Sat, 17 Jul 2004 10:14:03 +0200 + +sabre (0.2.4b-19) unstable; urgency=low + + * Rebuilt using gcc-3.3. + * debian/control: + + Set policy to 3.6.1.0. + + Removed the xlibs-dev build dependency; we don't directly use these + libraries during the build process. + + Removed leading "a" from short descriptions. + * debian/xsabre.menu: + + Fixed syntax. + * debian/copyright: + + Added a link to the GPL file on Debian systems. + + -- Sam Hocevar (Debian packages) Tue, 16 Mar 2004 13:45:09 +0100 + +sabre (0.2.4b-18) unstable; urgency=low + + * Used dpkg-statoverride in the postinst/postrm to register /usr/games/sabre + binary instead of shipping a setuid binary. + * Set policy to 3.5.10. + + -- Sam Hocevar (Debian packages) Fri, 30 May 2003 18:18:58 +0200 + +sabre (0.2.4b-17) unstable; urgency=low + + * New maintainer (Closes: #175226). + * Removed spurious Makefile.am file from the package. + * Re-ran "rm -f config.sub config.guess configure install-sh missing \ + mkinstalldirs && aclocal && automake --copy --add-missing && autoconf" + (Closes: #175263, #185299). + * Removed build-dependency on automake and automake calls in debian/rules + (Closes: #175978). + * Added proper touches to avoid clock skews (Closes: #116223). + + -- Samuel Hocevar Fri, 18 Apr 2003 00:56:49 +0200 + +sabre (0.2.4b-16) unstable; urgency=low + + * Orphaned. + + -- Milan Zamazal Mon, 13 Jan 2003 14:54:28 +0100 + +sabre (0.2.4b-15) unstable; urgency=low + + * Build depend on xlibs-dev instead of xlib6g-dev; closes: #170147. + + -- Milan Zamazal Wed, 1 Jan 2003 20:28:08 +0100 + +sabre (0.2.4b-14) unstable; urgency=low + + * Write log file to a temporary directory instead of the current + directory; closes: #145817. + + -- Milan Zamazal Wed, 15 May 2002 11:07:41 +0200 + +sabre (0.2.4b-13) unstable; urgency=low + + * Joystick support included into xsabre. + + -- Milan Zamazal Sun, 6 Jan 2002 15:29:13 +0100 + +sabre (0.2.4b-12) unstable; urgency=low + + * Build-depend on the newer version of libsdl1.2-dev; closes: #117525. + + -- Milan Zamazal Fri, 9 Nov 2001 09:37:58 +0100 + +sabre (0.2.4b-11) unstable; urgency=low + + * Stupid omission in a C++ error fix fixed; really closes: #104860. + * Standards 3.5.6. + + -- Milan Zamazal Fri, 10 Aug 2001 13:54:34 +0200 + +sabre (0.2.4b-10) unstable; urgency=low + + * C++ errors reported by gcc 3 fixed; closes: #104860. + * Compiled with libsdl1.2. + + -- Milan Zamazal Sun, 22 Jul 2001 22:53:09 +0200 + +sabre (0.2.4b-9) unstable; urgency=low + + * Reference to documentation in the man page fixed; closes: #103193. + * Standards 3.5.5. + * Missing documentation files added. + * Documentation files used by the user interface moved to + /usr/share/games/sabre/doc/. + * `Depends' removed in sabre-common. + * `sabre' and `xsabre' require newer `sabre-common'. + * Lintian overrides added. + * Lintian 1.20.13 satisfied. + + -- Milan Zamazal Sat, 14 Jul 2001 10:10:11 +0200 + +sabre (0.2.4b-8) unstable; urgency=low + + * Build dependency on libncurses-dev added; closes: #84654. + * Standards 3.2.1. + * Compile with `-g' only if DEB_BUILD_OPTIONS requests it. + * Suidregister support removed. + + -- Milan Zamazal Sat, 3 Feb 2001 20:05:16 +0100 + +sabre (0.2.4b-7) unstable; urgency=low + + * sabre: Suggest xsabre. + * Consult `./VERSION' version in configure with path specification; + closes: #77680. + * Menu icon added (thanks to Robert Cleaver Ancell); closes: #75764. + + -- Milan Zamazal Sat, 25 Nov 2000 10:31:28 +0100 + +sabre (0.2.4b-6) frozen unstable; urgency=low + + * Another non-SVGAlib compilation bug fixed; closes: #57634. (Thanks to + Roman Hodek.) + * General non-SVGAlib compilation cleanup done. + + -- Milan Zamazal Sat, 12 Feb 2000 12:18:02 +0100 + +sabre (0.2.4b-5) frozen unstable; urgency=low + + * Do not try to compress non-installed (for certain architectures) files + in rules; closes: #56813. (Thanks to Roman Hodek.) + + -- Milan Zamazal Thu, 3 Feb 2000 19:07:43 +0100 + +sabre (0.2.4b-4) frozen unstable; urgency=low + + * libsdl dependencies fixed, thanks to Roman Hodek for explanation of + the problem; closes: #55708. + * Change .am makefiles, not the .in ones; build-depend on automake. + * Use better way of detecting host architecture than + `dpkg --print-architecture'. + + -- Milan Zamazal Sat, 22 Jan 2000 12:48:37 +0100 + +sabre (0.2.4b-3) unstable; urgency=low + + * Recompiled with libsdl1.0. + * Lintian 1.11.2 satisfied. + + -- Milan Zamazal Mon, 10 Jan 2000 21:07:31 +0100 + +sabre (0.2.4b-2) unstable; urgency=low + + * Yet another without-SVGAlib fix; closes: #52930. + + -- Milan Zamazal Fri, 17 Dec 1999 22:17:22 +0100 + +sabre (0.2.4b-1) unstable; urgency=low + + * New upstream version. + * Allow compilation without SVGAlib; closes: #51615. + * Do not compile dialog. + * I hate CVS! + + -- Milan Zamazal Sun, 5 Dec 1999 14:18:01 +0100 + +sabre (0.2.4-6) unstable; urgency=low + + * Standards 3.1.1. + * cflags fixes, thanks to Roman Hodek; closes: #49656. + * Home page added to description. + * Use xargs with find in rules. + * Build dependencies defined. + * Yoke control setting typo in `RunSabre*' fixed. + * xsabre works with cursor keys now; closes: #48035. + + -- Milan Zamazal Sat, 27 Nov 1999 12:50:20 +0100 + +sabre (0.2.4-5) unstable; urgency=low + + * Added dependency on libsdl0; closes: #47595. + + -- Milan Zamazal Wed, 20 Oct 1999 21:07:11 +0200 + +sabre (0.2.4-4) unstable; urgency=low + + * Added dependency on dialog; closes: #47593. + * Setuid root warning moved from sabre-common to sabre. + * Bashism removed from *RunSabre; closes: #47791. + * Remove log files on quit of *RunSabre. + * Lintian 1.10 satisfied. + + -- Milan Zamazal Tue, 19 Oct 1999 21:05:10 +0200 + +sabre (0.2.4-3) unstable; urgency=low + + * Moved to FHS. + * X version produced too now, package split to the sabre-common, sabre, + and xsabre packages. + * Standard dialog used. + * Compiled with original flags in CFLAGS. + * Menu support. + * Standards 3.0.1. + * Lintian 1.9.2 satisfied. + + -- Milan Zamazal Mon, 4 Oct 1999 22:36:29 +0200 + +sabre (0.2.4-2) unstable; urgency=low + + * Recompiled with egcc and glibc 2.1. + * No lintian 1.3 errors. + + -- Milan Zamazal Tue, 25 May 1999 12:21:16 +0200 + +sabre (0.2.4-1) unstable; urgency=low + + * New upstream version. + * Compile with `-g'. + * No lintian 1.1 errors. + + -- Milan Zamazal Sun, 25 Apr 1999 18:18:20 +0200 + +sabre (0.2.3-3) frozen unstable; urgency=low + + * Recompiled with libncurses4. + * Forced to use standard curses.h to compile with new ncurses. + + -- Milan Zamazal Mon, 2 Nov 1998 21:45:20 +0100 + +sabre (0.2.3-2) frozen unstable; urgency=low + + * Architecture changed to `i386' (Bug #27994). + + -- Milan Zamazal Thu, 15 Oct 1998 20:43:14 +0200 + +sabre (0.2.3-1) unstable; urgency=low + + * Initial Release. + * `vga_init' inserted at the very beginning of the setuid root program + to make it at least a bit secure. + + -- Milan Zamazal Sun, 11 Oct 1998 22:41:06 +0200 --- sabre-0.2.4b.orig/debian/sabre.dirs +++ sabre-0.2.4b/debian/sabre.dirs @@ -0,0 +1,2 @@ +usr/games +usr/share/man/man6 --- sabre-0.2.4b.orig/debian/sabre.README.Debian +++ sabre-0.2.4b/debian/sabre.README.Debian @@ -0,0 +1,9 @@ +Packaged for Debian by Milan Zamazal . + +Though I have fixed the most horrible security bug by inserting vga_init() at +the very beginning of the program, I cannot guarantee the setuid root binary is +secure. + +Run the simulator as `RunSabre'. + +See /usr/share/doc/sabre-common/ for the documentation. --- sabre-0.2.4b.orig/debian/xsabre.xpm +++ sabre-0.2.4b/debian/xsabre.xpm @@ -0,0 +1,637 @@ +/* XPM */ +static char * sabre_icon_xpm[] = { +"32 32 602 2", +" c None", +". c #5151FC", +"+ c #5858EF", +"@ c #6868BA", +"# c #4F4FFC", +"$ c #4E4EFC", +"% c #5A5AFC", +"& c #5D5DFC", +"* c #6363FC", +"= c #5858FC", +"- c #5757FC", +"; c #5B5BF9", +"> c #5C5CF6", +", c #5E5EEA", +"' c #5959FC", +") c #6767F0", +"! c #7F7FCD", +"~ c #796ED2", +"{ c #6C6CFC", +"] c #7272E6", +"^ c #7D7DC5", +"/ c #7C7CCC", +"( c #7F7FFC", +"_ c #7F7FFB", +": c #8181F4", +"< c #9090FC", +"[ c #99A2E1", +"} c #84A88D", +"| c #A7C2AF", +"1 c #A2BFAC", +"2 c #A1BFAC", +"3 c #A3BFAC", +"4 c #93B3A0", +"5 c #8AAC97", +"6 c #87A995", +"7 c #82A490", +"8 c #80A38E", +"9 c #84A691", +"0 c #86A894", +"a c #89AB96", +"b c #8EAE9A", +"c c #98B6A2", +"d c #9EBBA8", +"e c #A9C2B2", +"f c #94B39F", +"g c #87A895", +"h c #7EA38B", +"i c #789C88", +"j c #7DA18D", +"k c #84A792", +"l c #86A893", +"m c #80A48E", +"n c #769B86", +"o c #7B9E8A", +"p c #7EA38C", +"q c #85A793", +"r c #81A48F", +"s c #7EA18C", +"t c #7A9F88", +"u c #93B0A1", +"v c #96B3A3", +"w c #9BB8A7", +"x c #9CB8A9", +"y c #9FBAA9", +"z c #A6C0B0", +"A c #A5BFAF", +"B c #98B4A3", +"C c #97B4A4", +"D c #9FBCA9", +"E c #B2CBBB", +"F c #C9DDCF", +"G c #DAEDE0", +"H c #E4F5EA", +"I c #E5F6EB", +"J c #DFF0E5", +"K c #C6DDCF", +"L c #ABC6B7", +"M c #98B6A7", +"N c #85A695", +"O c #749984", +"P c #5E8B6A", +"Q c #6F9482", +"R c #739486", +"S c #709484", +"T c #7A9C8D", +"U c #95B1A0", +"V c #89AA97", +"W c #7C9E8B", +"X c #6C927A", +"Y c #5D8967", +"Z c #5A8864", +"` c #5F7E70", +" . c #5C7B6A", +".. c #668B70", +"+. c #70947C", +"@. c #8AA99B", +"#. c #A3BFAE", +"$. c #BAD3C2", +"%. c #D6E7DB", +"&. c #E8F5EC", +"*. c #EEF9F1", +"=. c #E6F6E9", +"-. c #E2F4E6", +";. c #DCF0E2", +">. c #D4E9DB", +",. c #CBE1D3", +"'. c #C2D8CB", +"). c #BAD2C3", +"!. c #B5CCBF", +"~. c #B0C9BA", +"{. c #ABC5B6", +"]. c #B4CBBE", +"^. c #B1CBBA", +"/. c #A2BEA9", +"(. c #99B7A2", +"_. c #95B2A2", +":. c #9DBAA9", +"<. c #A6C0B1", +"[. c #9BB8A6", +"}. c #7EA18B", +"|. c #5D8C60", +"1. c #538655", +"2. c #49804A", +"3. c #B5CEBF", +"4. c #C9DFD2", +"5. c #D5E9DC", +"6. c #DDEFE4", +"7. c #E3F4E9", +"8. c #EDF7EF", +"9. c #ECF8F0", +"0. c #E9F4ED", +"a. c #E3EFE7", +"b. c #DAE9DF", +"c. c #D3E5DA", +"d. c #CEE0D5", +"e. c #C3D7CA", +"f. c #BAD0C2", +"g. c #AAC2B4", +"h. c #A1B9AA", +"i. c #98B2A2", +"j. c #8DAB9B", +"k. c #7EA18F", +"l. c #7E9F8F", +"m. c #7FA18F", +"n. c #86A794", +"o. c #92B09E", +"p. c #99B4A5", +"q. c #9AB5A5", +"r. c #8FAD9C", +"s. c #8BA998", +"t. c #88A996", +"u. c #82A592", +"v. c #7FA191", +"w. c #CCDFD2", +"x. c #C6DCCD", +"y. c #C5DACB", +"z. c #C9DECF", +"A. c #C4DACA", +"B. c #BBD1C3", +"C. c #A7BFAF", +"D. c #A0BAAA", +"E. c #9DB8A7", +"F. c #99B4A4", +"G. c #9EB8A7", +"H. c #9EB9A8", +"I. c #97B2A1", +"J. c #91AF9D", +"K. c #88A995", +"L. c #82A291", +"M. c #83A490", +"N. c #7FA38F", +"O. c #7A9E8B", +"P. c #749987", +"Q. c #6C917E", +"R. c #698E7A", +"S. c #6B8F7C", +"T. c #709481", +"U. c #769A86", +"V. c #7B9D8C", +"W. c #7FA28D", +"X. c #7D9F8D", +"Y. c #7A9D8D", +"Z. c #85A894", +"`. c #90AE9A", +" + c #96B2A1", +".+ c #9CB8A8", +"++ c #9BB6A5", +"@+ c #92B0A0", +"#+ c #87A896", +"$+ c #82A68F", +"%+ c #7EA38D", +"&+ c #85A693", +"*+ c #85A792", +"=+ c #7FA48D", +"-+ c #789C89", +";+ c #739686", +">+ c #6C917F", +",+ c #6B917C", +"'+ c #6F9281", +")+ c #769A88", +"!+ c #7B9F8C", +"~+ c #799D8B", +"{+ c #6C907D", +"]+ c #688D73", +"^+ c #668B71", +"/+ c #678D72", +"(+ c #688C73", +"_+ c #688D77", +":+ c #6A907A", +"<+ c #82A48F", +"[+ c #7A9C8C", +"}+ c #769B87", +"|+ c #799C89", +"1+ c #7B9F8A", +"2+ c #749886", +"3+ c #6D927C", +"4+ c #6E937E", +"5+ c #6F9382", +"6+ c #6F9383", +"7+ c #698E78", +"8+ c #668B72", +"9+ c #678C73", +"0+ c #678B71", +"a+ c #668C70", +"b+ c #6A9077", +"c+ c #6C917A", +"d+ c #688D74", +"e+ c #658672", +"f+ c #6A8876", +"g+ c #63866E", +"h+ c #A0A265", +"i+ c #D3CF82", +"j+ c #A7AC70", +"k+ c #678D73", +"l+ c #688E77", +"m+ c #6E9380", +"n+ c #729782", +"o+ c #6E927E", +"p+ c #678D76", +"q+ c #688C75", +"r+ c #688C72", +"s+ c #668971", +"t+ c #658C71", +"u+ c #668D71", +"v+ c #688C71", +"w+ c #678E75", +"x+ c #668D74", +"y+ c #5F806C", +"z+ c #587768", +"A+ c #587567", +"B+ c #587767", +"C+ c #5A7968", +"D+ c #5A7969", +"E+ c #5A7967", +"F+ c #597968", +"G+ c #6C8478", +"H+ c #93AF95", +"I+ c #87A98B", +"J+ c #D8C27F", +"K+ c #FCE68C", +"L+ c #CBB765", +"M+ c #648971", +"N+ c #668C71", +"O+ c #688E74", +"P+ c #678C72", +"Q+ c #668C72", +"R+ c #6A8E7A", +"S+ c #688C74", +"T+ c #64886F", +"U+ c #65886F", +"V+ c #678E73", +"W+ c #5E7F6B", +"X+ c #587667", +"Y+ c #597668", +"Z+ c #597667", +"`+ c #587866", +" @ c #587668", +".@ c #597767", +"+@ c #71867B", +"@@ c #A0A7A4", +"#@ c #A3ACA7", +"$@ c #93B297", +"%@ c #83A085", +"&@ c #829183", +"*@ c #6B7C63", +"=@ c #627B66", +"-@ c #678D71", +";@ c #658870", +">@ c #60816C", +",@ c #668A70", +"'@ c #678C71", +")@ c #688B73", +"!@ c #648670", +"~@ c #688D71", +"{@ c #5E7D6B", +"]@ c #587868", +"^@ c #5A7869", +"/@ c #89908C", +"(@ c #678274", +"_@ c #597766", +":@ c #5B7969", +"<@ c #688C70", +"[@ c #688B72", +"}@ c #688E72", +"|@ c #678C75", +"1@ c #668972", +"2@ c #688D75", +"3@ c #688D72", +"4@ c #64896F", +"5@ c #587867", +"6@ c #577565", +"7@ c #577566", +"8@ c #597868", +"9@ c #6C8477", +"0@ c #6F8178", +"a@ c #658A72", +"b@ c #63856D", +"c@ c #678C78", +"d@ c #6E8378", +"e@ c #787978", +"f@ c #747D77", +"g@ c #6F8677", +"h@ c #678A72", +"i@ c #688C76", +"j@ c #678D75", +"k@ c #678C70", +"l@ c #5B7E6A", +"m@ c #657F75", +"n@ c #69827A", +"o@ c #567665", +"p@ c #5A7B69", +"q@ c #658974", +"r@ c #668E76", +"s@ c #6A8E76", +"t@ c #6A8F78", +"u@ c #648873", +"v@ c #787F7A", +"w@ c #7E7E7E", +"x@ c #7F7F7F", +"y@ c #7B7F7C", +"z@ c #718275", +"A@ c #6A8772", +"B@ c #678E72", +"C@ c #658C6F", +"D@ c #698E72", +"E@ c #77957E", +"F@ c #7D9186", +"G@ c #7F808F", +"H@ c #838394", +"I@ c #8A7B81", +"J@ c #A2201C", +"K@ c #86483D", +"L@ c #628570", +"M@ c #638770", +"N@ c #63886F", +"O@ c #61866C", +"P@ c #678B70", +"Q@ c #678D70", +"R@ c #698D73", +"S@ c #8DA292", +"T@ c #7A7F7B", +"U@ c #7D7D7D", +"V@ c #929292", +"W@ c #A5A5A5", +"X@ c #898989", +"Y@ c #717171", +"Z@ c #6A736C", +"`@ c #768173", +" # c #96A99C", +".# c #839A8B", +"+# c #85978B", +"@# c #8B948D", +"## c #9EA09F", +"$# c #A6A6A6", +"%# c #A2A2A2", +"&# c #9A9A9C", +"*# c #9C9C9D", +"=# c #978080", +"-# c #930000", +";# c #8A1E1A", +"># c #668D6F", +",# c #688E75", +"'# c #668D73", +")# c #698B74", +"!# c #AFB2AF", +"~# c #D0D0D0", +"{# c #9F9F9F", +"]# c #626262", +"^# c #656565", +"/# c #6F6F6F", +"(# c #7A7474", +"_# c #888888", +":# c #9B9B9B", +"<# c #979797", +"[# c #999999", +"}# c #969696", +"|# c #9A9A9A", +"1# c #AAAAAA", +"2# c #7B7B7B", +"3# c #765B5B", +"4# c #7D110E", +"5# c #6C6E5B", +"6# c #648A6F", +"7# c #698F78", +"8# c #93A797", +"9# c #79857C", +"0# c #7F8080", +"a# c #919191", +"b# c #955757", +"c# c #907676", +"d# c #868686", +"e# c #818181", +"f# c #BBBBBB", +"g# c #CFCFCF", +"h# c #D7D7D7", +"i# c #818A83", +"j# c #5E7163", +"k# c #657E67", +"l# c #688B6F", +"m# c #678E74", +"n# c #62846D", +"o# c #63886E", +"p# c #678D74", +"q# c #678E77", +"r# c #688D78", +"s# c #688F77", +"t# c #6A9079", +"u# c #6C8F7B", +"v# c #6A7671", +"w# c #808080", +"x# c #7C7C7C", +"y# c #777777", +"z# c #757171", +"A# c #6D6666", +"B# c #656766", +"C# c #5E6562", +"D# c #B2B2B2", +"E# c #C8C8C8", +"F# c #D7D2D2", +"G# c #B3BEB7", +"H# c #668D72", +"I# c #668E71", +"J# c #678E71", +"K# c #678D77", +"L# c #678C77", +"M# c #6A8F7B", +"N# c #739487", +"O# c #709485", +"P# c #779D8A", +"Q# c #799C83", +"R# c #75937E", +"S# c #738E7D", +"T# c #6F8478", +"U# c #779280", +"V# c #7D9E87", +"W# c #81A68B", +"X# c #8BA697", +"Y# c #C1B3B3", +"Z# c #D49292", +"`# c #D47E7D", +" $ c #7E9C8D", +".$ c #709384", +"+$ c #709383", +"@$ c #6D9381", +"#$ c #6C927F", +"$$ c #6D9180", +"%$ c #6A907D", +"&$ c #688E76", +"*$ c #678F76", +"=$ c #688D79", +"-$ c #6D9183", +";$ c #6F9485", +">$ c #739587", +",$ c #779989", +"'$ c #7DA38A", +")$ c #83A68E", +"!$ c #82A98C", +"~$ c #80A38F", +"{$ c #7B9F8D", +"]$ c #7DA08D", +"^$ c #7DA08E", +"/$ c #80A68B", +"($ c #A3B4A7", +"_$ c #C6C6C6", +":$ c #CDD1CF", +"<$ c #A7BAAE", +"[$ c #83A791", +"}$ c #83A592", +"|$ c #82A590", +"1$ c #7C9F8E", +"2$ c #779A8A", +"3$ c #769B88", +"4$ c #709583", +"5$ c #6E9382", +"6$ c #6E9181", +"7$ c #6B927E", +"8$ c #698F79", +"9$ c #678F79", +"0$ c #68917A", +"a$ c #6A917C", +"b$ c #729685", +"c$ c #7EA38E", +"d$ c #84AA8D", +"e$ c #85AA8D", +"f$ c #85AA94", +"g$ c #89A794", +"h$ c #98ADA1", +"i$ c #95AD9E", +"j$ c #8CAE9C", +"k$ c #90B09F", +"l$ c #8FAC9C", +"m$ c #93B1A1", +"n$ c #8EAE9E", +"o$ c #87A796", +"p$ c #84A794", +"q$ c #85A891", +"r$ c #84A98F", +"s$ c #83A98E", +"t$ c #81A78D", +"u$ c #799C8C", +"v$ c #769888", +"w$ c #769688", +"x$ c #749586", +"y$ c #649071", +"z$ c #688E7E", +"A$ c #709483", +"B$ c #749786", +"C$ c #7EA28C", +"D$ c #89A896", +"E$ c #8AA998", +"F$ c #90AF9F", +"G$ c #95B3A3", +"H$ c #9CB5A5", +"I$ c #9CB4A4", +"J$ c #91AD9D", +"K$ c #87A595", +"L$ c #86A595", +"M$ c #86A694", +"N$ c #86A98F", +"O$ c #84AA8E", +"P$ c #81A48E", +"Q$ c #5E7A6A", +"R$ c #5A7D68", +"S$ c #5C7968", +"T$ c #5E7768", +"U$ c #617F6C", +"V$ c #61886E", +"W$ c #64886E", +"X$ c #688B70", +"Y$ c #689077", +"Z$ c #6B927F", +"`$ c #769C87", +" % c #88A898", +".% c #9DB6A6", +"+% c #A3BBAA", +"@% c #A6BAAA", +"#% c #9EB6A6", +"$% c #90AF9E", +"%% c #84A890", +"&% c #86AA8E", +"*% c #83AB8C", +"=% c #83A593", +"-% c #84A494", +";% c #84A791", +">% c #86A990", +",% c #84A893", +"'% c #5A7667", +")% c #587268", +"!% c #5C7A68", +"~% c #67886F", +"{% c #688C79", +"]% c #698D7C", +"^% c #789B8A", +"/% c #7FA38E", +"(% c #A4BEAB", +"_% c #A7BFAC", +":% c #A7BEAF", +"<% c #A3BBAD", +"[% c #88AA98", +"}% c #84AB8F", +"|% c #82A88B", +"1% c #82A290", +"2% c #82A78E", +"3% c #85AA91", +"4% c #84A693", +"5% c #89A797", +"6% c #5A7668", +"7% c #587568", +"8% c #5E846C", +"9% c #648D75", +"0% c #779B85", +"a% c #86A892", +"b% c #94B2A2", +"c% c #A2BAAA", +"d% c #A5BCAC", +"e% c #A5BEAC", +"f% c #A3B9AA", +"g% c #81A58D", +"h% c #85A691", +"i% c #87A694", +"j% c #86A594", +"k% c #86A494", +". . . . . . . . . . . . + @ # # $ $ # # . . . . % & * = = - . . ", +"% % ; > % % % % % % % % > , % % % % % ' % % % % % % % % % % % % ", +"* * ) ! ~ * * * * * * * * * * * * * * * * * * * * * * * * * * * ", +"{ { ] ^ / { { { { { { { { { { { { { { { { { { { { { { { { { { { ", +"( ( ( _ : ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ", +"< < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ", +"[ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ ", +"} } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } ", +"| 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n o p q r s t t ", +"u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ", +"` ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.", +"3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.q m k.l.m.n.o.p.q.r.s.t.u.v.", +"w.x.y.z.A.B.C.D.E.F.G.H.q.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.k.j Y.", +"Z.`. +.+++@+#+$+%+&+g *+=+-+i i ;+>+,+'+)+!+~+{+]+^+/+(+_+:+T.O.", +"7 q <+[+}+|+1+2+>+3+4+5+6+7+8+9+0+a+....]+b+c+d+e+f+g+h+i+j+k+l+", +"m+n+o+p+q+r+s+t+u+v+/+]+w+x+^+k+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+", +"O+P+Q+R+7+S+v+T+u+U+/+p+V+k+W+X+Y+Z+z+`+ @.@+@@@#@$@%@&@*@=@X+z+", +"-@;@>@,@..P+/+'@)@!@9+]+~@r+-@g+{@]@B+z+Y+B+z+^@X+z+G+/@(@_@B+:@", +"(+/+/+<@[@}@~@|@/+1@(+_+9+2@3@V+-@4@:@5@B+X+A+6@7@8@9@0@z+B+>@a@", +"b@'@q+c@d@e@f@g@l+'@h@i@j@(+,@k@,@r+1@l@m@n@8@o@6@B+B+B+p@q@p+r@", +"p+s@t@u@v@w@x@w@y@z@A@]+B@r+U+C@-@D@E@F@G@H@I@J@K@L@M@N@O@P@-@v+", +"-@Q@<@R@S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#O+]+/+~@<@Q@<@", +">#<@3@,#'#)#!#~#{#]#^#/#(#_#:#<#[#}#|#1#$#2#3#4#5#w+k+3@Q@6#<@Q@", +"-@Q@-@r+i@7#8#9#0#a#[#V@b#c#d#e#[#f#g#h#i#j#k#l#v+-@m#'#n#o#<@-@", +"<@]+p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#d+/+v+I#J#d+K#(+r+Q@9+", +"r+L#L#M#S N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$]+d+j@9+P+", +"d+*$=$-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$[$9 }$|$1$2$3$}+4$5$6$7$8$", +"<@Q@/+l+_+9$0$a$b$2$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$", +"v+y$P+0+~@3@v+|@z$A$B$C$q$D$E$F$G$H$I$I$H$J$o$K$L$M$N$O$N.!$P$p ", +"Q$R$S$T$U$V$W$X$J#Y$Z$5+`$)$M$ %F$.%+%@%#%$%6 %%N$&%*%=%-%;%>%,%", +"]@5@'%)%B+!%~%<@<@v+{%]%A$^%/%k @+(%_%:%<%v [%}%|%1%2%3%4%Z.K$5%", +"6%X+z+7%z+8%<@Q@<@<@9%c@+$0%O.a%b%c%d%e%f%C 5%,%/%Y.^%g%h%i%j%k%"}; --- sabre-0.2.4b.orig/debian/sabre.postinst +++ sabre-0.2.4b/debian/sabre.postinst @@ -0,0 +1,27 @@ +#! /bin/sh + +set -e + +case "$1" in + configure) + if [ -z "$2" ]; then + dpkg-statoverride --update --add root root 4755 /usr/games/sabre + else + if dpkg --compare-versions "$2" le-nl 0.2.4b-25; then + if [ "$(dpkg-statoverride --list /usr/games/sabre)" = "root root 2755 /usr/games/sabre" -o \ + "$(dpkg-statoverride --list /usr/games/sabre)" = "root root 1755 /usr/games/sabre" ]; then + dpkg-statoverride --force --update --add root root 4755 /usr/games/sabre + fi + fi + fi + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + --- sabre-0.2.4b.orig/debian/dirs +++ sabre-0.2.4b/debian/dirs @@ -0,0 +1,5 @@ +usr/share/doc/sabre-common +usr/share/games/sabre/doc +usr/share/games/sabre/lib/fonts +usr/share/games/sabre/lib/tzp +usr/share/man/man6/ --- sabre-0.2.4b.orig/debian/xsabre.dirs +++ sabre-0.2.4b/debian/xsabre.dirs @@ -0,0 +1,4 @@ +usr/games +usr/share/man/man6 +usr/share/pixmaps +usr/share/applications --- sabre-0.2.4b.orig/debian/xsabre.README.Debian +++ sabre-0.2.4b/debian/xsabre.README.Debian @@ -0,0 +1,9 @@ +Packaged for Debian by Milan Zamazal . + +Run the simulator as `XRunSabre'. + +Space and F-keys do not work in the X version. If you really desire for them, +let me know, and I will try to do something about this. + +See /usr/share/doc/sabre-common/ for the documentation. + --- sabre-0.2.4b.orig/debian/sabre.postrm +++ sabre-0.2.4b/debian/sabre.postrm @@ -0,0 +1,20 @@ +#! /bin/sh + +set -e + +case "$1" in + purge|remove) + if dpkg-statoverride --list /usr/games/sabre >/dev/null; then + dpkg-statoverride --remove /usr/games/sabre + fi + ;; + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + --- sabre-0.2.4b.orig/debian/README.Debian +++ sabre-0.2.4b/debian/README.Debian @@ -0,0 +1,5 @@ +sabre for Debian +---------------- + +The joystick calibration utility `sabrejoycal' is included in the `xsabre' +package. --- sabre-0.2.4b.orig/debian/rules +++ sabre-0.2.4b/debian/rules @@ -0,0 +1,140 @@ +#!/usr/bin/make -f + +package=sabre-common + +# Idea stolen from lincity +svgalib-archs=i386 +ifeq ($(DEB_HOST_ARCH),) + ARCH:=$(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null) +else + ARCH:=$(DEB_HOST_ARCH) +endif +ifneq (,$(findstring $(ARCH), $(svgalib-archs))) + make_svga=yes +else + make_svga=no +endif + +stamp-configure: + dh_testdir + QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 + touch configure.in + touch aclocal.m4 + touch configure + touch `find . -name Makefile.in` +ifeq ($(make_svga),yes) + ./configure --prefix=/usr --bindir=/usr/games +else + ./configure --prefix=/usr --bindir=/usr/games --without-svgalib +endif + touch stamp-configure + +build: stamp-configure + dh_testdir + make + ln -sf ../src/main.C sdlsrc/ + cd sdlsrc && make + ln -sf ../src/linux_joy.C joystick/ + cd joystick && make + touch build + +clean: stamp-configure + dh_testdir + dh_testroot + -rm -f build stamp-configure + cd sdlsrc && make distclean + -rm -f sdlsrc/main.C + cd joystick && make distclean + -rm -f joystick/linux_joy.C + [ ! -f Makefile ] || make distclean + find . -name Makefile | xargs -r rm -f + QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 + rm -rf .pc/ + dh_clean + +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs -i + dh_installchangelogs -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_md5sums -i + dh_gencontrol -psabre-common + dh_md5sums -psabre-common + dh_builddeb -psabre-common + +binary-arch: build install + dh_testdir + dh_testroot + dh_installmenu -pxsabre +ifeq ($(make_svga),yes) + dh_installmenu -psabre +endif + dh_installdocs -a + dh_installchangelogs -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -pxsabre + dh_md5sums -a + dh_builddeb -pxsabre +ifeq ($(make_svga),yes) + dh_gencontrol -psabre + dh_builddeb -psabre +endif + +install: build + dh_testdir + dh_testroot + dh_installdirs +ifeq ($(make_svga),yes) + make install prefix=$(CURDIR)/debian/$(package) bindir=$(CURDIR)/debian/$(package)/usr/games + mv $(CURDIR)/debian/$(package)/usr/games/* debian/sabre/usr/games/ + install -m 755 RunSabre debian/sabre/usr/games/ +else + make install-data prefix=$(CURDIR)/debian/$(package) bindir=$(CURDIR)/debian/$(package)/usr/games +endif + install -m 755 RunSabreSDL debian/xsabre/usr/games/XRunSabre + install -m 755 sdlsrc/sabresdl debian/xsabre/usr/games/ + install -m 755 joystick/sabrejoycal debian/xsabre/usr/games/ + find scenarios -type f -perm +100 -name '[a-z]*' | xargs -i -r \ + install -m 755 {} debian/$(package)/usr/share/games/sabre/ + find lib -type f -name '[a-z0-9]*' | xargs -i -r install -m 644 {} \ + debian/$(package)/usr/share/games/sabre/{} + install -m 644 doc/*.txt debian/$(package)/usr/share/games/sabre/doc/ + set -e; for i in CONTRIBUTORS HISTORY JOYSTICK.README README \ + REQUIREMENTS TODO TROUBLE_SHOOTING WHATSNEW; do \ + install -m 644 $$i debian/$(package)/usr/share/games/sabre/doc/; \ + done + install -m 644 dialogsrc/README \ + debian/$(package)/usr/share/doc/$(package)/README-dialog + set -e; cd debian/$(package)/usr/share/doc/$(package); \ + ln -sf ../../games/sabre/doc/* . + install -m 644 debian/sabre.6 debian/$(package)/usr/share/man/man6/ +ifeq ($(make_svga),yes) + cp debian/$(package)/usr/share/man/man6/sabre.6 \ + debian/sabre/usr/share/man/man6/ + ln -sf sabre.6.gz debian/sabre/usr/share/man/man6/RunSabre.6.gz +endif + mv debian/$(package)/usr/share/man/man6/sabre.6 \ + debian/xsabre/usr/share/man/man6/xsabre.6 + ln -sf xsabre.6.gz debian/xsabre/usr/share/man/man6/XRunSabre.6.gz + ln -sf xsabre.6.gz debian/xsabre/usr/share/man/man6/sabresdl.6.gz + install -m 644 debian/xsabre.xpm \ + debian/xsabre/usr/share/pixmaps/ + + install -m 644 debian/xsabre.desktop \ + debian/xsabre/usr/share/applications/ + + #Remove empty dirs. + rm -rf $(CURDIR)/debian/sabre-common/usr/share/man + rm -rf $(CURDIR)/debian/sabre-common/usr/games + rm -rf $(CURDIR)/debian/sabre-common/usr/share/games/sabre/lib/fonts + +binary: binary-indep binary-arch + +.PHONY: binary binary-arch binary-indep clean --- sabre-0.2.4b.orig/debian/copyright +++ sabre-0.2.4b/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Milan Zamazal on +Sun, 4 Oct 1998 16:47:10 +0200. + +It was downloaded from http://sabre.cobite.com/ . + +The file debian/xsabre.xpm was contributed by Robert Cleaver Ancell +. + +Copyright (c) 1997 Dan Hammer +Portions Donated By Antti Barck + + 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 1, 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, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- sabre-0.2.4b.orig/debian/patches/040_gcc43_2.diff +++ sabre-0.2.4b/debian/patches/040_gcc43_2.diff @@ -0,0 +1,32 @@ +diff -urN sabre-0.2.4b.orig.orig/src/linux_joy.C sabre-0.2.4b.orig/src/linux_joy.C +--- sabre-0.2.4b.orig.orig/src/linux_joy.C 1999-11-24 19:38:20.000000000 -0500 ++++ sabre-0.2.4b.orig/src/linux_joy.C 2008-01-31 16:49:31.000000000 -0500 +@@ -41,8 +41,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include "linux_joy.h" + + +@@ -108,7 +108,7 @@ + + int LinuxJoystick::read_def_file(char *path) + { +- ifstream is(build_libpath(path)); ++ std::ifstream is(build_libpath(path)); + int i; + + if (is) +@@ -416,7 +416,7 @@ + + void LinuxJoystick::write_def_file(char *path) + { +- ofstream os(path); ++ std::ofstream os(path); + if (os) + { + os << cor_x << " " << cor_y << '\n'; --- sabre-0.2.4b.orig/debian/patches/025_endianness.diff +++ sabre-0.2.4b/debian/patches/025_endianness.diff @@ -0,0 +1,329 @@ +Index: sabre-0.2.4b/src/mkterrain.c +=================================================================== +--- sabre-0.2.4b.orig/src/mkterrain.c 2006-11-17 00:45:23.000000000 +0100 ++++ sabre-0.2.4b/src/mkterrain.c 2006-11-17 01:21:53.000000000 +0100 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include "swap.h" + + #define MAXLEN 70 + #define NO_ERR 0 +@@ -70,20 +71,19 @@ + int found_palette; + + typedef struct PCX_HEADER { +- char manufacturer; +- char version; +- char encoding; +- char bits_per_pixel; +- short xmin,ymin; +- short xmax,ymax; +- short hres; +- short vres; +- char palette16[48]; +- char reserved; +- char color_planes; +- short bytes_per_line; +- short palette_type; +- char filler[58]; ++ int8_t manufacturer; ++ int8_t version; ++ int8_t encoding; ++ int8_t bits_per_pixel; ++ int16_t xmin, ymin; ++ int16_t xmax, ymax; ++ int16_t hres, vres; ++ int8_t palette16[48]; ++ int8_t reserved; ++ int8_t color_planes; ++ int16_t bytes_per_line; ++ int16_t palette_type; ++ int8_t filler[58]; + } pcx_header; + + struct IMG { +@@ -403,6 +403,12 @@ + error_exit(1,"Couldn't Open %s",filename); + fseek(infile,0L,SEEK_SET); + fread(&pcxhead,sizeof(pcx_header),1,infile); ++ pcxhead.xmin = ltohs(pcxhead.xmin); ++ pcxhead.xmax = ltohs(pcxhead.xmax); ++ pcxhead.ymin = ltohs(pcxhead.ymin); ++ pcxhead.ymax = ltohs(pcxhead.ymax); ++ pcxhead.hres = ltohs(pcxhead.hres); ++ pcxhead.vres = ltohs(pcxhead.vres); + image.xsize = (pcxhead.xmax-pcxhead.xmin) + 1; + image.ysize = (pcxhead.ymax-pcxhead.ymin) + 1; + Points = image.xsize * image.ysize; +Index: sabre-0.2.4b/src/mktextr.c +=================================================================== +--- sabre-0.2.4b.orig/src/mktextr.c 2006-11-17 00:45:23.000000000 +0100 ++++ sabre-0.2.4b/src/mktextr.c 2006-11-17 01:22:16.000000000 +0100 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include "swap.h" + + #define MAXLEN 70 + #define NO_ERR 0 +@@ -48,20 +49,19 @@ + int found_palette; + + typedef struct PCX_HEADER { +- char manufacturer; +- char version; +- char encoding; +- char bits_per_pixel; +- short xmin,ymin; +- short xmax,ymax; +- short hres; +- short vres; +- char palette16[48]; +- char reserved; +- char color_planes; +- short bytes_per_line; +- short palette_type; +- char filler[58]; ++ int8_t manufacturer; ++ int8_t version; ++ int8_t encoding; ++ int8_t bits_per_pixel; ++ int16_t xmin, ymin; ++ int16_t xmax, ymax; ++ int16_t hres, vres; ++ int8_t palette16[48]; ++ int8_t reserved; ++ int8_t color_planes; ++ int16_t bytes_per_line; ++ int16_t palette_type; ++ int8_t filler[58]; + } pcx_header; + + struct IMG { +@@ -250,6 +250,12 @@ + error_exit(1,"Couldn't Open %s",filename); + fseek(infile,0L,SEEK_SET); + fread(&pcxhead,sizeof(pcx_header),1,infile); ++ pcxhead.xmin = ltohs(pcxhead.xmin); ++ pcxhead.xmax = ltohs(pcxhead.xmax); ++ pcxhead.ymin = ltohs(pcxhead.ymin); ++ pcxhead.ymax = ltohs(pcxhead.ymax); ++ pcxhead.hres = ltohs(pcxhead.hres); ++ pcxhead.vres = ltohs(pcxhead.vres); + image.xsize = (pcxhead.xmax-pcxhead.xmin) + 1; + image.ysize = (pcxhead.ymax-pcxhead.ymin) + 1; + Points = image.xsize * image.ysize; +Index: sabre-0.2.4b/src/mktextr3.c +=================================================================== +--- sabre-0.2.4b.orig/src/mktextr3.c 2006-11-17 00:45:23.000000000 +0100 ++++ sabre-0.2.4b/src/mktextr3.c 2006-11-17 01:22:03.000000000 +0100 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include "swap.h" + + #define MAXLEN 70 + #define NO_ERR 0 +@@ -68,20 +69,19 @@ + int found_palette; + + typedef struct PCX_HEADER { +- char manufacturer; +- char version; +- char encoding; +- char bits_per_pixel; +- short xmin,ymin; +- short xmax,ymax; +- short hres; +- short vres; +- char palette16[48]; +- char reserved; +- char color_planes; +- short bytes_per_line; +- short palette_type; +- char filler[58]; ++ int8_t manufacturer; ++ int8_t version; ++ int8_t encoding; ++ int8_t bits_per_pixel; ++ int16_t xmin, ymin; ++ int16_t xmax, ymax; ++ int16_t hres, vres; ++ int8_t palette16[48]; ++ int8_t reserved; ++ int8_t color_planes; ++ int16_t bytes_per_line; ++ int16_t palette_type; ++ int8_t filler[58]; + } pcx_header; + + struct IMG { +@@ -418,6 +418,12 @@ + error_exit(1,"Couldn't Open %s",filename); + fseek(infile,0L,SEEK_SET); + fread(&pcxhead,sizeof(pcx_header),1,infile); ++ pcxhead.xmin = ltohs(pcxhead.xmin); ++ pcxhead.xmax = ltohs(pcxhead.xmax); ++ pcxhead.ymin = ltohs(pcxhead.ymin); ++ pcxhead.ymax = ltohs(pcxhead.ymax); ++ pcxhead.hres = ltohs(pcxhead.hres); ++ pcxhead.vres = ltohs(pcxhead.vres); + image.xsize = (pcxhead.xmax-pcxhead.xmin) + 1; + image.ysize = (pcxhead.ymax-pcxhead.ymin) + 1; + fprintf(stderr,"xsize: %d, ysize %d\n", +Index: sabre-0.2.4b/src/rmptextr3.c +=================================================================== +--- sabre-0.2.4b.orig/src/rmptextr3.c 2006-11-17 00:45:23.000000000 +0100 ++++ sabre-0.2.4b/src/rmptextr3.c 2006-11-17 01:22:28.000000000 +0100 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include "swap.h" + + #define MAXLEN 70 + #define NO_ERR 0 +@@ -70,20 +71,19 @@ + int found_palette; + + typedef struct PCX_HEADER { +- char manufacturer; +- char version; +- char encoding; +- char bits_per_pixel; +- short xmin,ymin; +- short xmax,ymax; +- short hres; +- short vres; +- char palette16[48]; +- char reserved; +- char color_planes; +- short bytes_per_line; +- short palette_type; +- char filler[58]; ++ int8_t manufacturer; ++ int8_t version; ++ int8_t encoding; ++ int8_t bits_per_pixel; ++ int16_t xmin, ymin; ++ int16_t xmax, ymax; ++ int16_t hres, vres; ++ int8_t palette16[48]; ++ int8_t reserved; ++ int8_t color_planes; ++ int16_t bytes_per_line; ++ int16_t palette_type; ++ int8_t filler[58]; + } pcx_header; + + struct IMG { +@@ -363,6 +363,12 @@ + error_exit(1,"Couldn't Open %s",filename); + fseek(infile,0L,SEEK_SET); + fread(&pcxhead,sizeof(pcx_header),1,infile); ++ pcxhead.xmin = ltohs(pcxhead.xmin); ++ pcxhead.xmax = ltohs(pcxhead.xmax); ++ pcxhead.ymin = ltohs(pcxhead.ymin); ++ pcxhead.ymax = ltohs(pcxhead.ymax); ++ pcxhead.hres = ltohs(pcxhead.hres); ++ pcxhead.vres = ltohs(pcxhead.vres); + image.xsize = (pcxhead.xmax-pcxhead.xmin) + 1; + image.ysize = (pcxhead.ymax-pcxhead.ymin) + 1; + fprintf(stderr,"xsize: %d, ysize %d\n", +Index: sabre-0.2.4b/src/txtrmap.C +=================================================================== +--- sabre-0.2.4b.orig/src/txtrmap.C 2006-11-17 00:45:27.000000000 +0100 ++++ sabre-0.2.4b/src/txtrmap.C 2006-11-17 01:22:46.000000000 +0100 +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include "swap.h" + #include "defs.h" + #include "grafix.h" + #include "vga_13.h" +@@ -184,9 +185,13 @@ + if (open_libos(os,fname)) + { + #ifdef DEBIAN +- os.write((char *)&map_w,sizeof(map_w)); +- os.write((char *)&map_h,sizeof(map_h)); +- os.write((char *)&n,sizeof(n)); ++ uint32_t tmp; ++ tmp = ltohl(map_w); ++ os.write((char *)&tmp,sizeof(tmp)); ++ tmp = ltohl(map_h); ++ os.write((char *)&tmp,sizeof(tmp)); ++ tmp = ltohl(n); ++ os.write((char *)&tmp,sizeof(tmp)); + #else + os.write((unsigned char *)&map_w,sizeof(map_w)); + os.write((unsigned char *)&map_h,sizeof(map_h)); +@@ -204,7 +209,7 @@ + + void TextrMap::read_compressed(int cflg) + { +-unsigned int n; ++uint32_t n; + char *fname; + FILE *f; + int nread; +@@ -224,8 +229,11 @@ + if ((f = fopen(path,open_params)) != NULL) + { + fread(&map_w,sizeof(map_w),1,f); ++ map_w = ltohl(map_w); + fread(&map_h,sizeof(map_h),1,f); ++ map_h = ltohl(map_h); + fread(&n,sizeof(n),1,f); ++ n = ltohl(n); + size = map_w * map_h; + csize = n; + cbytes = new unsigned char[csize]; +Index: sabre-0.2.4b/src/txtrmap.h +=================================================================== +--- sabre-0.2.4b.orig/src/txtrmap.h 2006-11-17 00:45:24.000000000 +0100 ++++ sabre-0.2.4b/src/txtrmap.h 2006-11-17 00:45:27.000000000 +0100 +@@ -41,8 +41,8 @@ + unsigned char *bytes; + public: + unsigned char *cbytes; +- int map_w; +- int map_h; ++ int32_t map_w; ++ int32_t map_h; + int trans_colr; + int delf; + char id[32]; +Index: sabre-0.2.4b/src/swap.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ sabre-0.2.4b/src/swap.h 2006-11-17 01:21:30.000000000 +0100 +@@ -0,0 +1,23 @@ ++#include ++ ++static inline uint16_t ltohs(uint16_t x) ++{ ++ /* This is compile-time optimised with at least -O1 or -Os */ ++ uint32_t const dummy = 0x12345678; ++ if(*(uint8_t const *)&dummy == 0x12) ++ return (x >> 8) | (x << 8); ++ else ++ return x; ++} ++ ++static inline uint32_t ltohl(uint32_t x) ++{ ++ /* This is compile-time optimised with at least -O1 or -Os */ ++ uint32_t const dummy = 0x12345678; ++ if(*(uint8_t const *)&dummy == 0x12) ++ return (x >> 24) | ((x >> 8) & 0x0000ff00) ++ | ((x << 8) & 0x00ff0000) | (x << 24); ++ else ++ return x; ++} ++ --- sabre-0.2.4b.orig/debian/patches/035_gcc43_1.diff +++ sabre-0.2.4b/debian/patches/035_gcc43_1.diff @@ -0,0 +1,3006 @@ +diff -urN sabre-0.2.4b/src/aaaunit.C tmp/sabre-0.2.4b/src/aaaunit.C +--- sabre-0.2.4b/src/aaaunit.C 1998-12-31 20:13:37.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/aaaunit.C 2008-01-31 12:16:20.000000000 -0500 +@@ -24,8 +24,8 @@ + * Author : Dan Hammer * + *************************************************/ + #include +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -139,7 +139,7 @@ + lp = target->position; + } + +-void AAA_Unit::read(istream &is) ++void AAA_Unit::read(std::istream &is) + { + char c; + +@@ -157,7 +157,7 @@ + init(); + } + +-void AAA_Unit::write(ostream &os) ++void AAA_Unit::write(std::ostream &os) + { + os << "{\n"; + os << view << '\n'; +diff -urN sabre-0.2.4b/src/aigunner.h tmp/sabre-0.2.4b/src/aigunner.h +--- sabre-0.2.4b/src/aigunner.h 1998-12-31 03:53:35.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/aigunner.h 2008-01-30 19:26:59.000000000 -0500 +@@ -31,7 +31,7 @@ + #define aiGUN_YAW_RATE (_degree * 20.0) + + #ifdef __cplusplus +-#include "fstream.h" ++#include "fstream" + #include "sobject.h" + #include "sarray.h" + #include "sfltmdl.h" +diff -urN sabre-0.2.4b/src/clip.C tmp/sabre-0.2.4b/src/clip.C +--- sabre-0.2.4b/src/clip.C 1999-02-12 17:33:40.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/clip.C 2008-01-30 19:12:44.000000000 -0500 +@@ -26,7 +26,7 @@ + * clipping algorythm. * + *************************************************/ + #include +-#include ++#include + #include + #include "defs.h" + #include "grafix.h" +diff -urN sabre-0.2.4b/src/clip.h tmp/sabre-0.2.4b/src/clip.h +--- sabre-0.2.4b/src/clip.h 1999-02-12 17:33:40.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/clip.h 2008-01-31 10:44:33.000000000 -0500 +@@ -105,14 +105,14 @@ + void set(const bounding_cube &bc); + R_3DPoint centerPoint(); + +- void write(ostream &os) ++ void write(std::ostream &os) + { + os << "[ " << min_x << " " << max_x << " ]\n"; + os << "[ " << min_y << " " << max_y << " ]\n"; + os << "[ " << min_z << " " << max_z << " ]\n"; + } + +- friend ostream &operator <<(ostream &os, bounding_cube &bc) ++ friend std::ostream &operator <<(std::ostream &os, bounding_cube &bc) + { + bc.write(os); + return (os); +diff -urN sabre-0.2.4b/src/cockpit.C tmp/sabre-0.2.4b/src/cockpit.C +--- sabre-0.2.4b/src/cockpit.C 1998-12-13 10:32:43.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/cockpit.C 2008-01-30 19:19:46.000000000 -0500 +@@ -31,8 +31,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include "defs.h" + #include "grafix.h" + #include "vga_13.h" +diff -urN sabre-0.2.4b/src/colormap.C tmp/sabre-0.2.4b/src/colormap.C +--- sabre-0.2.4b/src/colormap.C 1998-12-13 10:32:43.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/colormap.C 2008-01-31 11:45:11.000000000 -0500 +@@ -27,13 +27,13 @@ + #include + #include + #include +-#include ++#include + #include + #include "simerr.h" + #include "simfile.h" + #include "colormap.h" + +-void ColorMap::read(istream &is) ++void ColorMap::read(std::istream &is) + { + char c; + READ_TOKI('(',is,c) +@@ -42,7 +42,7 @@ + READ_TOK(')',is,c) + } + +-void ColorMap::write(ostream &os) ++void ColorMap::write(std::ostream &os) + { + os << "( " << id_color << ' ' << base_color << ' ' << n << " )"; + } +diff -urN sabre-0.2.4b/src/colormap.h tmp/sabre-0.2.4b/src/colormap.h +--- sabre-0.2.4b/src/colormap.h 1998-12-13 10:32:45.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/colormap.h 2008-01-31 10:38:05.000000000 -0500 +@@ -69,16 +69,16 @@ + n = cm.n; + } + +- void read(istream &is); +- void write(ostream &os); ++ void read(std::istream &is); ++ void write(std::ostream &os); + +- friend istream &operator >>(istream &is, ColorMap &cm) ++ friend std::istream &operator >>(std::istream &is, ColorMap &cm) + { + cm.read(is); + return(is); + } + +- friend ostream &operator <<(ostream &os, ColorMap &cm) ++ friend std::ostream &operator <<(std::ostream &os, ColorMap &cm) + { + cm.write(os); + return(os); +diff -urN sabre-0.2.4b/src/colorspc.C tmp/sabre-0.2.4b/src/colorspc.C +--- sabre-0.2.4b/src/colorspc.C 1998-12-13 10:32:43.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/colorspc.C 2008-01-31 12:15:36.000000000 -0500 +@@ -18,11 +18,11 @@ + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + #include +-#include +-#include ++#include ++#include + #include "colorspc.h" + +-istream &operator >>(istream &is, color_spec &cs) ++std::istream &operator >>(std::istream &is, color_spec &cs) + { + char c; + is >> c; +diff -urN sabre-0.2.4b/src/colorspc.h tmp/sabre-0.2.4b/src/colorspc.h +--- sabre-0.2.4b/src/colorspc.h 1998-12-13 10:32:45.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/colorspc.h 2008-01-31 10:36:21.000000000 -0500 +@@ -47,8 +47,8 @@ + red = r; green = g; blue = b; + } + +- friend istream &operator >>(istream &is, color_spec &cs); +- friend ostream &operator <<(ostream &os, color_spec &cs) ++ friend std::istream &operator >>(std::istream &is, color_spec &cs); ++ friend std::ostream &operator <<(std::ostream &os, color_spec &cs) + { + os << '(' << ' ' << cs.color << ' ' << cs.red << ' '; + os << cs.green << ' ' << cs.blue << " )"; +diff -urN sabre-0.2.4b/src/copoly.C tmp/sabre-0.2.4b/src/copoly.C +--- sabre-0.2.4b/src/copoly.C 1998-12-13 10:32:43.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/copoly.C 2008-01-31 11:37:09.000000000 -0500 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include "simerr.h" + #include "vga_13.h" + #include "pen.h" +@@ -185,7 +185,7 @@ + } + } + +-void C_Oriented_Poly::write(ostream &os) ++void C_Oriented_Poly::write(std::ostream &os) + { + int tflag = 0; + char cc = '0'; +@@ -218,13 +218,13 @@ + os << ']'; + } + +-ostream & operator <<(ostream &os, C_Oriented_Poly &cp) ++std::ostream & operator <<(std::ostream &os, C_Oriented_Poly &cp) + { + cp.write(os); + return os; + } + +-ostream &operator <<(ostream &os, C_Oriented_Shape &cs) ++std::ostream &operator <<(std::ostream &os, C_Oriented_Shape &cs) + { + os << '{' << '\n'; + os << cs.npolys << '\n'; +@@ -277,7 +277,7 @@ + delete [] o_polys; + } + +-istream &operator >>(istream &is, C_Oriented_Shape &cs) ++std::istream &operator >>(std::istream &is, C_Oriented_Shape &cs) + { + for (int i=0;i> cs.o_polys[i]; +diff -urN sabre-0.2.4b/src/copoly.h tmp/sabre-0.2.4b/src/copoly.h +--- sabre-0.2.4b/src/copoly.h 1998-12-13 10:32:46.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/copoly.h 2008-01-31 10:58:08.000000000 -0500 +@@ -71,8 +71,8 @@ + int shadow_color, + Port_3D &ref_port); + void draw(Port_3D &theport, Port_3D &ref_port, int = 1); +- friend ostream & operator <<(ostream &, C_Oriented_Poly &); +- void write(ostream &os); ++ friend std::ostream & operator <<(std::ostream &, C_Oriented_Poly &); ++ void write(std::ostream &os); + int getScreenPoints(Port_3D &, Port_3D &, R_2DPoint *spoints); + int getScreenPoints(Port_3D &, Port_3D &, TR_2DPoint *spoints); + +@@ -101,9 +101,9 @@ + void set_poly_icolor(Vector &light); + void set_poly_color(int n, int color); + int drawn_flag; +- friend istream &operator >>(istream &, C_Oriented_Shape &); ++ friend std::istream &operator >>(std::istream &, C_Oriented_Shape &); + void set_params(shape_params *); +- friend ostream &operator <<(ostream &, C_Oriented_Shape &); ++ friend std::ostream &operator <<(std::ostream &, C_Oriented_Shape &); + void create_points(Port_3D &ref_port); + void delete_points(); + }; +diff -urN sabre-0.2.4b/src/cpoly.C tmp/sabre-0.2.4b/src/cpoly.C +--- sabre-0.2.4b/src/cpoly.C 1998-12-13 10:32:43.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/cpoly.C 2008-01-31 11:34:06.000000000 -0500 +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "vmath.h" + #include "rendpoly.h" +@@ -56,7 +56,7 @@ + file_context = fcontext_buff; + } + +-void C_PolyInfo::read(istream &is) ++void C_PolyInfo::read(std::istream &is) + { + char c; + int txtflag; +@@ -104,7 +104,7 @@ + } + + +-void C_PolyInfo::write(ostream &os) ++void C_PolyInfo::write(std::ostream &os) + { + int txtflg = (tpoints != NULL); + os << '[' << npoints << " " << txtflg << " "; +@@ -181,7 +181,7 @@ + + } + +-void C_ShapeInfo::read(istream &is) ++void C_ShapeInfo::read(std::istream &is) + { + char c; + set_context(); +@@ -202,7 +202,7 @@ + READ_TOKX('}','{',is,c) + } + +-void C_ShapeInfo::write(ostream &os) ++void C_ShapeInfo::write(std::ostream &os) + { + os << "{\n"; + os << npolys << "\n"; +@@ -268,7 +268,7 @@ + return (*this); + } + +-void poly_params::read(istream &is) ++void poly_params::read(std::istream &is) + { + char c; + READ_TOKI('(',is,c) +@@ -277,12 +277,12 @@ + READ_TOK(')',is,c) + } + +-void poly_params::write(ostream &os) ++void poly_params::write(std::ostream &os) + { + os << '(' << color << " " << tmap << " " << flags << " " << color_range << ')'; + } + +-void shape_params::read(istream &is) ++void shape_params::read(std::istream &is) + { + char c; + if (p_params) +@@ -308,7 +308,7 @@ + READ_TOK(']',is,c) + } + +-void shape_params::write(ostream &os) ++void shape_params::write(std::ostream &os) + { + if (p_params) + { +@@ -365,7 +365,7 @@ + + void C_3DObjectInfo::readFile(char *path) + { +- ifstream is; ++ std::ifstream is; + if (this->path) + delete this->path; + this->path = strdup(path); +@@ -375,7 +375,7 @@ + + void C_3DObjectInfo::writeFile(char *path) + { +- ofstream os; ++ std::ofstream os; + MYCHECK(path != NULL); + if (this->path == NULL) + this->path = strdup(path); +@@ -388,7 +388,7 @@ + write(os); + } + +-void C_3DObjectInfo::read(istream &is) ++void C_3DObjectInfo::read(std::istream &is) + { + char c; + if (shapes) +@@ -398,7 +398,7 @@ + READ_TOKI('{',is,c) + is >> id; + is >> nshapes; +- // cout << id << ": " << nshapes << " shapes\n"; ++ // std::cout << id << ": " << nshapes << " shapes\n"; + shapes = new C_ShapeInfo[nshapes]; + MYCHECK(shapes != NULL); + dflt_params = new shape_params[nshapes]; +@@ -416,7 +416,7 @@ + + } + +-void C_3DObjectInfo::write(ostream &os) ++void C_3DObjectInfo::write(std::ostream &os) + { + if (shapes) + { +@@ -472,7 +472,7 @@ + base_color = cp.base_color; + } + +-istream & operator >>(istream &is, C_Poly &cp) ++std::istream & operator >>(std::istream &is, C_Poly &cp) + { + char c; + is >> c; +@@ -750,7 +750,7 @@ + delete [] polys; + } + +-istream & operator >>(istream &is, C_Shape &cs) ++std::istream & operator >>(std::istream &is, C_Shape &cs) + { + is >> cs.flags; + if (cs.flags & CPY_PARAMS) +diff -urN sabre-0.2.4b/src/cpoly.h tmp/sabre-0.2.4b/src/cpoly.h +--- sabre-0.2.4b/src/cpoly.h 1998-12-13 10:32:46.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/cpoly.h 2008-01-31 10:51:46.000000000 -0500 +@@ -139,10 +139,10 @@ + + friend inline int operator ==(const poly_params & p1, const poly_params & p2); + +- void read(istream &); +- void write(ostream &); +- friend inline istream &operator >>(istream & is, poly_params &ps); +- friend inline ostream &operator <<(ostream & os, poly_params &ps); ++ void read(std::istream &); ++ void write(std::ostream &); ++ friend inline std::istream &operator >>(std::istream & is, poly_params &ps); ++ friend inline std::ostream &operator <<(std::ostream & os, poly_params &ps); + } ; + + +@@ -153,13 +153,13 @@ + && (p1.tmap == p2.tmap)); + } + +-inline istream &operator >>(istream &is, poly_params &ps) ++inline std::istream &operator >>(std::istream &is, poly_params &ps) + { + ps.read(is); + return(is); + } + +-inline ostream &operator <<(ostream &os, poly_params &ps) ++inline std::ostream &operator <<(std::ostream &os, poly_params &ps) + { + ps.write(os); + return(os); +@@ -206,19 +206,19 @@ + + void add(const poly_params &); + +- void read(istream &); +- void write(ostream &); +- friend inline istream & operator >>(istream &, shape_params &); +- friend inline ostream & operator <<(ostream &, shape_params &); ++ void read(std::istream &); ++ void write(std::ostream &); ++ friend inline std::istream & operator >>(std::istream &, shape_params &); ++ friend inline std::ostream & operator <<(std::ostream &, shape_params &); + } ; + +-inline istream & operator >>(istream &is, shape_params &sp) ++inline std::istream & operator >>(std::istream &is, shape_params &sp) + { + sp.read(is); + return(is); + } + +-inline ostream & operator <<(ostream &os, shape_params &sp) ++inline std::ostream & operator <<(std::ostream &os, shape_params &sp) + { + sp.write(os); + return(os); +@@ -268,21 +268,21 @@ + + void copy(const C_PolyInfo &); + +- void read(istream &); +- void write(ostream &); ++ void read(std::istream &); ++ void write(std::ostream &); + +- friend inline istream &operator >>(istream &is, C_PolyInfo &cp); +- friend inline ostream &operator <<(ostream &os, C_PolyInfo &cp); ++ friend inline std::istream &operator >>(std::istream &is, C_PolyInfo &cp); ++ friend inline std::ostream &operator <<(std::ostream &os, C_PolyInfo &cp); + + }; + +-inline istream &operator >>(istream &is, C_PolyInfo &cp) ++inline std::istream &operator >>(std::istream &is, C_PolyInfo &cp) + { + cp.read(is); + return(is); + } + +-inline ostream &operator <<(ostream &os, C_PolyInfo &cp) ++inline std::ostream &operator <<(std::ostream &os, C_PolyInfo &cp) + { + cp.write(os); + return(os); +@@ -329,20 +329,20 @@ + void copy(const C_ShapeInfo &); + void add(const C_PolyInfo &ip); + +- void read(istream &); +- void write(ostream &); ++ void read(std::istream &); ++ void write(std::ostream &); + +- friend inline istream &operator >>(istream &, C_ShapeInfo &); +- friend inline ostream &operator <<(ostream &, C_ShapeInfo &); ++ friend inline std::istream &operator >>(std::istream &, C_ShapeInfo &); ++ friend inline std::ostream &operator <<(std::ostream &, C_ShapeInfo &); + }; + +-inline istream &operator >>(istream &is, C_ShapeInfo &cp) ++inline std::istream &operator >>(std::istream &is, C_ShapeInfo &cp) + { + cp.read(is); + return(is); + } + +-inline ostream &operator <<(ostream &os, C_ShapeInfo &cp) ++inline std::ostream &operator <<(std::ostream &os, C_ShapeInfo &cp) + { + cp.write(os); + return(os); +@@ -379,19 +379,19 @@ + + void readFile(char *path); + void writeFile(char *path); +- void read(istream &); +- void write(ostream &); +- friend inline istream &operator >>(istream &is, C_3DObjectInfo &co); +- friend inline ostream &operator <<(ostream &os, C_3DObjectInfo &co); ++ void read(std::istream &); ++ void write(std::ostream &); ++ friend inline std::istream &operator >>(std::istream &is, C_3DObjectInfo &co); ++ friend inline std::ostream &operator <<(std::ostream &os, C_3DObjectInfo &co); + }; + +-inline istream &operator >>(istream &is, C_3DObjectInfo &co) ++inline std::istream &operator >>(std::istream &is, C_3DObjectInfo &co) + { + co.read(is); + return(is); + } + +-inline ostream &operator <<(ostream &os, C_3DObjectInfo &co) ++inline std::ostream &operator <<(std::ostream &os, C_3DObjectInfo &co) + { + co.write(os); + return(os); +@@ -428,7 +428,7 @@ + void set_shadow(REAL_TYPE z_value, Vector &light_source); + void draw_shadow(Port_3D &theport, int z_clip, int shadow_color); + virtual void set_poly_icolor(Vector &); +- friend istream &operator >>(istream &, C_Poly &); ++ friend std::istream &operator >>(std::istream &, C_Poly &); + void set_params(poly_params *prms); + void set_params(const C_Poly &); + virtual void set_scale(REAL_TYPE x) +@@ -461,7 +461,7 @@ + virtual void set_shadow(REAL_TYPE , Vector &); + virtual void draw(Port_3D &, R_3DPoint &); + void set_poly_icolor(Vector &); +- friend istream & operator >>(istream &, C_Shape &); ++ friend std::istream & operator >>(std::istream &, C_Shape &); + virtual void set_params(shape_params *); + virtual void set_scale(REAL_TYPE); + virtual void getBounds(bounding_cube &); +diff -urN sabre-0.2.4b/src/dvector.C tmp/sabre-0.2.4b/src/dvector.C +--- sabre-0.2.4b/src/dvector.C 1998-12-13 10:32:43.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/dvector.C 2008-01-31 11:46:10.000000000 -0500 +@@ -22,14 +22,14 @@ + * floating-point equivalents of vectors * + ****************************************************************/ + #include +-#include ++#include + #include + #ifdef USING_FIXED + #include "fixpoint.h" + #endif + #include "vmath.h" + #include "dvmath.h" +-istream &operator >> (istream &is, DVector &v) ++std::istream &operator >> (std::istream &is, DVector &v) + { + char c; + is >> c; +diff -urN sabre-0.2.4b/src/dvmath.h tmp/sabre-0.2.4b/src/dvmath.h +--- sabre-0.2.4b/src/dvmath.h 1998-12-13 10:32:46.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/dvmath.h 2008-01-31 11:00:16.000000000 -0500 +@@ -60,9 +60,9 @@ + friend int operator ==(const DVector &v1, const DVector &v2) + { return (v1.X==v2.X && v1.Y==v2.Y && v1.Z==v2.Z); } + +- friend ostream &operator << (ostream &os,DVector &v) ++ friend std::ostream &operator << (std::ostream &os,DVector &v) + { return os << '<' << v.X << ' ' << v.Y << ' ' << v.Z << '>' ; } +- friend istream &operator >> (istream &is,DVector &v); ++ friend std::istream &operator >> (std::istream &is,DVector &v); + + void SetZero( void ) + { +diff -urN sabre-0.2.4b/src/earth.C tmp/sabre-0.2.4b/src/earth.C +--- sabre-0.2.4b/src/earth.C 1998-12-13 10:32:43.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/earth.C 2008-01-31 11:43:56.000000000 -0500 +@@ -26,8 +26,8 @@ + * background rendering of earth & sky * + *************************************************/ + #include +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -101,7 +101,7 @@ + return (result); + } + +-void Earth_Watch::read(istream &is) ++void Earth_Watch::read(std::istream &is) + { + char c; + int i,j,idx; +@@ -183,7 +183,7 @@ + READ_TOKI('}',is,c) + } + +-istream &operator >>(istream &is, Earth_Watch &ew) ++std::istream &operator >>(std::istream &is, Earth_Watch &ew) + { + ew.read(is); + return is; +@@ -488,13 +488,13 @@ + t_render_ground(port); + } + +-void Earth_Watch2::read(istream &is) ++void Earth_Watch2::read(std::istream &is) + { + char c; + int i,j; + int rsrv; + char terrain_path[100]; +- ifstream ts; ++ std::ifstream ts; + float dab_min; + + R_3DPoint loc; +diff -urN sabre-0.2.4b/src/earth.h tmp/sabre-0.2.4b/src/earth.h +--- sabre-0.2.4b/src/earth.h 1998-12-13 10:32:46.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/earth.h 2008-01-31 11:12:44.000000000 -0500 +@@ -75,8 +75,8 @@ + void draw_horizon_grade(Port_3D &); + void render_ground(Port_3D &); + void t_render_ground(Port_3D &); +- friend istream &operator >>(istream &is, Earth_Watch &); +- virtual void read(istream &is); ++ friend std::istream &operator >>(std::istream &is, Earth_Watch &); ++ virtual void read(std::istream &is); + }; + + class Earth_Watch2 : public Earth_Watch +@@ -84,7 +84,7 @@ + public: + Terrain_Shape *tshapes; + int ntshapes; +- virtual void read(istream &is); ++ virtual void read(std::istream &is); + REAL_TYPE getGroundLevel(R_3DPoint &p); + }; + +diff -urN sabre-0.2.4b/src/flight.C tmp/sabre-0.2.4b/src/flight.C +--- sabre-0.2.4b/src/flight.C 1999-11-21 08:01:36.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/flight.C 2008-01-31 11:47:02.000000000 -0500 +@@ -55,8 +55,8 @@ + * ain't no function of velocity + */ + #include +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -82,7 +82,7 @@ + REAL_TYPE Flight::rot_rate_max = _PI34; + REAL_TYPE Flight::rot_max = _PI2 * 0.4; + +-void Flight::read(istream &is) ++void Flight::read(std::istream &is) + { + char c; + READ_TOKI('{',is,c); +@@ -94,7 +94,7 @@ + state.weight = specs->weight; + } + +-void Flight::write(ostream &os) ++void Flight::write(std::ostream &os) + { + os << "{\n " << controls << " " << state << "\n}\n"; + } +diff -urN sabre-0.2.4b/src/flight.h tmp/sabre-0.2.4b/src/flight.h +--- sabre-0.2.4b/src/flight.h 1999-11-21 08:02:21.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/flight.h 2008-01-31 11:02:53.000000000 -0500 +@@ -52,14 +52,14 @@ + void calcRotations(float); + void applyForces(float); + void applyRotations(float); +- void read(istream &); +- void write(ostream &); +- friend istream & operator >>(istream & is, Flight &f) ++ void read(std::istream &); ++ void write(std::ostream &); ++ friend std::istream & operator >>(std::istream & is, Flight &f) + { + f.read(is); + return(is); + } +- friend ostream & operator <<(ostream & os, Flight &f) ++ friend std::ostream & operator <<(std::ostream & os, Flight &f) + { + f.write(os); + return(os); +diff -urN sabre-0.2.4b/src/fltlite.C tmp/sabre-0.2.4b/src/fltlite.C +--- sabre-0.2.4b/src/fltlite.C 1998-12-13 10:32:43.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/fltlite.C 2008-01-31 11:51:23.000000000 -0500 +@@ -21,8 +21,8 @@ + * flight.cpp * + *******************************************************/ + #include +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -57,7 +57,7 @@ + return (DVector(r_w)); + } + +-void FlightLight_Specs::read(istream &is) ++void FlightLight_Specs::read(std::istream &is) + { + char c = ' '; + READ_TOK('{',is,c); +@@ -68,7 +68,7 @@ + mass = weight / g; + } + +-void FlightLight_Specs::write(ostream &os) ++void FlightLight_Specs::write(std::ostream &os) + { + os << "{\n"; + os << weight << thrust; +@@ -77,13 +77,13 @@ + os << "}\n"; + } + +-istream &operator >>(istream &is, FlightLight_Specs &fs) ++std::istream &operator >>(std::istream &is, FlightLight_Specs &fs) + { + fs.read(is); + return (is); + } + +-ostream &operator <<(ostream &os, FlightLight_Specs &fs) ++std::ostream &operator <<(std::ostream &os, FlightLight_Specs &fs) + { + fs.write(os); + return (os); +diff -urN sabre-0.2.4b/src/fltlite.h tmp/sabre-0.2.4b/src/fltlite.h +--- sabre-0.2.4b/src/fltlite.h 1998-12-13 10:32:46.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/fltlite.h 2008-01-31 11:04:03.000000000 -0500 +@@ -96,10 +96,10 @@ + return *this; + } + +- void read(istream &); +- void write(ostream &); +- friend istream &operator >>(istream &, FlightLight_Specs &fs); +- friend ostream &operator <<(ostream &, FlightLight_Specs &fs); ++ void read(std::istream &); ++ void write(std::ostream &); ++ friend std::istream &operator >>(std::istream &, FlightLight_Specs &fs); ++ friend std::ostream &operator <<(std::ostream &, FlightLight_Specs &fs); + }; + + +diff -urN sabre-0.2.4b/src/fltmngr.C tmp/sabre-0.2.4b/src/fltmngr.C +--- sabre-0.2.4b/src/fltmngr.C 1999-04-19 16:17:31.000000000 -0400 ++++ tmp/sabre-0.2.4b/src/fltmngr.C 2008-01-31 11:57:26.000000000 -0500 +@@ -24,8 +24,8 @@ + * Author : Dan Hammer * + *************************************************/ + #include +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -58,7 +58,7 @@ + #define F2FIX(a) (a) + #define FIX2F(a) (a) + +-void Flight_Node::read(istream &is) ++void Flight_Node::read(std::istream &is) + { + char buff[64]; + int n; +@@ -157,7 +157,7 @@ + viewer->affiliation = pilot->getAffiliation(); + } + +-istream &operator >>(istream &is, Flight_Node &fn) ++std::istream &operator >>(std::istream &is, Flight_Node &fn) + { + fn.read(is); + return is; +@@ -413,7 +413,7 @@ + int Flight_Manager::read_file(char *path) + { + int result = 0; +- ifstream infile; ++ std::ifstream infile; + + if (open_is(infile,path)) + { +@@ -424,11 +424,11 @@ + return result; + } + +-void Flight_Manager::read(istream &is) ++void Flight_Manager::read(std::istream &is) + { + char buff[BUFSIZ]; + int got_line; +- ifstream is2; ++ std::ifstream is2; + int i; + + is.seekg(0L); +@@ -530,13 +530,13 @@ + } + } + +-istream & operator >>(istream &is, Flight_Manager &fm) ++std::istream & operator >>(std::istream &is, Flight_Manager &fm) + { + fm.read(is); + return is; + } + +-void Flight_Manager::readNodes(istream &is) ++void Flight_Manager::readNodes(std::istream &is) + { + int i; + +@@ -561,14 +561,14 @@ + + void Flight_Manager::readNodeFile(char *path) + { +- ifstream is; ++ std::ifstream is; + + if (open_is(is,path)) + readNodes(is); + } + + +-void Flight_Manager::readFlites(istream &is) ++void Flight_Manager::readFlites(std::istream &is) + { + #define MAX_SWAYPOINT_INFOS 16 + swaypoint_info waypoints[MAX_SWAYPOINT_INFOS]; +@@ -722,7 +722,7 @@ + + void Flight_Manager::readFliteFile(char *path) + { +- ifstream is; ++ std::ifstream is; + + if (open_is(is,path)) + readFlites(is); +diff -urN sabre-0.2.4b/src/fltmngr.h tmp/sabre-0.2.4b/src/fltmngr.h +--- sabre-0.2.4b/src/fltmngr.h 1999-02-12 17:33:40.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/fltmngr.h 2008-01-31 11:08:46.000000000 -0500 +@@ -77,8 +77,8 @@ + delete [] wi; + } + +- friend istream &operator >>(istream &, Flight_Node &); +- void read(istream &); ++ friend std::istream &operator >>(std::istream &, Flight_Node &); ++ void read(std::istream &); + + void start() + { +@@ -134,8 +134,8 @@ + + ~Flight_Manager(); + int read_file(char *); +- friend istream &operator >>(istream &, Flight_Manager &); +- void read(istream &); ++ friend std::istream &operator >>(std::istream &, Flight_Manager &); ++ void read(std::istream &); + void update(Unguided_Manager *um = NULL); + void start(); + void pause(); +@@ -180,9 +180,9 @@ + return NULL; + } + void readNodeFile(char *); +- void readNodes(istream &is); ++ void readNodes(std::istream &is); + void readFliteFile(char *); +- void readFlites(istream &is); ++ void readFlites(std::istream &is); + }; + + #endif +diff -urN sabre-0.2.4b/src/fltobj.C tmp/sabre-0.2.4b/src/fltobj.C +--- sabre-0.2.4b/src/fltobj.C 1999-11-21 08:01:13.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/fltobj.C 2008-01-31 12:20:16.000000000 -0500 +@@ -25,8 +25,8 @@ + *************************************************/ + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -130,7 +130,7 @@ + int Flight_Specs::read_file(char *path) + { + int result = 0; +-ifstream infile; ++std::ifstream infile; + + if (open_is(infile,path)) + { +@@ -145,7 +145,7 @@ + { + int result = 0; + +- ofstream outfile; ++ std::ofstream outfile; + if (open_libos(outfile,path)) + { + result = 1; +@@ -155,7 +155,7 @@ + return (result); + } + +-void Flight_Specs::read(istream &is) ++void Flight_Specs::read(std::istream &is) + { + char c; + +@@ -204,7 +204,7 @@ + READ_TOK('}',is,c); + } + +-void Flight_Specs::write(ostream &os) ++void Flight_Specs::write(std::ostream &os) + { + os << "{\n"; + os << weight << max_thrust << fps2kts(max_speed) << fps2kts(corner_speed); +@@ -228,7 +228,7 @@ + os << "}\n"; + } + +-void Flight_Controls::read(istream &is) ++void Flight_Controls::read(std::istream &is) + { + is >> throttle >> landing_gear >> wheel_brakes; + is >> cockpit >> hud_on >> vextern; +@@ -241,14 +241,14 @@ + radar = 1; + } + +-void Flight_Controls::write(ostream &os) ++void Flight_Controls::write(std::ostream &os) + { + os << elevators << ' ' << ailerons << ' ' << throttle << '\n'; + os << rudder << ' ' << speed_brakes << '\n' ; + os << flaps << ' ' << wheel_brakes << ' ' << landing_gear << '\n'; + } + +-istream &operator >>(istream &is, Vector_Q &vq) ++std::istream &operator >>(std::istream &is, Vector_Q &vq) + { + char c; + is >> c; +@@ -298,7 +298,7 @@ + return Vector_Q(r_mag,v_result); + } + +-void Flight_State::read(istream &is) ++void Flight_State::read(std::istream &is) + { + float kph; + +diff -urN sabre-0.2.4b/src/fltobj.h tmp/sabre-0.2.4b/src/fltobj.h +--- sabre-0.2.4b/src/fltobj.h 1999-11-21 08:03:08.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/fltobj.h 2008-01-31 11:01:47.000000000 -0500 +@@ -167,14 +167,14 @@ + + Flight_Specs(); + +- void read(istream &); +- void write(ostream &); +- friend istream &operator >>(istream &is, Flight_Specs &fs) ++ void read(std::istream &); ++ void write(std::ostream &); ++ friend std::istream &operator >>(std::istream &is, Flight_Specs &fs) + { + fs.read(is); + return(is); + } +- friend ostream &operator <<(ostream &os, Flight_Specs &fs) ++ friend std::ostream &operator <<(std::ostream &os, Flight_Specs &fs) + { + fs.write(os); + return(os); +@@ -286,14 +286,14 @@ + auto_coord = 0; + } + +- void read(istream &is); +- void write(ostream &os); +- friend istream & operator >>(istream &is, Flight_Controls &fc) ++ void read(std::istream &is); ++ void write(std::ostream &os); ++ friend std::istream & operator >>(std::istream &is, Flight_Controls &fc) + { + fc.read(is); + return(is); + } +- friend ostream & operator <<(ostream &os, Flight_Controls &fc) ++ friend std::ostream & operator <<(std::ostream &os, Flight_Controls &fc) + { + fc.write(os); + return(os); +@@ -331,13 +331,13 @@ + friend Vector_Q operator +(Vector_Q &, Vector_Q &); + friend DVector operator +(DVector &, Vector_Q &); + +- friend ostream &operator <<(ostream &os, Vector_Q &vq) ++ friend std::ostream &operator <<(std::ostream &os, Vector_Q &vq) + { + os << '(' << vq.magnitude << ' ' << vq.direction << ')'; + return os; + } + +- friend istream &operator >>(istream &is, Vector_Q &vq); ++ friend std::istream &operator >>(std::istream &is, Vector_Q &vq); + }; + + /*********************************************************** +@@ -445,17 +445,17 @@ + fuel = 0.0; + elapsed_time = 0.0; + } +- void read(istream &is); +- void write(ostream &os) ++ void read(std::istream &is); ++ void write(std::ostream &os) + { + os << velocity.magnitude << flight_port; + } +- friend istream &operator >>(istream &is, Flight_State &fp) ++ friend std::istream &operator >>(std::istream &is, Flight_State &fp) + { + fp.read(is); + return(is); + } +- friend ostream &operator <<(ostream &os, Flight_State &fp) ++ friend std::ostream &operator <<(std::ostream &os, Flight_State &fp) + { + fp.write(os); + return(os); +diff -urN sabre-0.2.4b/src/fltzview.C tmp/sabre-0.2.4b/src/fltzview.C +--- sabre-0.2.4b/src/fltzview.C 1998-12-31 03:21:23.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/fltzview.C 2008-01-30 19:10:24.000000000 -0500 +@@ -26,8 +26,8 @@ + *************************************************/ + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +diff -urN sabre-0.2.4b/src/game.C tmp/sabre-0.2.4b/src/game.C +--- sabre-0.2.4b/src/game.C 1999-11-24 18:17:36.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/game.C 2008-01-31 11:24:16.000000000 -0500 +@@ -32,8 +32,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include "sim.h" +@@ -114,12 +114,12 @@ + sound_off(SNDGLOBAL_INTRO); + } + sound_off_all(); +- printResults(cout); ++ printResults(std::cout); + } + + void GameSession::readWorldFile() + { +-ifstream is; ++std::ifstream is; + char c; + Port_3D port; + float pixl_ratio; +@@ -669,9 +669,9 @@ + } + + #ifndef SABREWIN +-inline void PRINTLN(ostream &os, char *s, ...) ++inline void PRINTLN(std::ostream &os, char *s, ...) + #else +-void __cdecl PRINTLN(ostream &os, char *s, ...) ++void __cdecl PRINTLN(std::ostream &os, char *s, ...) + #endif + { + va_list ap; +@@ -688,7 +688,7 @@ + } + + +-void GameSession::printResults(ostream &os) ++void GameSession::printResults(std::ostream &os) + { + int i; + PRINTLN(os, "\nMission Debrief\n"); +@@ -702,7 +702,7 @@ + } + + +-void GameSession::printResult(Flight_Node &fn, ostream &os) ++void GameSession::printResult(Flight_Node &fn, std::ostream &os) + { + + Flight *flight = fn.flight; +diff -urN sabre-0.2.4b/src/game.h tmp/sabre-0.2.4b/src/game.h +--- sabre-0.2.4b/src/game.h 1998-12-31 03:21:24.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/game.h 2008-01-31 11:13:00.000000000 -0500 +@@ -73,8 +73,8 @@ + void update_flight(); + void draw_flight(Port_3D *pport = NULL); + void doPaletteEffect(); +- void printResults(ostream &); +- void printResult(Flight_Node &, ostream &); ++ void printResults(std::ostream &); ++ void printResult(Flight_Node &, std::ostream &); + void __cdecl show_message(int bot, char *str, ... ); + Flight_Controls *getFlightControls() + { +diff -urN sabre-0.2.4b/src/grndunit.C tmp/sabre-0.2.4b/src/grndunit.C +--- sabre-0.2.4b/src/grndunit.C 1998-12-13 10:32:43.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/grndunit.C 2008-01-31 11:58:53.000000000 -0500 +@@ -25,8 +25,8 @@ + * Author : Dan Hammer * + *************************************************/ + #include +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -65,7 +65,7 @@ + */ + } + +-void Ground_Unit_Specs::read(istream &is) ++void Ground_Unit_Specs::read(std::istream &is) + { + char c; + char specs_id[32]; +@@ -230,7 +230,7 @@ + return (&position); + } + +-void Ground_Unit::read(istream &is) ++void Ground_Unit::read(std::istream &is) + { + char c; + file_context = "Ground_Unit"; +@@ -247,7 +247,7 @@ + init(); + } + +-void Ground_Unit::write(ostream &os) ++void Ground_Unit::write(std::ostream &os) + { + os << "{\n"; + os << affiliation << view << '\n'; +@@ -255,13 +255,13 @@ + os << "}\n"; + } + +-istream &operator >>(istream &is, Ground_Unit &gu) ++std::istream &operator >>(std::istream &is, Ground_Unit &gu) + { + gu.read(is); + return(is); + } + +-ostream &operator <<(ostream &os, Ground_Unit &gu) ++std::ostream &operator <<(std::ostream &os, Ground_Unit &gu) + { + gu.write(os); + return(os); +@@ -306,7 +306,7 @@ + units[i]->add_draw_list(dl,port); + } + +-istream &operator >>(istream &is, Ground_Unit_Manager &gum) ++std::istream &operator >>(std::istream &is, Ground_Unit_Manager &gum) + { + gum.read(is); + return(is); +@@ -314,13 +314,13 @@ + + void Ground_Unit_Manager::read_file(char *path) + { +- ifstream is; ++ std::ifstream is; + file_context = "Ground_Unit_Manager"; + if (open_is(is,path)) + read(is); + } + +-void Ground_Unit_Manager::read(istream &is) ++void Ground_Unit_Manager::read(std::istream &is) + { + char c; + int gu_idx; +@@ -370,7 +370,7 @@ + } + } + +-ostream &operator >>(ostream &os, Ground_Unit_Manager &gum) ++std::ostream &operator >>(std::ostream &os, Ground_Unit_Manager &gum) + { + gum.write(os); + return(os); +@@ -378,12 +378,12 @@ + + void Ground_Unit_Manager::write_file(char *path) + { +- ofstream os; ++ std::ofstream os; + if (open_libos(os,path)) + write(os); + } + +-void Ground_Unit_Manager::write(ostream &) ++void Ground_Unit_Manager::write(std::ostream &) + { + + } +diff -urN sabre-0.2.4b/src/grndunit.h tmp/sabre-0.2.4b/src/grndunit.h +--- sabre-0.2.4b/src/grndunit.h 1998-12-31 04:30:45.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/grndunit.h 2008-01-31 11:10:06.000000000 -0500 +@@ -57,15 +57,15 @@ + + ~Ground_Unit_Specs(); + +- void read(istream &); +- void write(ostream &); ++ void read(std::istream &); ++ void write(std::ostream &); + +- friend istream &operator >>(istream &is, Ground_Unit_Specs &gsp) ++ friend std::istream &operator >>(std::istream &is, Ground_Unit_Specs &gsp) + { + gsp.read(is); + return (is); + } +- friend ostream &operator <<(ostream &os, Ground_Unit_Specs &gsp) ++ friend std::ostream &operator <<(std::ostream &os, Ground_Unit_Specs &gsp) + { + gsp.write(os); + return (os); +@@ -122,10 +122,10 @@ + + void updatePosition(); + void setPosition(); +- virtual void read(istream &); +- virtual void write(ostream &); +- friend istream &operator >>(istream &, Ground_Unit &); +- friend ostream &operator <<(ostream &, Ground_Unit &); ++ virtual void read(std::istream &); ++ virtual void write(std::ostream &); ++ friend std::istream &operator >>(std::istream &, Ground_Unit &); ++ friend std::ostream &operator <<(std::ostream &, Ground_Unit &); + }; + + class AAA_Unit : public Ground_Unit +@@ -160,8 +160,8 @@ + void calcLead(R_3DPoint &, R_3DPoint &); + void youHit(Target *tg); + void update(Unguided_Manager *, Target_List &); +- void read(istream &); +- void write(ostream &); ++ void read(std::istream &); ++ void write(std::ostream &); + }; + + class Ground_Unit_Manager +@@ -179,12 +179,12 @@ + void update(Unguided_Manager *, Target_List &); + void add_draw_list(DrawList &, Port_3D &); + +- void read(istream &); +- friend istream &operator >>(istream &, Ground_Unit_Manager &); ++ void read(std::istream &); ++ friend std::istream &operator >>(std::istream &, Ground_Unit_Manager &); + void read_file(char *); + +- void write(ostream &); +- friend ostream &operator <<(ostream &, Ground_Unit_Manager &); ++ void write(std::ostream &); ++ friend std::ostream &operator <<(std::ostream &, Ground_Unit_Manager &); + void write_file(char *); + void addTargetList(Target_List &); + Ground_Unit_Specs *getSpecs(char *); +diff -urN sabre-0.2.4b/src/group_3d.C tmp/sabre-0.2.4b/src/group_3d.C +--- sabre-0.2.4b/src/group_3d.C 1998-12-13 10:32:43.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/group_3d.C 2008-01-30 19:08:16.000000000 -0500 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include "simerr.h" + #include "grafix.h" + #include "vmath.h" +diff -urN sabre-0.2.4b/src/hud.C tmp/sabre-0.2.4b/src/hud.C +--- sabre-0.2.4b/src/hud.C 1998-12-31 20:35:11.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/hud.C 2008-01-31 12:09:35.000000000 -0500 +@@ -28,8 +28,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include "defs.h" + #include "pc_keys.h" + #include "grafix.h" +@@ -71,12 +71,12 @@ + + void Hud::read_file(char *path) + { +- ifstream is; ++ std::ifstream is; + if (open_is(is,path)) + is >> *this; + } + +-istream &operator >>(istream &is, Hud &hd) ++std::istream &operator >>(std::istream &is, Hud &hd) + { + char c = ' '; + +diff -urN sabre-0.2.4b/src/hud.h tmp/sabre-0.2.4b/src/hud.h +--- sabre-0.2.4b/src/hud.h 1998-12-31 20:13:37.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/hud.h 2008-01-31 11:12:21.000000000 -0500 +@@ -69,7 +69,7 @@ + void show_gunsight(Pilot &, Port_3D &); + void do_hud(Flight_Node &); + void do_hud_stuff(int, int, Flight &); +- friend istream & operator >>(istream &, Hud &); ++ friend std::istream & operator >>(std::istream &, Hud &); + void read_file(char *path); + + void do_hud_formation_geometry(const sTargetGeometry &, Port_3D &); +diff -urN sabre-0.2.4b/src/input.C tmp/sabre-0.2.4b/src/input.C +--- sabre-0.2.4b/src/input.C 1998-12-31 04:22:18.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/input.C 2008-01-30 19:22:41.000000000 -0500 +@@ -31,8 +31,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include "defs.h" + #include "vga_13.h" + #include "input.h" +diff -urN sabre-0.2.4b/src/instrmnt.C tmp/sabre-0.2.4b/src/instrmnt.C +--- sabre-0.2.4b/src/instrmnt.C 1998-12-13 10:32:44.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/instrmnt.C 2008-01-31 12:10:40.000000000 -0500 +@@ -31,8 +31,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include "defs.h" + #include "grafix.h" + #include "vga_13.h" +@@ -315,7 +315,7 @@ + indicators[indicators_idx++] = ind; + } + +-istream &operator >>(istream &is, Instrument_Panel &ip) ++std::istream &operator >>(std::istream &is, Instrument_Panel &ip) + { + char c; + int i; +@@ -393,7 +393,7 @@ + ip.add_indicator(&compass); + ip.add_indicator(&throttle_i); + +- ifstream is; ++ std::ifstream is; + if (open_is(is,path)) + is >> ip; + is.close(); +diff -urN sabre-0.2.4b/src/instrmnt.h tmp/sabre-0.2.4b/src/instrmnt.h +--- sabre-0.2.4b/src/instrmnt.h 1998-12-13 10:32:46.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/instrmnt.h 2008-01-31 11:12:05.000000000 -0500 +@@ -36,7 +36,7 @@ + int x,y; + virtual void underpaint(Flight &) = 0; + virtual void display(Flight &) = 0; +- virtual void read_from(istream &) = 0; ++ virtual void read_from(std::istream &) = 0; + virtual void init() = 0; + }; + +@@ -46,7 +46,7 @@ + int width,color; + float scale; + float range; +- void read_from(istream &is) ++ void read_from(std::istream &is) + { + is >> x >> y >> width >> range; + is >> scale >> color; +@@ -168,7 +168,7 @@ + ~Instrument_Panel() + { if (indicators) delete indicators; } + void add_indicator(Indicator *); +- friend istream &operator >>(istream &is, Instrument_Panel &); ++ friend std::istream &operator >>(std::istream &is, Instrument_Panel &); + void underpaint(Flight &); + void display(Flight &); + void init(); +diff -urN sabre-0.2.4b/src/main.C tmp/sabre-0.2.4b/src/main.C +--- sabre-0.2.4b/src/main.C 2008-01-31 12:27:37.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/main.C 2008-01-31 11:22:27.000000000 -0500 +@@ -39,8 +39,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #ifdef DEBIAN +@@ -363,7 +363,7 @@ + demo, + messageLoop); + theGame.doGame(); +- theGame.printResults(cout); ++ theGame.printResults(std::cout); + } + + void doSceneEdit() +diff -urN sabre-0.2.4b/src/moveable.C tmp/sabre-0.2.4b/src/moveable.C +--- sabre-0.2.4b/src/moveable.C 1998-12-13 10:32:44.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/moveable.C 2008-01-30 19:22:09.000000000 -0500 +@@ -22,8 +22,8 @@ + ***********************************************************/ + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +diff -urN sabre-0.2.4b/src/obj_3d.C tmp/sabre-0.2.4b/src/obj_3d.C +--- sabre-0.2.4b/src/obj_3d.C 2008-01-31 12:27:37.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/obj_3d.C 2008-01-31 11:35:40.000000000 -0500 +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "vmath.h" + #include "rendpoly.h" +@@ -316,7 +316,7 @@ + + void C_3DInfoManager::readFile(char *path) + { +- ifstream is; ++ std::ifstream is; + if (this->path) + delete this->path; + this->path = strdup(path); +@@ -326,7 +326,7 @@ + + void C_3DInfoManager::writeFile(char *path) + { +- ofstream os; ++ std::ofstream os; + MYCHECK(path != NULL); + if (this->path == NULL) + this->path = strdup(path); +@@ -339,7 +339,7 @@ + write(os); + } + +-void C_3DInfoManager::read(istream &is) ++void C_3DInfoManager::read(std::istream &is) + { + char c; + char buff[256]; +@@ -361,7 +361,7 @@ + READ_TOKI('}',is,c) + } + +-void C_3DInfoManager::write(ostream &os) ++void C_3DInfoManager::write(std::ostream &os) + { + os << "{\n" << ninfos << "\n"; + for (int i=0;igetInfo(obj_id); + if (ci == NULL) + { +- cout << "C_3DObject2: object id " << obj_id << "not found!\n"; ++ std::cout << "C_3DObject2: object id " << obj_id << "not found!\n"; + READ_TOKI('}',is,c); + return; + } +@@ -635,7 +635,7 @@ + delete [] groups; + } + +-void C_DrawList2::read(istream &is) ++void C_DrawList2::read(std::istream &is) + { + int i,j,idx,n; + char c; +@@ -667,7 +667,7 @@ + } + } + +-istream &operator >>(istream &is, C_DrawList2 &cd) ++std::istream &operator >>(std::istream &is, C_DrawList2 &cd) + { + cd.read(is); + return is; +diff -urN sabre-0.2.4b/src/obj_3d.h tmp/sabre-0.2.4b/src/obj_3d.h +--- sabre-0.2.4b/src/obj_3d.h 1998-12-13 10:32:47.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/obj_3d.h 2008-01-31 10:55:42.000000000 -0500 +@@ -144,19 +144,19 @@ + + void readFile(char *path); + void writeFile(char *path); +- void read(istream &); +- void write(ostream &); +- friend inline istream &operator >>(istream &, C_3DInfoManager &); +- friend inline ostream &operator <<(ostream &, C_3DInfoManager &); ++ void read(std::istream &); ++ void write(std::ostream &); ++ friend inline std::istream &operator >>(std::istream &, C_3DInfoManager &); ++ friend inline std::ostream &operator <<(std::ostream &, C_3DInfoManager &); + } ; + +-istream &operator >>(istream &is, C_3DInfoManager &cm) ++std::istream &operator >>(std::istream &is, C_3DInfoManager &cm) + { + cm.read(is); + return(is); + } + +-ostream &operator <<(ostream &os, C_3DInfoManager &cm) ++std::ostream &operator <<(std::ostream &os, C_3DInfoManager &cm) + { + cm.write(os); + return(os); +@@ -236,19 +236,19 @@ + return (C_3DOBJECT_T); + } + +- void read(istream &); +- void write(ostream &); +- friend inline istream &operator >>(istream & is, C_3DObject2 &ob); +- friend inline ostream &operator <<(ostream & os, C_3DObject2 &ob); ++ void read(std::istream &); ++ void write(std::ostream &); ++ friend inline std::istream &operator >>(std::istream & is, C_3DObject2 &ob); ++ friend inline std::ostream &operator <<(std::ostream & os, C_3DObject2 &ob); + }; + +-istream & operator >>(istream &is, C_3DObject2 &ob) ++std::istream & operator >>(std::istream &is, C_3DObject2 &ob) + { + ob.read(is); + return(is); + } + +-ostream & operator <<(ostream &os, C_3DObject2 &ob) ++std::ostream & operator <<(std::ostream &os, C_3DObject2 &ob) + { + ob.write(os); + return(os); +@@ -273,8 +273,8 @@ + } + + ~C_DrawList2(); +- friend istream & operator >>(istream &is, C_DrawList2 &cs); +- void read(istream &is); ++ friend std::istream & operator >>(std::istream &is, C_DrawList2 &cs); ++ void read(std::istream &is); + void translate(R_3DPoint &); + void add_draw_list(DrawList &, Port_3D &port); + void get_targets(Target_List &); +diff -urN sabre-0.2.4b/src/pilobj.C tmp/sabre-0.2.4b/src/pilobj.C +--- sabre-0.2.4b/src/pilobj.C 1999-01-04 19:42:25.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/pilobj.C 2008-01-31 12:23:05.000000000 -0500 +@@ -19,8 +19,8 @@ + */ + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -37,7 +37,7 @@ + #include "flight.h" + #include "pilobj.h" + +-istream &operator >>(istream &is, Pilot_Params &ps) ++std::istream &operator >>(std::istream &is, Pilot_Params &ps) + { + char c= ' '; + READ_TOK('(',is,c); +diff -urN sabre-0.2.4b/src/pilobj.h tmp/sabre-0.2.4b/src/pilobj.h +--- sabre-0.2.4b/src/pilobj.h 1999-02-12 17:33:41.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/pilobj.h 2008-01-31 11:07:39.000000000 -0500 +@@ -53,7 +53,7 @@ + negG = -3.0; + log = 0; + } +- friend istream &operator>>(istream &, Pilot_Params &); ++ friend std::istream &operator>>(std::istream &, Pilot_Params &); + }; + + class Pilot; +@@ -78,4 +78,4 @@ + int set_message(char *mss, int priority, Pilot *fr); + }; + +-#endif +\ No newline at end of file ++#endif +diff -urN sabre-0.2.4b/src/pilot.C tmp/sabre-0.2.4b/src/pilot.C +--- sabre-0.2.4b/src/pilot.C 1999-11-21 19:38:53.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/pilot.C 2008-01-30 19:12:01.000000000 -0500 +@@ -29,8 +29,8 @@ + *************************************************/ + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +diff -urN sabre-0.2.4b/src/port_3d.C tmp/sabre-0.2.4b/src/port_3d.C +--- sabre-0.2.4b/src/port_3d.C 1999-02-25 09:26:24.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/port_3d.C 2008-01-31 11:29:58.000000000 -0500 +@@ -26,8 +26,8 @@ + *************************************************/ + #include + #include +-#include +-#include ++#include ++#include + #include "vmath.h" + #include "rtkey.h" + #include "vga_13.h" +@@ -52,7 +52,7 @@ + REAL_TYPE Port_3D::fovy = 280; + extern REAL_TYPE world_scale; + +-void Port_3D::read(istream &is) ++void Port_3D::read(std::istream &is) + { + /* used to be fovx */ + float ignore; +@@ -68,20 +68,20 @@ + cos_roll = cos(roll); + } + +-istream &operator >>(istream &is, Port_3D &port) ++std::istream &operator >>(std::istream &is, Port_3D &port) + { + port.read(is); + return is; + } + +-void Port_3D::write(ostream &os) ++void Port_3D::write(std::ostream &os) + { + os << slook_from << "\n"; + os << look_from << "\n"; + os << look_at << "\n"; + } + +-ostream &operator <<(ostream &os, Port_3D &port) ++std::ostream &operator <<(std::ostream &os, Port_3D &port) + { + port.write(os); + return os; +diff -urN sabre-0.2.4b/src/port_3d.h tmp/sabre-0.2.4b/src/port_3d.h +--- sabre-0.2.4b/src/port_3d.h 1999-02-12 17:33:40.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/port_3d.h 2008-01-31 10:45:50.000000000 -0500 +@@ -134,10 +134,10 @@ + inline void set_look_from(const R_3DPoint &); + inline const Vector &calc_view_normal(); + friend class C_Shape; +- friend istream &operator >>(istream &is, Port_3D &port); +- void read(istream &is); +- friend ostream &operator <<(ostream &os, Port_3D &port); +- void write(ostream &os); ++ friend std::istream &operator >>(std::istream &is, Port_3D &port); ++ void read(std::istream &is); ++ friend std::ostream &operator <<(std::ostream &os, Port_3D &port); ++ void write(std::ostream &os); + + + int IsVisible(int x, int y) +diff -urN sabre-0.2.4b/src/portkey.C tmp/sabre-0.2.4b/src/portkey.C +--- sabre-0.2.4b/src/portkey.C 1999-02-12 17:33:41.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/portkey.C 2008-01-30 19:17:32.000000000 -0500 +@@ -23,8 +23,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include "defs.h" + #include "pc_keys.h" +diff -urN sabre-0.2.4b/src/ppm.C tmp/sabre-0.2.4b/src/ppm.C +--- sabre-0.2.4b/src/ppm.C 1998-12-13 10:32:44.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/ppm.C 2008-01-31 12:14:26.000000000 -0500 +@@ -28,8 +28,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include "vga_13.h" + + static int fcount = 0; +@@ -46,11 +46,11 @@ + if (!buffer_ptr) + return; + sprintf(buff,"sbr%04d.ppm",fcount++); +- ofstream os(buff); ++ std::ofstream os(buff); + if (os) + { + os << "P3\n"; +- os << "# CREATOR: Sabre Fighter Plane Simulator Version " << VERSION << " " << __DATE__ << endl; ++ os << "# CREATOR: Sabre Fighter Plane Simulator Version " << VERSION << " " << __DATE__ << std::endl; + os << SCREEN_WIDTH << " " << SCREEN_HEIGHT << "\n"; + os << 63 << '\n'; + pptr = buffer_ptr; +diff -urN sabre-0.2.4b/src/rendpoly.C tmp/sabre-0.2.4b/src/rendpoly.C +--- sabre-0.2.4b/src/rendpoly.C 2008-01-31 12:27:37.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/rendpoly.C 2008-01-30 19:18:09.000000000 -0500 +@@ -18,8 +18,8 @@ + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + #include +-#include +-#include ++#include ++#include + #include + #include + #include +diff -urN sabre-0.2.4b/src/rndrpoly.C tmp/sabre-0.2.4b/src/rndrpoly.C +--- sabre-0.2.4b/src/rndrpoly.C 1999-11-21 09:27:51.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/rndrpoly.C 2008-01-30 19:15:39.000000000 -0500 +@@ -20,8 +20,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +diff -urN sabre-0.2.4b/src/rndzpoly.C tmp/sabre-0.2.4b/src/rndzpoly.C +--- sabre-0.2.4b/src/rndzpoly.C 1998-12-13 10:32:44.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/rndzpoly.C 2008-01-30 19:11:41.000000000 -0500 +@@ -28,8 +28,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +diff -urN sabre-0.2.4b/src/rotate.C tmp/sabre-0.2.4b/src/rotate.C +--- sabre-0.2.4b/src/rotate.C 1998-12-13 10:32:44.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/rotate.C 2008-01-30 19:21:28.000000000 -0500 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include "defs.h" + #include "grafix.h" + #include "vga_13.h" +diff -urN sabre-0.2.4b/src/scnedit.C tmp/sabre-0.2.4b/src/scnedit.C +--- sabre-0.2.4b/src/scnedit.C 1999-02-12 17:33:41.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/scnedit.C 2008-01-31 11:25:08.000000000 -0500 +@@ -33,8 +33,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include "sim.h" +@@ -68,7 +68,7 @@ + + void SceneEdit::readWorldFile() + { +-ifstream is; ++std::ifstream is; + char c; + float pixl_ratio; + char buff[100]; +diff -urN sabre-0.2.4b/src/simfile.C tmp/sabre-0.2.4b/src/simfile.C +--- sabre-0.2.4b/src/simfile.C 1999-04-19 16:59:18.000000000 -0400 ++++ tmp/sabre-0.2.4b/src/simfile.C 2008-01-31 12:02:58.000000000 -0500 +@@ -27,8 +27,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include "vmath.h" + #include "defs.h" +@@ -63,7 +63,7 @@ + + void read_texture_file(char *path) + { +- ifstream is; ++ std::ifstream is; + #ifdef SABREWIN + if (map_man) + delete map_man; +@@ -84,7 +84,7 @@ + void read_palette_file(char *path) + { + color_spec cs; +- ifstream is; ++ std::ifstream is; + current_path = path; + if (open_is(is,path)) + { +@@ -96,7 +96,7 @@ + + void read_sound_file(char *path) + { +- ifstream is; ++ std::ifstream is; + int nsounds; + int gotline; + char buff[BUFSIZ]; +@@ -128,7 +128,7 @@ + } + } + +-int get_line(istream &is, char *buff, int size) ++int get_line(std::istream &is, char *buff, int size) + { + int l; + while (is) +@@ -154,7 +154,7 @@ + return 0; + } + +-int open_is(ifstream &is, char *path) ++int open_is(std::ifstream &is, char *path) + { + char *lpath = build_libpath(path); + current_path = lpath; +@@ -167,7 +167,7 @@ + } + + +-int open_os(ofstream &os, char *path) ++int open_os(std::ofstream &os, char *path) + { + os.open(path); + if (!os.good()) +@@ -175,7 +175,7 @@ + return (os.good()); + } + +-int open_libos(ofstream &os, char *path) ++int open_libos(std::ofstream &os, char *path) + { + char *lpath = build_libpath(path); + os.open(lpath); +@@ -185,7 +185,7 @@ + return (os.good()); + } + +-int read_int(istream &is) ++int read_int(std::istream &is) + { + char c; + int result = 0; +diff -urN sabre-0.2.4b/src/simfile.h tmp/sabre-0.2.4b/src/simfile.h +--- sabre-0.2.4b/src/simfile.h 1998-12-31 03:58:34.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/simfile.h 2008-01-31 10:17:17.000000000 -0500 +@@ -21,18 +21,18 @@ + #define __simfile_h + #include "sim.h" + #include "simerr.h" +-#include "iostream.h" +-#include "fstream.h" ++#include ++#include + + void read_palette_file(char *); + void read_texture_file(char *); + void read_sound_file(char *); +-int get_line(istream &, char *, int); +-int open_is(ifstream &, char *); +-int open_os(ofstream &, char *); +-int open_libos(ofstream &, char *); ++int get_line(std::istream &, char *, int); ++int open_is(std::ifstream &, char *); ++int open_os(std::ofstream &, char *); ++int open_libos(std::ofstream &, char *); + char *build_libpath(char *); +-int read_int(istream &); ++int read_int(std::istream &); + + extern char *current_path; + extern char *file_context; +diff -urN sabre-0.2.4b/src/simfilex.C tmp/sabre-0.2.4b/src/simfilex.C +--- sabre-0.2.4b/src/simfilex.C 1999-04-19 17:01:02.000000000 -0400 ++++ tmp/sabre-0.2.4b/src/simfilex.C 2008-01-31 12:21:05.000000000 -0500 +@@ -24,7 +24,7 @@ + #include "simfile.h" + #include "simfilex.h" + +-int simfileX::readint(istream &is, char tok0, char tok1) ++int simfileX::readint(std::istream &is, char tok0, char tok1) + { + int result; + char c; +@@ -41,7 +41,7 @@ + return (result); + } + +-int simfileX::readstr(istream &is, char *buff, int maxlen, char tok0, char tok1) ++int simfileX::readstr(std::istream &is, char *buff, int maxlen, char tok0, char tok1) + { + char c0,c1=0; + int l; +@@ -89,7 +89,7 @@ + return (0); + } + +-int simfileX::readinput(istream &is, char *buff, int maxlen, int &i, ++int simfileX::readinput(std::istream &is, char *buff, int maxlen, int &i, + char tok0, + char tok1) + { +@@ -103,7 +103,7 @@ + return (result); + } + +-int simfileX::readdictinput(istream &is, char *buff, int maxlen, int &val, ++int simfileX::readdictinput(std::istream &is, char *buff, int maxlen, int &val, + dict *d, int d_cnt, + char tok0, + char tok1) +diff -urN sabre-0.2.4b/src/simfilex.h tmp/sabre-0.2.4b/src/simfilex.h +--- sabre-0.2.4b/src/simfilex.h 1998-12-13 10:32:47.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/simfilex.h 2008-01-31 11:47:46.000000000 -0500 +@@ -31,13 +31,13 @@ + char *str; + int val; + } dict; +-static int readint(istream &is, char tok0 = 0, char tok1 = 0); +-static int readstr(istream &is, char *bff, int maxlen, char tok0 = 0, ++static int readint(std::istream &is, char tok0 = 0, char tok1 = 0); ++static int readstr(std::istream &is, char *bff, int maxlen, char tok0 = 0, + char tok1 = 0); +-static int readinput(istream &is, char *buff, int maxlen, int &i, ++static int readinput(std::istream &is, char *buff, int maxlen, int &i, + char tok0 = 0, + char tok1 = 0); +-static int readdictinput(istream &is, char *buff, int maxlen, int &i, ++static int readdictinput(std::istream &is, char *buff, int maxlen, int &i, + dict *d, int d_cnt, + char tok0 = 0, + char tok1 = 0); +diff -urN sabre-0.2.4b/src/siminput.C tmp/sabre-0.2.4b/src/siminput.C +--- sabre-0.2.4b/src/siminput.C 1999-11-24 18:27:36.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/siminput.C 2008-01-30 19:16:17.000000000 -0500 +@@ -27,8 +27,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +diff -urN sabre-0.2.4b/src/simsnd.C tmp/sabre-0.2.4b/src/simsnd.C +--- sabre-0.2.4b/src/simsnd.C 1999-04-19 15:23:39.000000000 -0400 ++++ tmp/sabre-0.2.4b/src/simsnd.C 2008-01-30 19:20:52.000000000 -0500 +@@ -28,7 +28,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff -urN sabre-0.2.4b/src/target.C tmp/sabre-0.2.4b/src/target.C +--- sabre-0.2.4b/src/target.C 1998-12-13 10:32:45.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/target.C 2008-01-30 19:15:21.000000000 -0500 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "vmath.h" + #include "target.h" +diff -urN sabre-0.2.4b/src/terrain.C tmp/sabre-0.2.4b/src/terrain.C +--- sabre-0.2.4b/src/terrain.C 1999-02-12 17:33:41.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/terrain.C 2008-01-30 19:16:57.000000000 -0500 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "vmath.h" + #include "rendpoly.h" +diff -urN sabre-0.2.4b/src/txtrmap.C tmp/sabre-0.2.4b/src/txtrmap.C +--- sabre-0.2.4b/src/txtrmap.C 2008-01-31 12:27:37.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/txtrmap.C 2008-01-31 11:40:40.000000000 -0500 +@@ -33,8 +33,8 @@ + #include + #endif + #include +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -85,7 +85,7 @@ + } + } + +-void TextrMap::read(istream &is) ++void TextrMap::read(std::istream &is) + { + char *cptr; + int ii; +@@ -141,20 +141,20 @@ + READ_TOK('}',is,c); + } + +-void TextrMap::write(ostream &os) ++void TextrMap::write(std::ostream &os) + { + os << "{\n" << id << "*\n" << trans_colr << "\n"; + compress(); + os << "}\n"; + } + +-istream & operator >>(istream &is, TextrMap &tm) ++std::istream & operator >>(std::istream &is, TextrMap &tm) + { + tm.read(is); + return (is); + } + +-ostream & operator <<(ostream &os, TextrMap &tm) ++std::ostream & operator <<(std::ostream &os, TextrMap &tm) + { + tm.write(os); + return (os); +@@ -167,7 +167,7 @@ + unsigned long srcsize; + char *tgt; + char *fname; +-ofstream os; ++std::ofstream os; + + if (bytes != NULL) + { +@@ -812,7 +812,7 @@ + return 0; + } + +-void TextrMap_Manager::read(istream &is) ++void TextrMap_Manager::read(std::istream &is) + { + int n; + +@@ -844,7 +844,7 @@ + } + } + +-istream &operator >>(istream &is, TextrMap_Manager &tm) ++std::istream &operator >>(std::istream &is, TextrMap_Manager &tm) + { + tm.read(is); + return (is); +@@ -852,12 +852,12 @@ + + void TextrMap_Manager::read_file(char *path) + { +- ifstream is; ++ std::ifstream is; + if (open_is(is,path)) + is >> *this; + } + +-void TextrMap_Manager::write(ostream &os) ++void TextrMap_Manager::write(std::ostream &os) + { + os << nxt << '\n'; + for (int i=0;i>(istream &is, TextrMap &tm); +- friend ostream &operator >>(ostream &os, TextrMap &tm); +- void read(istream &is); +- void write(ostream &os); ++ friend std::istream &operator >>(std::istream &is, TextrMap &tm); ++ friend std::ostream &operator >>(std::ostream &os, TextrMap &tm); ++ void read(std::istream &is); ++ void write(std::ostream &os); + void compress(); + void read_compressed(int = 0); + unsigned char *getBytes(int = 0); +@@ -220,13 +220,13 @@ + + int add_map(TextrMap &); + +- void read(istream &is); ++ void read(std::istream &is); + void read_file(char *); +- friend istream &operator >>(istream &is, TextrMap_Manager &); ++ friend std::istream &operator >>(std::istream &is, TextrMap_Manager &); + +- void write(ostream &os); ++ void write(std::ostream &os); + void write_file(char *); +- friend ostream &operator <<(ostream &os, TextrMap_Manager &); ++ friend std::ostream &operator <<(std::ostream &os, TextrMap_Manager &); + + + TextrMap &get_map(int n) +diff -urN sabre-0.2.4b/src/unguided.C tmp/sabre-0.2.4b/src/unguided.C +--- sabre-0.2.4b/src/unguided.C 1998-12-31 03:21:23.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/unguided.C 2008-01-30 19:13:19.000000000 -0500 +@@ -27,8 +27,8 @@ + *************************************************/ + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include "defs.h" +diff -urN sabre-0.2.4b/src/viewobj.C tmp/sabre-0.2.4b/src/viewobj.C +--- sabre-0.2.4b/src/viewobj.C 1998-12-13 10:32:45.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/viewobj.C 2008-01-30 19:14:09.000000000 -0500 +@@ -26,8 +26,8 @@ + *************************************************/ + #include + #include +-#include +-#include ++#include ++#include + #include + #include "defs.h" + #include "vga_13.h" +diff -urN sabre-0.2.4b/src/vmath.C tmp/sabre-0.2.4b/src/vmath.C +--- sabre-0.2.4b/src/vmath.C 1998-12-13 10:32:45.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/vmath.C 2008-01-31 11:26:16.000000000 -0500 +@@ -21,7 +21,7 @@ + * vector.cpp * + ****************************************************************/ + #include +-#include ++#include + #include + #include "simfile.h" + #include "vmath.h" +@@ -33,7 +33,7 @@ + const REAL_TYPE zfact = REAL_TYPE(1.0); + #endif + +-istream &operator >> (istream &is, Vector &v) ++std::istream &operator >> (std::istream &is, Vector &v) + { + char c; + READ_TOKI('<',is,c); +@@ -42,7 +42,7 @@ + return is; + } + +-istream &operator >> (istream &is,R_3DPoint &r3D) ++std::istream &operator >> (std::istream &is,R_3DPoint &r3D) + { + char c; + READ_TOKI('<',is,c) +@@ -56,7 +56,7 @@ + + + +-istream &operator >> (istream &is, S_3DPoint &s3D) ++std::istream &operator >> (std::istream &is, S_3DPoint &s3D) + { + char c; + READ_TOKI('<',is,c) +@@ -65,7 +65,7 @@ + return is; + } + +-istream &operator >> (istream &is, TxtPoint &tp) ++std::istream &operator >> (std::istream &is, TxtPoint &tp) + { + char c; + READ_TOKI('<',is,c) +diff -urN sabre-0.2.4b/src/vmath.h tmp/sabre-0.2.4b/src/vmath.h +--- sabre-0.2.4b/src/vmath.h 1999-02-12 17:33:41.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/vmath.h 2008-01-31 10:42:47.000000000 -0500 +@@ -21,7 +21,7 @@ + #define __vmath_h + + #include +-#include ++#include + + + #ifndef REAL_TYPE +@@ -118,10 +118,10 @@ + X -= v.X; Y -= v.Y; Z -= v.Z; + } + +- friend ostream &operator << (ostream &os,Vector &v) ++ friend std::ostream &operator << (std::ostream &os,Vector &v) + { return os << '<' << v.X << ' ' << v.Y << ' ' << v.Z << '>' ; } + +- friend istream &operator >> (istream &is,Vector &v); ++ friend std::istream &operator >> (std::istream &is,Vector &v); + + void SetZero( void ) + { +@@ -338,10 +338,10 @@ + REAL_TYPE _z() + { return z; } + +- friend ostream &operator << (ostream &os,R_3DPoint &r3D) ++ friend std::ostream &operator << (std::ostream &os,R_3DPoint &r3D) + { return os << '<' << r3D.x << ' ' << r3D.y << ' ' << r3D.z << '>' ; } + +- friend istream &operator >> (istream &is,R_3DPoint &r3D); ++ friend std::istream &operator >> (std::istream &is,R_3DPoint &r3D); + + friend R_3DPoint operator +(const R_3DPoint &r1, const R_3DPoint &r2) + { return R_3DPoint(r1.x+r2.x,r1.y+r2.y,r1.z+r2.z); } +@@ -509,10 +509,10 @@ + TXTP_TYPE _i() + { return i; } + +- friend ostream &operator << (ostream &os,TxtPoint &r3D) ++ friend std::ostream &operator << (std::ostream &os,TxtPoint &r3D) + { return os << '<' << r3D.u << ' ' << r3D.v << ' ' << r3D.i << '>' ; } + +- friend istream &operator >> (istream &is,TxtPoint &r3D); ++ friend std::istream &operator >> (std::istream &is,TxtPoint &r3D); + + friend TxtPoint operator +(const TxtPoint &r1, const TxtPoint &r2) + { return TxtPoint(r1.u+r2.u,r1.v+r2.v,r1.i+r2.i); } +@@ -753,9 +753,9 @@ + REAL_TYPE _rho() + { return rho; } + +- friend istream &operator >>( istream &is, S_3DPoint &s3D); ++ friend std::istream &operator >>( std::istream &is, S_3DPoint &s3D); + +- friend ostream &operator << ( ostream &os, S_3DPoint &s3D) ++ friend std::ostream &operator << ( std::ostream &os, S_3DPoint &s3D) + { return os << "<" << s3D.theta << " " << s3D.phi << " " << s3D.rho << ">"; } + + friend S_3DPoint operator +(const S_3DPoint &s1, const S_3DPoint &s2) +diff -urN sabre-0.2.4b/src/waypoint.C tmp/sabre-0.2.4b/src/waypoint.C +--- sabre-0.2.4b/src/waypoint.C 1998-12-13 10:32:45.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/waypoint.C 2008-01-31 12:19:18.000000000 -0500 +@@ -26,8 +26,8 @@ + *************************************************/ + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -43,7 +43,7 @@ + WayPoint ** WayPoint::gwaypoints = NULL; + int WayPoint::n_waypoints = 0; + +-void WayPoint::read(istream &is) ++void WayPoint::read(std::istream &is) + { + char c = ' '; + READ_TOK('(',is,c) +@@ -54,14 +54,14 @@ + average_speed = kts2fps(average_speed); + } + +-void WayPoint::write(ostream &os) ++void WayPoint::write(std::ostream &os) + { + os << "(\n" << mode << " " << mode_x << " " << mode_y << "\n"; + os << location << " " << fps2kts(average_speed) << "\n"; + os << ")\n"; + } + +-void WayPoint::readWayPoints(istream &is) ++void WayPoint::readWayPoints(std::istream &is) + { + int i; + int n; +@@ -78,7 +78,7 @@ + } + } + +-WayPoint *WayPoint::readWayPointChain(istream &is, int &n) ++WayPoint *WayPoint::readWayPointChain(std::istream &is, int &n) + { + char c; + WayPoint *result = NULL; +@@ -102,19 +102,19 @@ + + void WayPoint::readWayPointFile(char *path) + { +- ifstream is; ++ std::ifstream is; + if (open_is(is,path)) + readWayPoints(is); + } + +-void WayPoint::writeWayPoints(ostream &) ++void WayPoint::writeWayPoints(std::ostream &) + { + + } + + void WayPoint::writeWayPointFile(char *path) + { +- ofstream os; ++ std::ofstream os; + if (open_libos(os,path)) + writeWayPoints(os); + } +diff -urN sabre-0.2.4b/src/waypoint.h tmp/sabre-0.2.4b/src/waypoint.h +--- sabre-0.2.4b/src/waypoint.h 1998-12-31 03:21:24.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/waypoint.h 2008-01-31 12:17:38.000000000 -0500 +@@ -75,24 +75,24 @@ + return *this; + } + +- void read(istream &); +- friend istream &operator >> (istream & is, WayPoint &wp) ++ void read(std::istream &); ++ friend std::istream &operator >> (std::istream & is, WayPoint &wp) + { + wp.read(is); + return(is); + } +- void write(ostream &); +- friend ostream &operator << (ostream &os, WayPoint &wp) ++ void write(std::ostream &); ++ friend std::ostream &operator << (std::ostream &os, WayPoint &wp) + { + wp.write(os); + return(os); + } + +- static void readWayPoints(istream &is); +- static void writeWayPoints(ostream &os); ++ static void readWayPoints(std::istream &is); ++ static void writeWayPoints(std::ostream &os); + static void readWayPointFile(char *); + static void writeWayPointFile(char *); +- static WayPoint *readWayPointChain(istream &is, int &); ++ static WayPoint *readWayPointChain(std::istream &is, int &); + static WayPoint **gwaypoints; + static int n_waypoints; + static WayPoint *getWayPoint(char *); +diff -urN sabre-0.2.4b/src/weapons.C tmp/sabre-0.2.4b/src/weapons.C +--- sabre-0.2.4b/src/weapons.C 1998-12-31 03:21:23.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/weapons.C 2008-01-31 11:49:37.000000000 -0500 +@@ -27,8 +27,8 @@ + *************************************************/ + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -51,7 +51,7 @@ + /*************************************************** + * Weapon_Specs methods * + ***************************************************/ +-void Weapon_Specs::read(istream &is) ++void Weapon_Specs::read(std::istream &is) + { + is >> wep_name; + is >> flt_specs; +@@ -60,7 +60,7 @@ + is >> damage_factor; + } + +-void Weapon_Specs::write(ostream &os) ++void Weapon_Specs::write(std::ostream &os) + { + os << wep_name << '\n'; + os << flt_specs << '\n'; +@@ -70,7 +70,7 @@ + /*************************************************** + * Gun_Specs methods * + ***************************************************/ +-void Gun_Specs::read(istream &is) ++void Gun_Specs::read(std::istream &is) + { + int clr,dummy; + char c = ' '; +@@ -87,7 +87,7 @@ + rounds_per_second = 1.0 / (rounds_per_second / 60); + } + +-void Gun_Specs::write(ostream &os) ++void Gun_Specs::write(std::ostream &os) + { + color_spec cs(tracer_color); + os << '(' << '\n'; +@@ -100,7 +100,7 @@ + /*************************************************** + * Cannon_Specs methods * + ***************************************************/ +-void Cannon_Specs::read(istream &is) ++void Cannon_Specs::read(std::istream &is) + { + char c; + int clr; +@@ -128,7 +128,7 @@ + rounds_per_second = 1.0 / (rounds_per_second / 60); + } + +-void Cannon_Specs::write(ostream &os) ++void Cannon_Specs::write(std::ostream &os) + { + color_spec cs(tracer_color); + os << '(' << '\n'; +@@ -162,7 +162,7 @@ + zm->read_file(path); + } + +-void Bomb_Specs::read(istream &is) ++void Bomb_Specs::read(std::istream &is) + { + char c; + READ_TOKI('(',is,c); +@@ -179,7 +179,7 @@ + blast_map_size *= world_scale; + } + +-void Bomb_Specs::write(ostream &os) ++void Bomb_Specs::write(std::ostream &os) + { + os << '(' << '\n'; + Weapon_Specs::write(os); +@@ -195,7 +195,7 @@ + /*************************************************** + * Rocket_Specs methods * + ***************************************************/ +-void Rocket_Specs::read(istream &is) ++void Rocket_Specs::read(std::istream &is) + { + char c; + READ_TOKI('(',is,c); +@@ -220,7 +220,7 @@ + flume_delta_size *= world_scale; + } + +-void Rocket_Specs::write(ostream &os) ++void Rocket_Specs::write(std::ostream &os) + { + os << '(' << '\n'; + Weapon_Specs::write(os); +@@ -273,7 +273,7 @@ + wep_i = NULL; + } + +-void Weapon::read(istream &is) ++void Weapon::read(std::istream &is) + { + char c; + READ_TOKI('{',is,c); +@@ -297,7 +297,7 @@ + READ_TOK('}',is,c); + } + +-void Weapon::write(ostream &) ++void Weapon::write(std::ostream &) + { + + } +@@ -401,7 +401,7 @@ + /***************************************************** + * Guns methods * + *****************************************************/ +-istream & operator >>(istream &is, Guns &gp) ++std::istream & operator >>(std::istream &is, Guns &gp) + { + ((Weapon &)gp).read(is); + return is; +@@ -445,7 +445,7 @@ + /******************************************************** + * Bombs methods * + ********************************************************/ +-istream & operator >>(istream &is, Bombs &b) ++std::istream & operator >>(std::istream &is, Bombs &b) + { + ((Weapon &)b).read(is); + return is; +@@ -480,7 +480,7 @@ + /******************************************************** + * Rockets methods * + ********************************************************/ +-istream & operator >>(istream &is, Rockets &r) ++std::istream & operator >>(std::istream &is, Rockets &r) + { + ((Weapon &)r).read(is); + return is; +@@ -516,7 +516,7 @@ + /******************************************************** + * Missiles methods * + ********************************************************/ +-istream & operator >>(istream &is, Missiles &r) ++std::istream & operator >>(std::istream &is, Missiles &r) + { + ((Weapon &)r).read(is); + return is; +@@ -551,7 +551,7 @@ + /******************************************************** + * FuelTanks methods * + ********************************************************/ +-istream & operator >>(istream &is, FuelTanks &r) ++std::istream & operator >>(std::istream &is, FuelTanks &r) + { + ((Weapon &)r).read(is); + return is; +@@ -809,7 +809,7 @@ + + void Weapons_Manager::read_file(char *path) + { +- ifstream infile; ++ std::ifstream infile; + if (open_is(infile,path)) + infile >> *this; + infile.close(); +@@ -826,7 +826,7 @@ + { "cannon_type",cannon_t } + }; + +-void Weapons_Manager::read(istream &is) ++void Weapons_Manager::read(std::istream &is) + { + int i,j,ndx,ndx2; + int wep_type,sz; +@@ -993,7 +993,7 @@ + READ_TOKI('}',is,c); + } + +-istream & operator >>(istream &is, Weapons_Manager &wp) ++std::istream & operator >>(std::istream &is, Weapons_Manager &wp) + { + wp.read(is); + return is; +diff -urN sabre-0.2.4b/src/weapons.h tmp/sabre-0.2.4b/src/weapons.h +--- sabre-0.2.4b/src/weapons.h 1998-12-31 03:21:24.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/weapons.h 2008-01-31 11:06:37.000000000 -0500 +@@ -45,8 +45,8 @@ + float max_range; + int damage_factor; + int wep_type; +- void read(istream &is); +- void write(ostream &os); ++ void read(std::istream &is); ++ void write(std::ostream &os); + + Weapon_Specs() + { +@@ -55,12 +55,12 @@ + wep_type = -1; + } + +- friend istream &operator >>(istream &is, Weapon_Specs &ws) ++ friend std::istream &operator >>(std::istream &is, Weapon_Specs &ws) + { + ws.read(is); + return(is); + } +- friend ostream &operator <<(ostream &os, Weapon_Specs &ws) ++ friend std::ostream &operator <<(std::ostream &os, Weapon_Specs &ws) + { + ws.write(os); + return(os); +@@ -116,14 +116,14 @@ + wep_type = gun_t; + rounds_per_second = 0.0; + } +- void read(istream &is); +- void write(ostream &os); +- friend istream &operator >>(istream &is, Gun_Specs &ws) ++ void read(std::istream &is); ++ void write(std::ostream &os); ++ friend std::istream &operator >>(std::istream &is, Gun_Specs &ws) + { + ws.read(is); + return(is); + } +- friend ostream &operator <<(ostream &os, Gun_Specs &ws) ++ friend std::ostream &operator <<(std::ostream &os, Gun_Specs &ws) + { + ws.write(os); + return(os); +@@ -175,14 +175,14 @@ + return (smoke_map); + } + +- void read(istream &is); +- void write(ostream &os); +- friend istream &operator >>(istream &is, Cannon_Specs &cs) ++ void read(std::istream &is); ++ void write(std::ostream &os); ++ friend std::istream &operator >>(std::istream &is, Cannon_Specs &cs) + { + cs.read(is); + return(is); + } +- friend ostream &operator <<(ostream &os, Cannon_Specs &cs) ++ friend std::ostream &operator <<(std::ostream &os, Cannon_Specs &cs) + { + cs.write(os); + return(os); +@@ -212,14 +212,14 @@ + + virtual ~Bomb_Specs(); + void createZManager(char *path); +- void read(istream &is); +- void write(ostream &os); +- friend istream &operator >>(istream &is, Bomb_Specs &ws) ++ void read(std::istream &is); ++ void write(std::ostream &os); ++ friend std::istream &operator >>(std::istream &is, Bomb_Specs &ws) + { + ws.read(is); + return(is); + } +- friend ostream &operator <<(ostream &os, Bomb_Specs &ws) ++ friend std::ostream &operator <<(std::ostream &os, Bomb_Specs &ws) + { + ws.write(os); + return(os); +@@ -272,14 +272,14 @@ + strcpy(flume_flame_map,"fire"); + strcpy(flume_smoke_map,"smoke"); + } +- void read(istream &is); +- void write(ostream &os); +- friend istream &operator >>(istream &is, Rocket_Specs &rs) ++ void read(std::istream &is); ++ void write(std::ostream &os); ++ friend std::istream &operator >>(std::istream &is, Rocket_Specs &rs) + { + rs.read(is); + return(is); + } +- friend ostream &operator <<(ostream &os, Rocket_Specs &rs) ++ friend std::ostream &operator <<(std::ostream &os, Rocket_Specs &rs) + { + rs.write(os); + return(os); +@@ -368,14 +368,14 @@ + { + return (n); + } +- void read(istream &is); +- void write(ostream &os); +- friend istream &operator >>(istream &is, Weapon &wp) ++ void read(std::istream &is); ++ void write(std::ostream &os); ++ friend std::istream &operator >>(std::istream &is, Weapon &wp) + { + wp.read(is); + return(is); + } +- friend ostream &operator <<(ostream &os, Weapon &wp) ++ friend std::ostream &operator <<(std::ostream &os, Weapon &wp) + { + wp.write(os); + return(os); +@@ -393,7 +393,7 @@ + gun_specs = spcs; + } + +- friend istream &operator >>(istream &is, Guns &gp); ++ friend std::istream &operator >>(std::istream &is, Guns &gp); + int update(Flight &host_flight, Unguided_Manager *um, + Weapon_Instance *, Target *); + int getMaxRounds(); +@@ -408,7 +408,7 @@ + { + bomb_specs = spcs; + } +- friend istream &operator >>(istream &is, Bombs &b); ++ friend std::istream &operator >>(std::istream &is, Bombs &b); + int update(Flight &host_flight, Unguided_Manager *um, + Weapon_Instance *, Target *); + }; +@@ -422,7 +422,7 @@ + { + rocket_specs = spcs; + } +- friend istream &operator >>(istream &is, Rockets &r); ++ friend std::istream &operator >>(std::istream &is, Rockets &r); + int update(Flight &host_flight, Unguided_Manager *um, + Weapon_Instance *, Target *); + }; +@@ -436,7 +436,7 @@ + { + missile_specs = spcs; + } +- friend istream &operator >>(istream &is, Missiles &m); ++ friend std::istream &operator >>(std::istream &is, Missiles &m); + int update(Flight &host_flight, Unguided_Manager *um, + Weapon_Instance *, Target *); + }; +@@ -450,7 +450,7 @@ + { + fueltank_specs = spcs; + } +- friend istream &operator >>(istream &is, FuelTanks &m); ++ friend std::istream &operator >>(std::istream &is, FuelTanks &m); + int update(Flight &host_flight, Unguided_Manager *um, + Weapon_Instance *, Target *); + }; +@@ -635,8 +635,8 @@ + Weapons_Manager(); + ~Weapons_Manager(); + void read_file(char *); +- friend istream & operator >>(istream &is, Weapons_Manager &wp); +- void read(istream &); ++ friend std::istream & operator >>(std::istream &is, Weapons_Manager &wp); ++ void read(std::istream &); + Weapon_List *get_list(int n); + Weapon_List *get_list(char *); + Weapon_Instance *build_instance_list(int n, int *cnt, char *id = NULL); +diff -urN sabre-0.2.4b/src/zview.C tmp/sabre-0.2.4b/src/zview.C +--- sabre-0.2.4b/src/zview.C 1998-12-13 10:32:45.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/zview.C 2008-01-31 11:42:25.000000000 -0500 +@@ -39,8 +39,8 @@ + * z-buffer * + ***************************************************/ + #include +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -127,7 +127,7 @@ + int Z_Node_Manager::read_file(char *path) + { + int result = 0; +- ifstream infile; ++ std::ifstream infile; + if (open_is(infile,path)) + { + zzpath = path; +@@ -139,7 +139,7 @@ + } + extern int shape_cnt; + +-void Z_Node_Manager::read(istream &is) ++void Z_Node_Manager::read(std::istream &is) + { + char c; + READ_TOKI('{',is,c) +@@ -190,7 +190,7 @@ + reference_shape[i].create(&(reference_info[i])); + } + +-istream & operator >>(istream &is, Z_Node_Manager &zm) ++std::istream & operator >>(std::istream &is, Z_Node_Manager &zm) + { + zm.read(is); + return(is); +@@ -293,7 +293,7 @@ + int Z_Node_Manager::write_file(char *path) + { + int result = 0; +- ofstream ofile; ++ std::ofstream ofile; + if (open_os(ofile,path)) + { + result = 1; +@@ -303,7 +303,7 @@ + return result; + } + +-void Z_Node_Manager::write(ostream &os) ++void Z_Node_Manager::write(std::ostream &os) + { + int i; + os << "{\n"; +@@ -337,7 +337,7 @@ + os << "}\n"; + } + +-void Z_Node_Manager::write_params(ostream &os, int i) ++void Z_Node_Manager::write_params(std::ostream &os, int i) + { + if (i >= 0 && i < n_shapes) + { +@@ -347,7 +347,7 @@ + } + } + +-ostream & operator <<(ostream &os, Z_Node_Manager &zm) ++std::ostream & operator <<(std::ostream &os, Z_Node_Manager &zm) + { + zm.write(os); + return os; +@@ -582,7 +582,7 @@ + } + } + +-void Z_Viewer::write(ostream &os) ++void Z_Viewer::write(std::ostream &os) + { + os << "{\n"; + os << "XXXXXX\n"; +@@ -602,7 +602,7 @@ + os << "}\n"; + } + +-ostream &operator <<(ostream &os, Z_Viewer &zv) ++std::ostream &operator <<(std::ostream &os, Z_Viewer &zv) + { + zv.write(os); + return os; +diff -urN sabre-0.2.4b/src/zview.h tmp/sabre-0.2.4b/src/zview.h +--- sabre-0.2.4b/src/zview.h 1998-12-13 10:32:48.000000000 -0500 ++++ tmp/sabre-0.2.4b/src/zview.h 2008-01-31 10:59:26.000000000 -0500 +@@ -71,15 +71,15 @@ + Z_Node_Manager(); + ~Z_Node_Manager(); + +- friend istream & operator >>(istream &, Z_Node_Manager &); +- void read(istream &is); ++ friend std::istream & operator >>(std::istream &, Z_Node_Manager &); ++ void read(std::istream &is); + int read_file(char *); + void create(); +- friend ostream & operator <<(ostream &, Z_Node_Manager &); +- void write(ostream &os); ++ friend std::ostream & operator <<(std::ostream &, Z_Node_Manager &); ++ void write(std::ostream &os); + int write_file(char *); + void add(C_ShapeInfo &new_shape, shape_params &new_params); +- void write_params(ostream &os, int); ++ void write_params(std::ostream &os, int); + void deleteShape(int which); + void buildShapes(); + void setId(char *); +@@ -132,8 +132,8 @@ + REAL_TYPE draw_prep(Port_3D &); + void build_bounding_cube(); + void calc_screen_bounds(Port_3D &, R_3DPoint *); +- friend ostream &operator <<(ostream &os, Z_Viewer &zv); +- void write(ostream &os); ++ friend std::ostream &operator <<(std::ostream &os, Z_Viewer &zv); ++ void write(std::ostream &os); + void setReferencePort(Port_3D *prt) + { + reference_port = prt; --- sabre-0.2.4b.orig/debian/patches/041_gcc43.diff +++ sabre-0.2.4b/debian/patches/041_gcc43.diff @@ -0,0 +1,14 @@ +diff -urN sabre-0.2.4b.orig.orig/sdlsrc/input.C sabre-0.2.4b.orig/sdlsrc/input.C +--- sabre-0.2.4b.orig.orig/sdlsrc/input.C 2008-01-31 16:57:26.000000000 -0500 ++++ sabre-0.2.4b.orig/sdlsrc/input.C 2008-01-31 17:05:02.000000000 -0500 +@@ -35,8 +35,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include "defs.h" + #include "vga_13.h" + #include "input.h" --- sabre-0.2.4b.orig/debian/patches/042_gcc44.diff +++ sabre-0.2.4b/debian/patches/042_gcc44.diff @@ -0,0 +1,11 @@ +--- a/src/txtrmap.h 2008-11-11 21:54:06.000000000 +0000 ++++ b/src/txtrmap.h 2008-11-11 21:54:20.000000000 +0000 +@@ -30,6 +30,8 @@ + #include "colormap.h" + #endif + ++#include ++ + #ifdef USES_DDRAW + #include + #include --- sabre-0.2.4b.orig/debian/patches/series +++ sabre-0.2.4b/debian/patches/series @@ -0,0 +1,10 @@ +000_autotools.diff +000_cflags.diff +010_rebootstrap.diff +020_bugfixes.diff +025_endianness.diff +030_launch_scripts.diff +035_gcc43_1.diff +040_gcc43_2.diff +041_gcc43.diff +042_gcc44.diff --- sabre-0.2.4b.orig/debian/patches/030_launch_scripts.diff +++ sabre-0.2.4b/debian/patches/030_launch_scripts.diff @@ -0,0 +1,703 @@ +Index: sabre-0.2.4b/RunSabre +=================================================================== +--- sabre-0.2.4b.orig/RunSabre 1999-11-25 01:32:16.000000000 +0100 ++++ sabre-0.2.4b/RunSabre 2008-10-01 15:38:12.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # 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 1, or (at your option) +@@ -23,26 +23,24 @@ + # for high-res Sabre + # 04/10/98 Version 0.2.3 patch + # 01/01/99 Version 0.2.4 +-banner="$(src/sabre --print-banner)" +-DLG=./dialogsrc/dialog +-FOO=.tmp ++# 1999 Miscellanous changes by Milan Zamazal ++banner="$(/usr/games/sabre --print-banner)" ++DLG=/usr/bin/dialog ++FOO=$(mktemp -t sabre.XXXXXX) || exit 1 ++LOG=$(mktemp -t sabre.XXXXXX) || exit 1 ++LOADLOG=$(mktemp -t sabre.XXXXXX) || exit 1 + MODE="-mode 0" + RZ_STEPS= + SABRE="-mode $MODE" #default flight parameters + DEMO= +-if [ -f "rs.sh" ] +- then +- . rs.sh ; +-else +- YOKE="-ms" +- RDDR="-kyr" +- THRT="-kyt" +- WINDOW="-window 320 200" +-fi ++YOKE="-ms" ++RDDR="-kyr" ++THRT="-kyt" ++WINDOW="-window 320 200" + + # fatal( context, error, source ) + # display errorbox +-function fatal () ++fatal () + { + errname="Unknown error" + case $2 in +@@ -60,7 +58,7 @@ + + # view_file( file ) + # display file on textbox +-function view_file() ++view_file() + { + if [ -r $1 ] + then +@@ -81,10 +79,10 @@ + + # load_scenario( file, type ) + # load mission or demo +-function load_scenario() ++load_scenario() + { +- path=scenarios/$1 +- echo "$1 $2 = $path $MODE $WINDOW" >> loadlog ++ path=/usr/share/games/sabre/$1 ++ echo "$1 $2 = $path $MODE $WINDOW" >> $LOADLOG + + if [ -x $path ] + then +@@ -94,8 +92,8 @@ + --infobox "Scenario coming up: Please standby!" \ + 3 44 + export SABRE +- export SABRE_BIN=./src/sabre +- $path $DEMO $MODE $WINDOW $YOKE $RDDR $THRT > sabre.log ++ export SABRE_BIN=/usr/games/sabre ++ $path $DEMO $MODE $WINDOW $YOKE $RDDR $THRT > $LOG + stty sane + $DLG \ + --backtitle "$banner" \ +@@ -103,7 +101,7 @@ + --yesno "Do you want to see the log?" 5 44 + if [ $? = 0 ] + then +- view_file sabre.log ++ view_file $LOG + fi + else + if [ -e $1 ] +@@ -117,7 +115,7 @@ + + # sabre_documentation() + # browse documentation +-function sabre_documentation() { ++sabre_documentation() { + looping=1 + until [ "$looping" = "0" ]; + do +@@ -125,7 +123,7 @@ + --backtitle "$banner" \ + --title "Documentation" \ + --menu "Miscellaneous Sabre papers" \ +- 21 68 15 \ ++ 21 68 14 \ + "WHATSNEW" "news on latest" \ + "intro" "introduction to the game" \ + "keys" "keys used" \ +@@ -136,7 +134,6 @@ + "CONTRIBUTORS" "people behind this game" \ + "README" "general background information" \ + "REQUIREMENTS" "the gear needed" \ +- "INSTALL" "building Sabre up" \ + "TODO" "future plans and fixes" \ + "TROUBLE_SHOOTING" "some noted problems and fixes" \ + "JOYSTICK.README" "info on using a joystick" \ +@@ -149,19 +146,19 @@ + "keys" | \ + "takeoff" | \ + "gru" | \ +- "shoot") view_file doc/$choice.txt ;; ++ "shoot") view_file /usr/share/games/sabre/doc/$choice.txt ;; ++ "COPYING") view_file /usr/share/common-licenses/GPL ;; + "HISTORY" | \ + "README" | \ + "CONTRIBUTORS" | \ +- "COPYING" | \ + "INSTALL" | \ + "README" | \ + "REQUIREMENTS" | \ + "WHATSNEW" | \ + "JOYSTICK.README" | \ + "TROUBLE_SHOOTING" | \ +- "TODO" ) view_file $choice ;; +- "User Interface" ) view_file dialogsrc/README ;; ++ "TODO" ) view_file /usr/share/games/sabre/doc/$choice ;; ++ "User Interface" ) view_file /usr/share/games/sabre/doc/README-dialog ;; + "") looping=0;; + esac + done +@@ -169,7 +166,7 @@ + + # sabre_missions() + # browse missions +-function sabre_missions() { ++sabre_missions() { + DEMO= + looping=1 + until [ "$looping" = "0" ]; +@@ -224,7 +221,7 @@ + + # sabre_demos() + # browse demos +-function sabre_demos() { ++sabre_demos() { + DEMO=-demo + until [ "foo" = "bar" ]; + do +@@ -261,7 +258,7 @@ + + # sabre_vgamodes() + # Allow choosing of the vga mode +-function sabre_vgamodes() ++sabre_vgamodes() + { + $DLG \ + --backtitle "$banner" \ +@@ -293,7 +290,7 @@ + # recommended. It's also best + # to keep a 3:2 width:height + # proportion +-function sabre_vgawindow() { ++sabre_vgawindow() { + # until [ "foo" = "bar" ]; + # do + $DLG \ +@@ -326,43 +323,29 @@ + } + + +-function sabre_controls() { ++sabre_controls() { + until [ "foo" = "bar" ]; + do + $DLG \ + --backtitle "$banner" \ + --title "Control Setup" \ + --menu "Select Control To Setup" \ +- 14 56 5 \ ++ 10 56 3 \ + "Yoke" "Yoke Control" \ + "Throttle" "Throttle Control" \ + "Rudder" "Rudder Control" \ +- "Calibrate 0" "Calibrate Joystick 0" \ +- "Calibrate 1" "Calibrate Joystick 1" \ + 2> $FOO + choice=$(cat $FOO) + case "$choice" in + "Yoke") sabre_yoke;; + "Throttle") sabre_throttle;; + "Rudder") sabre_rudder;; +- "Calibrate 0") WHICHJOY=0;sabre_calibrate;; +- "Calibrate 1") WHICHJOY=1;sabre_calibrate;; + "") return;; + esac + done + } + +-function sabre_calibrate +-{ +- cp ./lib/joy$WHICHJOY.def ./lib/joy$WHICHJOY,sav +- cd joystick +- rm joy$WHICHJOY.def +- sabrejoycal $WHICHJOY +- cp joy$WHICHJOY.def ../lib/. +- cd .. +-} +- +-function sabre_yoke() { ++sabre_yoke() { + #clear all flags + ST_JOY0=off + ST_MS=off +@@ -384,7 +367,7 @@ + 10 66 3 \ + "-j0" "Joystick" "$ST_JOY0" \ + "-ms" "Mouse" "$ST_MS" \ +- "-ks" "Keyboard" "$ST_KY" \ ++ "-kys" "Keyboard" "$ST_KY" \ + 2> $FOO + if [ $? = 0 ] + then +@@ -394,7 +377,7 @@ + + # sabre_setup() + # default flight parameters +-function sabre_rudder() { ++sabre_rudder() { + #clear all flags + ST_JOY2=off + ST_MR=off +@@ -426,7 +409,7 @@ + + # sabre_setup() + # default flight parameters +-function sabre_throttle() { ++sabre_throttle() { + #clear all flags + ST_JOY1=off + ST_MT=off +@@ -456,18 +439,6 @@ + fi + } + +-# write out saved stuff +-function runsabre_save() +-{ +- echo YOKE=\"$YOKE\" > rs.sh ; +- echo RDDR=\"$RDDR\" >> rs.sh ; +- echo THRT=\"$THRT\" >> rs.sh ; +- echo WINDOW=\"$WINDOW\" >> rs.sh; +- chmod a+x rs.sh; +- rm -f $FOO; +- exit; +-} +- + # the main loop + if [ ! -f $DLG ]; + then +@@ -504,15 +475,7 @@ + "svgamode") sabre_vgamodes;; + "window") sabre_vgawindow;; + "documentation") sabre_documentation;; +- "quit" | "") runsabre_save;; ++ "quit" | "") rm -f $FOO $LOG $LOADLOG; exit;; + esac + done + # the end +- +- +- +- +- +- +- +- +Index: sabre-0.2.4b/RunSabreSDL +=================================================================== +--- sabre-0.2.4b.orig/RunSabreSDL 1999-11-25 01:32:49.000000000 +0100 ++++ sabre-0.2.4b/RunSabreSDL 2008-10-01 15:38:23.000000000 +0200 +@@ -23,26 +23,24 @@ + # for high-res Sabre + # 04/10/98 Version 0.2.3 patch + # 01/01/99 Version 0.2.4 +-banner="$(sdlsrc/sabre --print-banner)" +-DLG=./dialogsrc/dialog +-FOO=.tmp ++# 1999, 2002 Miscellanous changes by Milan Zamazal ++banner="$(/usr/games/sabresdl --print-banner)" ++DLG=/usr/bin/dialog ++FOO=$(mktemp -t sabre.XXXXXX) || exit 1 ++LOG=$(mktemp -t sabre.XXXXXX) || exit 1 ++LOADLOG=$(mktemp -t sabre.XXXXXX) || exit 1 + MODE="-mode 0" + RZ_STEPS= + SABRE="-mode $MODE" #default flight parameters + DEMO= +-if [ -f "rs.sh" ] +- then +- . rs.sh ; +-else +- YOKE="-ms" +- RDDR="-kyr" +- THRT="-kyt" +- WINDOW="-window 320 200" +-fi ++YOKE="-ms" ++RDDR="-kyr" ++THRT="-kyt" ++WINDOW="-window 320 200" + + # fatal( context, error, source ) + # display errorbox +-function fatal () ++fatal () + { + errname="Unknown error" + case $2 in +@@ -60,7 +58,7 @@ + + # view_file( file ) + # display file on textbox +-function view_file() ++view_file() + { + if [ -r $1 ] + then +@@ -81,10 +79,10 @@ + + # load_scenario( file, type ) + # load mission or demo +-function load_scenario() ++load_scenario() + { +- path=scenarios/$1 +- echo "$1 $2 = $path $MODE $WINDOW" >> loadlog ++ path=/usr/share/games/sabre/$1 ++ echo "$1 $2 = $path $MODE $WINDOW" >> $LOADLOG + + if [ -x $path ] + then +@@ -94,8 +92,8 @@ + --infobox "Scenario coming up: Please standby!" \ + 3 44 + export SABRE +- export SABRE_BIN=./sdlsrc/sabre +- $path $DEMO $MODE $WINDOW $YOKE $RDDR $THRT > sabre.log ++ export SABRE_BIN=/usr/games/sabresdl ++ $path $DEMO $MODE $WINDOW $YOKE $RDDR $THRT > $LOG + stty sane + $DLG \ + --backtitle "$banner" \ +@@ -103,7 +101,7 @@ + --yesno "Do you want to see the log?" 5 44 + if [ $? = 0 ] + then +- view_file sabre.log ++ view_file $LOG + fi + else + if [ -e $1 ] +@@ -117,7 +115,7 @@ + + # sabre_documentation() + # browse documentation +-function sabre_documentation() { ++sabre_documentation() { + looping=1 + until [ "$looping" = "0" ]; + do +@@ -125,7 +123,7 @@ + --backtitle "$banner" \ + --title "Documentation" \ + --menu "Miscellaneous Sabre papers" \ +- 21 68 15 \ ++ 21 68 14 \ + "WHATSNEW" "news on latest" \ + "intro" "introduction to the game" \ + "keys" "keys used" \ +@@ -136,7 +134,6 @@ + "CONTRIBUTORS" "people behind this game" \ + "README" "general background information" \ + "REQUIREMENTS" "the gear needed" \ +- "INSTALL" "building Sabre up" \ + "TODO" "future plans and fixes" \ + "TROUBLE_SHOOTING" "some noted problems and fixes" \ + "JOYSTICK.README" "info on using a joystick" \ +@@ -149,19 +146,19 @@ + "keys" | \ + "takeoff" | \ + "gru" | \ +- "shoot") view_file doc/$choice.txt ;; ++ "shoot") view_file /usr/share/games/sabre/doc/$choice.txt ;; ++ "COPYING") view_file /usr/share/common-licenses/GPL ;; + "HISTORY" | \ + "README" | \ + "CONTRIBUTORS" | \ +- "COPYING" | \ + "INSTALL" | \ + "README" | \ + "REQUIREMENTS" | \ + "WHATSNEW" | \ + "JOYSTICK.README" | \ + "TROUBLE_SHOOTING" | \ +- "TODO" ) view_file $choice ;; +- "User Interface" ) view_file dialogsrc/README ;; ++ "TODO" ) view_file /usr/share/games/sabre/doc/$choice ;; ++ "User Interface" ) view_file /usr/share/games/sabre/doc/README-dialog ;; + "") looping=0;; + esac + done +@@ -169,7 +166,7 @@ + + # sabre_missions() + # browse missions +-function sabre_missions() { ++sabre_missions() { + DEMO= + looping=1 + until [ "$looping" = "0" ]; +@@ -224,7 +221,7 @@ + + # sabre_demos() + # browse demos +-function sabre_demos() { ++sabre_demos() { + DEMO=-demo + until [ "foo" = "bar" ]; + do +@@ -261,7 +258,7 @@ + + # sabre_vgamodes() + # Allow choosing of the vga mode +-function sabre_vgamodes() ++sabre_vgamodes() + { + $DLG \ + --backtitle "$banner" \ +@@ -293,7 +290,7 @@ + # recommended. It's also best + # to keep a 3:2 width:height + # proportion +-function sabre_vgawindow() { ++sabre_vgawindow() { + # until [ "foo" = "bar" ]; + # do + $DLG \ +@@ -326,43 +323,29 @@ + } + + +-function sabre_controls() { ++sabre_controls() { + until [ "foo" = "bar" ]; + do + $DLG \ + --backtitle "$banner" \ + --title "Control Setup" \ + --menu "Select Control To Setup" \ +- 14 56 5 \ ++ 10 56 3 \ + "Yoke" "Yoke Control" \ + "Throttle" "Throttle Control" \ + "Rudder" "Rudder Control" \ +- "Calibrate 0" "Calibrate Joystick 0" \ +- "Calibrate 1" "Calibrate Joystick 1" \ + 2> $FOO + choice=$(cat $FOO) + case "$choice" in + "Yoke") sabre_yoke;; + "Throttle") sabre_throttle;; + "Rudder") sabre_rudder;; +- "Calibrate 0") WHICHJOY=0;sabre_calibrate;; +- "Calibrate 1") WHICHJOY=1;sabre_calibrate;; + "") return;; + esac + done + } + +-function sabre_calibrate +-{ +- cp ./lib/joy$WHICHJOY.def ./lib/joy$WHICHJOY,sav +- cd joystick +- rm joy$WHICHJOY.def +- sabrejoycal $WHICHJOY +- cp joy$WHICHJOY.def ../lib/. +- cd .. +-} +- +-function sabre_yoke() { ++sabre_yoke() { + #clear all flags + ST_JOY0=off + ST_MS=off +@@ -384,7 +367,7 @@ + 10 66 3 \ + "-j0" "Joystick" "$ST_JOY0" \ + "-ms" "Mouse" "$ST_MS" \ +- "-ks" "Keyboard" "$ST_KY" \ ++ "-kys" "Keyboard" "$ST_KY" \ + 2> $FOO + if [ $? = 0 ] + then +@@ -394,7 +377,7 @@ + + # sabre_setup() + # default flight parameters +-function sabre_rudder() { ++sabre_rudder() { + #clear all flags + ST_JOY2=off + ST_MR=off +@@ -426,7 +409,7 @@ + + # sabre_setup() + # default flight parameters +-function sabre_throttle() { ++sabre_throttle() { + #clear all flags + ST_JOY1=off + ST_MT=off +@@ -456,18 +439,6 @@ + fi + } + +-# write out saved stuff +-function runsabre_save() +-{ +- echo YOKE=\"$YOKE\" > rs.sh ; +- echo RDDR=\"$RDDR\" >> rs.sh ; +- echo THRT=\"$THRT\" >> rs.sh ; +- echo WINDOW=\"$WINDOW\" >> rs.sh; +- chmod a+x rs.sh; +- rm -f $FOO; +- exit; +-} +- + # the main loop + if [ ! -f $DLG ]; + then +@@ -487,10 +458,9 @@ + --backtitle "$banner" \ + --title "Main" \ + --menu "Welcome to Sabre - enjoy your flight!" \ +- 14 50 7 \ ++ 12 50 6 \ + "missions" "Various Flight Scenarios" \ + "demos" "Some Flight Demos" \ +- "svgamode" "SVGALIB Video Mode Selection" \ + "window" "Select Window Size" \ + "documentation" "Miscellaneous Sabre papers" \ + "controls" "Select Flight Controls" \ +@@ -501,18 +471,9 @@ + "missions") sabre_missions;; + "demos") sabre_demos;; + "controls") sabre_controls;; +- "svgamode") sabre_vgamodes;; + "window") sabre_vgawindow;; + "documentation") sabre_documentation;; +- "quit" | "") runsabre_save;; ++ "quit" | "") rm -f $FOO $LOG $LOADLOG; exit;; + esac + done + # the end +- +- +- +- +- +- +- +- +Index: sabre-0.2.4b/scenarios/dogfight +=================================================================== +--- sabre-0.2.4b.orig/scenarios/dogfight 1998-12-17 17:51:26.000000000 +0100 ++++ sabre-0.2.4b/scenarios/dogfight 2008-10-01 15:21:20.000000000 +0200 +@@ -1,2 +1,3 @@ ++#!/bin/sh + $SABRE_BIN -flt dogfight.flt -rnd $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 + +Index: sabre-0.2.4b/scenarios/furball +=================================================================== +--- sabre-0.2.4b.orig/scenarios/furball 1998-12-17 17:51:45.000000000 +0100 ++++ sabre-0.2.4b/scenarios/furball 2008-10-01 15:21:20.000000000 +0200 +@@ -1,3 +1,3 @@ +-#! /bin/bash ++#! /bin/sh + # What a mess! + $SABRE_BIN -flt furball.flt -rnd -grnd a.gru $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 +Index: sabre-0.2.4b/scenarios/gru +=================================================================== +--- sabre-0.2.4b.orig/scenarios/gru 1998-12-17 17:51:53.000000000 +0100 ++++ sabre-0.2.4b/scenarios/gru 2008-10-01 15:21:20.000000000 +0200 +@@ -1,2 +1,3 @@ ++#!/bin/sh + $SABRE_BIN -flt gru.flt -grnd b.gru -wld gru.wld $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 + +Index: sabre-0.2.4b/scenarios/gru2 +=================================================================== +--- sabre-0.2.4b.orig/scenarios/gru2 1998-12-17 17:52:14.000000000 +0100 ++++ sabre-0.2.4b/scenarios/gru2 2008-10-01 15:21:20.000000000 +0200 +@@ -1,2 +1,3 @@ ++#!/bin/sh + $SABRE_BIN -flt gru2.flt -grnd b.gru -wld gru.wld $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 + +Index: sabre-0.2.4b/scenarios/gru3 +=================================================================== +--- sabre-0.2.4b.orig/scenarios/gru3 1998-12-17 17:52:30.000000000 +0100 ++++ sabre-0.2.4b/scenarios/gru3 2008-10-01 15:21:20.000000000 +0200 +@@ -1,2 +1,3 @@ ++#!/bin/sh + $SABRE_BIN -flt gru3.flt -grnd b.gru -wld gru.wld $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 + +Index: sabre-0.2.4b/scenarios/melee +=================================================================== +--- sabre-0.2.4b.orig/scenarios/melee 1998-12-17 17:52:48.000000000 +0100 ++++ sabre-0.2.4b/scenarios/melee 2008-10-01 15:21:20.000000000 +0200 +@@ -1,3 +1,4 @@ ++#!/bin/sh + $SABRE_BIN -flt melee.flt $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 + + +Index: sabre-0.2.4b/scenarios/migjump +=================================================================== +--- sabre-0.2.4b.orig/scenarios/migjump 1998-12-17 17:53:11.000000000 +0100 ++++ sabre-0.2.4b/scenarios/migjump 2008-10-01 15:21:20.000000000 +0200 +@@ -1 +1,2 @@ ++#!/bin/sh + $SABRE_BIN -flt migjump.flt $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 +Index: sabre-0.2.4b/scenarios/pistons +=================================================================== +--- sabre-0.2.4b.orig/scenarios/pistons 1998-12-17 17:53:18.000000000 +0100 ++++ sabre-0.2.4b/scenarios/pistons 2008-10-01 15:21:20.000000000 +0200 +@@ -1,3 +1,4 @@ ++#!/bin/sh + $SABRE_BIN -flt pistons.flt $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 + + +Index: sabre-0.2.4b/scenarios/shoot1 +=================================================================== +--- sabre-0.2.4b.orig/scenarios/shoot1 1998-12-17 17:53:42.000000000 +0100 ++++ sabre-0.2.4b/scenarios/shoot1 2008-10-01 15:21:20.000000000 +0200 +@@ -1,3 +1,4 @@ ++#!/bin/sh + # MiG in front + $SABRE_BIN -flt shoot1.flt $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 + +Index: sabre-0.2.4b/scenarios/shoot2 +=================================================================== +--- sabre-0.2.4b.orig/scenarios/shoot2 1998-12-17 17:53:49.000000000 +0100 ++++ sabre-0.2.4b/scenarios/shoot2 2008-10-01 15:21:20.000000000 +0200 +@@ -1,3 +1,4 @@ ++#!/bin/sh + # MiG in front + $SABRE_BIN -flt shoot2.flt $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 + +Index: sabre-0.2.4b/scenarios/shoot3 +=================================================================== +--- sabre-0.2.4b.orig/scenarios/shoot3 1998-12-17 17:53:57.000000000 +0100 ++++ sabre-0.2.4b/scenarios/shoot3 2008-10-01 15:21:20.000000000 +0200 +@@ -1,3 +1,4 @@ ++#!/bin/sh + # MiG in front + $SABRE_BIN -flt shoot3.flt $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 + +Index: sabre-0.2.4b/scenarios/takeoff +=================================================================== +--- sabre-0.2.4b.orig/scenarios/takeoff 1998-12-17 17:54:09.000000000 +0100 ++++ sabre-0.2.4b/scenarios/takeoff 2008-10-01 15:21:20.000000000 +0200 +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#! /bin/sh + $SABRE_BIN -flt takeoff.flt $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 + + +Index: sabre-0.2.4b/scenarios/thunder +=================================================================== +--- sabre-0.2.4b.orig/scenarios/thunder 1998-12-17 17:54:22.000000000 +0100 ++++ sabre-0.2.4b/scenarios/thunder 2008-10-01 15:21:20.000000000 +0200 +@@ -1,2 +1,3 @@ ++#!/bin/sh + $SABRE_BIN -flt thunder.flt $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 + +Index: sabre-0.2.4b/scenarios/yakattak +=================================================================== +--- sabre-0.2.4b.orig/scenarios/yakattak 1998-12-17 17:54:34.000000000 +0100 ++++ sabre-0.2.4b/scenarios/yakattak 2008-10-01 15:21:20.000000000 +0200 +@@ -1,3 +1,3 @@ +-#! /bin/bash ++#! /bin/sh + $SABRE_BIN -flt yakattak.flt -rnd $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 + --- sabre-0.2.4b.orig/debian/patches/020_bugfixes.diff +++ sabre-0.2.4b/debian/patches/020_bugfixes.diff @@ -0,0 +1,352 @@ +--- sabre-0.2.4b.orig/sdlsrc/input.C ++++ sabre-0.2.4b/sdlsrc/input.C +@@ -26,6 +26,8 @@ + * Device input (mouse & joystick) * + * 12/98 David Vandewalle : SDL Port * + *************************************************/ ++/* Small fix by Milan Zamazal on 1999-10-03 to allow ++ compilation with gcc 2.95, see #ifdef DEBIAN. */ + #define HAVE_LIBSDL + + #include +@@ -101,9 +103,13 @@ + { + #ifdef HAVE_LIBSDL + float scx,scy; ++#ifdef DEBIAN ++ int SDL_x,SDL_y; ++#else + unsigned short SDL_x,SDL_y; ++#endif + SDL_PollEvent(NULL); +- buttons = SDL_GetMouseState(&SDL_x, &SDL_y); ++ buttons = SDL_GetMouseState(&SDL_x, &SDL_y); + screenx = SDL_x; + screeny = SDL_y; + scx = (float) screenx; +--- sabre-0.2.4b.orig/sdlsrc/kbdhit.C ++++ sabre-0.2.4b/sdlsrc/kbdhit.C +@@ -17,6 +17,10 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ ++/* Fixes by Milan Zamazal (see #ifdef DEBIAN): ++ 1999-10-03: Allow compilation with new SDL. ++ 1999-11-27: Q&D hack allowing use of cursor keys in sabresdl. ++*/ + #define HAVE_LIBSDL + + #ifdef SABREWIN +@@ -46,6 +50,31 @@ + // #define TESTME + + ++#ifdef DEBIAN ++#ifdef HAVE_LIBSDL ++// Q&D hack, sorry ++static const int sdl_to_standard[256] = ++{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ++ 16,'i','m','l','j', 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, ++ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, ++ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, ++ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, ++ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, ++ 96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111, ++ 112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127, ++ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, ++ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159, ++ 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175, ++ 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191, ++ 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207, ++ 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223, ++ 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239, ++ 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 ++}; ++#endif ++#endif ++ ++ + KBHit kbhit; + int KBHit::kbdin = 0; + KBHit::KBHit() +@@ -62,6 +91,12 @@ + tcsetattr(0,TCSANOW,&newios); + FD_ZERO(&rfds); + FD_SET(0,&rfds); ++ ++#ifdef DEBIAN ++#if 0 ++ SDL_EnableUNICODE (1); ++#endif ++#endif + } + + int KBHit::kbdhit() +@@ -80,7 +115,11 @@ + SDL_Event event; + #endif + ++#ifdef DEBIAN ++ unsigned char c; ++#else + char c; ++#endif + + #ifdef HAVE_LIBSDL + if(SDL_PollEvent(&event)) +@@ -89,20 +128,33 @@ + #endif + { + #ifdef HAVE_LIBSDL ++#ifdef DEBIAN ++ c=event.key.keysym.sym; ++ c = sdl_to_standard[c]; ++#else + c=SDL_SymToASCII(&(event.key.keysym),NULL); ++#endif + #else + c = vga_getkey(); + #endif + if (c==ESC) + { + #ifdef HAVE_LIBSDL ++#ifdef DEBIAN ++ c=event.key.keysym.sym; ++#else + c=SDL_SymToASCII(&(event.key.keysym),NULL); ++#endif + #else + c = vga_getkey(); + #endif + if (c=='[') + #ifdef HAVE_LIBSDL ++#ifdef DEBIAN ++ c=event.key.keysym.sym; ++#else + c=SDL_SymToASCII(&(event.key.keysym),NULL); ++#endif + #else + c = vga_getkey(); + #endif +--- sabre-0.2.4b.orig/sdlsrc/vga_13.C ++++ sabre-0.2.4b/sdlsrc/vga_13.C +@@ -579,3 +579,12 @@ + + } + ++#ifdef DEBIAN ++void vga13_begin_scene() ++{ ++} ++ ++void vga13_end_scene() ++{ ++} ++#endif +--- sabre-0.2.4b.orig/gdev/hello.C ++++ sabre-0.2.4b/gdev/hello.C +@@ -24,6 +24,8 @@ + + #include "hello.h" + ++#include ++ + // -- + // -- main( options ) + // -- +--- sabre-0.2.4b.orig/gdev/fontedit.C ++++ sabre-0.2.4b/gdev/fontedit.C +@@ -24,6 +24,8 @@ + + #include "fontedit.h" + ++#include ++ + // -- + // -- main( options ) + // -- +--- sabre-0.2.4b.orig/src/main.C ++++ sabre-0.2.4b/src/main.C +@@ -25,6 +25,9 @@ + * Author : Dan Hammer * + * Main file * + *************************************************/ ++/* Small fix by Milan Zamazal in 1999 to disable big security ++ hole, see #ifdef DEBIAN. ++ 1999-12-17: Without SVGAlib compilation fix. */ + #define USING_SOUNDCLIENT + + #include +@@ -40,12 +43,18 @@ + #include + #include + #include ++#ifdef DEBIAN ++#ifndef DEBIAN_NO_LIBVGA ++#include ++#endif ++#else ++#include ++#endif + + #include "siminc.h" + #include "simsnd.h" + #include "game.h" + #include "scnedit.h" +-#include "simsnd.h" + #include "sbrkeys.h" + + #ifndef REV_DATE +@@ -119,6 +128,16 @@ + *************************************************************/ + main(int argc, char *argv[]) + { ++#ifdef DEBIAN ++#ifndef DEBIAN_NO_LIBVGA ++ vga_disabledriverreport(); ++ if (vga_init()) ++ { ++ printf("Cannot initialize VGA device.\n"); ++ return -1; ++ } ++#endif ++#endif + int i; + int m; + printf("Sabre Fighter Plane Simulator Version %s %s\n", +--- sabre-0.2.4b.orig/src/obj_3d.C ++++ sabre-0.2.4b/src/obj_3d.C +@@ -645,14 +645,9 @@ + READ_TOKI('(',is,c) + is >> n_objects >> n_groups; + READ_TOK(')',is,c) +-#ifdef SABREWIN + objects = new C_3DObject2[n_objects]; + for (i=0;i to make the file ++ compilable with gcc 3. See `#ifdef DEBIAN' for more details. */ + #ifdef SABREWIN + #include + #endif +@@ -181,9 +183,15 @@ + #endif + if (open_libos(os,fname)) + { ++#ifdef DEBIAN ++ os.write((char *)&map_w,sizeof(map_w)); ++ os.write((char *)&map_h,sizeof(map_h)); ++ os.write((char *)&n,sizeof(n)); ++#else + os.write((unsigned char *)&map_w,sizeof(map_w)); + os.write((unsigned char *)&map_h,sizeof(map_h)); + os.write((unsigned char *)&n,sizeof(n)); ++#endif + os.write(tgt,n); + } + delete [] fname; +--- sabre-0.2.4b.orig/src/rendpoly.C ++++ sabre-0.2.4b/src/rendpoly.C +@@ -34,6 +34,7 @@ + #include "simerr.h" + #include "simfile.h" + #include "rendpoly.h" ++#include "port_3d.h" + + /********************************************************** + * Non z-buffered, flat color poly rendering * +--- sabre-0.2.4b.orig/src/globals.C ++++ sabre-0.2.4b/src/globals.C +@@ -20,6 +20,8 @@ + /****************************************************************** + * globals * + ******************************************************************/ ++/* 1999-12-08: Changed by Milan Zamazal to point to default ++ library location on Debian, see #ifdef DEBIAN. */ + #include "stdio.h" + #include "string.h" + #include "vmath.h" +@@ -35,9 +37,13 @@ + #ifdef SABREWIN + #define DEFAULT_LIB ".\\lib" + #else ++#ifdef DEBIAN ++#define DEFAULT_LIB "/usr/share/games/sabre/lib" ++#else + #define DEFAULT_LIB "./lib" + #endif + #endif ++#endif + + Mouse mouse; + Joystick *joystick0 = NULL; +--- sabre-0.2.4b.orig/src/aibase.h ++++ sabre-0.2.4b/src/aibase.h +@@ -26,6 +26,8 @@ + * Defines skill levels, maneuver stack and * + * attacker list behavior. * + *************************************************/ ++/* Small fix by Milan Zamazal on 1999-10-03 to allow ++ compilation with gcc 2.95, see #ifdef DEBIAN. */ + #ifndef __aibase_h + #define __aibase_h + +@@ -144,7 +146,11 @@ + int affiliation; /* whose side we're on */ + int active; /* active status */ + char handle[aiB_HANDLE_SIZE]; /* call sign */ ++#ifdef DEBIAN ++ const char *dbg; /* debug string */ ++#else + char *dbg; /* debug string */ ++#endif + int task; /* current task */ + + sREAL timeFrame; /* time in secs from last update*/ +--- sabre-0.2.4b.orig/src/pilot.h ++++ sabre-0.2.4b/src/pilot.h +@@ -17,6 +17,9 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ ++/* 1999-12-08: Small patch by Milan Zamazal to allow ++ compilation on Debian, see #ifdef DEBIAN. */ ++ + #ifndef __pilot_h + #define __pilot_h + +@@ -138,7 +141,11 @@ + static Pilot *pilots[]; + static int npilots; + static int maxpilots; ++#ifdef DEBIAN ++ static int initPilot(); ++#else + static initPilot(); ++#endif + static Pilot *getPilot(char *hndle); + static float xpixel_adjust, ypixel_adjust; + +--- sabre-0.2.4b.orig/src/rendpoly.h ++++ sabre-0.2.4b/src/rendpoly.h +@@ -24,6 +24,7 @@ + #include "grafix.h" + #include "clip.h" + #include "convpoly.h" ++#include "port_3d.h" + + int rendpoly(R_3DPoint *poly, int n, int color, Port_3D &port, int zclip = 1); + int project_poly(R_3DPoint *poly, int n, int color, --- sabre-0.2.4b.orig/debian/patches/000_cflags.diff +++ sabre-0.2.4b/debian/patches/000_cflags.diff @@ -0,0 +1,51 @@ +--- sabre-0.2.4b.orig/cflags ++++ sabre-0.2.4b/cflags +@@ -6,6 +6,8 @@ + # + # Antti Barck 12/1997 + # ++# Modified by Milan Zamazal on 1999-11-21 to allow compilation ++# on m68k and to be built with `-g'. + + # + # usage: cflags +@@ -72,26 +74,34 @@ + esac + ;; + i586) +- + case $2 in + linux*) +- flaggies="-Wall -O4 -m486 -fomit-frame-pointer -fforce-addr -fforce-mem -malign-loops=2 -malign-functions=2 -malign-jumps=2 -funroll-loops" ++ flaggies="-Wall -O4 -fomit-frame-pointer -fforce-addr -falign-loops=2 -falign-functions=2 -falign-jumps=2 -funroll-loops" + # this might work for pentium povered linux machines that have PGCC + # flaggies="-Wall -O6 -mpentium -frisc" + ;; + esac + ;; + i686) +- + case $2 in + linux*) +- flaggies="-Wall -O4 -m486 -fomit-frame-pointer -fforce-addr -fforce-mem -malign-loops=2 -malign-functions=2 -malign-jumps=2 -funroll-loops" ++ flaggies="-Wall -O4 -fomit-frame-pointer -fforce-addr -falign-loops=2 -falign-functions=2 -falign-jumps=2 -funroll-loops" + # this might work for pentium povered linux machines that have PGCC + # flaggies="-Wall -O6 -mpentium -frisc" + ;; + esac ++ ;; ++ m68k) ++ case $2 in ++ linux*) ++ flaggies="-Wall -O3" ++ ;; ++ esac + ;; +- + esac + ++if test "$flaggies" != "(default)" -a \ ++ -n `echo $DEB_BUILD_OPTIONS | fgrep debug`; then ++ flaggies="$flaggies -g" ++fi + echo $flaggies --- sabre-0.2.4b.orig/debian/patches/000_autotools.diff +++ sabre-0.2.4b/debian/patches/000_autotools.diff @@ -0,0 +1,214 @@ +--- sabre-0.2.4b.orig/sdlsrc/Makefile.am ++++ sabre-0.2.4b/sdlsrc/Makefile.am +@@ -2,9 +2,14 @@ + + # This is part of Dan Hammer's SABRE Fighter Plane Simulator + # portions donated by Antti Barck ++# ++# 2000-01-22: Modified by Milan Zamazal for compilation with ++# newer libsdl versions. ++# 2000-02-12: Modified by Milan Zamazal for compilation ++# without SVGAlib. + AUTOMAKE_OPTIONS = foreign + bin_PROGRAMS = sabresdl +-SABREOBJS = ../src/main.o ../src/game.o ../src/scnedit.o ../src/vmath.o ../src/traveler.o ../src/pen.o \ ++SABREOBJS = ../src/game.o ../src/scnedit.o ../src/vmath.o ../src/traveler.o ../src/pen.o \ + ../src/transblt.o ../src/port_3d.o ../src/clip.o ../src/cpoly.o ../src/obj_3d.o ../src/group_3d.o \ + ../src/copoly.o ../src/txtrmap.o ../src/bits.o ../src/convpoly.o ../src/rendpoly.o ../src/rndrpoly.o \ + ../src/rndzpoly.o ../src/zview.o ../src/rotate.o ../src/terrain.o ../src/earth.o ../src/colormap.o \ +@@ -18,9 +23,12 @@ + ../src/aipilot2.o ../src/aipilot3.o ../src/aipilot4.o ../src/aipilot5.o ../src/aipilot6.o ../src/sairfld.o \ + ../src/sarray.o ../src/sattkr.o ../src/sfltmdl.o ../src/sfrmtn.o ../src/smath.o ../src/smnvrst.o \ + ../src/spilcaps.o ../src/splncaps.o ../src/srunway.o ../src/sslewer.o ../src/stact.o ../src/starget.o \ +- ../src/sweapon.o ../src/sbfltmdl.o ../src/simsnd.o ../src/dhlist.o ../src/stime.o ../src/spid.o ../src/pilobj.o +-sabresdl_SOURCES = vga_13.C kbdhit.C input.C fontdev.C ++ ../src/sweapon.o ../src/sbfltmdl.o ../src/simsnd.o ../src/dhlist.o ../src/stime.o ../src/spid.o ../src/pilobj.o ++#sabresdl_SOURCES = vga_13.C kbdhit.C input.C fontdev.C ++sabresdl_SOURCES = main.C vga_13.C kbdhit.C input.C fontdev.C + sabresdl_LDADD = $(SABREOBJS) ../libzip/libcomp.a ../libzip/libuncl.a +-EXTRA_DIST = *.h SDL_PORT_README ++EXTRA_DIST = *.h *.c SDL_PORT_README + INCLUDES=-I../src -I../libzip +-LIBS = -lm -ldl -lSDL -lncurses ++#LIBS = -lm -ldl -lSDL -lncurses ++LIBS = -lm -ldl `sdl-config --libs` -lncurses ++CXXFLAGS = @CXXFLAGS@ -DDEBIAN -DDEBIAN_NO_LIBVGA +--- sabre-0.2.4b.orig/Makefile.am ++++ sabre-0.2.4b/Makefile.am +@@ -3,11 +3,21 @@ + # This is part of Dan Hammer's SABRE Fighter Plane Simulator + # portions donated by Antti Barck + # ++# 2000-01-22: Modified by Milan Zamazal to allow compilation ++# for Debian. ++# 2000-02-12: Milan Zamazal -- non-SVGAlib fix. ++# + # Here are the top level make parameters + # + # Special update distribution + AUTOMAKE_OPTIONS = foreign +-SUBDIRS = lib libzip gdev src dialogsrc doc scenarios joystick ++#SUBDIRS = lib libzip gdev src dialogsrc doc scenarios joystick ++if SVGALIB ++SVGALIB_SUBDIRS = gdev ++else ++SVGALIB_SUBDIRS = ++endif ++SUBDIRS = $(SVGALIB_SUBDIRS) lib libzip src doc scenarios + EXTRA_DIST = configure TROUBLE_SHOOTING WHATSNEW VERSION REQUIREMENTS RunSabre CONTRIBUTORS fly JOYSTICK.README cflags HISTORY flySDL RunSabreSDL sdlsrc/Makefile.in sdlsrc/Makefile.am sdlsrc/*.h sdlsrc/*.C sdlsrc/SDL_PORT_README sdlsrc/README + + +--- sabre-0.2.4b.orig/configure.in ++++ sabre-0.2.4b/configure.in +@@ -4,6 +4,10 @@ + dnl portions donated by Antti Barck + dnl + dnl Here are the top level configuration parameters ++dnl ++dnl Modified by Milan Zamazal on 1999-12-05 to allow ++dnl compilation on non-SVGAlib architectures. ++dnl 2000-02-12: Milan Zamazal -- other non-SVGAlib fixes. + + AC_INIT(Makefile.in) + +@@ -14,13 +18,18 @@ + AC_SUBST(AUTOCONF) + + dnl initialize version and package information to keep automake happy +-. VERSION ++. ./VERSION + VERSION=$THE_VERSION + PACKAGE=$PACKAGE_NAME + REV_DATE=$THE_REV_DATE + AC_SUBST(VERSION) + AC_SUBST(PACKAGE) + AC_SUBST(REV_DATE) ++dnl svgalib option ++AC_ARG_WITH(svgalib, ++[ --with-svgalib create the SVGAlib version too], ++[], ++[with_svgalib=yes]) + dnl echo version number to sources + AC_DEFINE_UNQUOTED(VERSION,"$VERSION") + AC_DEFINE_UNQUOTED(REV_DATE,"$REV_DATE") +@@ -67,28 +76,17 @@ + + AC_CHECK_LIB(ncurses, main,, + AC_MSG_ERROR(Cannot find Ncurses (-ncurses). please check out your system setup.)) ++if test "x$with_svgalib" = "xyes"; then + AC_CHECK_LIB(vga, main, , + AC_MSG_ERROR(Cannot find SVGAlib (-lvga). please check out your system setup.)) + AC_CHECK_LIB(vgagl, main, , + AC_MSG_ERROR(Cannot find SVGAlib (-lvgagl). please check out your system setup.)) ++else ++echo "building without SVGAlib" ++fi + AC_CHECK_LIB(m, main, , + AC_MSG_ERROR(Cannot find mathlib (-lm). please check out your system setup.)) + ++AM_CONDITIONAL(SVGALIB, test x$with_svgalib = xyes) + dnl produce these file after configure + AC_OUTPUT(Makefile lib/Makefile lib/tzp/Makefile lib/fonts/Makefile libzip/Makefile gdev/Makefile src/Makefile dialogsrc/Makefile doc/Makefile scenarios/Makefile sdlsrc/Makefile joystick/Makefile) +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +--- sabre-0.2.4b.orig/src/Makefile.am ++++ sabre-0.2.4b/src/Makefile.am +@@ -2,16 +2,43 @@ + + # This is part of Dan Hammer's SABRE Fighter Plane Simulator + # portions donated by Antti Barck ++# ++# 2000-01-22: Modified by Milan Zamazal for Debian ++# compilation. ++# 2000-02-12: Modified by Milan Zamazal for non-SVGAlib ++# compilation. + AUTOMAKE_OPTIONS = foreign ++if SVGALIB + bin_PROGRAMS = sabre +-sabre_SOURCES = main.C game.C scnedit.C vga_13.C vmath.C traveler.C pen.C \ ++endif ++if SVGALIB ++SVGALIBSRCS = main.C vga_13.C input.C kbdhit.C ++else ++SVGALIBSRCS = ++endif ++# sabre_SOURCES = main.C game.C scnedit.C vga_13.C vmath.C traveler.C pen.C \ ++# transblt.C port_3d.C clip.C cpoly.C obj_3d.C group_3d.C \ ++# copoly.C txtrmap.C bits.C convpoly.C rendpoly.C rndrpoly.C \ ++# rndzpoly.C zview.C rotate.C terrain.C earth.C colormap.C \ ++# dvector.C flight.C weapons.C pilot.C fltlite.C \ ++# moveable.C unguided.C fltzview.C viewobj.C fltmngr.C \ ++# grndunit.C font8x8.C plltt.C input.C key_map.C linux_joy.C \ ++# kbdhit.C siminput.C simfile.C hud.C cockpit.C instrmnt.C \ ++# ppm.C mytimer.C colorspc.C globals.C portkey.C vtable2.C \ ++# led2.C aaaunit.C waypoint.C fltobj.C simfilex.C simmath.C \ ++# target.C sbrkeys.C aibase.C aiflite.C aigunner.C aipilot.C \ ++# aipilot2.C aipilot3.C aipilot4.C aipilot5.C aipilot6.C sairfld.C \ ++# sarray.C sattkr.C sfltmdl.C sfrmtn.C smath.C smnvrst.C \ ++# spilcaps.C splncaps.C srunway.C sslewer.C stact.C starget.C \ ++# sweapon.C sbfltmdl.C simsnd.C dhlist.c stime.c spid.c pilobj.C ++sabre_SOURCES = $(SVGALIBSRCS) game.C scnedit.C vmath.C traveler.C pen.C \ + transblt.C port_3d.C clip.C cpoly.C obj_3d.C group_3d.C \ + copoly.C txtrmap.C bits.C convpoly.C rendpoly.C rndrpoly.C \ + rndzpoly.C zview.C rotate.C terrain.C earth.C colormap.C \ + dvector.C flight.C weapons.C pilot.C fltlite.C \ + moveable.C unguided.C fltzview.C viewobj.C fltmngr.C \ +- grndunit.C font8x8.C plltt.C input.C key_map.C linux_joy.C \ +- kbdhit.C siminput.C simfile.C hud.C cockpit.C instrmnt.C \ ++ grndunit.C font8x8.C plltt.C key_map.C linux_joy.C \ ++ siminput.C simfile.C hud.C cockpit.C instrmnt.C \ + ppm.C mytimer.C colorspc.C globals.C portkey.C vtable2.C \ + led2.C aaaunit.C waypoint.C fltobj.C simfilex.C simmath.C \ + target.C sbrkeys.C aibase.C aiflite.C aigunner.C aipilot.C \ +@@ -22,4 +49,9 @@ + sabre_LDADD = ../libzip/libcomp.a ../libzip/libuncl.a ../gdev/libgdev.a + EXTRA_DIST = *.h *.c + INCLUDES=-I../gdev -I../libzip ++CXXFLAGS = @CXXFLAGS@ -DDEBIAN + ++if SVGALIB ++else ++all-local: $(sabre_OBJECTS) ++endif +--- sabre-0.2.4b.orig/joystick/Makefile.am ++++ sabre-0.2.4b/joystick/Makefile.am +@@ -2,10 +2,14 @@ + + # This is part of Dan Hammer's SABRE Fighter Plane Simulator + # portions donated by Antti Barck ++ ++# Hacked by Milan Zamazal in December 2001 to stop automake ++# complaining about subdirectories. ++ + AUTOMAKE_OPTIONS = foreign + bin_PROGRAMS = sabrejoycal + DEFS =-DJOYCAL +-sabrejoycal_SOURCES = ../src/linux_joy.C ++sabrejoycal_SOURCES = linux_joy.C + sabrejoycal_LDADD = + EXTRA_DIST = + INCLUDES=-I../src -I../libzip +@@ -13,7 +17,7 @@ + linux_joy.C : + echo + +-linux_joy.o : ../src/linux_joy.C +- $(CXX) $(INCLUDES) -DJOYCAL -c -o linux_joy.o ../src/linux_joy.C ++linux_joy.o : linux_joy.C ++ $(CXX) $(INCLUDES) -DJOYCAL -c -o linux_joy.o linux_joy.C + + --- sabre-0.2.4b.orig/debian/patches/010_rebootstrap.diff +++ sabre-0.2.4b/debian/patches/010_rebootstrap.diff @@ -0,0 +1,12773 @@ +Index: sabre-0.2.4b/Makefile.in +=================================================================== +--- sabre-0.2.4b.orig/Makefile.in 2006-05-15 23:35:47.000000000 +0200 ++++ sabre-0.2.4b/Makefile.in 2006-05-15 23:36:46.000000000 +0200 +@@ -1,6 +1,6 @@ +-# Makefile.in generated automatically by automake 1.3 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,12 +13,16 @@ + # This is part of Dan Hammer's SABRE Fighter Plane Simulator + # portions donated by Antti Barck + # ++# 2000-01-22: Modified by Milan Zamazal to allow compilation ++# for Debian. ++# 2000-02-12: Milan Zamazal -- non-SVGAlib fix. ++# + # Here are the top level make parameters + # + # Special update distribution + + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -39,7 +43,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include + +-DISTDIR = ++DESTDIR = + + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -53,7 +57,7 @@ + AUTOHEADER = @AUTOHEADER@ + + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + transform = @program_transform_name@ +@@ -70,37 +74,45 @@ + AUTOMAKE = @AUTOMAKE@ + CC = @CC@ + CXX = @CXX@ ++HAVE_LIB = @HAVE_LIB@ ++LIB = @LIB@ ++LTLIB = @LTLIB@ + PACKAGE = @PACKAGE@ + RANLIB = @RANLIB@ + REV_DATE = @REV_DATE@ + VERSION = @VERSION@ + + AUTOMAKE_OPTIONS = foreign +-SUBDIRS = lib libzip gdev src dialogsrc doc scenarios joystick ++@SVGALIB_TRUE@SVGALIB_SUBDIRS = gdev ++@SVGALIB_FALSE@SVGALIB_SUBDIRS = ++SUBDIRS = $(SVGALIB_SUBDIRS) lib libzip src doc scenarios + EXTRA_DIST = configure TROUBLE_SHOOTING WHATSNEW VERSION REQUIREMENTS RunSabre CONTRIBUTORS fly JOYSTICK.README cflags HISTORY flySDL RunSabreSDL sdlsrc/Makefile.in sdlsrc/Makefile.am sdlsrc/*.h sdlsrc/*.C sdlsrc/SDL_PORT_README sdlsrc/README ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = + DIST_COMMON = README COPYING INSTALL Makefile.am Makefile.in TODO \ +-config.guess config.sub configure configure.in install-sh missing \ +-mkinstalldirs ++aclocal.m4 config.guess config.sub configure configure.in install-sh \ ++missing mkinstalldirs + + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + + TAR = tar +-GZIP = --best +-all: all-recursive all-am +- ++GZIP_ENV = --best ++DIST_SUBDIRS = gdev lib libzip src doc scenarios ++all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + ++$(ACLOCAL_M4): configure.in ++ cd $(srcdir) && $(ACLOCAL) + +-config.status: $(srcdir)/configure ++config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && $(AUTOCONF) +@@ -118,48 +130,72 @@ + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive info-recursive dvi-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ ++ dot_seen=no; \ ++ target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +- target=`echo $@ | sed s/-recursive//`; \ + echo "Making $$target in $$subdir"; \ +- (cd $$subdir && $(MAKE) $$target) \ ++ if test "$$subdir" = "."; then \ ++ dot_seen=yes; \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ +- done && test -z "$$fail" ++ done; \ ++ if test "$$dot_seen" = "no"; then \ ++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ++ fi; test -z "$$fail" + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ ++ dot_seen=no; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ ++ test "$$subdir" != "." || dot_seen=yes; \ + done; \ ++ test "$$dot_seen" = "no" && rev=". $$rev"; \ ++ target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ +- target=`echo $@ | sed s/-recursive//`; \ + echo "Making $$target in $$subdir"; \ +- (cd $$subdir && $(MAKE) $$target) \ ++ if test "$$subdir" = "."; then \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- (cd $$subdir && $(MAKE) tags); \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + + tags: TAGS + + ID: $(HEADERS) $(SOURCES) $(LISP) ++ list='$(SOURCES) $(HEADERS)'; \ ++ unique=`for i in $$list; do echo $$i; done | \ ++ awk ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ +- && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) ++ && mkid -f$$here/ID $$unique $(LISP) + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ++ if test "$$subdir" = .; then :; else \ ++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ++ fi; \ + done; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ +- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + + mostlyclean-tags: + +@@ -178,105 +214,117 @@ + # tarfile. + distcheck: dist + -rm -rf $(distdir) +- GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz ++ GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz + mkdir $(distdir)/=build + mkdir $(distdir)/=inst + dc_install_base=`cd $(distdir)/=inst && pwd`; \ + cd $(distdir)/=build \ + && ../configure --srcdir=.. --prefix=$$dc_install_base \ +- && $(MAKE) \ +- && $(MAKE) dvi \ +- && $(MAKE) check \ +- && $(MAKE) install \ +- && $(MAKE) installcheck \ +- && $(MAKE) dist ++ && $(MAKE) $(AM_MAKEFLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) dvi \ ++ && $(MAKE) $(AM_MAKEFLAGS) check \ ++ && $(MAKE) $(AM_MAKEFLAGS) install \ ++ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ++ && $(MAKE) $(AM_MAKEFLAGS) dist + -rm -rf $(distdir) +- @echo "========================"; \ +- echo "$(distdir).tar.gz is ready for distribution"; \ +- echo "========================" ++ @banner="$(distdir).tar.gz is ready for distribution"; \ ++ dashes=`echo "$$banner" | sed s/./=/g`; \ ++ echo "$$dashes"; \ ++ echo "$$banner"; \ ++ echo "$$dashes" + dist: distdir + -chmod -R a+r $(distdir) +- GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) ++ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) + -rm -rf $(distdir) + dist-all: distdir + -chmod -R a+r $(distdir) +- GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) ++ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) + -rm -rf $(distdir) + distdir: $(DISTFILES) + -rm -rf $(distdir) + mkdir $(distdir) + -chmod 777 $(distdir) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile + $(mkinstalldirs) $(distdir)/sdlsrc + @for file in $(DISTFILES); do \ + d=$(srcdir); \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file; \ ++ if test -d $$d/$$file; then \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++ || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ fi; \ + done +- for subdir in $(SUBDIRS); do \ +- test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ +- || exit 1; \ +- chmod 777 $(distdir)/$$subdir; \ +- (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ ++ for subdir in $(DIST_SUBDIRS); do \ ++ if test "$$subdir" = .; then :; else \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ ++ chmod 777 $(distdir)/$$subdir; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ ++ || exit 1; \ ++ fi; \ + done ++info-am: + info: info-recursive ++dvi-am: + dvi: dvi-recursive +-check: all-am +- $(MAKE) check-recursive ++check-am: all-am ++check: check-recursive ++installcheck-am: + installcheck: installcheck-recursive +-all-am: Makefile +- ++install-exec-am: + install-exec: install-exec-recursive +- @$(NORMAL_INSTALL) + ++install-data-am: + install-data: install-data-recursive +- @$(NORMAL_INSTALL) + ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + install: install-recursive +- @: +- ++uninstall-am: + uninstall: uninstall-recursive +- ++all-am: Makefile ++all-redirect: all-recursive + install-strip: +- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install ++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: installdirs-recursive ++installdirs-am: + + + mostlyclean-generic: +- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f Makefile $(DISTCLEANFILES) ++ -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + mostlyclean-am: mostlyclean-tags mostlyclean-generic + +-clean-am: clean-tags clean-generic mostlyclean-am +- +-distclean-am: distclean-tags distclean-generic clean-am ++mostlyclean: mostlyclean-recursive + +-maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ +- distclean-am ++clean-am: clean-tags clean-generic mostlyclean-am + +-mostlyclean: mostlyclean-recursive mostlyclean-am ++clean: clean-recursive + +-clean: clean-recursive clean-am ++distclean-am: distclean-tags distclean-generic clean-am + +-distclean: distclean-recursive distclean-am ++distclean: distclean-recursive + -rm -f config.status + +-maintainer-clean: maintainer-clean-recursive maintainer-clean-am ++maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ ++ distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." ++ ++maintainer-clean: maintainer-clean-recursive + -rm -f config.status + + .PHONY: install-data-recursive uninstall-data-recursive \ +@@ -285,8 +333,10 @@ + installcheck-recursive info-recursive dvi-recursive \ + mostlyclean-recursive distclean-recursive clean-recursive \ + maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ +-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ +-installcheck all-am install-exec install-data install uninstall all \ ++distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ++install-exec install-data-am install-data install-am install \ ++uninstall-am uninstall all-redirect all-am all installdirs-am \ + installdirs mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + +Index: sabre-0.2.4b/aclocal.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ sabre-0.2.4b/aclocal.m4 2006-05-15 23:36:45.000000000 +0200 +@@ -0,0 +1,844 @@ ++dnl aclocal.m4 generated automatically by aclocal 1.4-p6 ++ ++dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl This program is distributed in the hope that it will be useful, ++dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++dnl PARTICULAR PURPOSE. ++ ++# lib-prefix.m4 serial 4 (gettext-0.14.2) ++dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl From Bruno Haible. ++ ++dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and ++dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't ++dnl require excessive bracketing. ++ifdef([AC_HELP_STRING], ++[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], ++[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) ++ ++dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed ++dnl to access previously installed libraries. The basic assumption is that ++dnl a user will want packages to use other packages he previously installed ++dnl with the same --prefix option. ++dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate ++dnl libraries, but is otherwise very convenient. ++AC_DEFUN([AC_LIB_PREFIX], ++[ ++ AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) ++ AC_REQUIRE([AC_PROG_CC]) ++ AC_REQUIRE([AC_CANONICAL_HOST]) ++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) ++ dnl By default, look in $includedir and $libdir. ++ use_additional=yes ++ AC_LIB_WITH_FINAL_PREFIX([ ++ eval additional_includedir=\"$includedir\" ++ eval additional_libdir=\"$libdir\" ++ ]) ++ AC_LIB_ARG_WITH([lib-prefix], ++[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib ++ --without-lib-prefix don't search for libraries in includedir and libdir], ++[ ++ if test "X$withval" = "Xno"; then ++ use_additional=no ++ else ++ if test "X$withval" = "X"; then ++ AC_LIB_WITH_FINAL_PREFIX([ ++ eval additional_includedir=\"$includedir\" ++ eval additional_libdir=\"$libdir\" ++ ]) ++ else ++ additional_includedir="$withval/include" ++ additional_libdir="$withval/lib" ++ fi ++ fi ++]) ++ if test $use_additional = yes; then ++ dnl Potentially add $additional_includedir to $CPPFLAGS. ++ dnl But don't add it ++ dnl 1. if it's the standard /usr/include, ++ dnl 2. if it's already present in $CPPFLAGS, ++ dnl 3. if it's /usr/local/include and we are using GCC on Linux, ++ dnl 4. if it doesn't exist as a directory. ++ if test "X$additional_includedir" != "X/usr/include"; then ++ haveit= ++ for x in $CPPFLAGS; do ++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ++ if test "X$x" = "X-I$additional_includedir"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ if test "X$additional_includedir" = "X/usr/local/include"; then ++ if test -n "$GCC"; then ++ case $host_os in ++ linux* | gnu* | k*bsd*-gnu) haveit=yes;; ++ esac ++ fi ++ fi ++ if test -z "$haveit"; then ++ if test -d "$additional_includedir"; then ++ dnl Really add $additional_includedir to $CPPFLAGS. ++ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" ++ fi ++ fi ++ fi ++ fi ++ dnl Potentially add $additional_libdir to $LDFLAGS. ++ dnl But don't add it ++ dnl 1. if it's the standard /usr/lib, ++ dnl 2. if it's already present in $LDFLAGS, ++ dnl 3. if it's /usr/local/lib and we are using GCC on Linux, ++ dnl 4. if it doesn't exist as a directory. ++ if test "X$additional_libdir" != "X/usr/lib"; then ++ haveit= ++ for x in $LDFLAGS; do ++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ++ if test "X$x" = "X-L$additional_libdir"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ if test "X$additional_libdir" = "X/usr/local/lib"; then ++ if test -n "$GCC"; then ++ case $host_os in ++ linux*) haveit=yes;; ++ esac ++ fi ++ fi ++ if test -z "$haveit"; then ++ if test -d "$additional_libdir"; then ++ dnl Really add $additional_libdir to $LDFLAGS. ++ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" ++ fi ++ fi ++ fi ++ fi ++ fi ++]) ++ ++dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, ++dnl acl_final_exec_prefix, containing the values to which $prefix and ++dnl $exec_prefix will expand at the end of the configure script. ++AC_DEFUN([AC_LIB_PREPARE_PREFIX], ++[ ++ dnl Unfortunately, prefix and exec_prefix get only finally determined ++ dnl at the end of configure. ++ if test "X$prefix" = "XNONE"; then ++ acl_final_prefix="$ac_default_prefix" ++ else ++ acl_final_prefix="$prefix" ++ fi ++ if test "X$exec_prefix" = "XNONE"; then ++ acl_final_exec_prefix='${prefix}' ++ else ++ acl_final_exec_prefix="$exec_prefix" ++ fi ++ acl_save_prefix="$prefix" ++ prefix="$acl_final_prefix" ++ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" ++ prefix="$acl_save_prefix" ++]) ++ ++dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the ++dnl variables prefix and exec_prefix bound to the values they will have ++dnl at the end of the configure script. ++AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], ++[ ++ acl_save_prefix="$prefix" ++ prefix="$acl_final_prefix" ++ acl_save_exec_prefix="$exec_prefix" ++ exec_prefix="$acl_final_exec_prefix" ++ $1 ++ exec_prefix="$acl_save_exec_prefix" ++ prefix="$acl_save_prefix" ++]) ++ ++# lib-link.m4 serial 6 (gettext-0.14.3) ++dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl From Bruno Haible. ++ ++AC_PREREQ(2.50) ++ ++dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and ++dnl the libraries corresponding to explicit and implicit dependencies. ++dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and ++dnl augments the CPPFLAGS variable. ++AC_DEFUN([AC_LIB_LINKFLAGS], ++[ ++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) ++ AC_REQUIRE([AC_LIB_RPATH]) ++ define([Name],[translit([$1],[./-], [___])]) ++ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) ++ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ ++ AC_LIB_LINKFLAGS_BODY([$1], [$2]) ++ ac_cv_lib[]Name[]_libs="$LIB[]NAME" ++ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" ++ ac_cv_lib[]Name[]_cppflags="$INC[]NAME" ++ ]) ++ LIB[]NAME="$ac_cv_lib[]Name[]_libs" ++ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" ++ INC[]NAME="$ac_cv_lib[]Name[]_cppflags" ++ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) ++ AC_SUBST([LIB]NAME) ++ AC_SUBST([LTLIB]NAME) ++ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the ++ dnl results of this search when this library appears as a dependency. ++ HAVE_LIB[]NAME=yes ++ undefine([Name]) ++ undefine([NAME]) ++]) ++ ++dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) ++dnl searches for libname and the libraries corresponding to explicit and ++dnl implicit dependencies, together with the specified include files and ++dnl the ability to compile and link the specified testcode. If found, it ++dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and ++dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and ++dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs ++dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. ++AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], ++[ ++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) ++ AC_REQUIRE([AC_LIB_RPATH]) ++ define([Name],[translit([$1],[./-], [___])]) ++ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) ++ ++ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME ++ dnl accordingly. ++ AC_LIB_LINKFLAGS_BODY([$1], [$2]) ++ ++ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, ++ dnl because if the user has installed lib[]Name and not disabled its use ++ dnl via --without-lib[]Name-prefix, he wants to use it. ++ ac_save_CPPFLAGS="$CPPFLAGS" ++ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) ++ ++ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ ++ ac_save_LIBS="$LIBS" ++ LIBS="$LIBS $LIB[]NAME" ++ AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) ++ LIBS="$ac_save_LIBS" ++ ]) ++ if test "$ac_cv_lib[]Name" = yes; then ++ HAVE_LIB[]NAME=yes ++ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) ++ AC_MSG_CHECKING([how to link with lib[]$1]) ++ AC_MSG_RESULT([$LIB[]NAME]) ++ else ++ HAVE_LIB[]NAME=no ++ dnl If $LIB[]NAME didn't lead to a usable library, we don't need ++ dnl $INC[]NAME either. ++ CPPFLAGS="$ac_save_CPPFLAGS" ++ LIB[]NAME= ++ LTLIB[]NAME= ++ fi ++ AC_SUBST([HAVE_LIB]NAME) ++ AC_SUBST([LIB]NAME) ++ AC_SUBST([LTLIB]NAME) ++ undefine([Name]) ++ undefine([NAME]) ++]) ++ ++dnl Determine the platform dependent parameters needed to use rpath: ++dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, ++dnl hardcode_direct, hardcode_minus_L. ++AC_DEFUN([AC_LIB_RPATH], ++[ ++ dnl Tell automake >= 1.10 to complain if config.rpath is missing. ++ m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) ++ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS ++ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld ++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host ++ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir ++ AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ ++ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ ++ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh ++ . ./conftest.sh ++ rm -f ./conftest.sh ++ acl_cv_rpath=done ++ ]) ++ wl="$acl_cv_wl" ++ libext="$acl_cv_libext" ++ shlibext="$acl_cv_shlibext" ++ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" ++ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" ++ hardcode_direct="$acl_cv_hardcode_direct" ++ hardcode_minus_L="$acl_cv_hardcode_minus_L" ++ dnl Determine whether the user wants rpath handling at all. ++ AC_ARG_ENABLE(rpath, ++ [ --disable-rpath do not hardcode runtime library paths], ++ :, enable_rpath=yes) ++]) ++ ++dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and ++dnl the libraries corresponding to explicit and implicit dependencies. ++dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. ++AC_DEFUN([AC_LIB_LINKFLAGS_BODY], ++[ ++ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) ++ dnl By default, look in $includedir and $libdir. ++ use_additional=yes ++ AC_LIB_WITH_FINAL_PREFIX([ ++ eval additional_includedir=\"$includedir\" ++ eval additional_libdir=\"$libdir\" ++ ]) ++ AC_LIB_ARG_WITH([lib$1-prefix], ++[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib ++ --without-lib$1-prefix don't search for lib$1 in includedir and libdir], ++[ ++ if test "X$withval" = "Xno"; then ++ use_additional=no ++ else ++ if test "X$withval" = "X"; then ++ AC_LIB_WITH_FINAL_PREFIX([ ++ eval additional_includedir=\"$includedir\" ++ eval additional_libdir=\"$libdir\" ++ ]) ++ else ++ additional_includedir="$withval/include" ++ additional_libdir="$withval/lib" ++ fi ++ fi ++]) ++ dnl Search the library and its dependencies in $additional_libdir and ++ dnl $LDFLAGS. Using breadth-first-seach. ++ LIB[]NAME= ++ LTLIB[]NAME= ++ INC[]NAME= ++ rpathdirs= ++ ltrpathdirs= ++ names_already_handled= ++ names_next_round='$1 $2' ++ while test -n "$names_next_round"; do ++ names_this_round="$names_next_round" ++ names_next_round= ++ for name in $names_this_round; do ++ already_handled= ++ for n in $names_already_handled; do ++ if test "$n" = "$name"; then ++ already_handled=yes ++ break ++ fi ++ done ++ if test -z "$already_handled"; then ++ names_already_handled="$names_already_handled $name" ++ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS ++ dnl or AC_LIB_HAVE_LINKFLAGS call. ++ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` ++ eval value=\"\$HAVE_LIB$uppername\" ++ if test -n "$value"; then ++ if test "$value" = yes; then ++ eval value=\"\$LIB$uppername\" ++ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" ++ eval value=\"\$LTLIB$uppername\" ++ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" ++ else ++ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined ++ dnl that this library doesn't exist. So just drop it. ++ : ++ fi ++ else ++ dnl Search the library lib$name in $additional_libdir and $LDFLAGS ++ dnl and the already constructed $LIBNAME/$LTLIBNAME. ++ found_dir= ++ found_la= ++ found_so= ++ found_a= ++ if test $use_additional = yes; then ++ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then ++ found_dir="$additional_libdir" ++ found_so="$additional_libdir/lib$name.$shlibext" ++ if test -f "$additional_libdir/lib$name.la"; then ++ found_la="$additional_libdir/lib$name.la" ++ fi ++ else ++ if test -f "$additional_libdir/lib$name.$libext"; then ++ found_dir="$additional_libdir" ++ found_a="$additional_libdir/lib$name.$libext" ++ if test -f "$additional_libdir/lib$name.la"; then ++ found_la="$additional_libdir/lib$name.la" ++ fi ++ fi ++ fi ++ fi ++ if test "X$found_dir" = "X"; then ++ for x in $LDFLAGS $LTLIB[]NAME; do ++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ++ case "$x" in ++ -L*) ++ dir=`echo "X$x" | sed -e 's/^X-L//'` ++ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then ++ found_dir="$dir" ++ found_so="$dir/lib$name.$shlibext" ++ if test -f "$dir/lib$name.la"; then ++ found_la="$dir/lib$name.la" ++ fi ++ else ++ if test -f "$dir/lib$name.$libext"; then ++ found_dir="$dir" ++ found_a="$dir/lib$name.$libext" ++ if test -f "$dir/lib$name.la"; then ++ found_la="$dir/lib$name.la" ++ fi ++ fi ++ fi ++ ;; ++ esac ++ if test "X$found_dir" != "X"; then ++ break ++ fi ++ done ++ fi ++ if test "X$found_dir" != "X"; then ++ dnl Found the library. ++ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" ++ if test "X$found_so" != "X"; then ++ dnl Linking with a shared library. We attempt to hardcode its ++ dnl directory into the executable's runpath, unless it's the ++ dnl standard /usr/lib. ++ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then ++ dnl No hardcoding is needed. ++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" ++ else ++ dnl Use an explicit option to hardcode DIR into the resulting ++ dnl binary. ++ dnl Potentially add DIR to ltrpathdirs. ++ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. ++ haveit= ++ for x in $ltrpathdirs; do ++ if test "X$x" = "X$found_dir"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ ltrpathdirs="$ltrpathdirs $found_dir" ++ fi ++ dnl The hardcoding into $LIBNAME is system dependent. ++ if test "$hardcode_direct" = yes; then ++ dnl Using DIR/libNAME.so during linking hardcodes DIR into the ++ dnl resulting binary. ++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" ++ else ++ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then ++ dnl Use an explicit option to hardcode DIR into the resulting ++ dnl binary. ++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" ++ dnl Potentially add DIR to rpathdirs. ++ dnl The rpathdirs will be appended to $LIBNAME at the end. ++ haveit= ++ for x in $rpathdirs; do ++ if test "X$x" = "X$found_dir"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ rpathdirs="$rpathdirs $found_dir" ++ fi ++ else ++ dnl Rely on "-L$found_dir". ++ dnl But don't add it if it's already contained in the LDFLAGS ++ dnl or the already constructed $LIBNAME ++ haveit= ++ for x in $LDFLAGS $LIB[]NAME; do ++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ++ if test "X$x" = "X-L$found_dir"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" ++ fi ++ if test "$hardcode_minus_L" != no; then ++ dnl FIXME: Not sure whether we should use ++ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" ++ dnl here. ++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" ++ else ++ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH ++ dnl here, because this doesn't fit in flags passed to the ++ dnl compiler. So give up. No hardcoding. This affects only ++ dnl very old systems. ++ dnl FIXME: Not sure whether we should use ++ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" ++ dnl here. ++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" ++ fi ++ fi ++ fi ++ fi ++ else ++ if test "X$found_a" != "X"; then ++ dnl Linking with a static library. ++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" ++ else ++ dnl We shouldn't come here, but anyway it's good to have a ++ dnl fallback. ++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" ++ fi ++ fi ++ dnl Assume the include files are nearby. ++ additional_includedir= ++ case "$found_dir" in ++ */lib | */lib/) ++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` ++ additional_includedir="$basedir/include" ++ ;; ++ esac ++ if test "X$additional_includedir" != "X"; then ++ dnl Potentially add $additional_includedir to $INCNAME. ++ dnl But don't add it ++ dnl 1. if it's the standard /usr/include, ++ dnl 2. if it's /usr/local/include and we are using GCC on Linux, ++ dnl 3. if it's already present in $CPPFLAGS or the already ++ dnl constructed $INCNAME, ++ dnl 4. if it doesn't exist as a directory. ++ if test "X$additional_includedir" != "X/usr/include"; then ++ haveit= ++ if test "X$additional_includedir" = "X/usr/local/include"; then ++ if test -n "$GCC"; then ++ case $host_os in ++ linux* | gnu* | k*bsd*-gnu) haveit=yes;; ++ esac ++ fi ++ fi ++ if test -z "$haveit"; then ++ for x in $CPPFLAGS $INC[]NAME; do ++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ++ if test "X$x" = "X-I$additional_includedir"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ if test -d "$additional_includedir"; then ++ dnl Really add $additional_includedir to $INCNAME. ++ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" ++ fi ++ fi ++ fi ++ fi ++ fi ++ dnl Look for dependencies. ++ if test -n "$found_la"; then ++ dnl Read the .la file. It defines the variables ++ dnl dlname, library_names, old_library, dependency_libs, current, ++ dnl age, revision, installed, dlopen, dlpreopen, libdir. ++ save_libdir="$libdir" ++ case "$found_la" in ++ */* | *\\*) . "$found_la" ;; ++ *) . "./$found_la" ;; ++ esac ++ libdir="$save_libdir" ++ dnl We use only dependency_libs. ++ for dep in $dependency_libs; do ++ case "$dep" in ++ -L*) ++ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` ++ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. ++ dnl But don't add it ++ dnl 1. if it's the standard /usr/lib, ++ dnl 2. if it's /usr/local/lib and we are using GCC on Linux, ++ dnl 3. if it's already present in $LDFLAGS or the already ++ dnl constructed $LIBNAME, ++ dnl 4. if it doesn't exist as a directory. ++ if test "X$additional_libdir" != "X/usr/lib"; then ++ haveit= ++ if test "X$additional_libdir" = "X/usr/local/lib"; then ++ if test -n "$GCC"; then ++ case $host_os in ++ linux* | gnu* | k*bsd*-gnu) haveit=yes;; ++ esac ++ fi ++ fi ++ if test -z "$haveit"; then ++ haveit= ++ for x in $LDFLAGS $LIB[]NAME; do ++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ++ if test "X$x" = "X-L$additional_libdir"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ if test -d "$additional_libdir"; then ++ dnl Really add $additional_libdir to $LIBNAME. ++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" ++ fi ++ fi ++ haveit= ++ for x in $LDFLAGS $LTLIB[]NAME; do ++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ++ if test "X$x" = "X-L$additional_libdir"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ if test -d "$additional_libdir"; then ++ dnl Really add $additional_libdir to $LTLIBNAME. ++ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" ++ fi ++ fi ++ fi ++ fi ++ ;; ++ -R*) ++ dir=`echo "X$dep" | sed -e 's/^X-R//'` ++ if test "$enable_rpath" != no; then ++ dnl Potentially add DIR to rpathdirs. ++ dnl The rpathdirs will be appended to $LIBNAME at the end. ++ haveit= ++ for x in $rpathdirs; do ++ if test "X$x" = "X$dir"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ rpathdirs="$rpathdirs $dir" ++ fi ++ dnl Potentially add DIR to ltrpathdirs. ++ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. ++ haveit= ++ for x in $ltrpathdirs; do ++ if test "X$x" = "X$dir"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ ltrpathdirs="$ltrpathdirs $dir" ++ fi ++ fi ++ ;; ++ -l*) ++ dnl Handle this in the next round. ++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ++ ;; ++ *.la) ++ dnl Handle this in the next round. Throw away the .la's ++ dnl directory; it is already contained in a preceding -L ++ dnl option. ++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` ++ ;; ++ *) ++ dnl Most likely an immediate library name. ++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" ++ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" ++ ;; ++ esac ++ done ++ fi ++ else ++ dnl Didn't find the library; assume it is in the system directories ++ dnl known to the linker and runtime loader. (All the system ++ dnl directories known to the linker should also be known to the ++ dnl runtime loader, otherwise the system is severely misconfigured.) ++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" ++ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" ++ fi ++ fi ++ fi ++ done ++ done ++ if test "X$rpathdirs" != "X"; then ++ if test -n "$hardcode_libdir_separator"; then ++ dnl Weird platform: only the last -rpath option counts, the user must ++ dnl pass all path elements in one option. We can arrange that for a ++ dnl single library, but not when more than one $LIBNAMEs are used. ++ alldirs= ++ for found_dir in $rpathdirs; do ++ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" ++ done ++ dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. ++ acl_save_libdir="$libdir" ++ libdir="$alldirs" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ libdir="$acl_save_libdir" ++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" ++ else ++ dnl The -rpath options are cumulative. ++ for found_dir in $rpathdirs; do ++ acl_save_libdir="$libdir" ++ libdir="$found_dir" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ libdir="$acl_save_libdir" ++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" ++ done ++ fi ++ fi ++ if test "X$ltrpathdirs" != "X"; then ++ dnl When using libtool, the option that works for both libraries and ++ dnl executables is -R. The -R options are cumulative. ++ for found_dir in $ltrpathdirs; do ++ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" ++ done ++ fi ++]) ++ ++dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, ++dnl unless already present in VAR. ++dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes ++dnl contains two or three consecutive elements that belong together. ++AC_DEFUN([AC_LIB_APPENDTOVAR], ++[ ++ for element in [$2]; do ++ haveit= ++ for x in $[$1]; do ++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ++ if test "X$x" = "X$element"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ [$1]="${[$1]}${[$1]:+ }$element" ++ fi ++ done ++]) ++ ++# lib-ld.m4 serial 3 (gettext-0.13) ++dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl Subroutines of libtool.m4, ++dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision ++dnl with libtool.m4. ++ ++dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. ++AC_DEFUN([AC_LIB_PROG_LD_GNU], ++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, ++[# I'd rather use --version here, but apparently some GNU ld's only accept -v. ++case `$LD -v 2>&1 conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh ++fi ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ AC_MSG_CHECKING([for ld used by GCC]) ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [[\\/]* | [A-Za-z]:[\\/]*)] ++ [re_direlt='/[^/][^/]*/\.\./'] ++ # Canonicalize the path of ld ++ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` ++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld ++ ;; ++ *) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown ++ ;; ++ esac ++elif test "$with_gnu_ld" = yes; then ++ AC_MSG_CHECKING([for GNU ld]) ++else ++ AC_MSG_CHECKING([for non-GNU ld]) ++fi ++AC_CACHE_VAL(acl_cv_path_LD, ++[if test -z "$LD"; then ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" ++ for ac_dir in $PATH; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ acl_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some GNU ld's only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in ++ *GNU* | *'with BFD'*) ++ test "$with_gnu_ld" != no && break ;; ++ *) ++ test "$with_gnu_ld" != yes && break ;; ++ esac ++ fi ++ done ++ IFS="$ac_save_ifs" ++else ++ acl_cv_path_LD="$LD" # Let the user override the test with a path. ++fi]) ++LD="$acl_cv_path_LD" ++if test -n "$LD"; then ++ AC_MSG_RESULT($LD) ++else ++ AC_MSG_RESULT(no) ++fi ++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) ++AC_LIB_PROG_LD_GNU ++]) ++ ++# Define a conditional. ++ ++AC_DEFUN([AM_CONDITIONAL], ++[AC_SUBST($1_TRUE) ++AC_SUBST($1_FALSE) ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' ++else ++ $1_TRUE='#' ++ $1_FALSE= ++fi]) ++ +Index: sabre-0.2.4b/config.guess +=================================================================== +--- sabre-0.2.4b.orig/config.guess 2006-05-15 23:35:59.000000000 +0200 ++++ sabre-0.2.4b/config.guess 2006-05-15 23:36:45.000000000 +0200 +@@ -1,7 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. +-# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. +-# ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ++ ++timestamp='2006-02-23' ++ + # This file 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 2 of the License, or +@@ -14,109 +17,326 @@ + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + +-# Written by Per Bothner . +-# The master version of this file is at the FSF in /home/gd/gnu/lib. ++ ++# Originally written by Per Bothner . ++# Please send patches to . Submit a context ++# diff and a properly formatted ChangeLog entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # + # The plan is that this can be called by configure scripts if you +-# don't specify an explicit system type (host/target name). +-# +-# Only a few systems have been added to this list; please add others +-# (but try to keep the structure clean). +-# ++# don't specify an explicit build system type. ++ ++me=`echo "$0" | sed -e 's,.*/,,'` ++ ++usage="\ ++Usage: $0 [OPTION] ++ ++Output the configuration name of the system \`$me' is run on. ++ ++Operation modes: ++ -h, --help print this help, then exit ++ -t, --time-stamp print date of last modification, then exit ++ -v, --version print version number, then exit ++ ++Report bugs and patches to ." ++ ++version="\ ++GNU config.guess ($timestamp) ++ ++Originally written by Per Bothner. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++Free Software Foundation, Inc. ++ ++This is free software; see the source for copying conditions. There is NO ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++ ++help=" ++Try \`$me --help' for more information." ++ ++# Parse command line ++while test $# -gt 0 ; do ++ case $1 in ++ --time-stamp | --time* | -t ) ++ echo "$timestamp" ; exit ;; ++ --version | -v ) ++ echo "$version" ; exit ;; ++ --help | --h* | -h ) ++ echo "$usage"; exit ;; ++ -- ) # Stop option processing ++ shift; break ;; ++ - ) # Use stdin as input. ++ break ;; ++ -* ) ++ echo "$me: invalid option $1$help" >&2 ++ exit 1 ;; ++ * ) ++ break ;; ++ esac ++done ++ ++if test $# != 0; then ++ echo "$me: too many arguments$help" >&2 ++ exit 1 ++fi ++ ++trap 'exit 1' 1 2 15 ++ ++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a ++# compiler to aid in system detection is discouraged as it requires ++# temporary files to be created and, as you can see below, it is a ++# headache to deal with in a portable fashion. ++ ++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still ++# use `HOST_CC' if defined, but it is deprecated. ++ ++# Portable tmp directory creation inspired by the Autoconf team. ++ ++set_cc_for_build=' ++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; ++: ${TMPDIR=/tmp} ; ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || ++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; ++dummy=$tmp/dummy ; ++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; ++case $CC_FOR_BUILD,$HOST_CC,$CC in ++ ,,) echo "int x;" > $dummy.c ; ++ for c in cc gcc c89 c99 ; do ++ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then ++ CC_FOR_BUILD="$c"; break ; ++ fi ; ++ done ; ++ if test x"$CC_FOR_BUILD" = x ; then ++ CC_FOR_BUILD=no_compiler_found ; ++ fi ++ ;; ++ ,,*) CC_FOR_BUILD=$CC ;; ++ ,*,*) CC_FOR_BUILD=$HOST_CC ;; ++esac ; set_cc_for_build= ;' + + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. +-# (ghazi@noc.rutgers.edu 8/24/94.) ++# (ghazi@noc.rutgers.edu 1994-08-24) + if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH + fi + + UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown + UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown ++UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15 +- + # Note: order is significant - the case branches are not exclusive. + + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ++ *:NetBSD:*:*) ++ # NetBSD (nbsd) targets should (where applicable) match one or ++ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently ++ # switched to ELF, *-*-netbsd* would select the old ++ # object file format. This provides both forward ++ # compatibility and a consistent mechanism for selecting the ++ # object file format. ++ # ++ # Note: NetBSD doesn't particularly care about the vendor ++ # portion of the name. We always set it to "unknown". ++ sysctl="sysctl -n hw.machine_arch" ++ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ ++ /usr/sbin/$sysctl 2>/dev/null || echo unknown)` ++ case "${UNAME_MACHINE_ARCH}" in ++ armeb) machine=armeb-unknown ;; ++ arm*) machine=arm-unknown ;; ++ sh3el) machine=shl-unknown ;; ++ sh3eb) machine=sh-unknown ;; ++ *) machine=${UNAME_MACHINE_ARCH}-unknown ;; ++ esac ++ # The Operating System including object format, if it has switched ++ # to ELF recently, or will in the future. ++ case "${UNAME_MACHINE_ARCH}" in ++ arm*|i386|m68k|ns32k|sh3*|sparc|vax) ++ eval $set_cc_for_build ++ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep __ELF__ >/dev/null ++ then ++ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). ++ # Return netbsd for either. FIX? ++ os=netbsd ++ else ++ os=netbsdelf ++ fi ++ ;; ++ *) ++ os=netbsd ++ ;; ++ esac ++ # The OS release ++ # Debian GNU/NetBSD machines have a different userland, and ++ # thus, need a distinct triplet. However, they do not need ++ # kernel version information, so it can be replaced with a ++ # suitable tag, in the style of linux-gnu. ++ case "${UNAME_VERSION}" in ++ Debian*) ++ release='-gnu' ++ ;; ++ *) ++ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ ;; ++ esac ++ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: ++ # contains redundant information, the shorter form: ++ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. ++ echo "${machine}-${os}${release}" ++ exit ;; ++ *:OpenBSD:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; ++ *:ekkoBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} ++ exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; ++ macppc:MirBSD:*:*) ++ echo powerppc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ *:MirBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; + alpha:OSF1:*:*) ++ case $UNAME_RELEASE in ++ *4.0) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac ++ # According to Compaq, /usr/sbin/psrinfo has been available on ++ # OSF/1 and Tru64 systems produced since 1995. I hope that ++ # covers most systems running today. This code pipes the CPU ++ # types through head -n 1, so we only detect the type of CPU 0. ++ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` ++ case "$ALPHA_CPU_TYPE" in ++ "EV4 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "EV4.5 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "LCA4 (21066/21068)") ++ UNAME_MACHINE="alpha" ;; ++ "EV5 (21164)") ++ UNAME_MACHINE="alphaev5" ;; ++ "EV5.6 (21164A)") ++ UNAME_MACHINE="alphaev56" ;; ++ "EV5.6 (21164PC)") ++ UNAME_MACHINE="alphapca56" ;; ++ "EV5.7 (21164PC)") ++ UNAME_MACHINE="alphapca57" ;; ++ "EV6 (21264)") ++ UNAME_MACHINE="alphaev6" ;; ++ "EV6.7 (21264A)") ++ UNAME_MACHINE="alphaev67" ;; ++ "EV6.8CB (21264C)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8AL (21264B)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8CX (21264D)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.9A (21264/EV69A)") ++ UNAME_MACHINE="alphaev69" ;; ++ "EV7 (21364)") ++ UNAME_MACHINE="alphaev7" ;; ++ "EV7.9 (21364A)") ++ UNAME_MACHINE="alphaev79" ;; ++ esac ++ # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'` +- exit 0 ;; ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ exit ;; ++ Alpha\ *:Windows_NT*:*) ++ # How do we know it's Interix rather than the generic POSIX subsystem? ++ # Should we change UNAME_MACHINE based on the output of uname instead ++ # of the specific Alpha model? ++ echo alpha-pc-interix ++ exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 +- exit 0 ;; ++ exit ;; + Amiga*:UNIX_System_V:4.0:*) +- echo m68k-cbm-sysv4 +- exit 0;; +- amiga:NetBSD:*:*) +- echo m68k-cbm-netbsd${UNAME_RELEASE} +- exit 0 ;; +- amiga:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arc64:OpenBSD:*:*) +- echo mips64el-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- hkmips:OpenBSD:*:*) +- echo mips-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pmax:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sgi:OpenBSD:*:*) +- echo mips-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- wgrisc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-unknown-sysv4 ++ exit ;; ++ *:[Aa]miga[Oo][Ss]:*:*) ++ echo ${UNAME_MACHINE}-unknown-amigaos ++ exit ;; ++ *:[Mm]orph[Oo][Ss]:*:*) ++ echo ${UNAME_MACHINE}-unknown-morphos ++ exit ;; ++ *:OS/390:*:*) ++ echo i370-ibm-openedition ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; ++ *:OS400:*:*) ++ echo powerpc-ibm-os400 ++ exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} +- exit 0;; +- SR2?01:HI-UX/MPP:*:*) ++ exit ;; ++ arm:riscos:*:*|arm:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; ++ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp +- exit 0;; +- Pyramid*:OSx*:*:*|MIS*:OSx*:*:*) ++ exit ;; ++ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi +- exit 0 ;; +- NILE:*:*:dcosx) ++ exit ;; ++ NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 +- exit 0 ;; ++ exit ;; ++ DRS?6000:unix:4.0:6*) ++ echo sparc-icl-nx6 ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) ++ case `/usr/bin/uname -p` in ++ sparc) echo sparc-icl-nx7; exit ;; ++ esac ;; ++ sun4H:SunOS:5.*:*) ++ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + i86pc:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) +@@ -125,55 +345,78 @@ + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit 0 ;; ++ exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ sun*:*:4.2BSD:*) ++ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` ++ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 ++ case "`/bin/arch`" in ++ sun3) ++ echo m68k-sun-sunos${UNAME_RELEASE} ++ ;; ++ sun4) ++ echo sparc-sun-sunos${UNAME_RELEASE} ++ ;; ++ esac ++ exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; +- atari*:NetBSD:*:*) +- echo m68k-atari-netbsd${UNAME_RELEASE} +- exit 0 ;; +- atari*:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sun3*:NetBSD:*:*) +- echo m68k-sun-netbsd${UNAME_RELEASE} +- exit 0 ;; +- sun3*:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:NetBSD:*:*) +- echo m68k-apple-netbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ # The situation for MiNT is a little confusing. The machine name ++ # can be virtually everything (everything which is not ++ # "atarist" or "atariste" at least should have a processor ++ # > m68000). The system name ranges from "MiNT" over "FreeMiNT" ++ # to the lowercase version "mint" (or "freemint"). Finally ++ # the system name "TOS" denotes a system which is actually not ++ # MiNT. But MiNT is downward compatible to TOS, so this should ++ # be no problem. ++ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; ++ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; ++ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 +- exit 0 ;; ++ exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; +- 2020:CLIX:*:*) ++ exit ;; ++ 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) +- sed 's/^ //' << EOF >dummy.c +- int main (argc, argv) int argc; char **argv; { ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++#ifdef __cplusplus ++#include /* for printf() prototype */ ++ int main (int argc, char *argv[]) { ++#else ++ int main (argc, argv) int argc; char *argv[]; { ++#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); +@@ -188,62 +431,83 @@ + exit (-1); + } + EOF +- ${CC-cc} dummy.c -o dummy \ +- && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ +- && rm dummy.c dummy && exit 0 +- rm -f dummy.c dummy ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ Motorola:PowerMAX_OS:*:*) ++ echo powerpc-motorola-powermax ++ exit ;; ++ Motorola:*:4.3:PL8-*) ++ echo powerpc-harris-powermax ++ exit ;; ++ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) ++ echo powerpc-harris-powermax ++ exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix +- exit 0 ;; ++ exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 +- exit 0 ;; ++ exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 +- exit 0 ;; ++ exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` +- if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then +- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ +- -o ${TARGET_BINARY_INTERFACE}x = x ] ; then ++ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] ++ then ++ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ ++ [ ${TARGET_BINARY_INTERFACE}x = x ] ++ then + echo m88k-dg-dgux${UNAME_RELEASE} +- else ++ else + echo m88k-dg-dguxbcs${UNAME_RELEASE} ++ fi ++ else ++ echo i586-dg-dgux${UNAME_RELEASE} + fi +- else echo i586-dg-dgux${UNAME_RELEASE} +- fi +- exit 0 ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 +- exit 0 ;; ++ exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 +- exit 0 ;; ++ exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd +- exit 0 ;; ++ exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit 0 ;; ++ exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' +- i?86:AIX:*:*) ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ i*86:AIX:*:*) + echo i386-ibm-aix +- exit 0 ;; ++ exit ;; ++ ia64:AIX:*:*) ++ if [ -x /usr/bin/oslevel ] ; then ++ IBM_REV=`/usr/bin/oslevel` ++ else ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi ++ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} ++ exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then +- sed 's/^ //' << EOF >dummy.c ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c + #include + + main() +@@ -254,17 +518,21 @@ + exit(0); + } + EOF +- ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 +- rm -f dummy.c dummy +- echo rs6000-ibm-aix3.2.5 ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi +- exit 0 ;; +- *:AIX:*:4) +- if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then ++ exit ;; ++ *:AIX:*:[45]) ++ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` ++ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc +@@ -272,43 +540,120 @@ + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else +- IBM_REV=4.${UNAME_RELEASE} ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix +- exit 0 ;; ++ exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 +- exit 0 ;; +- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and ++ exit ;; ++ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit 0 ;; # report: romp-ibm BSD 4.3 ++ exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx +- exit 0 ;; ++ exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 +- exit 0 ;; ++ exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd +- exit 0 ;; ++ exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 +- exit 0 ;; +- 9000/[3478]??:HP-UX:*:*) ++ exit ;; ++ 9000/[34678]??:HP-UX:*:*) ++ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; +- 9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;; +- 9000/8?? ) HP_ARCH=hppa1.0 ;; ++ 9000/[678][0-9][0-9]) ++ if [ -x /usr/bin/getconf ]; then ++ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; ++ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 ++ esac ;; ++ esac ++ fi ++ if [ "${HP_ARCH}" = "" ]; then ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } ++EOF ++ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ++ test -z "$HP_ARCH" && HP_ARCH=hppa ++ fi ;; + esac +- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` ++ if [ ${HP_ARCH} = "hppa2.0w" ] ++ then ++ eval $set_cc_for_build ++ ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 ++ ++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep __LP64__ >/dev/null ++ then ++ HP_ARCH="hppa2.0w" ++ else ++ HP_ARCH="hppa64" ++ fi ++ fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; ++ ia64:HP-UX:*:*) ++ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` ++ echo ia64-hp-hpux${HPUX_REV} ++ exit ;; + 3050*:HI-UX:*:*) +- sed 's/^ //' << EOF >dummy.c ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c + #include + int + main () +@@ -333,241 +678,473 @@ + exit (0); + } + EOF +- ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 +- rm -f dummy.c dummy ++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 +- exit 0 ;; ++ exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd +- exit 0 ;; ++ exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd +- exit 0 ;; ++ exit ;; ++ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) ++ echo hppa1.0-hp-mpeix ++ exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf +- exit 0 ;; ++ exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf +- exit 0 ;; +- i?86:OSF1:*:*) ++ exit ;; ++ i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi +- exit 0 ;; ++ exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites +- exit 0 ;; ++ exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit 0 ;; +- CRAY*X-MP:*:*:*) +- echo xmp-cray-unicos +- exit 0 ;; ++ exit ;; + CRAY*Y-MP:*:*:*) +- echo ymp-cray-unicos${UNAME_RELEASE} +- exit 0 ;; ++ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ +- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ +- exit 0 ;; ++ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ ++ -e 's/\.[^.]*$/.X/' ++ exit ;; + CRAY*TS:*:*:*) +- echo t90-cray-unicos${UNAME_RELEASE} +- exit 0 ;; +- CRAY-2:*:*:*) +- echo cray2-cray-unicos +- exit 0 ;; +- F300:UNIX_System_V:*:*) +- FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'` ++ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*T3E:*:*:*) ++ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*SV1:*:*:*) ++ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ *:UNICOS/mp:*:*) ++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) ++ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; +- F301:UNIX_System_V:*:*) +- echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` +- exit 0 ;; +- hp3[0-9][05]:NetBSD:*:*) +- echo m68k-hp-netbsd${UNAME_RELEASE} +- exit 0 ;; +- hp300:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- i?86:BSD/386:*:* | *:BSD/OS:*:*) ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; ++ 5000:UNIX_System_V:4.*:*) ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; ++ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ sparc*:BSD/OS:*:*) ++ echo sparc-unknown-bsdi${UNAME_RELEASE} ++ exit ;; ++ *:BSD/OS:*:*) ++ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} ++ exit ;; + *:FreeBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` +- exit 0 ;; +- *:NetBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` +- exit 0 ;; +- *:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` +- exit 0 ;; ++ case ${UNAME_MACHINE} in ++ pc98) ++ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac ++ exit ;; + i*:CYGWIN*:*) +- echo i386-pc-cygwin32 +- exit 0 ;; ++ echo ${UNAME_MACHINE}-pc-cygwin ++ exit ;; ++ i*:MINGW*:*) ++ echo ${UNAME_MACHINE}-pc-mingw32 ++ exit ;; ++ i*:MSYS_NT-*:*:*) ++ echo ${UNAME_MACHINE}-pc-mingw32 ++ exit ;; ++ i*:windows32*:*) ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 ++ exit ;; ++ i*:PW*:*) ++ echo ${UNAME_MACHINE}-pc-pw32 ++ exit ;; ++ x86:Interix*:[345]*) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ EM64T:Interix*:[345]*) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) ++ echo i${UNAME_MACHINE}-pc-mks ++ exit ;; ++ i*:Windows_NT*:* | Pentium*:Windows_NT*:*) ++ # How do we know it's Interix rather than the generic POSIX subsystem? ++ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we ++ # UNAME_MACHINE based on the output of uname instead of i386? ++ echo i586-pc-interix ++ exit ;; ++ i*:UWIN*:*) ++ echo ${UNAME_MACHINE}-pc-uwin ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-unknown-cygwin ++ exit ;; + p*:CYGWIN*:*) +- echo powerpcle-unknown-cygwin32 +- exit 0 ;; ++ echo powerpcle-unknown-cygwin ++ exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + *:GNU:*:*) ++ # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- exit 0 ;; +- *:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. +- ld_help_string=`ld --help 2>&1` +- if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then +- echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0 +- elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 +- elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 +- elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then +- echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0 +- elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then +- echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 +- elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then +- echo "powerpc-unknown-linux-gnu" ; exit 0 +- elif test "${UNAME_MACHINE}" = "alpha" ; then +- echo alpha-unknown-linux-gnu ; exit 0 +- elif test "${UNAME_MACHINE}" = "sparc" ; then +- echo sparc-unknown-linux-gnu ; exit 0 +- elif test "${UNAME_MACHINE}" = "mips" ; then +- cat >dummy.c <$dummy.c ++ #undef CPU ++ #undef mips ++ #undef mipsel ++ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ++ CPU=mipsel ++ #else ++ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ++ CPU=mips ++ #else ++ CPU= ++ #endif ++ #endif + EOF +- ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 +- rm -f dummy.c dummy +- else +- # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us +- # useful --help. Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout. +- test ! -d /usr/lib/ldscripts/. \ +- && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 +- # Determine whether the default compiler is a.out or elf +- cat >dummy.c </dev/null | sed -n ' ++ /^CPU/{ ++ s: ::g ++ p ++ }'`" ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ++ ;; ++ mips64:Linux:*:*) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #undef CPU ++ #undef mips64 ++ #undef mips64el ++ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ++ CPU=mips64el ++ #else ++ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ++ CPU=mips64 ++ #else ++ CPU= ++ #endif ++ #endif ++EOF ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^CPU/{ ++ s: ::g ++ p ++ }'`" ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ++ ;; ++ or32:Linux:*:*) ++ echo or32-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; ++ parisc:Linux:*:* | hppa:Linux:*:*) ++ # Look for CPU level ++ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in ++ PA7*) echo hppa1.1-unknown-linux-gnu ;; ++ PA8*) echo hppa2.0-unknown-linux-gnu ;; ++ *) echo hppa-unknown-linux-gnu ;; ++ esac ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; ++ s390:Linux:*:* | s390x:Linux:*:*) ++ echo ${UNAME_MACHINE}-ibm-linux ++ exit ;; ++ sh64*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ sh*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ sparc:Linux:*:* | sparc64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-gnu ++ exit ;; ++ x86_64:Linux:*:*) ++ echo x86_64-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ # The BFD linker knows what the default object file format is, so ++ # first see if it will tell us. cd to the root directory to prevent ++ # problems with other programs or directories called `ld' in the path. ++ # Set LC_ALL=C to ensure ld outputs messages in English. ++ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ ++ | sed -ne '/supported targets:/!d ++ s/[ ][ ]*/ /g ++ s/.*supported targets: *// ++ s/ .*// ++ p'` ++ case "$ld_supported_targets" in ++ elf32-i386) ++ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ++ ;; ++ a.out-i386-linux) ++ echo "${UNAME_MACHINE}-pc-linux-gnuaout" ++ exit ;; ++ coff-i386) ++ echo "${UNAME_MACHINE}-pc-linux-gnucoff" ++ exit ;; ++ "") ++ # Either a pre-BFD a.out linker (linux-gnuoldld) or ++ # one that does not give us useful --help. ++ echo "${UNAME_MACHINE}-pc-linux-gnuoldld" ++ exit ;; ++ esac ++ # Determine whether the default compiler is a.out or elf ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #include ++ #ifdef __ELF__ ++ # ifdef __GLIBC__ ++ # if __GLIBC__ >= 2 ++ LIBC=gnu ++ # else ++ LIBC=gnulibc1 ++ # endif ++ # else ++ LIBC=gnulibc1 ++ # endif ++ #else ++ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) ++ LIBC=gnu ++ #else ++ LIBC=gnuaout ++ #endif ++ #endif ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif + EOF +- ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 +- rm -f dummy.c dummy +- fi ;; +-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions +-# are messed up and put the nodename in both sysname and nodename. +- i?86:DYNIX/ptx:4*:*) ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^LIBC/{ ++ s: ::g ++ p ++ }'`" ++ test x"${LIBC}" != x && { ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ++ } ++ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ++ ;; ++ i*86:DYNIX/ptx:4*:*) ++ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. ++ # earlier versions are messed up and put the nodename in both ++ # sysname and nodename. + echo i386-sequent-sysv4 +- exit 0 ;; +- i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) ++ exit ;; ++ i*86:UNIX_SV:4.2MP:2.*) ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, ++ # I just have to hope. -- rms. ++ # Use sysv4.2uw... so that sysv4* matches it. ++ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} ++ exit ;; ++ i*86:OS/2:*:*) ++ # If we were able to find `uname', then EMX Unix compatibility ++ # is probably installed. ++ echo ${UNAME_MACHINE}-pc-os2-emx ++ exit ;; ++ i*86:XTS-300:*:STOP) ++ echo ${UNAME_MACHINE}-unknown-stop ++ exit ;; ++ i*86:atheos:*:*) ++ echo ${UNAME_MACHINE}-unknown-atheos ++ exit ;; ++ i*86:syllable:*:*) ++ echo ${UNAME_MACHINE}-pc-syllable ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ echo i386-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ i*86:*DOS:*:*) ++ echo ${UNAME_MACHINE}-pc-msdosdjgpp ++ exit ;; ++ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) ++ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +- echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} ++ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else +- echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} ++ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi +- exit 0 ;; +- i?86:*:3.2:*) ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ case `/bin/uname -X | grep "^Machine"` in ++ *486*) UNAME_MACHINE=i486 ;; ++ *Pentium) UNAME_MACHINE=i586 ;; ++ *Pent*|*Celeron) UNAME_MACHINE=i686 ;; ++ esac ++ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} ++ exit ;; ++ i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then +- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` +- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 +- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ ++ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` ++ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 ++ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 ++ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ ++ && UNAME_MACHINE=i686 ++ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ ++ && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi +- exit 0 ;; ++ exit ;; ++ pc:*:*:*) ++ # Left here for compatibility: ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i386. ++ echo i386-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 +- exit 0 ;; ++ exit ;; + paragon:*:*:*) + echo i860-intel-osf1 +- exit 0 ;; ++ exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi +- exit 0 ;; ++ exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv +- exit 0 ;; +- M68*:*:R3V[567]*:*) +- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) ++ exit ;; ++ mc68k:UNIX:SYSTEM5:3.51m) ++ echo m68k-convergent-sysv ++ exit ;; ++ M680?0:D-NIX:5.3:*) ++ echo m68k-diab-dnix ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4 && exit 0 ;; +- m68*:LynxOS:2.*:*) ++ && { echo i486-ncr-sysv4; exit; } ;; ++ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 +- exit 0 ;; +- i?86:LynxOS:2.*:*) +- echo i386-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; +- rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) ++ exit ;; ++ rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ echo powerpc-unknown-lynxos${UNAME_RELEASE} ++ exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ RM*:ReliantUNIX-*:*:*) ++ echo mips-sni-sysv4 ++ exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` +@@ -575,36 +1152,156 @@ + else + echo ns32k-sni-sysv + fi +- exit 0 ;; +- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says ++ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says + echo i586-unisys-sysv4 +- exit 0 ;; ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 +- exit 0 ;; ++ exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 +- exit 0 ;; ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo ${UNAME_MACHINE}-stratus-vos ++ exit ;; ++ *:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo hppa1.1-stratus-vos ++ exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} +- exit 0 ;; +- R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*) ++ exit ;; ++ news*:NEWS-OS:6*:*) ++ echo mips-sony-newsos6 ++ exit ;; ++ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; ++ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. ++ echo powerpc-be-beos ++ exit ;; ++ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. ++ echo powerpc-apple-beos ++ exit ;; ++ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. ++ echo i586-pc-beos ++ exit ;; ++ SX-4:SUPER-UX:*:*) ++ echo sx4-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-5:SUPER-UX:*:*) ++ echo sx5-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-6:SUPER-UX:*:*) ++ echo sx6-nec-superux${UNAME_RELEASE} ++ exit ;; ++ Power*:Rhapsody:*:*) ++ echo powerpc-apple-rhapsody${UNAME_RELEASE} ++ exit ;; ++ *:Rhapsody:*:*) ++ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} ++ exit ;; ++ *:Darwin:*:*) ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ case $UNAME_PROCESSOR in ++ unknown) UNAME_PROCESSOR=powerpc ;; ++ esac ++ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} ++ exit ;; ++ *:procnto*:*:* | *:QNX:[0123456789]*:*) ++ UNAME_PROCESSOR=`uname -p` ++ if test "$UNAME_PROCESSOR" = "x86"; then ++ UNAME_PROCESSOR=i386 ++ UNAME_MACHINE=pc ++ fi ++ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} ++ exit ;; ++ *:QNX:*:4*) ++ echo i386-pc-qnx ++ exit ;; ++ NSE-?:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSR-?:NONSTOP_KERNEL:*:*) ++ echo nsr-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ *:NonStop-UX:*:*) ++ echo mips-compaq-nonstopux ++ exit ;; ++ BS2000:POSIX*:*:*) ++ echo bs2000-siemens-sysv ++ exit ;; ++ DS/*:UNIX_System_V:*:*) ++ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} ++ exit ;; ++ *:Plan9:*:*) ++ # "uname -m" is not consistent, so use $cputype instead. 386 ++ # is converted to i386 for consistency with other x86 ++ # operating systems. ++ if test "$cputype" = "386"; then ++ UNAME_MACHINE=i386 ++ else ++ UNAME_MACHINE="$cputype" ++ fi ++ echo ${UNAME_MACHINE}-unknown-plan9 ++ exit ;; ++ *:TOPS-10:*:*) ++ echo pdp10-unknown-tops10 ++ exit ;; ++ *:TENEX:*:*) ++ echo pdp10-unknown-tenex ++ exit ;; ++ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) ++ echo pdp10-dec-tops20 ++ exit ;; ++ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) ++ echo pdp10-xkl-tops20 ++ exit ;; ++ *:TOPS-20:*:*) ++ echo pdp10-unknown-tops20 ++ exit ;; ++ *:ITS:*:*) ++ echo pdp10-unknown-its ++ exit ;; ++ SEI:*:*:SEIUX) ++ echo mips-sei-seiux${UNAME_RELEASE} ++ exit ;; ++ *:DragonFly:*:*) ++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "${UNAME_MACHINE}" in ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; ++ esac ;; ++ *:XENIX:*:SysV) ++ echo i386-pc-xenix ++ exit ;; ++ i*86:skyos:*:*) ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ exit ;; ++ i*86:rdos:*:*) ++ echo ${UNAME_MACHINE}-pc-rdos ++ exit ;; + esac + + #echo '(No uname command or uname output not recognized.)' 1>&2 + #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + +-cat >dummy.c <$dummy.c < + # include +@@ -629,7 +1326,7 @@ + #endif + + #if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix"); exit (0); ++ printf ("arm-acorn-riscix\n"); exit (0); + #endif + + #if defined (hp300) && !defined (hpux) +@@ -642,7 +1339,10 @@ + #endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; +- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); ++ if (version < 4) ++ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); ++ else ++ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); + #endif + +@@ -687,11 +1387,24 @@ + #endif + + #if defined (vax) +-#if !defined (ultrix) +- printf ("vax-dec-bsd\n"); exit (0); +-#else +- printf ("vax-dec-ultrix\n"); exit (0); +-#endif ++# if !defined (ultrix) ++# include ++# if defined (BSD) ++# if BSD == 43 ++ printf ("vax-dec-bsd4.3\n"); exit (0); ++# else ++# if BSD == 199006 ++ printf ("vax-dec-bsd4.3reno\n"); exit (0); ++# else ++ printf ("vax-dec-bsd\n"); exit (0); ++# endif ++# endif ++# else ++ printf ("vax-dec-bsd\n"); exit (0); ++# endif ++# else ++ printf ("vax-dec-ultrix\n"); exit (0); ++# endif + #endif + + #if defined (alliant) && defined (i860) +@@ -702,12 +1415,12 @@ + } + EOF + +-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0 +-rm -f dummy.c dummy ++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + + # Apollos put the system type in the environment. + +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } ++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + + # Convex versions that predate uname can use getsysinfo(1) + +@@ -716,25 +1429,69 @@ + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + c34*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + c38*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + c4*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + esac + fi + +-#echo '(Unable to guess system type)' 1>&2 ++cat >&2 < in order to provide the needed ++information to handle your system. ++ ++config.guess timestamp = $timestamp ++ ++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` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null` ++ ++hostinfo = `(hostinfo) 2>/dev/null` ++/bin/universe = `(/bin/universe) 2>/dev/null` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` ++/bin/arch = `(/bin/arch) 2>/dev/null` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` ++ ++UNAME_MACHINE = ${UNAME_MACHINE} ++UNAME_RELEASE = ${UNAME_RELEASE} ++UNAME_SYSTEM = ${UNAME_SYSTEM} ++UNAME_VERSION = ${UNAME_VERSION} ++EOF + + exit 1 ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "timestamp='" ++# time-stamp-format: "%:y-%02m-%02d" ++# time-stamp-end: "'" ++# End: +Index: sabre-0.2.4b/config.sub +=================================================================== +--- sabre-0.2.4b.orig/config.sub 2006-05-15 23:35:59.000000000 +0200 ++++ sabre-0.2.4b/config.sub 2006-05-15 23:36:45.000000000 +0200 +@@ -1,6 +1,10 @@ + #! /bin/sh +-# Configuration validation subroutine script, version 1.1. +-# Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. ++# Configuration validation subroutine script. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ++ ++timestamp='2006-02-23' ++ + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software + # can handle that machine. It does not imply ALL GNU software can. +@@ -17,14 +21,18 @@ + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, +-# Boston, MA 02111-1307, USA. +- ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. ++# + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + ++ ++# Please send patches to . Submit a context ++# diff and a properly formatted ChangeLog entry. ++# + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. +@@ -45,30 +53,75 @@ + # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM + # It is wrong to echo any other type of specification. + +-if [ x$1 = x ] +-then +- echo Configuration name missing. 1>&2 +- echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 +- echo "or $0 ALIAS" 1>&2 +- echo where ALIAS is a recognized configuration type. 1>&2 +- exit 1 +-fi ++me=`echo "$0" | sed -e 's,.*/,,'` + +-# First pass through any local machine types. +-case $1 in +- *local*) +- echo $1 +- exit 0 +- ;; +- *) +- ;; ++usage="\ ++Usage: $0 [OPTION] CPU-MFR-OPSYS ++ $0 [OPTION] ALIAS ++ ++Canonicalize a configuration name. ++ ++Operation modes: ++ -h, --help print this help, then exit ++ -t, --time-stamp print date of last modification, then exit ++ -v, --version print version number, then exit ++ ++Report bugs and patches to ." ++ ++version="\ ++GNU config.sub ($timestamp) ++ ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++Free Software Foundation, Inc. ++ ++This is free software; see the source for copying conditions. There is NO ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++ ++help=" ++Try \`$me --help' for more information." ++ ++# Parse command line ++while test $# -gt 0 ; do ++ case $1 in ++ --time-stamp | --time* | -t ) ++ echo "$timestamp" ; exit ;; ++ --version | -v ) ++ echo "$version" ; exit ;; ++ --help | --h* | -h ) ++ echo "$usage"; exit ;; ++ -- ) # Stop option processing ++ shift; break ;; ++ - ) # Use stdin as input. ++ break ;; ++ -* ) ++ echo "$me: invalid option $1$help" ++ exit 1 ;; ++ ++ *local*) ++ # First pass through any local machine types. ++ echo $1 ++ exit ;; ++ ++ * ) ++ break ;; ++ esac ++done ++ ++case $# in ++ 0) echo "$me: missing argument$help" >&2 ++ exit 1;; ++ 1) ;; ++ *) echo "$me: too many arguments$help" >&2 ++ exit 1;; + esac + + # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- linux-gnu*) ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; +@@ -94,15 +147,37 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple) ++ -apple | -axis | -knuth | -cray) ++ os= ++ basic_machine=$1 ++ ;; ++ -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; ++ -scout) ++ ;; ++ -wrs) ++ os=-vxworks ++ basic_machine=$1 ++ ;; ++ -chorusos*) ++ os=-chorusos ++ basic_machine=$1 ++ ;; ++ -chorusrdb) ++ os=-chorusrdb ++ basic_machine=$1 ++ ;; + -hiux*) + os=-hiuxwe2 + ;; ++ -sco6) ++ os=-sco5v6 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco5) +- os=sco3.2v5 ++ os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) +@@ -117,10 +192,17 @@ + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -sco5v6*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -udk*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -143,25 +225,85 @@ + -psos*) + os=-psos + ;; ++ -mint | -mint[0-9]*) ++ basic_machine=m68k-atari ++ os=-mint ++ ;; + esac + + # Decode aliases for certain CPU-COMPANY combinations. + case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. +- tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arm \ +- | arme[lb] | pyramid | mn10300 \ +- | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \ +- | alpha | we32k | ns16k | clipper | i370 | sh \ +- | powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \ +- | pdp11 | mips64el | mips64orion | mips64orionel \ +- | sparc | sparclet | sparclite | sparc64) ++ 1750a | 580 \ ++ | a29k \ ++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ++ | bfin \ ++ | c4x | clipper \ ++ | d10v | d30v | dlx | dsp16xx \ ++ | fr30 | frv \ ++ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | i370 | i860 | i960 | ia64 \ ++ | ip2k | iq2000 \ ++ | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ ++ | mips | mipsbe | mipseb | mipsel | mipsle \ ++ | mips16 \ ++ | mips64 | mips64el \ ++ | mips64vr | mips64vrel \ ++ | mips64orion | mips64orionel \ ++ | mips64vr4100 | mips64vr4100el \ ++ | mips64vr4300 | mips64vr4300el \ ++ | mips64vr5000 | mips64vr5000el \ ++ | mips64vr5900 | mips64vr5900el \ ++ | mipsisa32 | mipsisa32el \ ++ | mipsisa32r2 | mipsisa32r2el \ ++ | mipsisa64 | mipsisa64el \ ++ | mipsisa64r2 | mipsisa64r2el \ ++ | mipsisa64sb1 | mipsisa64sb1el \ ++ | mipsisa64sr71k | mipsisa64sr71kel \ ++ | mipstx39 | mipstx39el \ ++ | mn10200 | mn10300 \ ++ | mt \ ++ | msp430 \ ++ | nios | nios2 \ ++ | ns16k | ns32k \ ++ | or32 \ ++ | pdp10 | pdp11 | pj | pjl \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | pyramid \ ++ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh64 | sh64le \ ++ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b \ ++ | strongarm \ ++ | tahoe | thumb | tic4x | tic80 | tron \ ++ | v850 | v850e \ ++ | we32k \ ++ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | z8k) ++ basic_machine=$basic_machine-unknown ++ ;; ++ m32c) + basic_machine=$basic_machine-unknown + ;; ++ m6811 | m68hc11 | m6812 | m68hc12) ++ # Motorola 68HC11/12. ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ++ ;; ++ ms1) ++ basic_machine=mt-unknown ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +- i[3456]86) ++ i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. +@@ -170,23 +312,92 @@ + exit 1 + ;; + # Recognize the basic CPU types with company name. +- vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \ +- | m88k-* | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \ +- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \ +- | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \ +- | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \ +- | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \ +- | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \ +- | mips64el-* | mips64orion-* | mips64orionel-* | f301-*) ++ 580-* \ ++ | a29k-* \ ++ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | avr-* \ ++ | bfin-* | bs2000-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | clipper-* | craynv-* | cydra-* \ ++ | d10v-* | d30v-* | dlx-* \ ++ | elxsi-* \ ++ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ ++ | h8300-* | h8500-* \ ++ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | i*86-* | i860-* | i960-* | ia64-* \ ++ | ip2k-* | iq2000-* \ ++ | m32r-* | m32rle-* \ ++ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* \ ++ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ++ | mips16-* \ ++ | mips64-* | mips64el-* \ ++ | mips64vr-* | mips64vrel-* \ ++ | mips64orion-* | mips64orionel-* \ ++ | mips64vr4100-* | mips64vr4100el-* \ ++ | mips64vr4300-* | mips64vr4300el-* \ ++ | mips64vr5000-* | mips64vr5000el-* \ ++ | mips64vr5900-* | mips64vr5900el-* \ ++ | mipsisa32-* | mipsisa32el-* \ ++ | mipsisa32r2-* | mipsisa32r2el-* \ ++ | mipsisa64-* | mipsisa64el-* \ ++ | mipsisa64r2-* | mipsisa64r2el-* \ ++ | mipsisa64sb1-* | mipsisa64sb1el-* \ ++ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ++ | mipstx39-* | mipstx39el-* \ ++ | mmix-* \ ++ | mt-* \ ++ | msp430-* \ ++ | nios-* | nios2-* \ ++ | none-* | np1-* | ns16k-* | ns32k-* \ ++ | orion-* \ ++ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | pyramid-* \ ++ | romp-* | rs6000-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ ++ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ ++ | sparclite-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ++ | tahoe-* | thumb-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tron-* \ ++ | v850-* | v850e-* | vax-* \ ++ | we32k-* \ ++ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | xstormy16-* | xtensa-* \ ++ | ymp-* \ ++ | z8k-*) ++ ;; ++ m32c-*) + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. ++ 386bsd) ++ basic_machine=i386-unknown ++ os=-bsd ++ ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; ++ a29khif) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; ++ adobe68k) ++ basic_machine=m68010-adobe ++ os=-scout ++ ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; +@@ -197,25 +408,35 @@ + basic_machine=a29k-none + os=-bsd + ;; ++ amd64) ++ basic_machine=x86_64-pc ++ ;; ++ amd64-*) ++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) +- basic_machine=m68k-cbm ++ basic_machine=m68k-unknown + ;; +- amigados) +- basic_machine=m68k-cbm +- os=-amigados ++ amigaos | amigados) ++ basic_machine=m68k-unknown ++ os=-amigaos + ;; + amigaunix | amix) +- basic_machine=m68k-cbm ++ basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; ++ apollo68bsd) ++ basic_machine=m68k-apollo ++ os=-bsd ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -224,6 +445,10 @@ + basic_machine=ns32k-sequent + os=-dynix + ;; ++ c90) ++ basic_machine=c90-cray ++ os=-unicos ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd +@@ -244,27 +469,45 @@ + basic_machine=c38-convex + os=-bsd + ;; +- cray | ymp) +- basic_machine=ymp-cray ++ cray | j90) ++ basic_machine=j90-cray + os=-unicos + ;; +- cray2) +- basic_machine=cray2-cray +- os=-unicos +- ;; +- [ctj]90-cray) +- basic_machine=c90-cray +- os=-unicos ++ craynv) ++ basic_machine=craynv-cray ++ os=-unicosmp ++ ;; ++ cr16c) ++ basic_machine=cr16c-unknown ++ os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; ++ crisv32 | crisv32-* | etraxfs*) ++ basic_machine=crisv32-axis ++ ;; ++ cris | cris-* | etrax*) ++ basic_machine=cris-axis ++ ;; ++ crx) ++ basic_machine=crx-unknown ++ os=-elf ++ ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; ++ decsystem10* | dec10*) ++ basic_machine=pdp10-dec ++ os=-tops10 ++ ;; ++ decsystem20* | dec20*) ++ basic_machine=pdp10-dec ++ os=-tops20 ++ ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola +@@ -273,6 +516,10 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ djgpp) ++ basic_machine=i586-pc ++ os=-msdosdjgpp ++ ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx +@@ -292,6 +539,10 @@ + encore | umax | mmax) + basic_machine=ns32k-encore + ;; ++ es1800 | OSE68k | ose68k | ose | OSE) ++ basic_machine=m68k-ericsson ++ os=-ose ++ ;; + fx2800) + basic_machine=i860-alliant + ;; +@@ -302,6 +553,10 @@ + basic_machine=tron-gmicro + os=-sysv + ;; ++ go32) ++ basic_machine=i386-pc ++ os=-go32 ++ ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 +@@ -310,6 +565,14 @@ + basic_machine=h8300-hitachi + os=-hms + ;; ++ h8300xray) ++ basic_machine=h8300-hitachi ++ os=-xray ++ ;; ++ h8500hms) ++ basic_machine=h8500-hitachi ++ os=-hms ++ ;; + harris) + basic_machine=m88k-harris + os=-sysv3 +@@ -325,13 +588,30 @@ + basic_machine=m68k-hp + os=-hpux + ;; ++ hp3k9[0-9][0-9] | hp9[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; +- hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) ++ hp9k6[0-9][0-9] | hp6[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hp9k7[0-79][0-9] | hp7[0-79][0-9]) ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k78[0-9] | hp78[0-9]) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) +@@ -340,27 +620,42 @@ + hppa-next) + os=-nextstep3 + ;; ++ hppaosf) ++ basic_machine=hppa1.1-hp ++ os=-osf ++ ;; ++ hppro) ++ basic_machine=hppa1.1-hp ++ os=-proelf ++ ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm +- os=-mvs + ;; + # I'm not sure what "Sysv32" means. Should this be sysv3.2? +- i[3456]86v32) ++ i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; +- i[3456]86v4*) ++ i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; +- i[3456]86v) ++ i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; +- i[3456]86sol2) ++ i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; ++ i386mach) ++ basic_machine=i386-mach ++ os=-mach ++ ;; ++ i386-vsta | vsta) ++ basic_machine=i386-unknown ++ os=-vsta ++ ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in +@@ -386,16 +681,16 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ mingw32) ++ basic_machine=i386-pc ++ os=-mingw32 ++ ;; + miniframe) + basic_machine=m68000-convergent + ;; +- mipsel*-linux*) +- basic_machine=mipsel-unknown +- os=-linux +- ;; +- mips*-linux*) +- basic_machine=mips-unknown +- os=-linux ++ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) ++ basic_machine=m68k-atari ++ os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` +@@ -403,10 +698,37 @@ + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; ++ monitor) ++ basic_machine=m68k-rom68k ++ os=-coff ++ ;; ++ morphos) ++ basic_machine=powerpc-unknown ++ os=-morphos ++ ;; ++ msdos) ++ basic_machine=i386-pc ++ os=-msdos ++ ;; ++ ms1-*) ++ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ++ ;; ++ mvs) ++ basic_machine=i370-ibm ++ os=-mvs ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; ++ netbsd386) ++ basic_machine=i386-unknown ++ os=-netbsd ++ ;; ++ netwinder) ++ basic_machine=armv4l-rebel ++ os=-linux ++ ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos +@@ -419,6 +741,10 @@ + basic_machine=mips-sony + os=-newsos + ;; ++ necv70) ++ basic_machine=v70-nec ++ os=-sysv ++ ;; + next | m*-next ) + basic_machine=m68k-next + case $os in +@@ -444,9 +770,39 @@ + basic_machine=i960-intel + os=-nindy + ;; ++ mon960) ++ basic_machine=i960-intel ++ os=-mon960 ++ ;; ++ nonstopux) ++ basic_machine=mips-compaq ++ os=-nonstopux ++ ;; + np1) + basic_machine=np1-gould + ;; ++ nsr-tandem) ++ basic_machine=nsr-tandem ++ ;; ++ op50n-* | op60c-*) ++ basic_machine=hppa1.1-oki ++ os=-proelf ++ ;; ++ openrisc | openrisc-*) ++ basic_machine=or32-unknown ++ ;; ++ os400) ++ basic_machine=powerpc-ibm ++ os=-os400 ++ ;; ++ OSE68000 | ose68000) ++ basic_machine=m68000-ericsson ++ os=-ose ++ ;; ++ os68k) ++ basic_machine=m68k-none ++ os=-os68k ++ ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 +@@ -461,53 +817,105 @@ + pbb) + basic_machine=m68k-tti + ;; +- pc532 | pc532-*) ++ pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; +- pentium | p5) +- basic_machine=i586-intel ++ pc98) ++ basic_machine=i386-pc + ;; +- pentiumpro | p6) +- basic_machine=i686-intel ++ pc98-*) ++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; +- pentium-* | p5-*) ++ pentium | p5 | k5 | k6 | nexgen | viac3) ++ basic_machine=i586-pc ++ ;; ++ pentiumpro | p6 | 6x86 | athlon | athlon_*) ++ basic_machine=i686-pc ++ ;; ++ pentiumii | pentium2 | pentiumiii | pentium3) ++ basic_machine=i686-pc ++ ;; ++ pentium4) ++ basic_machine=i786-pc ++ ;; ++ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; +- pentiumpro-* | p6-*) ++ pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; +- k5) +- # We don't have specific support for AMD's K5 yet, so just call it a Pentium +- basic_machine=i586-amd +- ;; +- nexen) +- # We don't have specific support for Nexgen yet, so just call it a Pentium +- basic_machine=i586-nexgen ++ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) ++ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentium4-*) ++ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; +- power) basic_machine=rs6000-ibm ++ power) basic_machine=power-ibm + ;; + ppc) basic_machine=powerpc-unknown +- ;; ++ ;; + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +- ;; ++ ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ++ ppc64) basic_machine=powerpc64-unknown ++ ;; ++ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ppc64le | powerpc64little | ppc64-le | powerpc64-little) ++ basic_machine=powerpc64le-unknown ++ ;; ++ ppc64le-* | powerpc64little-*) ++ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + ps2) + basic_machine=i386-ibm + ;; ++ pw32) ++ basic_machine=i586-unknown ++ os=-pw32 ++ ;; ++ rdos) ++ basic_machine=i386-pc ++ os=-rdos ++ ;; ++ rom68k) ++ basic_machine=m68k-rom68k ++ os=-coff ++ ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; ++ s390 | s390-*) ++ basic_machine=s390-ibm ++ ;; ++ s390x | s390x-*) ++ basic_machine=s390x-ibm ++ ;; ++ sa29200) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ sb1) ++ basic_machine=mipsisa64sb1-unknown ++ ;; ++ sb1el) ++ basic_machine=mipsisa64sb1el-unknown ++ ;; ++ sei) ++ basic_machine=mips-sei ++ os=-seiux ++ ;; + sequent) + basic_machine=i386-sequent + ;; +@@ -515,6 +923,13 @@ + basic_machine=sh-hitachi + os=-hms + ;; ++ sh64) ++ basic_machine=sh64-unknown ++ ;; ++ sparclite-wrs | simso-wrs) ++ basic_machine=sparclite-wrs ++ os=-vxworks ++ ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 +@@ -522,6 +937,13 @@ + spur) + basic_machine=spur-unknown + ;; ++ st2000) ++ basic_machine=m68k-tandem ++ ;; ++ stratus) ++ basic_machine=i860-stratus ++ os=-sysv4 ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -562,13 +984,51 @@ + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; ++ sv1) ++ basic_machine=sv1-cray ++ os=-unicos ++ ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; ++ t3e) ++ basic_machine=alphaev5-cray ++ os=-unicos ++ ;; ++ t90) ++ basic_machine=t90-cray ++ os=-unicos ++ ;; ++ tic54x | c54x*) ++ basic_machine=tic54x-unknown ++ os=-coff ++ ;; ++ tic55x | c55x*) ++ basic_machine=tic55x-unknown ++ os=-coff ++ ;; ++ tic6x | c6x*) ++ basic_machine=tic6x-unknown ++ os=-coff ++ ;; ++ tx39) ++ basic_machine=mipstx39-unknown ++ ;; ++ tx39el) ++ basic_machine=mipstx39el-unknown ++ ;; ++ toad1) ++ basic_machine=pdp10-xkl ++ os=-tops20 ++ ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; ++ tpf) ++ basic_machine=s390x-ibm ++ os=-tpf ++ ;; + udi29k) + basic_machine=a29k-amd + os=-udi +@@ -577,6 +1037,10 @@ + basic_machine=a29k-nyu + os=-sym1 + ;; ++ v810 | necv810) ++ basic_machine=v810-nec ++ os=-none ++ ;; + vaxv) + basic_machine=vax-dec + os=-sysv +@@ -585,9 +1049,9 @@ + basic_machine=vax-dec + os=-vms + ;; +- vpp*|vx|vx-*) +- basic_machine=f301-fujitsu +- ;; ++ vpp*|vx|vx-*) ++ basic_machine=f301-fujitsu ++ ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks +@@ -600,13 +1064,29 @@ + basic_machine=a29k-wrs + os=-vxworks + ;; +- xmp) +- basic_machine=xmp-cray +- os=-unicos ++ w65*) ++ basic_machine=w65-wdc ++ os=-none + ;; +- xps | xps100) ++ w89k-*) ++ basic_machine=hppa1.1-winbond ++ os=-proelf ++ ;; ++ xbox) ++ basic_machine=i686-pc ++ os=-mingw32 ++ ;; ++ xps | xps100) + basic_machine=xps100-honeywell + ;; ++ ymp) ++ basic_machine=ymp-cray ++ os=-unicos ++ ;; ++ z8k-*-coff) ++ basic_machine=z8k-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -614,32 +1094,44 @@ + + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. +- mips) +- if [ x$os = x-linux ]; then +- basic_machine=mips-unknown +- else +- basic_machine=mips-mips +- fi ++ w89k) ++ basic_machine=hppa1.1-winbond ++ ;; ++ op50n) ++ basic_machine=hppa1.1-oki ++ ;; ++ op60c) ++ basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; ++ mmix) ++ basic_machine=mmix-knuth ++ ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; ++ pdp10) ++ # there are many clones, so DEC is not a safe bet ++ basic_machine=pdp10-unknown ++ ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; +- sparc) ++ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) ++ basic_machine=sh-unknown ++ ;; ++ sparc | sparcv8 | sparcv9 | sparcv9b) + basic_machine=sparc-sun + ;; +- cydra) ++ cydra) + basic_machine=cydra-cydrome + ;; + orion) +@@ -648,6 +1140,15 @@ + orion105) + basic_machine=clipper-highlevel + ;; ++ mac | mpw | mac-mpw) ++ basic_machine=m68k-apple ++ ;; ++ pmac | pmac-mpw) ++ basic_machine=powerpc-apple ++ ;; ++ *-unknown) ++ # Make sure to match an already-canonicalized machine name. ++ ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 +@@ -680,9 +1181,12 @@ + -solaris) + os=-solaris2 + ;; +- -unixware* | svr4*) ++ -svr4*) + os=-sysv4 + ;; ++ -unixware*) ++ os=-sysv4.2uw ++ ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; +@@ -693,17 +1197,53 @@ + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ +- | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \ ++ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ++ | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ +- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ++ | -openbsd* | -solidbsd* \ ++ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ ++ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ +- | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -linux-gnu* | -uxpv*) ++ | -chorusos* | -chorusrdb* \ ++ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ ++ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ ++ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ++ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ ++ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ++ | -skyos* | -haiku* | -rdos*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; ++ -qnx*) ++ case $basic_machine in ++ x86-* | i*86-*) ++ ;; ++ *) ++ os=-nto$os ++ ;; ++ esac ++ ;; ++ -nto-qnx*) ++ ;; ++ -nto*) ++ os=`echo $os | sed -e 's|nto|nto-qnx|'` ++ ;; ++ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ ++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ ++ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ++ ;; ++ -mac*) ++ os=`echo $os | sed -e 's|mac|macos|'` ++ ;; ++ -linux-dietlibc) ++ os=-linux-dietlibc ++ ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; +@@ -713,6 +1253,15 @@ + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; ++ -opened*) ++ os=-openedition ++ ;; ++ -os400*) ++ os=-os400 ++ ;; ++ -wince*) ++ os=-wince ++ ;; + -osfrose*) + os=-osfrose + ;; +@@ -728,11 +1277,26 @@ + -acis*) + os=-aos + ;; ++ -atheos*) ++ os=-atheos ++ ;; ++ -syllable*) ++ os=-syllable ++ ;; ++ -386bsd) ++ os=-bsd ++ ;; + -ctix* | -uts*) + os=-sysv + ;; ++ -nova*) ++ os=-rtmk-nova ++ ;; + -ns2 ) +- os=-nextstep2 ++ os=-nextstep2 ++ ;; ++ -nsk*) ++ os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) +@@ -741,6 +1305,9 @@ + -sinix*) + os=-sysv4 + ;; ++ -tpf*) ++ os=-tpf ++ ;; + -triton*) + os=-sysv3 + ;; +@@ -759,9 +1326,27 @@ + # This must come after -sysvr4. + -sysv*) + ;; ++ -ose*) ++ os=-ose ++ ;; ++ -es1800*) ++ os=-ose ++ ;; + -xenix) + os=-xenix + ;; ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ++ os=-mint ++ ;; ++ -aros*) ++ os=-aros ++ ;; ++ -kaos*) ++ os=-kaos ++ ;; ++ -zvmoe) ++ os=-zvmoe ++ ;; + -none) + ;; + *) +@@ -787,10 +1372,20 @@ + *-acorn) + os=-riscix1.2 + ;; ++ arm*-rebel) ++ os=-linux ++ ;; + arm*-semi) + os=-aout + ;; +- pdp11-*) ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ # This must come before the *-dec entry. ++ pdp10-*) ++ os=-tops20 ++ ;; ++ pdp11-*) + os=-none + ;; + *-dec | vax-*) +@@ -808,15 +1403,45 @@ + # default. + # os=-sunos4 + ;; ++ m68*-cisco) ++ os=-aout ++ ;; ++ mips*-cisco) ++ os=-elf ++ ;; ++ mips*-*) ++ os=-elf ++ ;; ++ or32-*) ++ os=-coff ++ ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; ++ *-be) ++ os=-beos ++ ;; ++ *-haiku) ++ os=-haiku ++ ;; + *-ibm) + os=-aix + ;; ++ *-knuth) ++ os=-mmixware ++ ;; ++ *-wec) ++ os=-proelf ++ ;; ++ *-winbond) ++ os=-proelf ++ ;; ++ *-oki) ++ os=-proelf ++ ;; + *-hp) + os=-hpux + ;; +@@ -827,7 +1452,7 @@ + os=-sysv + ;; + *-cbm) +- os=-amigados ++ os=-amigaos + ;; + *-dg) + os=-dgux +@@ -859,27 +1484,39 @@ + *-next) + os=-nextstep3 + ;; +- *-gould) ++ *-gould) + os=-sysv + ;; +- *-highlevel) ++ *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; +- *-sgi) ++ *-sgi) + os=-irix + ;; +- *-siemens) ++ *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; +- f301-fujitsu) ++ f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; ++ *-rom68k) ++ os=-coff ++ ;; ++ *-*bug) ++ os=-coff ++ ;; ++ *-apple) ++ os=-macos ++ ;; ++ *-atari*) ++ os=-mint ++ ;; + *) + os=-none + ;; +@@ -901,9 +1538,15 @@ + -aix*) + vendor=ibm + ;; ++ -beos*) ++ vendor=be ++ ;; + -hpux*) + vendor=hp + ;; ++ -mpeix*) ++ vendor=hp ++ ;; + -hiux*) + vendor=hitachi + ;; +@@ -919,21 +1562,47 @@ + -genix*) + vendor=ns + ;; +- -mvs*) ++ -mvs* | -opened*) ++ vendor=ibm ++ ;; ++ -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; +- -vxsim* | -vxworks*) ++ -tpf*) ++ vendor=ibm ++ ;; ++ -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; ++ -hms*) ++ vendor=hitachi ++ ;; ++ -mpw* | -macos*) ++ vendor=apple ++ ;; ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ++ vendor=atari ++ ;; ++ -vos*) ++ vendor=stratus ++ ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; + esac + + echo $basic_machine$os ++exit ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "timestamp='" ++# time-stamp-format: "%:y-%02m-%02d" ++# time-stamp-end: "'" ++# End: +Index: sabre-0.2.4b/configure +=================================================================== +--- sabre-0.2.4b.orig/configure 2006-05-15 23:35:59.000000000 +0200 ++++ sabre-0.2.4b/configure 2006-05-15 23:36:47.000000000 +0200 +@@ -1,26 +1,288 @@ + #! /bin/sh +- + # Guess values for system-dependent variables and create Makefiles. +-# Generated automatically using autoconf version 2.12 +-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. ++# 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 ++ + +-# Defaults: +-ac_help= ++# 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 +-# Any additions from configure.in: ++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="Makefile.in" ++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 AUTOMAKE AUTOCONF VERSION PACKAGE REV_DATE build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB SVGALIB_TRUE SVGALIB_FALSE 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. +-build=NONE +-cache_file=./config.cache ++cache_file=/dev/null + exec_prefix=NONE +-host=NONE + no_create= +-nonopt=NONE + no_recursion= + prefix=NONE + program_prefix=NONE +@@ -29,10 +291,15 @@ + silent= + site= + srcdir= +-target=NONE + 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' +@@ -46,16 +313,9 @@ + infodir='${prefix}/info' + mandir='${prefix}/man' + +-# Initialize some other variables. +-subdirs= +-MFLAGS= MAKEFLAGS= +-# Maximum number of lines to put in a shell here document. +-ac_max_here_lines=12 +- + 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" +@@ -63,59 +323,59 @@ + continue + fi + +- case "$ac_option" in +- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; +- *) ac_optarg= ;; +- esac ++ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + + # Accept the important Cygnus configure options, so we can diagnose typos. + +- case "$ac_option" in ++ case $ac_option in + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) +- bindir="$ac_optarg" ;; ++ bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) +- ac_prev=build ;; ++ ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) +- build="$ac_optarg" ;; ++ 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" ;; ++ 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" ;; ++ datadir=$ac_optarg ;; + + -disable-* | --disable-*) +- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` ++ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then +- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } +- fi +- ac_feature=`echo $ac_feature| sed 's/-/_/g'` +- eval "enable_${ac_feature}=no" ;; ++ 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=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` ++ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then +- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } +- fi +- ac_feature=`echo $ac_feature| sed 's/-/_/g'` +- case "$ac_option" in +- *=*) ;; ++ 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'" ;; ++ eval "enable_$ac_feature='$ac_optarg'" ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -124,95 +384,47 @@ + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) +- exec_prefix="$ac_optarg" ;; ++ exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + +- -help | --help | --hel | --he) +- # 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 << EOF +-Usage: configure [options] [host] +-Options: [defaults in brackets after descriptions] +-Configuration: +- --cache-file=FILE cache test results in FILE +- --help print this message +- --no-create do not create output files +- --quiet, --silent do not print \`checking...' messages +- --version print the version of autoconf that created configure +-Directory and file names: +- --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] +- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [same as prefix] +- --bindir=DIR user executables in DIR [EPREFIX/bin] +- --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] +- --libexecdir=DIR program executables in DIR [EPREFIX/libexec] +- --datadir=DIR read-only architecture-independent data in DIR +- [PREFIX/share] +- --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] +- --sharedstatedir=DIR modifiable architecture-independent data in DIR +- [PREFIX/com] +- --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] +- --libdir=DIR object code libraries in DIR [EPREFIX/lib] +- --includedir=DIR C header files in DIR [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] +- --infodir=DIR info documentation in DIR [PREFIX/info] +- --mandir=DIR man documentation in DIR [PREFIX/man] +- --srcdir=DIR find the sources in DIR [configure dir or ..] +- --program-prefix=PREFIX prepend PREFIX to installed program names +- --program-suffix=SUFFIX append SUFFIX to installed program names +- --program-transform-name=PROGRAM +- run sed PROGRAM on installed program names +-EOF +- cat << EOF +-Host type: +- --build=BUILD configure for building on BUILD [BUILD=HOST] +- --host=HOST configure for HOST [guessed] +- --target=TARGET configure for TARGET [TARGET=HOST] +-Features and packages: +- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) +- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] +- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +- --x-includes=DIR X include files are in DIR +- --x-libraries=DIR X library files are in DIR +-EOF +- if test -n "$ac_help"; then +- echo "--enable and --with options recognized:$ac_help" +- fi +- exit 0 ;; ++ -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 ;; ++ ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) +- host="$ac_optarg" ;; ++ 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" ;; ++ includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) +- infodir="$ac_optarg" ;; ++ infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) +- libdir="$ac_optarg" ;; ++ 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" ;; ++ libexecdir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ +@@ -221,19 +433,19 @@ + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) +- localstatedir="$ac_optarg" ;; ++ localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) +- mandir="$ac_optarg" ;; ++ 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) ++ | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ +@@ -247,26 +459,26 @@ + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) +- oldincludedir="$ac_optarg" ;; ++ oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) +- prefix="$ac_optarg" ;; ++ 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_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_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ +@@ -283,7 +495,7 @@ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) +- program_transform_name="$ac_optarg" ;; ++ program_transform_name=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) +@@ -293,7 +505,7 @@ + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) +- sbindir="$ac_optarg" ;; ++ sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ +@@ -304,58 +516,57 @@ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) +- sharedstatedir="$ac_optarg" ;; ++ sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) +- site="$ac_optarg" ;; ++ site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) +- srcdir="$ac_optarg" ;; ++ 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" ;; ++ sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) +- ac_prev=target ;; ++ ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) +- target="$ac_optarg" ;; ++ target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + +- -version | --version | --versio | --versi | --vers) +- echo "configure generated by autoconf version 2.12" +- exit 0 ;; ++ -version | --version | --versio | --versi | --vers | -V) ++ ac_init_version=: ;; + + -with-* | --with-*) +- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` ++ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then +- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } +- fi ++ 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 +- *=*) ;; ++ case $ac_option in ++ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + *) ac_optarg=yes ;; + esac +- eval "with_${ac_package}='$ac_optarg'" ;; ++ eval "with_$ac_package='$ac_optarg'" ;; + + -without-* | --without-*) +- ac_package=`echo $ac_option|sed -e 's/-*without-//'` ++ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then +- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } +- fi +- ac_package=`echo $ac_package| sed 's/-/_/g'` +- eval "with_${ac_package}=no" ;; ++ 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. +@@ -366,99 +577,110 @@ + 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_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" ;; ++ x_libraries=$ac_optarg ;; + +- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ++ -*) { 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 ;; ++ + *) +- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then +- echo "configure: warning: $ac_option: invalid host type" 1>&2 +- fi +- if test "x$nonopt" != xNONE; then +- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } +- fi +- nonopt="$ac_option" ++ # 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 +- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } +-fi +- +-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 +- +-# File descriptor usage: +-# 0 standard input +-# 1 file creation +-# 2 errors and warnings +-# 3 some systems may open it to /dev/tty +-# 4 used on the Kubota Titan +-# 6 checking for... messages and results +-# 5 compiler messages saved in config.log +-if test "$silent" = yes; then +- exec 6>/dev/null +-else +- exec 6>&1 ++ ac_option=--`echo $ac_prev | sed 's/_/-/g'` ++ { echo "$as_me: error: missing argument to $ac_option" >&2 ++ { (exit 1); exit 1; }; } + fi +-exec 5>./config.log + +-echo "\ +-This file contains any messages produced by compilers while +-running configure, to aid debugging if configure makes a mistake. +-" 1>&5 ++# 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 + +-# Strip out --no-create and --no-recursion so they do not pile up. +-# Also quote any args containing shell metacharacters. +-ac_configure_args= +-for ac_arg ++# Be sure to have absolute paths. ++for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ ++ localstatedir libdir includedir oldincludedir infodir mandir + do +- case "$ac_arg" in +- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ +- | --no-cr | --no-c) ;; +- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ +- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) +- ac_configure_args="$ac_configure_args '$ac_arg'" ;; +- *) ac_configure_args="$ac_configure_args $ac_arg" ;; ++ 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 + +-# NLS nuisances. +-# Only set these to C if already set. These must not be set unconditionally +-# because not all systems understand e.g. LANG=C (notably SCO). +-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +-# Non-C LC_CTYPE values break the ctype check. +-if test "${LANG+set}" = set; then LANG=C; export LANG; fi +-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi ++# 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 + +-# 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 ++ac_tool_prefix= ++test -n "$host_alias" && ac_tool_prefix=$host_alias- ++ ++test "$silent" = yes && exec 6>/dev/null + +-# A filename unique to this package, relative to the directory that +-# configure is in, which we can look for to find out if srcdir is correct. +-ac_unique_file=Makefile.in + + # 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_prog=$0 +- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` +- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. ++ 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=.. +@@ -468,13 +690,473 @@ + fi + if test ! -r $srcdir/$ac_unique_file; then + if test "$ac_srcdir_defaulted" = yes; then +- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 ++ { (exit 1); exit 1; }; } + else +- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 ++ { (exit 1); exit 1; }; } + fi + fi +-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` ++(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_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_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_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 ++ ++# ++# 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 ++ ++Program names: ++ --program-prefix=PREFIX prepend PREFIX to installed program names ++ --program-suffix=SUFFIX append SUFFIX to installed program names ++ --program-transform-name=PROGRAM run sed PROGRAM on installed program names ++ ++System types: ++ --build=BUILD configure for building on BUILD [guessed] ++ --host=HOST cross-compile to build programs to run on HOST [BUILD] ++_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-svgalib create the SVGAlib version too ++ ++Some influential environment variables: ++ CC C compiler command ++ CFLAGS C compiler flags ++ LDFLAGS linker flags, e.g. -L if you have libraries in a ++ nonstandard directory ++ CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have ++ headers in a nonstandard directory ++ CXX C++ compiler command ++ CXXFLAGS C++ compiler flags ++ ++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 +@@ -485,37 +1167,103 @@ + fi + for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then +- echo "loading site script $ac_site_file" ++ { 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 +- echo "loading cache $cache_file" +- . $cache_file ++ # 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 "creating cache $cache_file" +- > $cache_file ++ { 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 +-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cc_cross +- +-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then +- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. +- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then +- ac_n= ac_c=' +-' ac_t=' ' +- else +- ac_n=-n ac_c= ac_t= +- fi +-else +- ac_n= ac_c='\c' ac_t= +-fi ++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 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -524,31 +1272,39 @@ + + + +-. VERSION ++. ./VERSION + VERSION=$THE_VERSION + PACKAGE=$PACKAGE_NAME + REV_DATE=$THE_REV_DATE + + + +-cat >> confdefs.h <>confdefs.h <<_ACEOF + #define VERSION "$VERSION" +-EOF ++_ACEOF + +-cat >> confdefs.h <>confdefs.h <<_ACEOF + #define REV_DATE "$REV_DATE" +-EOF ++_ACEOF + +-cat >> confdefs.h <<\EOF ++cat >>confdefs.h <<\_ACEOF + #define USING_NEWPILOT 1 +-EOF ++_ACEOF + + + if test -f /usr/include/linux/joystick.h ; + then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define JSTICK_INSTALLED 1 +-EOF ++_ACEOF + + fi + +@@ -564,104 +1320,134 @@ + 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 "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +-fi +-ac_config_guess=$ac_aux_dir/config.guess +-ac_config_sub=$ac_aux_dir/config.sub +-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +- ++ { { 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. + + # Make sure we can run config.sub. +-if $ac_config_sub sun4 >/dev/null 2>&1; then : +-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +-fi +- +-echo $ac_n "checking host system type""... $ac_c" 1>&6 +-echo "configure:584: checking host system type" >&5 ++$ac_config_sub sun4 >/dev/null 2>&1 || ++ { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 ++echo "$as_me: error: cannot run $ac_config_sub" >&2;} ++ { (exit 1); exit 1; }; } ++ ++echo "$as_me:$LINENO: checking build system type" >&5 ++echo $ECHO_N "checking build system type... $ECHO_C" >&6 ++if test "${ac_cv_build+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_build_alias=$build_alias ++test -z "$ac_cv_build_alias" && ++ ac_cv_build_alias=`$ac_config_guess` ++test -z "$ac_cv_build_alias" && ++ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 ++echo "$as_me: error: cannot guess build type; you must specify one" >&2;} ++ { (exit 1); exit 1; }; } ++ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || ++ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 ++echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} ++ { (exit 1); exit 1; }; } ++ ++fi ++echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++echo "${ECHO_T}$ac_cv_build" >&6 ++build=$ac_cv_build ++build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` ++build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` ++build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ++ ++ ++echo "$as_me:$LINENO: checking host system type" >&5 ++echo $ECHO_N "checking host system type... $ECHO_C" >&6 ++if test "${ac_cv_host+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_host_alias=$host_alias ++test -z "$ac_cv_host_alias" && ++ ac_cv_host_alias=$ac_cv_build_alias ++ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || ++ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 ++echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} ++ { (exit 1); exit 1; }; } ++ ++fi ++echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++echo "${ECHO_T}$ac_cv_host" >&6 ++host=$ac_cv_host ++host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` ++host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` ++host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +-host_alias=$host +-case "$host_alias" in +-NONE) +- case $nonopt in +- NONE) +- if host_alias=`$ac_config_guess`; then : +- else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } +- fi ;; +- *) host_alias=$nonopt ;; +- esac ;; +-esac + +-host=`$ac_config_sub $host_alias` +-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +-echo "$ac_t""$host" 1>&6 +- +- echo $ac_n "checking choosing CFLAGS""... $ac_c" 1>&6 +-echo "configure:605: checking choosing CFLAGS" >&5 ++ echo "$as_me:$LINENO: checking choosing CFLAGS" >&5 ++echo $ECHO_N "checking choosing CFLAGS... $ECHO_C" >&6 + cflaggedcflags=$(./cflags $host_cpu $host_os) +- echo "$ac_t""$cflaggedcflags" 1>&6 ++ echo "$as_me:$LINENO: result: $cflaggedcflags" >&5 ++echo "${ECHO_T}$cflaggedcflags" >&6 + if test "$cflaggedcflags" != "(default)"; + then + CFLAGS="$cflaggedcflags" + CXXFLAGS="$cflaggedcflags" + fi +- fi ++ fi + + if test -f /usr/include/joystick.h ; + then +- cat >> confdefs.h <>confdefs.h <<_ACEOF + #define JSTICK_INSTALLED "" +-EOF +- ++_ACEOF ++ + fi + +-if test "$program_transform_name" = s,x,x,; then +- program_transform_name= +-else +- # Double any \ or $. echo might interpret backslashes. +- cat <<\EOF_SED > conftestsed +-s,\\,\\\\,g; s,\$,$$,g +-EOF_SED +- program_transform_name="`echo $program_transform_name|sed -f conftestsed`" +- rm -f conftestsed +-fi + test "$program_prefix" != NONE && +- program_transform_name="s,^,${program_prefix},; $program_transform_name" ++ program_transform_name="s,^,$program_prefix,;$program_transform_name" + # Use a double $ so make ignores it. + test "$program_suffix" != NONE && +- program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" +- +-# sed with no file args requires a program. +-test "$program_transform_name" = "" && program_transform_name="s,x,x," +- +-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +-echo "configure:643: checking whether ${MAKE-make} sets \${MAKE}" >&5 +-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ program_transform_name="s,\$,$program_suffix,;$program_transform_name" ++# Double any \ or $. echo might interpret backslashes. ++# By default was `s,x,x', remove it if useless. ++cat <<\_ACEOF >conftest.sed ++s/[\\$]/&&/g;s/;s,x,x,$// ++_ACEOF ++program_transform_name=`echo $program_transform_name | sed -f conftest.sed` ++rm conftest.sed ++ ++echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 ++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` ++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftestmake <<\EOF ++ cat >conftest.make <<\_ACEOF + all: +- @echo 'ac_maketemp="${MAKE}"' +-EOF ++ @echo 'ac_maketemp="$(MAKE)"' ++_ACEOF + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. +-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` ++eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` + if test -n "$ac_maketemp"; then + eval ac_cv_prog_make_${ac_make}_set=yes + else + eval ac_cv_prog_make_${ac_make}_set=no + fi +-rm -f conftestmake ++rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi + +@@ -672,854 +1458,2681 @@ + # 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 $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +-echo "configure:680: checking for a BSD compatible install" >&5 ++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 eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++if test "${ac_cv_path_install+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" +- for ac_dir in $PATH; do +- # Account for people who put trailing slashes in PATH elements. +- case "$ac_dir/" in +- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; +- *) +- # OSF1 and SCO ODT 3.0 have their own names for install. +- for ac_prog in ginstall installbsd scoinst install; do +- if test -f $ac_dir/$ac_prog; then ++ 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 $ac_dir/$ac_prog >/dev/null 2>&1; then ++ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +- # OSF/1 installbsd also uses dspmsg, but is usable. ++ : ++ 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="$ac_dir/$ac_prog -c" +- break 2 ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 + fi + fi + done +- ;; +- esac +- done +- IFS="$ac_save_IFS" ++ done ++ ;; ++esac ++done ++ + + fi + if test "${ac_cv_path_install+set}" = set; then +- INSTALL="$ac_cv_path_install" ++ 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" ++ INSTALL=$ac_install_sh + fi + fi +-echo "$ac_t""$INSTALL" 1>&6 ++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' + +-# Extract the first word of "gcc", so it can be a program name with args. +-set dummy gcc; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:732: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++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 +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in $PATH; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_CC="gcc" +- break +- fi +- done +- IFS="$ac_save_ifs" ++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" ++CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$ac_t""$CC" 1>&6 ++ echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6 + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:761: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++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 +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + ac_prog_rejected=no +- for ac_dir in $PATH; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +- fi +- ac_cv_prog_CC="cc" +- break +- fi +- done +- IFS="$ac_save_ifs" ++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 $# -gt 0; then ++ 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 +- set dummy "$ac_dir/$ac_word" "$@" +- shift +- ac_cv_prog_CC="$@" ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi + fi + fi + fi +-CC="$ac_cv_prog_CC" ++CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$ac_t""$CC" 1>&6 ++ echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6 + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + fi + +- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } + fi +- +-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:809: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +- +-ac_ext=c +-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cc_cross +- +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +- ac_cv_prog_cc_works=yes +- # If we can't run a trivial program, we are probably using a cross compiler. +- if (./conftest; exit) 2>/dev/null; then +- ac_cv_prog_cc_cross=no +- else +- ac_cv_prog_cc_cross=yes ++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 "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- ac_cv_prog_cc_works=no ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + fi +-rm -fr conftest* + +-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +-if test $ac_cv_prog_cc_works = no; then +- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } ++ test -n "$CC" && break ++ done + fi +-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:843: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +-cross_compiling=$ac_cv_prog_cc_cross +- +-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:848: checking whether we are using GNU C" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++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 +- cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +- ac_cv_prog_gcc=yes ++ 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 +- ac_cv_prog_gcc=no ++ 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 + +-echo "$ac_t""$ac_cv_prog_gcc" 1>&6 ++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 &5\"") >&5 ++ (eval $ac_compiler --version &5) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 ++ (eval $ac_compiler -v &5) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 ++ (eval $ac_compiler -V &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 + +-if test $ac_cv_prog_gcc = yes; then +- GCC=yes +- ac_test_CFLAGS="${CFLAGS+set}" +- ac_save_CFLAGS="$CFLAGS" +- CFLAGS= +- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:872: checking whether ${CC-cc} accepts -g" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ { 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 'void f(){}' > conftest.c +-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ++ { { 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_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 +- ac_cv_prog_cc_g=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ac_cv_prog_cc_g=no + fi +- +-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +- if test "$ac_test_CFLAGS" = set; then +- CFLAGS="$ac_save_CFLAGS" +- elif test $ac_cv_prog_cc_g = yes; then ++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 ++#include ++#include ++#include ++/* 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 +- GCC= +- test "${CFLAGS+set}" = set || CFLAGS="-g" ++ 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 + +-for ac_prog in $CCC c++ g++ gcc CC cxx 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 +-# Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:904: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ 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 ++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 ++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 +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in $PATH; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_CXX="$ac_prog" +- break +- fi +- done +- IFS="$ac_save_ifs" ++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" ++CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- echo "$ac_t""$CXX" 1>&6 ++ echo "$as_me:$LINENO: result: $CXX" >&5 ++echo "${ECHO_T}$CXX" >&6 + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + fi + +-test -n "$CXX" && break ++ 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 +-test -n "$CXX" || CXX="gcc" +- +- +-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:935: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + +-ac_ext=C +-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cxx_cross +- +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +- ac_cv_prog_cxx_works=yes +- # If we can't run a trivial program, we are probably using a cross compiler. +- if (./conftest; exit) 2>/dev/null; then +- ac_cv_prog_cxx_cross=no +- else +- ac_cv_prog_cxx_cross=yes +- fi +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- ac_cv_prog_cxx_works=no + fi +-rm -fr conftest* +-ac_ext=c +-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cc_cross +- +-echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 +-if test $ac_cv_prog_cxx_works = no; then +- { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } +-fi +-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:975: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +-echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 +-cross_compiling=$ac_cv_prog_cxx_cross +- +-echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +-echo "configure:980: checking whether we are using GNU C++" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +- ac_cv_prog_gxx=yes ++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 +- ac_cv_prog_gxx=no ++ 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 + +-echo "$ac_t""$ac_cv_prog_gxx" 1>&6 + +-if test $ac_cv_prog_gxx = yes; then +- GXX=yes +- ac_test_CXXFLAGS="${CXXFLAGS+set}" +- ac_save_CXXFLAGS="$CXXFLAGS" +- CXXFLAGS= +- echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:1004: checking whether ${CXX-g++} accepts -g" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- echo 'void f(){}' > conftest.cc +-if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then ++# 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 &5\"") >&5 ++ (eval $ac_compiler --version &5) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 ++ (eval $ac_compiler -v &5) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 ++ (eval $ac_compiler -V &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_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 +- ac_cv_prog_cxx_g=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ac_cv_prog_cxx_g=no + fi +- +-echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 +- if test "$ac_test_CXXFLAGS" = set; then +- CXXFLAGS="$ac_save_CXXFLAGS" +- elif test $ac_cv_prog_cxx_g = yes; then ++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 ++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 +- GXX= +- test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" ++ 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 + +-# Extract the first word of "ranlib", so it can be a program name with args. +-set dummy ranlib; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1034: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++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 ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. ++set dummy ${ac_tool_prefix}ranlib; 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_RANLIB+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in $PATH; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_RANLIB="ranlib" +- break +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" ++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_RANLIB="${ac_tool_prefix}ranlib" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ + fi + fi +-RANLIB="$ac_cv_prog_RANLIB" ++RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$ac_t""$RANLIB" 1>&6 ++ echo "$as_me:$LINENO: result: $RANLIB" >&5 ++echo "${ECHO_T}$RANLIB" >&6 + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + fi + ++fi ++if test -z "$ac_cv_prog_RANLIB"; then ++ ac_ct_RANLIB=$RANLIB ++ # Extract the first word of "ranlib", so it can be a program name with args. ++set dummy ranlib; 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_RANLIB+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_RANLIB"; then ++ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_RANLIB="ranlib" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done + +- +- +-echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6 +-echo "configure:1064: checking for main in -lncurses" >&5 +-ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" ++fi ++fi ++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB ++if test -n "$ac_ct_RANLIB"; then ++ echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-lncurses $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + ++ RANLIB=$ac_ct_RANLIB ++else ++ RANLIB="$ac_cv_prog_RANLIB" + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <&5 ++echo $ECHO_N "checking for main in -lncurses... $ECHO_C" >&6 ++if test "${ac_cv_lib_ncurses_main+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lncurses $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++ ++int ++main () ++{ ++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_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_ncurses_main=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_ncurses_main=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_ncurses_main" >&5 ++echo "${ECHO_T}$ac_cv_lib_ncurses_main" >&6 ++if test $ac_cv_lib_ncurses_main = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBNCURSES 1 ++_ACEOF + + LIBS="-lncurses $LIBS" + + else +- echo "$ac_t""no" 1>&6 +-{ echo "configure: error: Cannot find Ncurses (-ncurses). please check out your system setup." 1>&2; exit 1; } ++ { { echo "$as_me:$LINENO: error: Cannot find Ncurses (-ncurses). please check out your system setup." >&5 ++echo "$as_me: error: Cannot find Ncurses (-ncurses). please check out your system setup." >&2;} ++ { (exit 1); exit 1; }; } + fi + +-echo $ac_n "checking for main in -lvga""... $ac_c" 1>&6 +-echo "configure:1108: checking for main in -lvga" >&5 +-ac_lib_var=`echo vga'_'main | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++if test "x$with_svgalib" = "xyes"; then ++ ++echo "$as_me:$LINENO: checking for main in -lvga" >&5 ++echo $ECHO_N "checking for main in -lvga... $ECHO_C" >&6 ++if test "${ac_cv_lib_vga_main+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lvga $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_lib=HAVE_LIB`echo vga | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++ ++int ++main () ++{ ++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_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_vga_main=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_vga_main=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_vga_main" >&5 ++echo "${ECHO_T}$ac_cv_lib_vga_main" >&6 ++if test $ac_cv_lib_vga_main = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBVGA 1 ++_ACEOF + + LIBS="-lvga $LIBS" + + else +- echo "$ac_t""no" 1>&6 +-{ echo "configure: error: Cannot find SVGAlib (-lvga). please check out your system setup." 1>&2; exit 1; } ++ { { echo "$as_me:$LINENO: error: Cannot find SVGAlib (-lvga). please check out your system setup." >&5 ++echo "$as_me: error: Cannot find SVGAlib (-lvga). please check out your system setup." >&2;} ++ { (exit 1); exit 1; }; } + fi + +-echo $ac_n "checking for main in -lvgagl""... $ac_c" 1>&6 +-echo "configure:1152: checking for main in -lvgagl" >&5 +-ac_lib_var=`echo vgagl'_'main | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++echo "$as_me:$LINENO: checking for main in -lvgagl" >&5 ++echo $ECHO_N "checking for main in -lvgagl... $ECHO_C" >&6 ++if test "${ac_cv_lib_vgagl_main+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lvgagl $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_lib=HAVE_LIB`echo vgagl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++ ++int ++main () ++{ ++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_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_vgagl_main=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_vgagl_main=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_vgagl_main" >&5 ++echo "${ECHO_T}$ac_cv_lib_vgagl_main" >&6 ++if test $ac_cv_lib_vgagl_main = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBVGAGL 1 ++_ACEOF + + LIBS="-lvgagl $LIBS" + + else +- echo "$ac_t""no" 1>&6 +-{ echo "configure: error: Cannot find SVGAlib (-lvgagl). please check out your system setup." 1>&2; exit 1; } ++ { { echo "$as_me:$LINENO: error: Cannot find SVGAlib (-lvgagl). please check out your system setup." >&5 ++echo "$as_me: error: Cannot find SVGAlib (-lvgagl). please check out your system setup." >&2;} ++ { (exit 1); exit 1; }; } + fi + +-echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 +-echo "configure:1196: checking for main in -lm" >&5 +-ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-lm $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" ++echo "building without SVGAlib" + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <&5 ++echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6 ++if test "${ac_cv_lib_m_main+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lm $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++ ++int ++main () ++{ ++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_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_m_main=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_m_main=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_m_main" >&5 ++echo "${ECHO_T}$ac_cv_lib_m_main" >&6 ++if test $ac_cv_lib_m_main = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBM 1 ++_ACEOF + + LIBS="-lm $LIBS" + + else +- echo "$ac_t""no" 1>&6 +-{ echo "configure: error: Cannot find mathlib (-lm). please check out your system setup." 1>&2; exit 1; } ++ { { echo "$as_me:$LINENO: error: Cannot find mathlib (-lm). please check out your system setup." >&5 ++echo "$as_me: error: Cannot find mathlib (-lm). please check out your system setup." >&2;} ++ { (exit 1); exit 1; }; } + fi + + +-trap '' 1 2 15 +-cat > confcache <<\EOF ++ ++ ++if test x$with_svgalib = xyes; then ++ SVGALIB_TRUE= ++ SVGALIB_FALSE='#' ++else ++ SVGALIB_TRUE='#' ++ SVGALIB_FALSE= ++fi ++ ac_config_files="$ac_config_files Makefile lib/Makefile lib/tzp/Makefile lib/fonts/Makefile libzip/Makefile gdev/Makefile src/Makefile dialogsrc/Makefile doc/Makefile scenarios/Makefile sdlsrc/Makefile joystick/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. It is not useful on other systems. +-# If it contains results you don't want to keep, you may remove or edit it. ++# 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. + # +-# By default, configure uses ./config.cache as the cache file, +-# creating it if it does not exist already. You can give configure +-# the --cache-file=FILE option to use a different cache file; that is +-# what configure does when it calls configure scripts in +-# subdirectories, so they share the cache. +-# Giving --cache-file=/dev/null disables caching, for debugging configure. +-# config.status only pays attention to the cache file if you give it the +-# --recheck option to rerun configure. ++# config.status only pays attention to the cache file if you give it ++# the --recheck option to rerun configure. + # +-EOF ++# `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) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote substitution +- # turns \\\\ into \\, and sed turns \\ into \). +- sed -n \ +- -e "s/'/'\\\\''/g" \ +- -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" +- ;; +- *) +- # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' +- ;; +- esac >> confcache +-if cmp -s $cache_file confcache; then +- : +-else ++{ ++ (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 +- echo "updating cache $cache_file" +- cat confcache > $cache_file ++ 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 + +-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 +- + test "x$prefix" = xNONE && prefix=$ac_default_prefix + # Let make expand exec_prefix. + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +-# Any assignment to VPATH causes Sun make to only execute +-# the first set of double-colon rules, so remove it if not needed. +-# If there is a colon in the path, we need to keep it. ++# 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[ ]*=[^:]*$/d' ++ ac_vpsub='/^[ ]*VPATH[ ]*=/{ ++s/:*\$(srcdir):*/:/; ++s/:*\${srcdir}:*/:/; ++s/:*@srcdir@:*/:/; ++s/^\([^=]*=[ ]*\):*/\1/; ++s/:*$//; ++s/^[^=]*=[ ]*$//; ++}' + fi + +-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 +- + # Transform confdefs.h into DEFS. + # Protect against shell expansion while executing Makefile rules. + # Protect against Makefile macro expansion. +-cat > conftest.defs <<\EOF +-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +-s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g +-s%\[%\\&%g +-s%\]%\\&%g +-s%\$%$$%g +-EOF +-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +-rm -f conftest.defs ++# ++# 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 + +-# Without the "./", some shells look in PATH for config.status. +-: ${CONFIG_STATUS=./config.status} + +-echo creating $CONFIG_STATUS +-rm -f $CONFIG_STATUS +-cat > $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. +-# This directory was configured as follows, +-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +-# +-# $0 $ac_configure_args +-# + # Compiler output produced by configure, useful for debugging +-# configure, is in ./config.log if it exists. +- +-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +-for ac_option +-do +- case "\$ac_option" in +- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) +- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" +- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; +- -version | --version | --versio | --versi | --vers | --ver | --ve | --v) +- echo "$CONFIG_STATUS generated by autoconf version 2.12" +- exit 0 ;; +- -help | --help | --hel | --he | --h) +- echo "\$ac_cs_usage"; exit 0 ;; +- *) echo "\$ac_cs_usage"; exit 1 ;; +- esac +-done +- +-ac_given_srcdir=$srcdir +-ac_given_INSTALL="$INSTALL" ++# configure, is in config.log if it exists. + +-trap 'rm -fr `echo "Makefile lib/Makefile lib/tzp/Makefile lib/fonts/Makefile libzip/Makefile gdev/Makefile src/Makefile dialogsrc/Makefile doc/Makefile scenarios/Makefile sdlsrc/Makefile joystick/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +-EOF +-cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF +-$ac_vpsub +-$extrasub +-s%@CFLAGS@%$CFLAGS%g +-s%@CPPFLAGS@%$CPPFLAGS%g +-s%@CXXFLAGS@%$CXXFLAGS%g +-s%@DEFS@%$DEFS%g +-s%@LDFLAGS@%$LDFLAGS%g +-s%@LIBS@%$LIBS%g +-s%@exec_prefix@%$exec_prefix%g +-s%@prefix@%$prefix%g +-s%@program_transform_name@%$program_transform_name%g +-s%@bindir@%$bindir%g +-s%@sbindir@%$sbindir%g +-s%@libexecdir@%$libexecdir%g +-s%@datadir@%$datadir%g +-s%@sysconfdir@%$sysconfdir%g +-s%@sharedstatedir@%$sharedstatedir%g +-s%@localstatedir@%$localstatedir%g +-s%@libdir@%$libdir%g +-s%@includedir@%$includedir%g +-s%@oldincludedir@%$oldincludedir%g +-s%@infodir@%$infodir%g +-s%@mandir@%$mandir%g +-s%@AUTOMAKE@%$AUTOMAKE%g +-s%@AUTOCONF@%$AUTOCONF%g +-s%@VERSION@%$VERSION%g +-s%@PACKAGE@%$PACKAGE%g +-s%@REV_DATE@%$REV_DATE%g +-s%@host@%$host%g +-s%@host_alias@%$host_alias%g +-s%@host_cpu@%$host_cpu%g +-s%@host_vendor@%$host_vendor%g +-s%@host_os@%$host_os%g +-s%@SET_MAKE@%$SET_MAKE%g +-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +-s%@INSTALL_DATA@%$INSTALL_DATA%g +-s%@CC@%$CC%g +-s%@CXX@%$CXX%g +-s%@RANLIB@%$RANLIB%g ++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 + +-CEOF +-EOF + +-cat >> $CONFIG_STATUS <<\EOF ++# Work around bugs in pre-3.0 UWIN ksh. ++$as_unset ENV MAIL MAILPATH ++PS1='$ ' ++PS2='> ' ++PS4='+ ' + +-# 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_cmds=90 # Maximum number of lines to put in a sed script. +-ac_file=1 # Number of current file. +-ac_beg=1 # First line for current file. +-ac_end=$ac_max_sed_cmds # 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" conftest.subs > conftest.s$ac_file ++# 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 +- sed "${ac_end}q" conftest.subs > conftest.s$ac_file ++ $as_unset $as_var + fi +- if test ! -s conftest.s$ac_file; then +- ac_more_lines=false +- rm -f conftest.s$ac_file ++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 +- if test -z "$ac_sed_cmds"; then +- ac_sed_cmds="sed -f conftest.s$ac_file" +- else +- ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" +- fi +- ac_file=`expr $ac_file + 1` +- ac_beg=$ac_end +- ac_end=`expr $ac_end + $ac_max_sed_cmds` ++ PATH_SEPARATOR=: + fi +-done +-if test -z "$ac_sed_cmds"; then +- ac_sed_cmds=cat ++ rm -f conf$$.sh + fi +-EOF + +-cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +- case "$ac_file" in +- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` +- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; +- *) ac_file_in="${ac_file}.in" ;; ++ 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 + +- # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. ++ # 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 + +- # Remove last slash and all that follows it. Not all systems have dirname. +- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` +- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then +- # The file is in a subdirectory. +- test ! -d "$ac_dir" && mkdir "$ac_dir" +- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" +- # A "../" for each directory in $ac_dir_suffix. +- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` ++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 +- ac_dir_suffix= ac_dots= ++ 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 + +- case "$ac_given_srcdir" in +- .) srcdir=. +- if test -z "$ac_dots"; then top_srcdir=. +- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; +- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; +- *) # Relative path. +- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" +- top_srcdir="$ac_dots$ac_given_srcdir" ;; +- esac ++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 + +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; ++ 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 ." ++_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 + +- echo creating "$ac_file" +- rm -f "$ac_file" +- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." +- case "$ac_file" in +- *Makefile*) ac_comsub="1i\\ +-# $configure_input" ;; +- *) ac_comsub= ;; ++ 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_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` +- sed -e "$ac_comsub +-s%@configure_input@%$configure_input%g +-s%@srcdir@%$srcdir%g +-s%@top_srcdir@%$top_srcdir%g +-s%@INSTALL@%$INSTALL%g +-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file +-fi; done +-rm -f conftest.s* ++ac_configure_extra_args= + +-EOF +-cat >> $CONFIG_STATUS </dev/null ++ ac_configure_extra_args="$ac_configure_extra_args --silent" ++fi + +-EOF +-cat >> $CONFIG_STATUS <<\EOF ++_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 + +-exit 0 +-EOF +-chmod +x $CONFIG_STATUS +-rm -fr confdefs* $ac_clean_files +-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 ++_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" ;; ++ "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; ++ "lib/tzp/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/tzp/Makefile" ;; ++ "lib/fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/fonts/Makefile" ;; ++ "libzip/Makefile" ) CONFIG_FILES="$CONFIG_FILES libzip/Makefile" ;; ++ "gdev/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdev/Makefile" ;; ++ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; ++ "dialogsrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES dialogsrc/Makefile" ;; ++ "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; ++ "scenarios/Makefile" ) CONFIG_FILES="$CONFIG_FILES scenarios/Makefile" ;; ++ "sdlsrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES sdlsrc/Makefile" ;; ++ "joystick/Makefile" ) CONFIG_FILES="$CONFIG_FILES joystick/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,@AUTOMAKE@,$AUTOMAKE,;t t ++s,@AUTOCONF@,$AUTOCONF,;t t ++s,@VERSION@,$VERSION,;t t ++s,@PACKAGE@,$PACKAGE,;t t ++s,@REV_DATE@,$REV_DATE,;t t ++s,@build@,$build,;t t ++s,@build_cpu@,$build_cpu,;t t ++s,@build_vendor@,$build_vendor,;t t ++s,@build_os@,$build_os,;t t ++s,@host@,$host,;t t ++s,@host_cpu@,$host_cpu,;t t ++s,@host_vendor@,$host_vendor,;t t ++s,@host_os@,$host_os,;t t ++s,@SET_MAKE@,$SET_MAKE,;t t ++s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t ++s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t ++s,@INSTALL_DATA@,$INSTALL_DATA,;t t ++s,@CC@,$CC,;t t ++s,@CFLAGS@,$CFLAGS,;t t ++s,@LDFLAGS@,$LDFLAGS,;t t ++s,@CPPFLAGS@,$CPPFLAGS,;t t ++s,@ac_ct_CC@,$ac_ct_CC,;t t ++s,@EXEEXT@,$EXEEXT,;t t ++s,@OBJEXT@,$OBJEXT,;t t ++s,@CXX@,$CXX,;t t ++s,@CXXFLAGS@,$CXXFLAGS,;t t ++s,@ac_ct_CXX@,$ac_ct_CXX,;t t ++s,@RANLIB@,$RANLIB,;t t ++s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t ++s,@SVGALIB_TRUE@,$SVGALIB_TRUE,;t t ++s,@SVGALIB_FALSE@,$SVGALIB_FALSE,;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 ++ ++ # 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; } ++ ++ 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 ++$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 + +Index: sabre-0.2.4b/dialogsrc/Makefile.in +=================================================================== +--- sabre-0.2.4b.orig/dialogsrc/Makefile.in 2006-05-15 23:35:46.000000000 +0200 ++++ sabre-0.2.4b/dialogsrc/Makefile.in 2006-05-15 23:36:46.000000000 +0200 +@@ -1,6 +1,6 @@ +-# Makefile.in generated automatically by automake 1.3 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,7 +14,7 @@ + # portions donated by Antti Barck + + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -35,7 +35,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include + +-DISTDIR = ++DESTDIR = + + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -49,7 +49,7 @@ + AUTOHEADER = @AUTOHEADER@ + + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + transform = @program_transform_name@ +@@ -66,21 +66,24 @@ + AUTOMAKE = @AUTOMAKE@ + CC = @CC@ + CXX = @CXX@ ++HAVE_LIB = @HAVE_LIB@ ++LIB = @LIB@ ++LTLIB = @LTLIB@ + PACKAGE = @PACKAGE@ + RANLIB = @RANLIB@ + REV_DATE = @REV_DATE@ + VERSION = @VERSION@ + +-AUTOMAKE_OPTIONS=foreign ++AUTOMAKE_OPTIONS = foreign ++ ++noinst_PROGRAMS = dialog ++dialog_SOURCES = checklist.c inputbox.c menubox.c msgbox.c textbox.c util.c yesno.c dialog.c + +-noinst_PROGRAMS=dialog +-dialog_SOURCES=checklist.c inputbox.c menubox.c msgbox.c \ +- textbox.c util.c yesno.c dialog.c + + # disable mouse support (for now) + # Dan -- keep dialogsrc compiled with these flags + # others seem to cause problems +-CFLAGS=-g -O2 ++CFLAGS = -g -O2 + EXTRA_DIST = *.h + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = +@@ -96,26 +99,29 @@ + dialog_LDADD = $(LDADD) + dialog_DEPENDENCIES = + dialog_LDFLAGS = +-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ + DIST_COMMON = README Makefile.am Makefile.in + + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + + TAR = tar +-GZIP = --best ++GZIP_ENV = --best ++DEP_FILES = .deps/checklist.P .deps/dialog.P .deps/inputbox.P \ ++.deps/menubox.P .deps/msgbox.P .deps/textbox.P .deps/util.P \ ++.deps/yesno.P + SOURCES = $(dialog_SOURCES) + OBJECTS = $(dialog_OBJECTS) + +-all: Makefile $(PROGRAMS) +- ++all: all-redirect + .SUFFIXES: + .SUFFIXES: .S .c .o .s +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps dialogsrc/Makefile ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && $(AUTOMAKE) --foreign dialogsrc/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -129,9 +135,6 @@ + + maintainer-clean-noinstPROGRAMS: + +-.c.o: +- $(COMPILE) -c $< +- + .s.o: + $(COMPILE) -c $< + +@@ -155,8 +158,12 @@ + tags: TAGS + + ID: $(HEADERS) $(SOURCES) $(LISP) ++ list='$(SOURCES) $(HEADERS)'; \ ++ unique=`for i in $$list; do echo $$i; done | \ ++ awk ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ +- && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) ++ && mkid -f$$here/ID $$unique $(LISP) + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ +@@ -166,7 +173,7 @@ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ +- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + + mostlyclean-tags: + +@@ -182,70 +189,121 @@ + subdir = dialogsrc + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign dialogsrc/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file; \ ++ if test -d $$d/$$file; then \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++ || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ fi; \ + done + +-info: +-dvi: +-check: all +- $(MAKE) +-installcheck: +-install-exec: +- @$(NORMAL_INSTALL) ++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-install-data: +- @$(NORMAL_INSTALL) ++-include $(DEP_FILES) + +-install: install-exec install-data all +- @: ++mostlyclean-depend: + +-uninstall: ++clean-depend: + ++distclean-depend: ++ -rm -rf .deps ++ ++maintainer-clean-depend: ++ ++%.o: %.c ++ @echo '$(COMPILE) -c $<'; \ ++ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-cp .deps/$(*F).pp .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm .deps/$(*F).pp ++ ++%.lo: %.c ++ @echo '$(LTCOMPILE) -c $<'; \ ++ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ++ < .deps/$(*F).pp > .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm -f .deps/$(*F).pp ++info-am: ++info: info-am ++dvi-am: ++dvi: dvi-am ++check-am: all-am ++check: check-am ++installcheck-am: ++installcheck: installcheck-am ++install-exec-am: ++install-exec: install-exec-am ++ ++install-data-am: ++install-data: install-data-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++install: install-am ++uninstall-am: ++uninstall: uninstall-am ++all-am: Makefile $(PROGRAMS) ++all-redirect: all-am + install-strip: +- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install ++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: + + + mostlyclean-generic: +- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f Makefile $(DISTCLEANFILES) ++ -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +-mostlyclean: mostlyclean-noinstPROGRAMS mostlyclean-compile \ +- mostlyclean-tags mostlyclean-generic +- +-clean: clean-noinstPROGRAMS clean-compile clean-tags clean-generic \ +- mostlyclean +- +-distclean: distclean-noinstPROGRAMS distclean-compile distclean-tags \ +- distclean-generic clean +- -rm -f config.status ++mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \ ++ mostlyclean-tags mostlyclean-depend mostlyclean-generic ++ ++mostlyclean: mostlyclean-am ++ ++clean-am: clean-noinstPROGRAMS clean-compile clean-tags clean-depend \ ++ clean-generic mostlyclean-am ++ ++clean: clean-am + +-maintainer-clean: maintainer-clean-noinstPROGRAMS \ ++distclean-am: distclean-noinstPROGRAMS distclean-compile distclean-tags \ ++ distclean-depend distclean-generic clean-am ++ ++distclean: distclean-am ++ ++maintainer-clean-am: maintainer-clean-noinstPROGRAMS \ + maintainer-clean-compile maintainer-clean-tags \ +- maintainer-clean-generic distclean ++ maintainer-clean-depend maintainer-clean-generic \ ++ distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + ++maintainer-clean: maintainer-clean-am ++ + .PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ + clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ + mostlyclean-compile distclean-compile clean-compile \ + maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +-clean-tags maintainer-clean-tags distdir info dvi installcheck \ +-install-exec install-data install uninstall all installdirs \ ++clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ++distclean-depend clean-depend maintainer-clean-depend info-am info \ ++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ++install-exec install-data-am install-data install-am install \ ++uninstall-am uninstall all-redirect all-am all installdirs \ + mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + +Index: sabre-0.2.4b/doc/Makefile.in +=================================================================== +--- sabre-0.2.4b.orig/doc/Makefile.in 2006-05-15 23:35:46.000000000 +0200 ++++ sabre-0.2.4b/doc/Makefile.in 2006-05-15 23:36:46.000000000 +0200 +@@ -1,6 +1,6 @@ +-# Makefile.in generated automatically by automake 1.3 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,7 +14,7 @@ + # portions donated by Antti Barck + + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -35,7 +35,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include + +-DISTDIR = ++DESTDIR = + + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -49,7 +49,7 @@ + AUTOHEADER = @AUTOHEADER@ + + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + transform = @program_transform_name@ +@@ -66,12 +66,15 @@ + AUTOMAKE = @AUTOMAKE@ + CC = @CC@ + CXX = @CXX@ ++HAVE_LIB = @HAVE_LIB@ ++LIB = @LIB@ ++LTLIB = @LTLIB@ + PACKAGE = @PACKAGE@ + RANLIB = @RANLIB@ + REV_DATE = @REV_DATE@ + VERSION = @VERSION@ + +-EXTRA_DIST=intro.txt keys.txt moral.txt pilots.txt shoot.txt takeoff.txt gru.txt ++EXTRA_DIST = intro.txt keys.txt moral.txt pilots.txt shoot.txt takeoff.txt gru.txt + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = + DIST_COMMON = Makefile.am Makefile.in +@@ -80,14 +83,13 @@ + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + + TAR = tar +-GZIP = --best +-all: Makefile +- ++GZIP_ENV = --best ++all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -100,62 +102,80 @@ + subdir = doc + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file; \ ++ if test -d $$d/$$file; then \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++ || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ fi; \ + done +-info: +-dvi: +-check: all +- $(MAKE) +-installcheck: +-install-exec: +- @$(NORMAL_INSTALL) +- +-install-data: +- @$(NORMAL_INSTALL) +- +-install: install-exec install-data all +- @: +- +-uninstall: +- ++info-am: ++info: info-am ++dvi-am: ++dvi: dvi-am ++check-am: all-am ++check: check-am ++installcheck-am: ++installcheck: installcheck-am ++install-exec-am: ++install-exec: install-exec-am ++ ++install-data-am: ++install-data: install-data-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++install: install-am ++uninstall-am: ++uninstall: uninstall-am ++all-am: Makefile ++all-redirect: all-am + install-strip: +- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install ++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: + + + mostlyclean-generic: +- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f Makefile $(DISTCLEANFILES) ++ -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +-mostlyclean: mostlyclean-generic ++mostlyclean-am: mostlyclean-generic + +-clean: clean-generic mostlyclean ++mostlyclean: mostlyclean-am + +-distclean: distclean-generic clean +- -rm -f config.status ++clean-am: clean-generic mostlyclean-am + +-maintainer-clean: maintainer-clean-generic distclean ++clean: clean-am ++ ++distclean-am: distclean-generic clean-am ++ ++distclean: distclean-am ++ ++maintainer-clean-am: maintainer-clean-generic distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +-.PHONY: tags distdir info dvi installcheck install-exec install-data \ +-install uninstall all installdirs mostlyclean-generic distclean-generic \ +-clean-generic maintainer-clean-generic clean mostlyclean distclean \ +-maintainer-clean ++maintainer-clean: maintainer-clean-am ++ ++.PHONY: tags distdir info-am info dvi-am dvi check check-am \ ++installcheck-am installcheck install-exec-am install-exec \ ++install-data-am install-data install-am install uninstall-am uninstall \ ++all-redirect all-am all installdirs mostlyclean-generic \ ++distclean-generic clean-generic maintainer-clean-generic clean \ ++mostlyclean distclean maintainer-clean + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +Index: sabre-0.2.4b/gdev/Makefile.in +=================================================================== +--- sabre-0.2.4b.orig/gdev/Makefile.in 2006-05-15 23:35:46.000000000 +0200 ++++ sabre-0.2.4b/gdev/Makefile.in 2006-05-15 23:36:46.000000000 +0200 +@@ -1,6 +1,6 @@ +-# Makefile.in generated automatically by automake 1.3 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -27,7 +27,7 @@ + # forget strictness + + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -48,7 +48,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include + +-DISTDIR = ++DESTDIR = + + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -62,7 +62,7 @@ + AUTOHEADER = @AUTOHEADER@ + + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + transform = @program_transform_name@ +@@ -79,6 +79,9 @@ + AUTOMAKE = @AUTOMAKE@ + CC = @CC@ + CXX = @CXX@ ++HAVE_LIB = @HAVE_LIB@ ++LIB = @LIB@ ++LTLIB = @LTLIB@ + PACKAGE = @PACKAGE@ + RANLIB = @RANLIB@ + REV_DATE = @REV_DATE@ +@@ -86,15 +89,15 @@ + + AUTOMAKE_OPTIONS = foreign + +-noinst_LIBRARIES=libgdev.a +-libgdev_a_SOURCES=gdev.h gdev.C gdev-svgalib.h gdev-svgalib.C fontdev.h \ +- fontdev.C +-FONT_UTILS=fontutils.h fontutils.C +-noinst_PROGRAMS=hello fontedit +-hello_SOURCES=hello.h hello.C $(FONT_UTILS) +-hello_LDADD=libgdev.a +-fontedit_SOURCES=fontedit.h fontedit.C $(FONT_UTILS) +-fontedit_LDADD=libgdev.a ++noinst_LIBRARIES = libgdev.a ++libgdev_a_SOURCES = gdev.h gdev.C gdev-svgalib.h gdev-svgalib.C fontdev.h fontdev.C ++ ++FONT_UTILS = fontutils.h fontutils.C ++noinst_PROGRAMS = hello fontedit ++hello_SOURCES = hello.h hello.C $(FONT_UTILS) ++hello_LDADD = libgdev.a ++fontedit_SOURCES = fontedit.h fontedit.C $(FONT_UTILS) ++fontedit_LDADD = libgdev.a + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = + LIBRARIES = $(noinst_LIBRARIES) +@@ -116,26 +119,32 @@ + fontedit_DEPENDENCIES = libgdev.a + fontedit_LDFLAGS = + CXXFLAGS = @CXXFLAGS@ +-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) +-CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ ++CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXLD = $(CXX) ++CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ ++CFLAGS = @CFLAGS@ ++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ + DIST_COMMON = Makefile.am Makefile.in + + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + + TAR = tar +-GZIP = --best ++GZIP_ENV = --best ++DEP_FILES = .deps/fontdev.P .deps/fontedit.P .deps/fontutils.P \ ++.deps/gdev-svgalib.P .deps/gdev.P .deps/hello.P + SOURCES = $(libgdev_a_SOURCES) $(hello_SOURCES) $(fontedit_SOURCES) + OBJECTS = $(libgdev_a_OBJECTS) $(hello_OBJECTS) $(fontedit_OBJECTS) + +-all: Makefile $(LIBRARIES) $(PROGRAMS) +- ++all: all-redirect + .SUFFIXES: + .SUFFIXES: .C .S .c .o .s +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps gdev/Makefile ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && $(AUTOMAKE) --foreign gdev/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -149,9 +158,6 @@ + + maintainer-clean-noinstLIBRARIES: + +-.c.o: +- $(COMPILE) -c $< +- + .s.o: + $(COMPILE) -c $< + +@@ -195,8 +201,12 @@ + tags: TAGS + + ID: $(HEADERS) $(SOURCES) $(LISP) ++ list='$(SOURCES) $(HEADERS)'; \ ++ unique=`for i in $$list; do echo $$i; done | \ ++ awk ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ +- && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) ++ && mkid -f$$here/ID $$unique $(LISP) + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ +@@ -206,7 +216,7 @@ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ +- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + + mostlyclean-tags: + +@@ -222,75 +232,145 @@ + subdir = gdev + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign gdev/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file; \ ++ if test -d $$d/$$file; then \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++ || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ fi; \ + done + +-info: +-dvi: +-check: all +- $(MAKE) +-installcheck: +-install-exec: +- @$(NORMAL_INSTALL) ++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-install-data: +- @$(NORMAL_INSTALL) ++-include $(DEP_FILES) + +-install: install-exec install-data all +- @: ++mostlyclean-depend: + +-uninstall: ++clean-depend: + ++distclean-depend: ++ -rm -rf .deps ++ ++maintainer-clean-depend: ++ ++%.o: %.c ++ @echo '$(COMPILE) -c $<'; \ ++ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-cp .deps/$(*F).pp .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm .deps/$(*F).pp ++ ++%.lo: %.c ++ @echo '$(LTCOMPILE) -c $<'; \ ++ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ++ < .deps/$(*F).pp > .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm -f .deps/$(*F).pp ++ ++%.o: %.C ++ @echo '$(CXXCOMPILE) -c $<'; \ ++ $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-cp .deps/$(*F).pp .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm .deps/$(*F).pp ++ ++%.lo: %.C ++ @echo '$(LTCXXCOMPILE) -c $<'; \ ++ $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ++ < .deps/$(*F).pp > .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm -f .deps/$(*F).pp ++info-am: ++info: info-am ++dvi-am: ++dvi: dvi-am ++check-am: all-am ++check: check-am ++installcheck-am: ++installcheck: installcheck-am ++install-exec-am: ++install-exec: install-exec-am ++ ++install-data-am: ++install-data: install-data-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++install: install-am ++uninstall-am: ++uninstall: uninstall-am ++all-am: Makefile $(LIBRARIES) $(PROGRAMS) ++all-redirect: all-am + install-strip: +- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install ++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: + + + mostlyclean-generic: +- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f Makefile $(DISTCLEANFILES) ++ -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +-mostlyclean: mostlyclean-noinstLIBRARIES mostlyclean-compile \ ++mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ + mostlyclean-noinstPROGRAMS mostlyclean-tags \ +- mostlyclean-generic ++ mostlyclean-depend mostlyclean-generic ++ ++mostlyclean: mostlyclean-am + +-clean: clean-noinstLIBRARIES clean-compile clean-noinstPROGRAMS \ +- clean-tags clean-generic mostlyclean ++clean-am: clean-noinstLIBRARIES clean-compile clean-noinstPROGRAMS \ ++ clean-tags clean-depend clean-generic mostlyclean-am + +-distclean: distclean-noinstLIBRARIES distclean-compile \ ++clean: clean-am ++ ++distclean-am: distclean-noinstLIBRARIES distclean-compile \ + distclean-noinstPROGRAMS distclean-tags \ +- distclean-generic clean +- -rm -f config.status ++ distclean-depend distclean-generic clean-am ++ ++distclean: distclean-am + +-maintainer-clean: maintainer-clean-noinstLIBRARIES \ ++maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ + maintainer-clean-compile \ + maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ +- maintainer-clean-generic distclean ++ maintainer-clean-depend maintainer-clean-generic \ ++ distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + ++maintainer-clean: maintainer-clean-am ++ + .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ + clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ + mostlyclean-compile distclean-compile clean-compile \ + maintainer-clean-compile mostlyclean-noinstPROGRAMS \ + distclean-noinstPROGRAMS clean-noinstPROGRAMS \ + maintainer-clean-noinstPROGRAMS tags mostlyclean-tags distclean-tags \ +-clean-tags maintainer-clean-tags distdir info dvi installcheck \ +-install-exec install-data install uninstall all installdirs \ ++clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ++distclean-depend clean-depend maintainer-clean-depend info-am info \ ++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ++install-exec install-data-am install-data install-am install \ ++uninstall-am uninstall all-redirect all-am all installdirs \ + mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + +Index: sabre-0.2.4b/install-sh +=================================================================== +--- sabre-0.2.4b.orig/install-sh 2006-05-15 23:35:59.000000000 +0200 ++++ sabre-0.2.4b/install-sh 2006-05-15 23:36:45.000000000 +0200 +@@ -1,19 +1,37 @@ + #!/bin/sh + # + # install - install a program, script, or datafile +-# This comes from X11R5 (mit/util/scripts/install.sh). + # +-# Copyright 1991 by the Massachusetts Institute of Technology ++# This originates from X11R5 (mit/util/scripts/install.sh), which was ++# later released in X11R6 (xc/config/util/install.sh) with the ++# following copyright and license. + # +-# Permission to use, copy, modify, distribute, and sell this software and its +-# documentation for any purpose is hereby granted without fee, provided that +-# the above copyright notice appear in all copies and that both that +-# copyright notice and this permission notice appear in supporting +-# documentation, and that the name of M.I.T. not be used in advertising or +-# publicity pertaining to distribution of the software without specific, +-# written prior permission. M.I.T. makes no representations about the +-# suitability of this software for any purpose. It is provided "as is" +-# without express or implied warranty. ++# Copyright (C) 1994 X Consortium ++# ++# Permission is hereby granted, free of charge, to any person obtaining a copy ++# of this software and associated documentation files (the "Software"), to ++# deal in the Software without restriction, including without limitation the ++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++# sell copies of the Software, and to permit persons to whom the Software is ++# furnished to do so, subject to the following conditions: ++# ++# The above copyright notice and this permission notice shall be included in ++# all copies or substantial portions of the Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- ++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++# ++# Except as contained in this notice, the name of the X Consortium shall not ++# be used in advertising or otherwise to promote the sale, use or other deal- ++# ings in this Software without prior written authorization from the X Consor- ++# tium. ++# ++# ++# FSF changes to this file are in the public domain. + # + # Calling this script install-sh is preferred over install.sh, to prevent + # `make' implicit rules from creating a file called install from it +@@ -118,6 +136,7 @@ + + if [ -d $dst ]; then + instcmd=: ++ chmodcmd="" + else + instcmd=mkdir + fi +@@ -162,7 +181,7 @@ + + # Skip lots of stat calls in the usual case. + if [ ! -d "$dstdir" ]; then +-defaultIFS=' ++defaultIFS=' + ' + IFS="${IFS-${defaultIFS}}" + +Index: sabre-0.2.4b/joystick/Makefile.in +=================================================================== +--- sabre-0.2.4b.orig/joystick/Makefile.in 2006-05-15 23:35:46.000000000 +0200 ++++ sabre-0.2.4b/joystick/Makefile.in 2006-05-15 23:36:46.000000000 +0200 +@@ -1,6 +1,6 @@ +-# Makefile.in generated automatically by automake 1.3 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,8 +13,11 @@ + # This is part of Dan Hammer's SABRE Fighter Plane Simulator + # portions donated by Antti Barck + ++# Hacked by Milan Zamazal in December 2001 to stop automake ++# complaining about subdirectories. + +-SHELL = /bin/sh ++ ++SHELL = @SHELL@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -35,7 +38,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include + +-DISTDIR = ++DESTDIR = + + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -49,7 +52,7 @@ + AUTOHEADER = @AUTOHEADER@ + + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + transform = @program_transform_name@ +@@ -66,6 +69,9 @@ + AUTOMAKE = @AUTOMAKE@ + CC = @CC@ + CXX = @CXX@ ++HAVE_LIB = @HAVE_LIB@ ++LIB = @LIB@ ++LTLIB = @LTLIB@ + PACKAGE = @PACKAGE@ + RANLIB = @RANLIB@ + REV_DATE = @REV_DATE@ +@@ -73,11 +79,11 @@ + + AUTOMAKE_OPTIONS = foreign + bin_PROGRAMS = sabrejoycal +-DEFS =-DJOYCAL +-sabrejoycal_SOURCES = ../src/linux_joy.C ++DEFS = -DJOYCAL ++sabrejoycal_SOURCES = linux_joy.C + sabrejoycal_LDADD = + EXTRA_DIST = +-INCLUDES=-I../src -I../libzip ++INCLUDES = -I../src -I../libzip + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = + PROGRAMS = $(bin_PROGRAMS) +@@ -89,26 +95,27 @@ + sabrejoycal_DEPENDENCIES = + sabrejoycal_LDFLAGS = + CXXFLAGS = @CXXFLAGS@ +-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) +-CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ ++CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXLD = $(CXX) ++CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ + DIST_COMMON = Makefile.am Makefile.in + + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + + TAR = tar +-GZIP = --best ++GZIP_ENV = --best ++DEP_FILES = .deps/linux_joy.P + SOURCES = $(sabrejoycal_SOURCES) + OBJECTS = $(sabrejoycal_OBJECTS) + +-all: Makefile $(PROGRAMS) +- ++all: all-redirect + .SUFFIXES: + .SUFFIXES: .C .S .c .o .s +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps joystick/Makefile ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && $(AUTOMAKE) --foreign joystick/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -127,20 +134,17 @@ + $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + if test -f $$p; then \ +- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ +- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ ++ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ++ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + else :; fi; \ + done + + uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + list='$(bin_PROGRAMS)'; for p in $$list; do \ +- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ ++ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + done + +-.c.o: +- $(COMPILE) -c $< +- + .s.o: + $(COMPILE) -c $< + +@@ -166,8 +170,12 @@ + tags: TAGS + + ID: $(HEADERS) $(SOURCES) $(LISP) ++ list='$(SOURCES) $(HEADERS)'; \ ++ unique=`for i in $$list; do echo $$i; done | \ ++ awk ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ +- && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) ++ && mkid -f$$here/ID $$unique $(LISP) + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ +@@ -177,7 +185,7 @@ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ +- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + + mostlyclean-tags: + +@@ -193,72 +201,141 @@ + subdir = joystick + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign joystick/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file; \ ++ if test -d $$d/$$file; then \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++ || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ fi; \ + done +-linux_joy.o: linux_joy.C ../src/joydummy.h ../src/linux_joy.h + +-info: +-dvi: +-check: all +- $(MAKE) +-installcheck: +-install-exec: install-binPROGRAMS +- @$(NORMAL_INSTALL) ++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-install-data: +- @$(NORMAL_INSTALL) ++-include $(DEP_FILES) + +-install: install-exec install-data all +- @: ++mostlyclean-depend: + +-uninstall: uninstall-binPROGRAMS ++clean-depend: + ++distclean-depend: ++ -rm -rf .deps ++ ++maintainer-clean-depend: ++ ++%.o: %.c ++ @echo '$(COMPILE) -c $<'; \ ++ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-cp .deps/$(*F).pp .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm .deps/$(*F).pp ++ ++%.lo: %.c ++ @echo '$(LTCOMPILE) -c $<'; \ ++ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ++ < .deps/$(*F).pp > .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm -f .deps/$(*F).pp ++ ++%.o: %.C ++ @echo '$(CXXCOMPILE) -c $<'; \ ++ $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-cp .deps/$(*F).pp .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm .deps/$(*F).pp ++ ++%.lo: %.C ++ @echo '$(LTCXXCOMPILE) -c $<'; \ ++ $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ++ < .deps/$(*F).pp > .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm -f .deps/$(*F).pp ++info-am: ++info: info-am ++dvi-am: ++dvi: dvi-am ++check-am: all-am ++check: check-am ++installcheck-am: ++installcheck: installcheck-am ++install-exec-am: install-binPROGRAMS ++install-exec: install-exec-am ++ ++install-data-am: ++install-data: install-data-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++install: install-am ++uninstall-am: uninstall-binPROGRAMS ++uninstall: uninstall-am ++all-am: Makefile $(PROGRAMS) ++all-redirect: all-am + install-strip: +- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install ++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: +- $(mkinstalldirs) $(DATADIR)$(bindir) ++ $(mkinstalldirs) $(DESTDIR)$(bindir) + + + mostlyclean-generic: +- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f Makefile $(DISTCLEANFILES) ++ -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +-mostlyclean: mostlyclean-binPROGRAMS mostlyclean-compile \ +- mostlyclean-tags mostlyclean-generic +- +-clean: clean-binPROGRAMS clean-compile clean-tags clean-generic \ +- mostlyclean +- +-distclean: distclean-binPROGRAMS distclean-compile distclean-tags \ +- distclean-generic clean +- -rm -f config.status +- +-maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ +- maintainer-clean-tags maintainer-clean-generic \ +- distclean ++mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ ++ mostlyclean-tags mostlyclean-depend mostlyclean-generic ++ ++mostlyclean: mostlyclean-am ++ ++clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \ ++ clean-generic mostlyclean-am ++ ++clean: clean-am ++ ++distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ ++ distclean-depend distclean-generic clean-am ++ ++distclean: distclean-am ++ ++maintainer-clean-am: maintainer-clean-binPROGRAMS \ ++ maintainer-clean-compile maintainer-clean-tags \ ++ maintainer-clean-depend maintainer-clean-generic \ ++ distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + ++maintainer-clean: maintainer-clean-am ++ + .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ + maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ + mostlyclean-compile distclean-compile clean-compile \ + maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +-clean-tags maintainer-clean-tags distdir info dvi installcheck \ +-install-exec install-data install uninstall all installdirs \ ++clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ++distclean-depend clean-depend maintainer-clean-depend info-am info \ ++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ++install-exec install-data-am install-data install-am install \ ++uninstall-am uninstall all-redirect all-am all installdirs \ + mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + +@@ -266,8 +343,8 @@ + linux_joy.C : + echo + +-linux_joy.o : ../src/linux_joy.C +- $(CXX) $(INCLUDES) -DJOYCAL -c -o linux_joy.o ../src/linux_joy.C ++linux_joy.o : linux_joy.C ++ $(CXX) $(INCLUDES) -DJOYCAL -c -o linux_joy.o linux_joy.C + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +Index: sabre-0.2.4b/lib/Makefile.in +=================================================================== +--- sabre-0.2.4b.orig/lib/Makefile.in 2006-05-15 23:35:47.000000000 +0200 ++++ sabre-0.2.4b/lib/Makefile.in 2006-05-15 23:36:46.000000000 +0200 +@@ -1,6 +1,6 @@ +-# Makefile.in generated automatically by automake 1.3 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,7 +14,7 @@ + # portions donated by Antti Barck + + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -35,7 +35,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include + +-DISTDIR = ++DESTDIR = + + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -49,7 +49,7 @@ + AUTOHEADER = @AUTOHEADER@ + + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + transform = @program_transform_name@ +@@ -66,6 +66,9 @@ + AUTOMAKE = @AUTOMAKE@ + CC = @CC@ + CXX = @CXX@ ++HAVE_LIB = @HAVE_LIB@ ++LIB = @LIB@ ++LTLIB = @LTLIB@ + PACKAGE = @PACKAGE@ + RANLIB = @RANLIB@ + REV_DATE = @REV_DATE@ +@@ -82,14 +85,13 @@ + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + + TAR = tar +-GZIP = --best +-all: all-recursive all-am +- ++GZIP_ENV = --best ++all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps lib/Makefile ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -107,48 +109,72 @@ + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive info-recursive dvi-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ ++ dot_seen=no; \ ++ target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +- target=`echo $@ | sed s/-recursive//`; \ + echo "Making $$target in $$subdir"; \ +- (cd $$subdir && $(MAKE) $$target) \ ++ if test "$$subdir" = "."; then \ ++ dot_seen=yes; \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ +- done && test -z "$$fail" ++ done; \ ++ if test "$$dot_seen" = "no"; then \ ++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ++ fi; test -z "$$fail" + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ ++ dot_seen=no; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ ++ test "$$subdir" != "." || dot_seen=yes; \ + done; \ ++ test "$$dot_seen" = "no" && rev=". $$rev"; \ ++ target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ +- target=`echo $@ | sed s/-recursive//`; \ + echo "Making $$target in $$subdir"; \ +- (cd $$subdir && $(MAKE) $$target) \ ++ if test "$$subdir" = "."; then \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- (cd $$subdir && $(MAKE) tags); \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + + tags: TAGS + + ID: $(HEADERS) $(SOURCES) $(LISP) ++ list='$(SOURCES) $(HEADERS)'; \ ++ unique=`for i in $$list; do echo $$i; done | \ ++ awk ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ +- && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) ++ && mkid -f$$here/ID $$unique $(LISP) + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ++ if test "$$subdir" = .; then :; else \ ++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ++ fi; \ + done; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ +- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + + mostlyclean-tags: + +@@ -164,85 +190,96 @@ + subdir = lib + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign lib/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file; \ ++ if test -d $$d/$$file; then \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++ || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ fi; \ + done + for subdir in $(SUBDIRS); do \ +- test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ +- || exit 1; \ +- chmod 777 $(distdir)/$$subdir; \ +- (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ ++ if test "$$subdir" = .; then :; else \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ ++ chmod 777 $(distdir)/$$subdir; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ ++ || exit 1; \ ++ fi; \ + done ++info-am: + info: info-recursive ++dvi-am: + dvi: dvi-recursive +-check: all-am +- $(MAKE) check-recursive ++check-am: all-am ++check: check-recursive ++installcheck-am: + installcheck: installcheck-recursive +-all-am: Makefile +- ++install-exec-am: + install-exec: install-exec-recursive +- @$(NORMAL_INSTALL) + ++install-data-am: + install-data: install-data-recursive +- @$(NORMAL_INSTALL) + ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + install: install-recursive +- @: +- ++uninstall-am: + uninstall: uninstall-recursive +- ++all-am: Makefile ++all-redirect: all-recursive + install-strip: +- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install ++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: installdirs-recursive ++installdirs-am: + + + mostlyclean-generic: +- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f Makefile $(DISTCLEANFILES) ++ -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + mostlyclean-am: mostlyclean-tags mostlyclean-generic + ++mostlyclean: mostlyclean-recursive ++ + clean-am: clean-tags clean-generic mostlyclean-am + ++clean: clean-recursive ++ + distclean-am: distclean-tags distclean-generic clean-am + ++distclean: distclean-recursive ++ + maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am +- +-mostlyclean: mostlyclean-recursive mostlyclean-am +- +-clean: clean-recursive clean-am +- +-distclean: distclean-recursive distclean-am +- -rm -f config.status +- +-maintainer-clean: maintainer-clean-recursive maintainer-clean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + ++maintainer-clean: maintainer-clean-recursive ++ + .PHONY: install-data-recursive uninstall-data-recursive \ + install-exec-recursive uninstall-exec-recursive installdirs-recursive \ + uninstalldirs-recursive all-recursive check-recursive \ + installcheck-recursive info-recursive dvi-recursive \ + mostlyclean-recursive distclean-recursive clean-recursive \ + maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ +-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ +-installcheck all-am install-exec install-data install uninstall all \ ++distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ++install-exec install-data-am install-data install-am install \ ++uninstall-am uninstall all-redirect all-am all installdirs-am \ + installdirs mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + +Index: sabre-0.2.4b/lib/fonts/Makefile.in +=================================================================== +--- sabre-0.2.4b.orig/lib/fonts/Makefile.in 2006-05-15 23:35:47.000000000 +0200 ++++ sabre-0.2.4b/lib/fonts/Makefile.in 2006-05-15 23:36:46.000000000 +0200 +@@ -1,6 +1,6 @@ +-# Makefile.in generated automatically by automake 1.3 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,7 +14,7 @@ + # portions donated by Antti Barck + + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -35,7 +35,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include + +-DISTDIR = ++DESTDIR = + + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -49,7 +49,7 @@ + AUTOHEADER = @AUTOHEADER@ + + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + transform = @program_transform_name@ +@@ -66,6 +66,9 @@ + AUTOMAKE = @AUTOMAKE@ + CC = @CC@ + CXX = @CXX@ ++HAVE_LIB = @HAVE_LIB@ ++LIB = @LIB@ ++LTLIB = @LTLIB@ + PACKAGE = @PACKAGE@ + RANLIB = @RANLIB@ + REV_DATE = @REV_DATE@ +@@ -81,14 +84,13 @@ + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + + TAR = tar +-GZIP = --best +-all: Makefile +- ++GZIP_ENV = --best ++all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps lib/fonts/Makefile ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/fonts/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -101,62 +103,80 @@ + subdir = lib/fonts + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign lib/fonts/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file; \ ++ if test -d $$d/$$file; then \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++ || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ fi; \ + done +-info: +-dvi: +-check: all +- $(MAKE) +-installcheck: +-install-exec: +- @$(NORMAL_INSTALL) +- +-install-data: +- @$(NORMAL_INSTALL) +- +-install: install-exec install-data all +- @: +- +-uninstall: +- ++info-am: ++info: info-am ++dvi-am: ++dvi: dvi-am ++check-am: all-am ++check: check-am ++installcheck-am: ++installcheck: installcheck-am ++install-exec-am: ++install-exec: install-exec-am ++ ++install-data-am: ++install-data: install-data-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++install: install-am ++uninstall-am: ++uninstall: uninstall-am ++all-am: Makefile ++all-redirect: all-am + install-strip: +- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install ++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: + + + mostlyclean-generic: +- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f Makefile $(DISTCLEANFILES) ++ -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +-mostlyclean: mostlyclean-generic ++mostlyclean-am: mostlyclean-generic + +-clean: clean-generic mostlyclean ++mostlyclean: mostlyclean-am + +-distclean: distclean-generic clean +- -rm -f config.status ++clean-am: clean-generic mostlyclean-am + +-maintainer-clean: maintainer-clean-generic distclean ++clean: clean-am ++ ++distclean-am: distclean-generic clean-am ++ ++distclean: distclean-am ++ ++maintainer-clean-am: maintainer-clean-generic distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +-.PHONY: tags distdir info dvi installcheck install-exec install-data \ +-install uninstall all installdirs mostlyclean-generic distclean-generic \ +-clean-generic maintainer-clean-generic clean mostlyclean distclean \ +-maintainer-clean ++maintainer-clean: maintainer-clean-am ++ ++.PHONY: tags distdir info-am info dvi-am dvi check check-am \ ++installcheck-am installcheck install-exec-am install-exec \ ++install-data-am install-data install-am install uninstall-am uninstall \ ++all-redirect all-am all installdirs mostlyclean-generic \ ++distclean-generic clean-generic maintainer-clean-generic clean \ ++mostlyclean distclean maintainer-clean + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +Index: sabre-0.2.4b/lib/tzp/Makefile.in +=================================================================== +--- sabre-0.2.4b.orig/lib/tzp/Makefile.in 2006-05-15 23:35:47.000000000 +0200 ++++ sabre-0.2.4b/lib/tzp/Makefile.in 2006-05-15 23:36:46.000000000 +0200 +@@ -1,6 +1,6 @@ +-# Makefile.in generated automatically by automake 1.3 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,7 +16,7 @@ + # Here are the top level make parameters + + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -37,7 +37,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include + +-DISTDIR = ++DESTDIR = + + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -51,7 +51,7 @@ + AUTOHEADER = @AUTOHEADER@ + + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + transform = @program_transform_name@ +@@ -68,6 +68,9 @@ + AUTOMAKE = @AUTOMAKE@ + CC = @CC@ + CXX = @CXX@ ++HAVE_LIB = @HAVE_LIB@ ++LIB = @LIB@ ++LTLIB = @LTLIB@ + PACKAGE = @PACKAGE@ + RANLIB = @RANLIB@ + REV_DATE = @REV_DATE@ +@@ -83,14 +86,13 @@ + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + + TAR = tar +-GZIP = --best +-all: Makefile +- ++GZIP_ENV = --best ++all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps lib/tzp/Makefile ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/tzp/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -103,62 +105,80 @@ + subdir = lib/tzp + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign lib/tzp/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file; \ ++ if test -d $$d/$$file; then \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++ || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ fi; \ + done +-info: +-dvi: +-check: all +- $(MAKE) +-installcheck: +-install-exec: +- @$(NORMAL_INSTALL) +- +-install-data: +- @$(NORMAL_INSTALL) +- +-install: install-exec install-data all +- @: +- +-uninstall: +- ++info-am: ++info: info-am ++dvi-am: ++dvi: dvi-am ++check-am: all-am ++check: check-am ++installcheck-am: ++installcheck: installcheck-am ++install-exec-am: ++install-exec: install-exec-am ++ ++install-data-am: ++install-data: install-data-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++install: install-am ++uninstall-am: ++uninstall: uninstall-am ++all-am: Makefile ++all-redirect: all-am + install-strip: +- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install ++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: + + + mostlyclean-generic: +- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f Makefile $(DISTCLEANFILES) ++ -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +-mostlyclean: mostlyclean-generic ++mostlyclean-am: mostlyclean-generic + +-clean: clean-generic mostlyclean ++mostlyclean: mostlyclean-am + +-distclean: distclean-generic clean +- -rm -f config.status ++clean-am: clean-generic mostlyclean-am + +-maintainer-clean: maintainer-clean-generic distclean ++clean: clean-am ++ ++distclean-am: distclean-generic clean-am ++ ++distclean: distclean-am ++ ++maintainer-clean-am: maintainer-clean-generic distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +-.PHONY: tags distdir info dvi installcheck install-exec install-data \ +-install uninstall all installdirs mostlyclean-generic distclean-generic \ +-clean-generic maintainer-clean-generic clean mostlyclean distclean \ +-maintainer-clean ++maintainer-clean: maintainer-clean-am ++ ++.PHONY: tags distdir info-am info dvi-am dvi check check-am \ ++installcheck-am installcheck install-exec-am install-exec \ ++install-data-am install-data install-am install uninstall-am uninstall \ ++all-redirect all-am all installdirs mostlyclean-generic \ ++distclean-generic clean-generic maintainer-clean-generic clean \ ++mostlyclean distclean maintainer-clean + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +Index: sabre-0.2.4b/libzip/Makefile.in +=================================================================== +--- sabre-0.2.4b.orig/libzip/Makefile.in 2006-05-15 23:35:47.000000000 +0200 ++++ sabre-0.2.4b/libzip/Makefile.in 2006-05-15 23:36:46.000000000 +0200 +@@ -1,6 +1,6 @@ +-# Makefile.in generated automatically by automake 1.3 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,7 +14,7 @@ + # portions donated by Antti Barck + + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -35,7 +35,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include + +-DISTDIR = ++DESTDIR = + + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -49,7 +49,7 @@ + AUTOHEADER = @AUTOHEADER@ + + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + transform = @program_transform_name@ +@@ -66,6 +66,9 @@ + AUTOMAKE = @AUTOMAKE@ + CC = @CC@ + CXX = @CXX@ ++HAVE_LIB = @HAVE_LIB@ ++LIB = @LIB@ ++LTLIB = @LTLIB@ + PACKAGE = @PACKAGE@ + RANLIB = @RANLIB@ + REV_DATE = @REV_DATE@ +@@ -79,7 +82,7 @@ + #comp_SOURCES = bits.c crc.c deflate.c trees.c + #uncl_SOURCES = inflate.c unc.c crc.c + EXTRA_DIST = *.h +-CFLAGS=-O2 ++CFLAGS = -O2 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = + LIBRARIES = $(noinst_LIBRARIES) +@@ -94,26 +97,28 @@ + libuncl_a_LIBADD = + libuncl_a_OBJECTS = inflate.o unc.o crc.o + AR = ar +-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ + DIST_COMMON = Makefile.am Makefile.in + + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + + TAR = tar +-GZIP = --best ++GZIP_ENV = --best ++DEP_FILES = .deps/bits.P .deps/crc.P .deps/deflate.P .deps/inflate.P \ ++.deps/trees.P .deps/unc.P + SOURCES = $(libcomp_a_SOURCES) $(libuncl_a_SOURCES) + OBJECTS = $(libcomp_a_OBJECTS) $(libuncl_a_OBJECTS) + +-all: Makefile $(LIBRARIES) +- ++all: all-redirect + .SUFFIXES: + .SUFFIXES: .S .c .o .s +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps libzip/Makefile ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && $(AUTOMAKE) --foreign libzip/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -127,9 +132,6 @@ + + maintainer-clean-noinstLIBRARIES: + +-.c.o: +- $(COMPILE) -c $< +- + .s.o: + $(COMPILE) -c $< + +@@ -159,8 +161,12 @@ + tags: TAGS + + ID: $(HEADERS) $(SOURCES) $(LISP) ++ list='$(SOURCES) $(HEADERS)'; \ ++ unique=`for i in $$list; do echo $$i; done | \ ++ awk ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ +- && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) ++ && mkid -f$$here/ID $$unique $(LISP) + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ +@@ -170,7 +176,7 @@ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ +- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + + mostlyclean-tags: + +@@ -186,70 +192,122 @@ + subdir = libzip + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign libzip/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file; \ ++ if test -d $$d/$$file; then \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++ || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ fi; \ + done + +-info: +-dvi: +-check: all +- $(MAKE) +-installcheck: +-install-exec: +- @$(NORMAL_INSTALL) ++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-install-data: +- @$(NORMAL_INSTALL) ++-include $(DEP_FILES) + +-install: install-exec install-data all +- @: ++mostlyclean-depend: + +-uninstall: ++clean-depend: + ++distclean-depend: ++ -rm -rf .deps ++ ++maintainer-clean-depend: ++ ++%.o: %.c ++ @echo '$(COMPILE) -c $<'; \ ++ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-cp .deps/$(*F).pp .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm .deps/$(*F).pp ++ ++%.lo: %.c ++ @echo '$(LTCOMPILE) -c $<'; \ ++ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ++ < .deps/$(*F).pp > .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm -f .deps/$(*F).pp ++info-am: ++info: info-am ++dvi-am: ++dvi: dvi-am ++check-am: all-am ++check: check-am ++installcheck-am: ++installcheck: installcheck-am ++install-exec-am: ++install-exec: install-exec-am ++ ++install-data-am: ++install-data: install-data-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++install: install-am ++uninstall-am: ++uninstall: uninstall-am ++all-am: Makefile $(LIBRARIES) ++all-redirect: all-am + install-strip: +- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install ++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: + + + mostlyclean-generic: +- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f Makefile $(DISTCLEANFILES) ++ -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +-mostlyclean: mostlyclean-noinstLIBRARIES mostlyclean-compile \ +- mostlyclean-tags mostlyclean-generic +- +-clean: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \ +- mostlyclean +- +-distclean: distclean-noinstLIBRARIES distclean-compile distclean-tags \ +- distclean-generic clean +- -rm -f config.status ++mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ ++ mostlyclean-tags mostlyclean-depend mostlyclean-generic + +-maintainer-clean: maintainer-clean-noinstLIBRARIES \ ++mostlyclean: mostlyclean-am ++ ++clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \ ++ clean-generic mostlyclean-am ++ ++clean: clean-am ++ ++distclean-am: distclean-noinstLIBRARIES distclean-compile \ ++ distclean-tags distclean-depend distclean-generic \ ++ clean-am ++ ++distclean: distclean-am ++ ++maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ + maintainer-clean-compile maintainer-clean-tags \ +- maintainer-clean-generic distclean ++ maintainer-clean-depend maintainer-clean-generic \ ++ distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + ++maintainer-clean: maintainer-clean-am ++ + .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ + clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ + mostlyclean-compile distclean-compile clean-compile \ + maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +-clean-tags maintainer-clean-tags distdir info dvi installcheck \ +-install-exec install-data install uninstall all installdirs \ ++clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ++distclean-depend clean-depend maintainer-clean-depend info-am info \ ++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ++install-exec install-data-am install-data install-am install \ ++uninstall-am uninstall all-redirect all-am all installdirs \ + mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + +Index: sabre-0.2.4b/missing +=================================================================== +--- sabre-0.2.4b.orig/missing 2006-05-15 23:35:50.000000000 +0200 ++++ sabre-0.2.4b/missing 2006-05-15 23:36:45.000000000 +0200 +@@ -1,6 +1,6 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. +-# Copyright (C) 1996, 1997 Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc. + # Franc,ois Pinard , 1996. + + # This program is free software; you can redistribute it and/or modify +@@ -23,6 +23,14 @@ + exit 1 + fi + ++# In the cases where this matters, `missing' is being run in the ++# srcdir already. ++if test -f configure.in; then ++ configure_ac=configure.ac ++else ++ configure_ac=configure.in ++fi ++ + case "$1" in + + -h|--h|--he|--hel|--help) +@@ -41,9 +49,11 @@ + autoconf touch file \`configure' + autoheader touch file \`config.h.in' + automake touch all \`Makefile.in' files +- bison touch file \`y.tab.c' ++ bison create \`y.tab.[ch]', if possible, from existing .[ch] ++ flex create \`lex.yy.c', if possible, from existing .c ++ lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file +- yacc touch file \`y.tab.c'" ++ yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) +@@ -56,10 +66,10 @@ + exit 1 + ;; + +- aclocal) ++ aclocal*) + echo 1>&2 "\ + WARNING: \`$1' is missing on your system. You should only need it if +- you modified \`acinclude.m4' or \`configure.in'. You might want ++ you modified \`acinclude.m4' or \`$configure_ac'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." + touch aclocal.m4 +@@ -68,7 +78,7 @@ + autoconf) + echo 1>&2 "\ + WARNING: \`$1' is missing on your system. You should only need it if +- you modified \`configure.in'. You might want to install the ++ you modified \`$configure_ac'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure +@@ -77,21 +87,31 @@ + autoheader) + echo 1>&2 "\ + WARNING: \`$1' is missing on your system. You should only need it if +- you modified \`acconfig.h' or \`configure.in'. You might want ++ you modified \`acconfig.h' or \`$configure_ac'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." +- touch config.h.in ++ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac` ++ test -z "$files" && files="config.h" ++ touch_files= ++ for f in $files; do ++ case "$f" in ++ *:*) touch_files="$touch_files "`echo "$f" | ++ sed -e 's/^[^:]*://' -e 's/:.*//'`;; ++ *) touch_files="$touch_files $f.in";; ++ esac ++ done ++ touch $touch_files + ;; + +- automake) ++ automake*) + echo 1>&2 "\ + WARNING: \`$1' is missing on your system. You should only need it if +- you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. ++ you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." +- find . -type f -name Makefile.am -print \ +- | sed 's/^\(.*\).am$/touch \1.in/' \ +- | sh ++ find . -type f -name Makefile.am -print | ++ sed 's/\.am$/.in/' | ++ while read f; do touch "$f"; done + ;; + + bison|yacc) +@@ -100,7 +120,51 @@ + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." +- touch y.tab.c ++ rm -f y.tab.c y.tab.h ++ if [ $# -ne 1 ]; then ++ eval LASTARG="\${$#}" ++ case "$LASTARG" in ++ *.y) ++ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` ++ if [ -f "$SRCFILE" ]; then ++ cp "$SRCFILE" y.tab.c ++ fi ++ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` ++ if [ -f "$SRCFILE" ]; then ++ cp "$SRCFILE" y.tab.h ++ fi ++ ;; ++ esac ++ fi ++ if [ ! -f y.tab.h ]; then ++ echo >y.tab.h ++ fi ++ if [ ! -f y.tab.c ]; then ++ echo 'main() { return 0; }' >y.tab.c ++ fi ++ ;; ++ ++ lex|flex) ++ echo 1>&2 "\ ++WARNING: \`$1' is missing on your system. You should only need it if ++ you modified a \`.l' file. You may need the \`Flex' package ++ in order for those modifications to take effect. You can get ++ \`Flex' from any GNU archive site." ++ rm -f lex.yy.c ++ if [ $# -ne 1 ]; then ++ eval LASTARG="\${$#}" ++ case "$LASTARG" in ++ *.l) ++ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` ++ if [ -f "$SRCFILE" ]; then ++ cp "$SRCFILE" lex.yy.c ++ fi ++ ;; ++ esac ++ fi ++ if [ ! -f lex.yy.c ]; then ++ echo 'main() { return 0; }' >lex.yy.c ++ fi + ;; + + makeinfo) +Index: sabre-0.2.4b/mkinstalldirs +=================================================================== +--- sabre-0.2.4b.orig/mkinstalldirs 2006-05-15 23:35:50.000000000 +0200 ++++ sabre-0.2.4b/mkinstalldirs 2006-05-15 23:36:45.000000000 +0200 +@@ -4,7 +4,7 @@ + # Created: 1993-05-16 + # Public domain + +-# $Id: mkinstalldirs,v 1.10 1996/05/03 07:37:52 friedman Exp $ ++# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $ + + errstatus=0 + +@@ -22,7 +22,7 @@ + esac + + if test ! -d "$pathcomp"; then +- echo "mkdir $pathcomp" 1>&2 ++ echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + +Index: sabre-0.2.4b/scenarios/Makefile.in +=================================================================== +--- sabre-0.2.4b.orig/scenarios/Makefile.in 2006-05-15 23:35:47.000000000 +0200 ++++ sabre-0.2.4b/scenarios/Makefile.in 2006-05-15 23:36:46.000000000 +0200 +@@ -1,6 +1,6 @@ +-# Makefile.in generated automatically by automake 1.3 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,7 +14,7 @@ + # portions donated by Antti Barck + + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -35,7 +35,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include + +-DISTDIR = ++DESTDIR = + + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -49,7 +49,7 @@ + AUTOHEADER = @AUTOHEADER@ + + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + transform = @program_transform_name@ +@@ -66,6 +66,9 @@ + AUTOMAKE = @AUTOMAKE@ + CC = @CC@ + CXX = @CXX@ ++HAVE_LIB = @HAVE_LIB@ ++LIB = @LIB@ ++LTLIB = @LTLIB@ + PACKAGE = @PACKAGE@ + RANLIB = @RANLIB@ + REV_DATE = @REV_DATE@ +@@ -80,14 +83,13 @@ + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + + TAR = tar +-GZIP = --best +-all: Makefile +- ++GZIP_ENV = --best ++all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps scenarios/Makefile ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && $(AUTOMAKE) --gnu scenarios/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -100,62 +102,80 @@ + subdir = scenarios + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu scenarios/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file; \ ++ if test -d $$d/$$file; then \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++ || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ fi; \ + done +-info: +-dvi: +-check: all +- $(MAKE) +-installcheck: +-install-exec: +- @$(NORMAL_INSTALL) +- +-install-data: +- @$(NORMAL_INSTALL) +- +-install: install-exec install-data all +- @: +- +-uninstall: +- ++info-am: ++info: info-am ++dvi-am: ++dvi: dvi-am ++check-am: all-am ++check: check-am ++installcheck-am: ++installcheck: installcheck-am ++install-exec-am: ++install-exec: install-exec-am ++ ++install-data-am: ++install-data: install-data-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++install: install-am ++uninstall-am: ++uninstall: uninstall-am ++all-am: Makefile ++all-redirect: all-am + install-strip: +- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install ++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: + + + mostlyclean-generic: +- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f Makefile $(DISTCLEANFILES) ++ -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +-mostlyclean: mostlyclean-generic ++mostlyclean-am: mostlyclean-generic + +-clean: clean-generic mostlyclean ++mostlyclean: mostlyclean-am + +-distclean: distclean-generic clean +- -rm -f config.status ++clean-am: clean-generic mostlyclean-am + +-maintainer-clean: maintainer-clean-generic distclean ++clean: clean-am ++ ++distclean-am: distclean-generic clean-am ++ ++distclean: distclean-am ++ ++maintainer-clean-am: maintainer-clean-generic distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +-.PHONY: tags distdir info dvi installcheck install-exec install-data \ +-install uninstall all installdirs mostlyclean-generic distclean-generic \ +-clean-generic maintainer-clean-generic clean mostlyclean distclean \ +-maintainer-clean ++maintainer-clean: maintainer-clean-am ++ ++.PHONY: tags distdir info-am info dvi-am dvi check check-am \ ++installcheck-am installcheck install-exec-am install-exec \ ++install-data-am install-data install-am install uninstall-am uninstall \ ++all-redirect all-am all installdirs mostlyclean-generic \ ++distclean-generic clean-generic maintainer-clean-generic clean \ ++mostlyclean distclean maintainer-clean + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +Index: sabre-0.2.4b/sdlsrc/Makefile.in +=================================================================== +--- sabre-0.2.4b.orig/sdlsrc/Makefile.in 2006-05-15 23:35:47.000000000 +0200 ++++ sabre-0.2.4b/sdlsrc/Makefile.in 2006-05-15 23:36:46.000000000 +0200 +@@ -1,6 +1,6 @@ +-# Makefile.in generated automatically by automake 1.3 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -12,9 +12,14 @@ + + # This is part of Dan Hammer's SABRE Fighter Plane Simulator + # portions donated by Antti Barck ++# ++# 2000-01-22: Modified by Milan Zamazal for compilation with ++# newer libsdl versions. ++# 2000-02-12: Modified by Milan Zamazal for compilation ++# without SVGAlib. + + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -35,7 +40,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include + +-DISTDIR = ++DESTDIR = + + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -49,7 +54,7 @@ + AUTOHEADER = @AUTOHEADER@ + + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + transform = @program_transform_name@ +@@ -66,6 +71,9 @@ + AUTOMAKE = @AUTOMAKE@ + CC = @CC@ + CXX = @CXX@ ++HAVE_LIB = @HAVE_LIB@ ++LIB = @LIB@ ++LTLIB = @LTLIB@ + PACKAGE = @PACKAGE@ + RANLIB = @RANLIB@ + REV_DATE = @REV_DATE@ +@@ -73,26 +81,16 @@ + + AUTOMAKE_OPTIONS = foreign + bin_PROGRAMS = sabresdl +-SABREOBJS = ../src/main.o ../src/game.o ../src/scnedit.o ../src/vmath.o ../src/traveler.o ../src/pen.o \ +- ../src/transblt.o ../src/port_3d.o ../src/clip.o ../src/cpoly.o ../src/obj_3d.o ../src/group_3d.o \ +- ../src/copoly.o ../src/txtrmap.o ../src/bits.o ../src/convpoly.o ../src/rendpoly.o ../src/rndrpoly.o \ +- ../src/rndzpoly.o ../src/zview.o ../src/rotate.o ../src/terrain.o ../src/earth.o ../src/colormap.o \ +- ../src/dvector.o ../src/flight.o ../src/weapons.o ../src/pilot.o ../src/fltlite.o \ +- ../src/moveable.o ../src/unguided.o ../src/fltzview.o ../src/viewobj.o ../src/fltmngr.o \ +- ../src/grndunit.o ../src/font8x8.o ../src/plltt.o ../src/key_map.o ../src/linux_joy.o \ +- ../src/siminput.o ../src/simfile.o ../src/hud.o ../src/cockpit.o ../src/instrmnt.o \ +- ../src/ppm.o ../src/mytimer.o ../src/colorspc.o ../src/globals.o ../src/portkey.o ../src/vtable2.o \ +- ../src/led2.o ../src/aaaunit.o ../src/waypoint.o ../src/fltobj.o ../src/simfilex.o ../src/simmath.o \ +- ../src/target.o ../src/sbrkeys.o ../src/aibase.o ../src/aiflite.o ../src/aigunner.o ../src/aipilot.o \ +- ../src/aipilot2.o ../src/aipilot3.o ../src/aipilot4.o ../src/aipilot5.o ../src/aipilot6.o ../src/sairfld.o \ +- ../src/sarray.o ../src/sattkr.o ../src/sfltmdl.o ../src/sfrmtn.o ../src/smath.o ../src/smnvrst.o \ +- ../src/spilcaps.o ../src/splncaps.o ../src/srunway.o ../src/sslewer.o ../src/stact.o ../src/starget.o \ +- ../src/sweapon.o ../src/sbfltmdl.o ../src/simsnd.o ../src/dhlist.o ../src/stime.o ../src/spid.o ../src/pilobj.o +-sabresdl_SOURCES = vga_13.C kbdhit.C input.C fontdev.C ++SABREOBJS = ../src/game.o ../src/scnedit.o ../src/vmath.o ../src/traveler.o ../src/pen.o ../src/transblt.o ../src/port_3d.o ../src/clip.o ../src/cpoly.o ../src/obj_3d.o ../src/group_3d.o ../src/copoly.o ../src/txtrmap.o ../src/bits.o ../src/convpoly.o ../src/rendpoly.o ../src/rndrpoly.o ../src/rndzpoly.o ../src/zview.o ../src/rotate.o ../src/terrain.o ../src/earth.o ../src/colormap.o ../src/dvector.o ../src/flight.o ../src/weapons.o ../src/pilot.o ../src/fltlite.o ../src/moveable.o ../src/unguided.o ../src/fltzview.o ../src/viewobj.o ../src/fltmngr.o ../src/grndunit.o ../src/font8x8.o ../src/plltt.o ../src/key_map.o ../src/linux_joy.o ../src/siminput.o ../src/simfile.o ../src/hud.o ../src/cockpit.o ../src/instrmnt.o ../src/ppm.o ../src/mytimer.o ../src/colorspc.o ../src/globals.o ../src/portkey.o ../src/vtable2.o ../src/led2.o ../src/aaaunit.o ../src/waypoint.o ../src/fltobj.o ../src/simfilex.o ../src/simmath.o ../src/target.o ../src/sbrkeys.o ../src/aibase.o ../src/aiflite.o ../src/aigunner.o ../src/aipilot.o ../src/aipilot2.o ../src/aipilot3.o ../src/aipilot4.o ../src/aipilot5.o ../src/aipilot6.o ../src/sairfld.o ../src/sarray.o ../src/sattkr.o ../src/sfltmdl.o ../src/sfrmtn.o ../src/smath.o ../src/smnvrst.o ../src/spilcaps.o ../src/splncaps.o ../src/srunway.o ../src/sslewer.o ../src/stact.o ../src/starget.o ../src/sweapon.o ../src/sbfltmdl.o ../src/simsnd.o ../src/dhlist.o ../src/stime.o ../src/spid.o ../src/pilobj.o ++ ++#sabresdl_SOURCES = vga_13.C kbdhit.C input.C fontdev.C ++sabresdl_SOURCES = main.C vga_13.C kbdhit.C input.C fontdev.C + sabresdl_LDADD = $(SABREOBJS) ../libzip/libcomp.a ../libzip/libuncl.a +-EXTRA_DIST = *.h SDL_PORT_README +-INCLUDES=-I../src -I../libzip +-LIBS = -lm -ldl -lSDL -lncurses ++EXTRA_DIST = *.h *.c SDL_PORT_README ++INCLUDES = -I../src -I../libzip ++#LIBS = -lm -ldl -lSDL -lncurses ++LIBS = -lm -ldl `sdl-config --libs` -lncurses ++CXXFLAGS = @CXXFLAGS@ -DDEBIAN -DDEBIAN_NO_LIBVGA + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = + PROGRAMS = $(bin_PROGRAMS) +@@ -101,51 +99,50 @@ + DEFS = @DEFS@ -I. -I$(srcdir) + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ +-sabresdl_OBJECTS = vga_13.o kbdhit.o input.o fontdev.o +-sabresdl_DEPENDENCIES = ../src/main.o ../src/game.o ../src/scnedit.o \ +-../src/vmath.o ../src/traveler.o ../src/pen.o ../src/transblt.o \ +-../src/port_3d.o ../src/clip.o ../src/cpoly.o ../src/obj_3d.o \ +-../src/group_3d.o ../src/copoly.o ../src/txtrmap.o ../src/bits.o \ +-../src/convpoly.o ../src/rendpoly.o ../src/rndrpoly.o ../src/rndzpoly.o \ +-../src/zview.o ../src/rotate.o ../src/terrain.o ../src/earth.o \ +-../src/colormap.o ../src/dvector.o ../src/flight.o ../src/weapons.o \ +-../src/pilot.o ../src/fltlite.o ../src/moveable.o ../src/unguided.o \ +-../src/fltzview.o ../src/viewobj.o ../src/fltmngr.o ../src/grndunit.o \ +-../src/font8x8.o ../src/plltt.o ../src/key_map.o ../src/linux_joy.o \ +-../src/siminput.o ../src/simfile.o ../src/hud.o ../src/cockpit.o \ +-../src/instrmnt.o ../src/ppm.o ../src/mytimer.o ../src/colorspc.o \ +-../src/globals.o ../src/portkey.o ../src/vtable2.o ../src/led2.o \ +-../src/aaaunit.o ../src/waypoint.o ../src/fltobj.o ../src/simfilex.o \ +-../src/simmath.o ../src/target.o ../src/sbrkeys.o ../src/aibase.o \ +-../src/aiflite.o ../src/aigunner.o ../src/aipilot.o ../src/aipilot2.o \ +-../src/aipilot3.o ../src/aipilot4.o ../src/aipilot5.o ../src/aipilot6.o \ +-../src/sairfld.o ../src/sarray.o ../src/sattkr.o ../src/sfltmdl.o \ +-../src/sfrmtn.o ../src/smath.o ../src/smnvrst.o ../src/spilcaps.o \ +-../src/splncaps.o ../src/srunway.o ../src/sslewer.o ../src/stact.o \ +-../src/starget.o ../src/sweapon.o ../src/sbfltmdl.o ../src/simsnd.o \ +-../src/dhlist.o ../src/stime.o ../src/spid.o ../src/pilobj.o \ +-../libzip/libcomp.a ../libzip/libuncl.a ++sabresdl_OBJECTS = main.o vga_13.o kbdhit.o input.o fontdev.o ++sabresdl_DEPENDENCIES = ../src/game.o ../src/scnedit.o ../src/vmath.o \ ++../src/traveler.o ../src/pen.o ../src/transblt.o ../src/port_3d.o \ ++../src/clip.o ../src/cpoly.o ../src/obj_3d.o ../src/group_3d.o \ ++../src/copoly.o ../src/txtrmap.o ../src/bits.o ../src/convpoly.o \ ++../src/rendpoly.o ../src/rndrpoly.o ../src/rndzpoly.o ../src/zview.o \ ++../src/rotate.o ../src/terrain.o ../src/earth.o ../src/colormap.o \ ++../src/dvector.o ../src/flight.o ../src/weapons.o ../src/pilot.o \ ++../src/fltlite.o ../src/moveable.o ../src/unguided.o ../src/fltzview.o \ ++../src/viewobj.o ../src/fltmngr.o ../src/grndunit.o ../src/font8x8.o \ ++../src/plltt.o ../src/key_map.o ../src/linux_joy.o ../src/siminput.o \ ++../src/simfile.o ../src/hud.o ../src/cockpit.o ../src/instrmnt.o \ ++../src/ppm.o ../src/mytimer.o ../src/colorspc.o ../src/globals.o \ ++../src/portkey.o ../src/vtable2.o ../src/led2.o ../src/aaaunit.o \ ++../src/waypoint.o ../src/fltobj.o ../src/simfilex.o ../src/simmath.o \ ++../src/target.o ../src/sbrkeys.o ../src/aibase.o ../src/aiflite.o \ ++../src/aigunner.o ../src/aipilot.o ../src/aipilot2.o ../src/aipilot3.o \ ++../src/aipilot4.o ../src/aipilot5.o ../src/aipilot6.o ../src/sairfld.o \ ++../src/sarray.o ../src/sattkr.o ../src/sfltmdl.o ../src/sfrmtn.o \ ++../src/smath.o ../src/smnvrst.o ../src/spilcaps.o ../src/splncaps.o \ ++../src/srunway.o ../src/sslewer.o ../src/stact.o ../src/starget.o \ ++../src/sweapon.o ../src/sbfltmdl.o ../src/simsnd.o ../src/dhlist.o \ ++../src/stime.o ../src/spid.o ../src/pilobj.o ../libzip/libcomp.a \ ++../libzip/libuncl.a + sabresdl_LDFLAGS = +-CXXFLAGS = @CXXFLAGS@ +-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) +-CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ ++CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXLD = $(CXX) ++CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ + DIST_COMMON = README Makefile.am Makefile.in + + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + + TAR = tar +-GZIP = --best +-DEP_FILES = .deps/fontdev.P .deps/input.P .deps/kbdhit.P .deps/vga_13.P +-CXXMKDEP = $(CXX) -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) ++GZIP_ENV = --best ++DEP_FILES = .deps/fontdev.P .deps/input.P .deps/kbdhit.P .deps/main.P \ ++.deps/vga_13.P + SOURCES = $(sabresdl_SOURCES) + OBJECTS = $(sabresdl_OBJECTS) + +-all: Makefile $(PROGRAMS) +- ++all: all-redirect + .SUFFIXES: + .SUFFIXES: .C .S .c .o .s +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --foreign sdlsrc/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +@@ -167,15 +164,15 @@ + $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + if test -f $$p; then \ +- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ +- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ ++ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ++ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + else :; fi; \ + done + + uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + list='$(bin_PROGRAMS)'; for p in $$list; do \ +- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ ++ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + done + + .s.o: +@@ -203,8 +200,12 @@ + tags: TAGS + + ID: $(HEADERS) $(SOURCES) $(LISP) ++ list='$(SOURCES) $(HEADERS)'; \ ++ unique=`for i in $$list; do echo $$i; done | \ ++ awk ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ +- && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) ++ && mkid -f$$here/ID $$unique $(LISP) + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ +@@ -214,7 +215,7 @@ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ +- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + + mostlyclean-tags: + +@@ -237,9 +238,13 @@ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign sdlsrc/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file; \ ++ if test -d $$d/$$file; then \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++ || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ fi; \ + done + + DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) +@@ -251,91 +256,117 @@ + clean-depend: + + distclean-depend: ++ -rm -rf .deps + + maintainer-clean-depend: +- -rm -rf .deps + + %.o: %.c + @echo '$(COMPILE) -c $<'; \ +- $(COMPILE) -Wp,-MD,.deps/$(*F).P -c $< ++ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-cp .deps/$(*F).pp .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm .deps/$(*F).pp + + %.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ +- $(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $< +- @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \ +- < .deps/$(*F).p > .deps/$(*F).P +- @-rm -f .deps/$(*F).p ++ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ++ < .deps/$(*F).pp > .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm -f .deps/$(*F).pp + + %.o: %.C + @echo '$(CXXCOMPILE) -c $<'; \ +- $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).P -c $< ++ $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-cp .deps/$(*F).pp .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm .deps/$(*F).pp + + %.lo: %.C + @echo '$(LTCXXCOMPILE) -c $<'; \ +- $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).p -c $< +- @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \ +- < .deps/$(*F).p > .deps/$(*F).P +- @-rm -f .deps/$(*F).p +-info: +-dvi: +-check: all +- $(MAKE) +-installcheck: +-install-exec: install-binPROGRAMS +- @$(NORMAL_INSTALL) +- +-install-data: +- @$(NORMAL_INSTALL) +- +-install: install-exec install-data all +- @: +- +-uninstall: uninstall-binPROGRAMS +- ++ $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ++ < .deps/$(*F).pp > .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm -f .deps/$(*F).pp ++info-am: ++info: info-am ++dvi-am: ++dvi: dvi-am ++check-am: all-am ++check: check-am ++installcheck-am: ++installcheck: installcheck-am ++install-exec-am: install-binPROGRAMS ++install-exec: install-exec-am ++ ++install-data-am: ++install-data: install-data-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++install: install-am ++uninstall-am: uninstall-binPROGRAMS ++uninstall: uninstall-am ++all-am: Makefile $(PROGRAMS) ++all-redirect: all-am + install-strip: +- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install ++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: +- $(mkinstalldirs) $(DATADIR)$(bindir) ++ $(mkinstalldirs) $(DESTDIR)$(bindir) + + + mostlyclean-generic: +- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f Makefile $(DISTCLEANFILES) ++ -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +-mostlyclean: mostlyclean-binPROGRAMS mostlyclean-compile \ ++mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic + +-clean: clean-binPROGRAMS clean-compile clean-tags clean-depend \ +- clean-generic mostlyclean ++mostlyclean: mostlyclean-am ++ ++clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \ ++ clean-generic mostlyclean-am + +-distclean: distclean-binPROGRAMS distclean-compile distclean-tags \ +- distclean-depend distclean-generic clean +- -rm -f config.status +- +-maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ +- maintainer-clean-tags maintainer-clean-depend \ +- maintainer-clean-generic distclean ++clean: clean-am ++ ++distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ ++ distclean-depend distclean-generic clean-am ++ ++distclean: distclean-am ++ ++maintainer-clean-am: maintainer-clean-binPROGRAMS \ ++ maintainer-clean-compile maintainer-clean-tags \ ++ maintainer-clean-depend maintainer-clean-generic \ ++ distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + ++maintainer-clean: maintainer-clean-am ++ + .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ + maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ + mostlyclean-compile distclean-compile clean-compile \ + maintainer-clean-compile tags mostlyclean-tags distclean-tags \ + clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +-distclean-depend clean-depend maintainer-clean-depend info dvi \ +-installcheck install-exec install-data install uninstall all \ +-installdirs mostlyclean-generic distclean-generic clean-generic \ ++distclean-depend clean-depend maintainer-clean-depend info-am info \ ++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ++install-exec install-data-am install-data install-am install \ ++uninstall-am uninstall all-redirect all-am all installdirs \ ++mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +Index: sabre-0.2.4b/src/Makefile.in +=================================================================== +--- sabre-0.2.4b.orig/src/Makefile.in 2006-05-15 23:35:47.000000000 +0200 ++++ sabre-0.2.4b/src/Makefile.in 2006-05-15 23:36:46.000000000 +0200 +@@ -1,6 +1,6 @@ +-# Makefile.in generated automatically by automake 1.3 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -12,9 +12,14 @@ + + # This is part of Dan Hammer's SABRE Fighter Plane Simulator + # portions donated by Antti Barck ++# ++# 2000-01-22: Modified by Milan Zamazal for Debian ++# compilation. ++# 2000-02-12: Modified by Milan Zamazal for non-SVGAlib ++# compilation. + + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -35,7 +40,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include + +-DISTDIR = ++DESTDIR = + + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -49,7 +54,7 @@ + AUTOHEADER = @AUTOHEADER@ + + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + transform = @program_transform_name@ +@@ -66,31 +71,39 @@ + AUTOMAKE = @AUTOMAKE@ + CC = @CC@ + CXX = @CXX@ ++HAVE_LIB = @HAVE_LIB@ ++LIB = @LIB@ ++LTLIB = @LTLIB@ + PACKAGE = @PACKAGE@ + RANLIB = @RANLIB@ + REV_DATE = @REV_DATE@ + VERSION = @VERSION@ + + AUTOMAKE_OPTIONS = foreign +-bin_PROGRAMS = sabre +-sabre_SOURCES = main.C game.C scnedit.C vga_13.C vmath.C traveler.C pen.C \ +- transblt.C port_3d.C clip.C cpoly.C obj_3d.C group_3d.C \ +- copoly.C txtrmap.C bits.C convpoly.C rendpoly.C rndrpoly.C \ +- rndzpoly.C zview.C rotate.C terrain.C earth.C colormap.C \ +- dvector.C flight.C weapons.C pilot.C fltlite.C \ +- moveable.C unguided.C fltzview.C viewobj.C fltmngr.C \ +- grndunit.C font8x8.C plltt.C input.C key_map.C linux_joy.C \ +- kbdhit.C siminput.C simfile.C hud.C cockpit.C instrmnt.C \ +- ppm.C mytimer.C colorspc.C globals.C portkey.C vtable2.C \ +- led2.C aaaunit.C waypoint.C fltobj.C simfilex.C simmath.C \ +- target.C sbrkeys.C aibase.C aiflite.C aigunner.C aipilot.C \ +- aipilot2.C aipilot3.C aipilot4.C aipilot5.C aipilot6.C sairfld.C \ +- sarray.C sattkr.C sfltmdl.C sfrmtn.C smath.C smnvrst.C \ +- spilcaps.C splncaps.C srunway.C sslewer.C stact.C starget.C \ +- sweapon.C sbfltmdl.C simsnd.C dhlist.c stime.c spid.c pilobj.C ++@SVGALIB_TRUE@bin_PROGRAMS = sabre ++@SVGALIB_TRUE@SVGALIBSRCS = main.C vga_13.C input.C kbdhit.C ++@SVGALIB_FALSE@SVGALIBSRCS = ++# sabre_SOURCES = main.C game.C scnedit.C vga_13.C vmath.C traveler.C pen.C \ ++# transblt.C port_3d.C clip.C cpoly.C obj_3d.C group_3d.C \ ++# copoly.C txtrmap.C bits.C convpoly.C rendpoly.C rndrpoly.C \ ++# rndzpoly.C zview.C rotate.C terrain.C earth.C colormap.C \ ++# dvector.C flight.C weapons.C pilot.C fltlite.C \ ++# moveable.C unguided.C fltzview.C viewobj.C fltmngr.C \ ++# grndunit.C font8x8.C plltt.C input.C key_map.C linux_joy.C \ ++# kbdhit.C siminput.C simfile.C hud.C cockpit.C instrmnt.C \ ++# ppm.C mytimer.C colorspc.C globals.C portkey.C vtable2.C \ ++# led2.C aaaunit.C waypoint.C fltobj.C simfilex.C simmath.C \ ++# target.C sbrkeys.C aibase.C aiflite.C aigunner.C aipilot.C \ ++# aipilot2.C aipilot3.C aipilot4.C aipilot5.C aipilot6.C sairfld.C \ ++# sarray.C sattkr.C sfltmdl.C sfrmtn.C smath.C smnvrst.C \ ++# spilcaps.C splncaps.C srunway.C sslewer.C stact.C starget.C \ ++# sweapon.C sbfltmdl.C simsnd.C dhlist.c stime.c spid.c pilobj.C ++sabre_SOURCES = $(SVGALIBSRCS) game.C scnedit.C vmath.C traveler.C pen.C transblt.C port_3d.C clip.C cpoly.C obj_3d.C group_3d.C copoly.C txtrmap.C bits.C convpoly.C rendpoly.C rndrpoly.C rndzpoly.C zview.C rotate.C terrain.C earth.C colormap.C dvector.C flight.C weapons.C pilot.C fltlite.C moveable.C unguided.C fltzview.C viewobj.C fltmngr.C grndunit.C font8x8.C plltt.C key_map.C linux_joy.C siminput.C simfile.C hud.C cockpit.C instrmnt.C ppm.C mytimer.C colorspc.C globals.C portkey.C vtable2.C led2.C aaaunit.C waypoint.C fltobj.C simfilex.C simmath.C target.C sbrkeys.C aibase.C aiflite.C aigunner.C aipilot.C aipilot2.C aipilot3.C aipilot4.C aipilot5.C aipilot6.C sairfld.C sarray.C sattkr.C sfltmdl.C sfrmtn.C smath.C smnvrst.C spilcaps.C splncaps.C srunway.C sslewer.C stact.C starget.C sweapon.C sbfltmdl.C simsnd.C dhlist.c stime.c spid.c pilobj.C ++ + sabre_LDADD = ../libzip/libcomp.a ../libzip/libuncl.a ../gdev/libgdev.a + EXTRA_DIST = *.h *.c +-INCLUDES=-I../gdev -I../libzip ++INCLUDES = -I../gdev -I../libzip ++CXXFLAGS = @CXXFLAGS@ -DDEBIAN + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = + PROGRAMS = $(bin_PROGRAMS) +@@ -100,46 +113,90 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ +-sabre_OBJECTS = main.o game.o scnedit.o vga_13.o vmath.o traveler.o \ +-pen.o transblt.o port_3d.o clip.o cpoly.o obj_3d.o group_3d.o copoly.o \ +-txtrmap.o bits.o convpoly.o rendpoly.o rndrpoly.o rndzpoly.o zview.o \ +-rotate.o terrain.o earth.o colormap.o dvector.o flight.o weapons.o \ +-pilot.o fltlite.o moveable.o unguided.o fltzview.o viewobj.o fltmngr.o \ +-grndunit.o font8x8.o plltt.o input.o key_map.o linux_joy.o kbdhit.o \ +-siminput.o simfile.o hud.o cockpit.o instrmnt.o ppm.o mytimer.o \ +-colorspc.o globals.o portkey.o vtable2.o led2.o aaaunit.o waypoint.o \ +-fltobj.o simfilex.o simmath.o target.o sbrkeys.o aibase.o aiflite.o \ +-aigunner.o aipilot.o aipilot2.o aipilot3.o aipilot4.o aipilot5.o \ +-aipilot6.o sairfld.o sarray.o sattkr.o sfltmdl.o sfrmtn.o smath.o \ +-smnvrst.o spilcaps.o splncaps.o srunway.o sslewer.o stact.o starget.o \ +-sweapon.o sbfltmdl.o simsnd.o dhlist.o stime.o spid.o pilobj.o ++@SVGALIB_TRUE@sabre_OBJECTS = main.o vga_13.o input.o kbdhit.o game.o \ ++@SVGALIB_TRUE@scnedit.o vmath.o traveler.o pen.o transblt.o port_3d.o \ ++@SVGALIB_TRUE@clip.o cpoly.o obj_3d.o group_3d.o copoly.o txtrmap.o \ ++@SVGALIB_TRUE@bits.o convpoly.o rendpoly.o rndrpoly.o rndzpoly.o \ ++@SVGALIB_TRUE@zview.o rotate.o terrain.o earth.o colormap.o dvector.o \ ++@SVGALIB_TRUE@flight.o weapons.o pilot.o fltlite.o moveable.o \ ++@SVGALIB_TRUE@unguided.o fltzview.o viewobj.o fltmngr.o grndunit.o \ ++@SVGALIB_TRUE@font8x8.o plltt.o key_map.o linux_joy.o siminput.o \ ++@SVGALIB_TRUE@simfile.o hud.o cockpit.o instrmnt.o ppm.o mytimer.o \ ++@SVGALIB_TRUE@colorspc.o globals.o portkey.o vtable2.o led2.o aaaunit.o \ ++@SVGALIB_TRUE@waypoint.o fltobj.o simfilex.o simmath.o target.o \ ++@SVGALIB_TRUE@sbrkeys.o aibase.o aiflite.o aigunner.o aipilot.o \ ++@SVGALIB_TRUE@aipilot2.o aipilot3.o aipilot4.o aipilot5.o aipilot6.o \ ++@SVGALIB_TRUE@sairfld.o sarray.o sattkr.o sfltmdl.o sfrmtn.o smath.o \ ++@SVGALIB_TRUE@smnvrst.o spilcaps.o splncaps.o srunway.o sslewer.o \ ++@SVGALIB_TRUE@stact.o starget.o sweapon.o sbfltmdl.o simsnd.o dhlist.o \ ++@SVGALIB_TRUE@stime.o spid.o pilobj.o ++@SVGALIB_FALSE@sabre_OBJECTS = game.o scnedit.o vmath.o traveler.o \ ++@SVGALIB_FALSE@pen.o transblt.o port_3d.o clip.o cpoly.o obj_3d.o \ ++@SVGALIB_FALSE@group_3d.o copoly.o txtrmap.o bits.o convpoly.o \ ++@SVGALIB_FALSE@rendpoly.o rndrpoly.o rndzpoly.o zview.o rotate.o \ ++@SVGALIB_FALSE@terrain.o earth.o colormap.o dvector.o flight.o \ ++@SVGALIB_FALSE@weapons.o pilot.o fltlite.o moveable.o unguided.o \ ++@SVGALIB_FALSE@fltzview.o viewobj.o fltmngr.o grndunit.o font8x8.o \ ++@SVGALIB_FALSE@plltt.o key_map.o linux_joy.o siminput.o simfile.o hud.o \ ++@SVGALIB_FALSE@cockpit.o instrmnt.o ppm.o mytimer.o colorspc.o \ ++@SVGALIB_FALSE@globals.o portkey.o vtable2.o led2.o aaaunit.o \ ++@SVGALIB_FALSE@waypoint.o fltobj.o simfilex.o simmath.o target.o \ ++@SVGALIB_FALSE@sbrkeys.o aibase.o aiflite.o aigunner.o aipilot.o \ ++@SVGALIB_FALSE@aipilot2.o aipilot3.o aipilot4.o aipilot5.o aipilot6.o \ ++@SVGALIB_FALSE@sairfld.o sarray.o sattkr.o sfltmdl.o sfrmtn.o smath.o \ ++@SVGALIB_FALSE@smnvrst.o spilcaps.o splncaps.o srunway.o sslewer.o \ ++@SVGALIB_FALSE@stact.o starget.o sweapon.o sbfltmdl.o simsnd.o dhlist.o \ ++@SVGALIB_FALSE@stime.o spid.o pilobj.o + sabre_DEPENDENCIES = ../libzip/libcomp.a ../libzip/libuncl.a \ + ../gdev/libgdev.a + sabre_LDFLAGS = +-CXXFLAGS = @CXXFLAGS@ +-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) +-CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ ++CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXLD = $(CXX) ++CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ + CFLAGS = @CFLAGS@ +-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ + DIST_COMMON = COPYING Makefile.am Makefile.in + + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + + TAR = tar +-GZIP = --best ++GZIP_ENV = --best ++DEP_FILES = .deps/aaaunit.P .deps/aibase.P .deps/aiflite.P \ ++.deps/aigunner.P .deps/aipilot.P .deps/aipilot2.P .deps/aipilot3.P \ ++.deps/aipilot4.P .deps/aipilot5.P .deps/aipilot6.P .deps/bits.P \ ++.deps/clip.P .deps/cockpit.P .deps/colormap.P .deps/colorspc.P \ ++.deps/convpoly.P .deps/copoly.P .deps/cpoly.P .deps/dhlist.P \ ++.deps/dvector.P .deps/earth.P .deps/flight.P .deps/fltlite.P \ ++.deps/fltmngr.P .deps/fltobj.P .deps/fltzview.P .deps/font8x8.P \ ++.deps/game.P .deps/globals.P .deps/grndunit.P .deps/group_3d.P \ ++.deps/hud.P .deps/input.P .deps/instrmnt.P .deps/kbdhit.P \ ++.deps/key_map.P .deps/led2.P .deps/linux_joy.P .deps/main.P \ ++.deps/moveable.P .deps/mytimer.P .deps/obj_3d.P .deps/pen.P \ ++.deps/pilobj.P .deps/pilot.P .deps/plltt.P .deps/port_3d.P \ ++.deps/portkey.P .deps/ppm.P .deps/rendpoly.P .deps/rndrpoly.P \ ++.deps/rndzpoly.P .deps/rotate.P .deps/sairfld.P .deps/sarray.P \ ++.deps/sattkr.P .deps/sbfltmdl.P .deps/sbrkeys.P .deps/scnedit.P \ ++.deps/sfltmdl.P .deps/sfrmtn.P .deps/simfile.P .deps/simfilex.P \ ++.deps/siminput.P .deps/simmath.P .deps/simsnd.P .deps/smath.P \ ++.deps/smnvrst.P .deps/spid.P .deps/spilcaps.P .deps/splncaps.P \ ++.deps/srunway.P .deps/sslewer.P .deps/stact.P .deps/starget.P \ ++.deps/stime.P .deps/sweapon.P .deps/target.P .deps/terrain.P \ ++.deps/transblt.P .deps/traveler.P .deps/txtrmap.P .deps/unguided.P \ ++.deps/vga_13.P .deps/viewobj.P .deps/vmath.P .deps/vtable2.P \ ++.deps/waypoint.P .deps/weapons.P .deps/zview.P + SOURCES = $(sabre_SOURCES) + OBJECTS = $(sabre_OBJECTS) + +-all: Makefile $(PROGRAMS) +- ++all: all-redirect + .SUFFIXES: + .SUFFIXES: .C .S .c .o .s +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/Makefile ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -158,20 +215,17 @@ + $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + if test -f $$p; then \ +- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ +- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ ++ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ++ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + else :; fi; \ + done + + uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + list='$(bin_PROGRAMS)'; for p in $$list; do \ +- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ ++ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + done + +-.c.o: +- $(COMPILE) -c $< +- + .s.o: + $(COMPILE) -c $< + +@@ -197,8 +251,12 @@ + tags: TAGS + + ID: $(HEADERS) $(SOURCES) $(LISP) ++ list='$(SOURCES) $(HEADERS)'; \ ++ unique=`for i in $$list; do echo $$i; done | \ ++ awk ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ +- && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) ++ && mkid -f$$here/ID $$unique $(LISP) + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ +@@ -208,7 +266,7 @@ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ +- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + + mostlyclean-tags: + +@@ -224,115 +282,147 @@ + subdir = src + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file; \ ++ if test -d $$d/$$file; then \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++ || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ fi; \ + done +-game.o: game.C sim.h rtkey.h siminc.h simerr.h simfile.h colorspc.h \ +- font8x8.h defs.h grafix.h colormap.h vga_13.h traveler.h pen.h \ +- transblt.h vmath.h port_3d.h clip.h target.h cpoly.h rendpoly.h \ +- convpoly.h rndrpoly.h txtrmap.h clstypes.h obj_3d.h group_3d.h \ +- copoly.h bits.h rndzpoly.h zview.h rotate.h dvmath.h flight.h \ +- fltobj.h spid.h smath.h fltlite.h viewobj.h moveable.h \ +- weapons.h unguided.h fltzview.h pilot.h aipilot.h sobject.h \ +- stypes.h sarray.h sfltmdl.h sslewer.h scntrl.h starget.h \ +- stact.h splncaps.h spilcaps.h sweapon.h smnvrst.h swaypnt.h \ +- sattkr.h dhlist.h aigunner.h aibase.h aicomm.h sbfltmdl.h \ +- pilobj.h fltmngr.h grndunit.h instrmnt.h cockpit.h hud.h \ +- input.h linux_joy.h pc_keys.h kbdhit.h key_map.h siminput.h \ +- sbrvkeys.h portkey.h earth.h terrain.h plltt.h mytimer.h \ +- globals.h simsnd.h game.h stime.h sfrmtn.h +-linux_joy.o: linux_joy.C linux_joy.h +-main.o: main.C siminc.h simerr.h sim.h rtkey.h simfile.h colorspc.h \ +- font8x8.h defs.h grafix.h colormap.h vga_13.h traveler.h pen.h \ +- transblt.h vmath.h port_3d.h clip.h target.h cpoly.h rendpoly.h \ +- convpoly.h rndrpoly.h txtrmap.h clstypes.h obj_3d.h group_3d.h \ +- copoly.h bits.h rndzpoly.h zview.h rotate.h dvmath.h flight.h \ +- fltobj.h spid.h smath.h fltlite.h viewobj.h moveable.h \ +- weapons.h unguided.h fltzview.h pilot.h aipilot.h sobject.h \ +- stypes.h sarray.h sfltmdl.h sslewer.h scntrl.h starget.h \ +- stact.h splncaps.h spilcaps.h sweapon.h smnvrst.h swaypnt.h \ +- sattkr.h dhlist.h aigunner.h aibase.h aicomm.h sbfltmdl.h \ +- pilobj.h fltmngr.h grndunit.h instrmnt.h cockpit.h hud.h \ +- input.h linux_joy.h pc_keys.h kbdhit.h key_map.h siminput.h \ +- sbrvkeys.h portkey.h earth.h terrain.h plltt.h mytimer.h \ +- globals.h simsnd.h game.h scnedit.h sbrkeys.h +-siminput.o: siminput.C defs.h pc_keys.h key_map.h vmath.h port_3d.h \ +- vga_13.h grafix.h clip.h rtkey.h sim.h cpoly.h target.h \ +- rendpoly.h convpoly.h rndrpoly.h txtrmap.h colormap.h \ +- clstypes.h obj_3d.h copoly.h input.h linux_joy.h simfile.h \ +- simerr.h flight.h dvmath.h fltobj.h spid.h smath.h fltlite.h \ +- weapons.h pilot.h aipilot.h sobject.h stypes.h sarray.h \ +- sfltmdl.h sslewer.h scntrl.h starget.h stact.h splncaps.h \ +- spilcaps.h sweapon.h smnvrst.h swaypnt.h sattkr.h dhlist.h \ +- aigunner.h aibase.h aicomm.h sbfltmdl.h pilobj.h zview.h \ +- fltzview.h unguided.h viewobj.h moveable.h fltmngr.h terrain.h \ +- kbdhit.h siminput.h sbrvkeys.h globals.h +- +-info: +-dvi: +-check: all +- $(MAKE) +-installcheck: +-install-exec: install-binPROGRAMS +- @$(NORMAL_INSTALL) + +-install-data: +- @$(NORMAL_INSTALL) ++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-install: install-exec install-data all +- @: ++-include $(DEP_FILES) + +-uninstall: uninstall-binPROGRAMS ++mostlyclean-depend: + ++clean-depend: ++ ++distclean-depend: ++ -rm -rf .deps ++ ++maintainer-clean-depend: ++ ++%.o: %.c ++ @echo '$(COMPILE) -c $<'; \ ++ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-cp .deps/$(*F).pp .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm .deps/$(*F).pp ++ ++%.lo: %.c ++ @echo '$(LTCOMPILE) -c $<'; \ ++ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ++ < .deps/$(*F).pp > .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm -f .deps/$(*F).pp ++ ++%.o: %.C ++ @echo '$(CXXCOMPILE) -c $<'; \ ++ $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-cp .deps/$(*F).pp .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm .deps/$(*F).pp ++ ++%.lo: %.C ++ @echo '$(LTCXXCOMPILE) -c $<'; \ ++ $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ++ < .deps/$(*F).pp > .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm -f .deps/$(*F).pp ++info-am: ++info: info-am ++dvi-am: ++dvi: dvi-am ++check-am: all-am ++check: check-am ++installcheck-am: ++installcheck: installcheck-am ++install-exec-am: install-binPROGRAMS ++install-exec: install-exec-am ++ ++install-data-am: ++install-data: install-data-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++install: install-am ++uninstall-am: uninstall-binPROGRAMS ++uninstall: uninstall-am ++all-am: Makefile $(PROGRAMS) all-local ++all-redirect: all-am + install-strip: +- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install ++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: +- $(mkinstalldirs) $(DATADIR)$(bindir) ++ $(mkinstalldirs) $(DESTDIR)$(bindir) + + + mostlyclean-generic: +- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f Makefile $(DISTCLEANFILES) ++ -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +-mostlyclean: mostlyclean-binPROGRAMS mostlyclean-compile \ +- mostlyclean-tags mostlyclean-generic +- +-clean: clean-binPROGRAMS clean-compile clean-tags clean-generic \ +- mostlyclean +- +-distclean: distclean-binPROGRAMS distclean-compile distclean-tags \ +- distclean-generic clean +- -rm -f config.status +- +-maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ +- maintainer-clean-tags maintainer-clean-generic \ +- distclean ++mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ ++ mostlyclean-tags mostlyclean-depend mostlyclean-generic ++ ++mostlyclean: mostlyclean-am ++ ++clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \ ++ clean-generic mostlyclean-am ++ ++clean: clean-am ++ ++distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ ++ distclean-depend distclean-generic clean-am ++ ++distclean: distclean-am ++ ++maintainer-clean-am: maintainer-clean-binPROGRAMS \ ++ maintainer-clean-compile maintainer-clean-tags \ ++ maintainer-clean-depend maintainer-clean-generic \ ++ distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + ++maintainer-clean: maintainer-clean-am ++ + .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ + maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ + mostlyclean-compile distclean-compile clean-compile \ + maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +-clean-tags maintainer-clean-tags distdir info dvi installcheck \ +-install-exec install-data install uninstall all installdirs \ ++clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ++distclean-depend clean-depend maintainer-clean-depend info-am info \ ++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ++install-exec install-data-am install-data install-am install \ ++uninstall-am uninstall all-local all-redirect all-am all installdirs \ + mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + ++@SVGALIB_FALSE@all-local: $(sabre_OBJECTS) ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: