--- pstoedit-3.45.orig/debian/libpstoedit0c2a.files +++ pstoedit-3.45/debian/libpstoedit0c2a.files @@ -0,0 +1,3 @@ +usr/lib/libpstoedit.so.* +usr/lib/pstoedit/lib*.so.* +usr/lib/pstoedit/lib*.so --- pstoedit-3.45.orig/debian/pstoedit-dev.files +++ pstoedit-3.45/debian/pstoedit-dev.files @@ -0,0 +1,3 @@ +usr/include/* +usr/lib/lib*.a +usr/lib/lib*.so --- pstoedit-3.45.orig/debian/pstoedit.files +++ pstoedit-3.45/debian/pstoedit.files @@ -0,0 +1,2 @@ +usr/bin/pstoedit +usr/share/pstoedit/* --- pstoedit-3.45.orig/debian/changelog +++ pstoedit-3.45/debian/changelog @@ -0,0 +1,521 @@ +pstoedit (3.45-2) unstable; urgency=low + + * [debian/rules] Use -Wl,--as-needed to drop indirect dependencies. + + -- J.H.M. Dassen (Ray) Tue, 27 Nov 2007 21:22:35 +0100 + +pstoedit (3.45-1) unstable; urgency=low + + * New upstream release. Changes include: + * Fixed a problem which caused newer versions of GhostScript to go into + an endless loop. (Closes: #433540) + + -- J.H.M. Dassen (Ray) Wed, 14 Nov 2007 19:25:32 +0100 + +pstoedit (3.44-2) unstable; urgency=low + + * [debian/control] Removed sysutils from build dependencies; it was no + longer needed and interfered with building on GNU/kFreeBSD. + (Closes: #374847) + * [debian/control] Updated Standards-Version. + * [doc/pstoedit.tex, doc/pstoedit.1, doc/pstoedit.htm] + s/standalong/standalone/ (Closes: #370047) + + -- J.H.M. Dassen (Ray) Sun, 11 Mar 2007 20:33:39 +0100 + +pstoedit (3.44-1) unstable; urgency=low + + * New upstream release. + * pstoedit-config has been dropped; code relying on it needs to change to + using pkg-config instead. + [debian/libpstoedit-dev.files, debian/pstoedit-config.sgml] Removed. + [debian/libpstoedit-dev.files, debian/rules] Changed accordingly. + * [debian/rules] Configure --disable-maintainer-mode. + * Addressed in 3.43: usability improvements. (Closes: #347732) + + -- J.H.M. Dassen (Ray) Sat, 11 Mar 2006 10:40:55 +0100 + +pstoedit (3.43-2) unstable; urgency=low + + * [configure.ac, src/cppcomp.h] Use autoconf to determine endianness. + * [configure] Regenerated. + + -- J.H.M. Dassen (Ray) Thu, 9 Mar 2006 08:48:31 +0100 + +pstoedit (3.43-1) unstable; urgency=low + + * New upstream release. + * [debian/rules] Install pstoedit-config. This script is now deprecated + though; code that still relies on it should be updated to use pkg-config + instead. + + -- J.H.M. Dassen (Ray) Tue, 7 Mar 2006 20:49:11 +0100 + +pstoedit (3.42-3) unstable; urgency=medium + + * [configure.ac] Use pkg-config for ImageMagick++ information, if + available. + * [configure] Regenerated. + * [debian/control] Added build dependency on pkg-config; removed indirect + build dependencies. + + -- J.H.M. Dassen (Ray) Sun, 18 Dec 2005 17:01:07 +0100 + +pstoedit (3.42-2) unstable; urgency=medium + + * libstdc++ allocator transition (Closes: #339252) + (http://lists.debian.org/debian-devel-announce/2005/11/msg00010.html): + * [debian/control, debian/rules, debian/libpstoedit0c2a.files] Renamed + runtime library from libpstoedit0c2 to libpstoedit0c2a. + * [debian/control] Versioned the libmagick++9-dev build and runtime + dependencies; added Conflicts:, Replaces: libpstoedit0c2. + * [debian/compat] New; switched to current compat level. + [debian/rules] Dropped compat level setting. + * Acknowledge NMU. (Closes: #332859) + + -- J.H.M. Dassen (Ray) Wed, 23 Nov 2005 07:40:04 +0100 + +pstoedit (3.42-1.1) unstable; urgency=low + + * Non-maintainer upload + * Really do the C++ transition; the library package is again + libpstoedit0c2. (Closes: #332859) + + -- Henning Makholm Wed, 26 Oct 2005 22:58:10 +0200 + +pstoedit (3.42-1) unstable; urgency=low + + * New upstream release. + * [configure.ac, configure] Look for Magick++-config instead of + GraphicsMagick++-config; put in AM_MAINTAINER_MODE. + * [debian/control] Update dependencies for new imagemagick. + * [debian/libpstoedit0.files, debian/rules, debian/control] Dropped "c2" + from libpstoedit0c2. + + -- J.H.M. Dassen (Ray) Thu, 29 Sep 2005 21:42:12 +0200 + +pstoedit (3.41-1) unstable; urgency=low + + * New upstream release. + + -- J.H.M. Dassen (Ray) Tue, 30 Aug 2005 21:15:52 +0200 + +pstoedit (3.40-1) unstable; urgency=high + + * New upstream release. (Closes: #293045) + * [src/Makefile.am, src/Makefile.in] Add "-ldl" to libpstoedit_la_LIBADD so + as to generate complete inter-library dependencies. + * [src/drvlplot.cpp] Minor changes needed to get things to build. + * [debian/control, debian/rules, libpstoedit0c2.files] C++ ABI transition; + libpstoedit0 is now libpstoedit0c2. Based on a patch by Henning Makholm + . (Closes: #321632) + * [debian/shlibs.local, debian/libpstoedit0.files] Dropped. + * [debian/rules, debian/control] Include buildinfo. + * [debian/pstoedit.docs] Added. + * [debian/pstoedit.preinst] Removed bashism. + * [debian/control] Updated Standards-Version. + + -- J.H.M. Dassen (Ray) Sun, 7 Aug 2005 15:36:36 +0200 + +pstoedit (3.33-15) unstable; urgency=medium + + * [debian/control] Libtiff transition: updated build dependencies. + * [numerous .cpp files] Removed ';'s which broke compilation with gcc 3.4. + * Relibtoolised sources. + + -- J.H.M. Dassen (Ray) Thu, 29 Jul 2004 20:57:30 +0200 + +pstoedit (3.33-14) unstable; urgency=medium + + * [debian/control] Updated libmagick++ build and runtime dependencies; + rebuild to get installable packages again. Again. (Closes: #245652) + Reworked build dependencies; no longer rely on xlibs-dev. + + -- J.H.M. Dassen (Ray) Mon, 26 Apr 2004 13:50:57 +0200 + +pstoedit (3.33-13) unstable; urgency=medium + + * [debian/control] Bumped libmagick++ build dependency and rebuild to get + installable packages again. (Closes: #245156) + * [debian/rules] Ensure at build time that the library has no dependencies + on undefined; speed up loading. + + -- J.H.M. Dassen (Ray) Wed, 21 Apr 2004 21:11:46 +0200 + +pstoedit (3.33-12) unstable; urgency=medium + + * [debian/control] Added a runtime dependency of libpstoedit-dev on + libplot-dev. (Closes: #240382) + * [debian/pstoedit-config.sgml] Corrected command name. (Closes: #240400) + + -- J.H.M. Dassen (Ray) Sat, 27 Mar 2004 09:57:49 +0100 + +pstoedit (3.33-11) unstable; urgency=high + + * [debian/control] Tightend build dependency on libmagick++ as its + soname has reverted. + + -- J.H.M. Dassen (Ray) Wed, 24 Dec 2003 08:57:18 +0100 + +pstoedit (3.33-10) unstable; urgency=high + + * [debian/control] Tightend build dependency on libmagick++ as its + soname has changed; bumped Standards-Version. + + -- J.H.M. Dassen (Ray) Sat, 20 Dec 2003 15:32:07 +0100 + +pstoedit (3.33-9) unstable; urgency=medium + + * [debian/control] Added an explicit, versioned build dependency on + libpng12-dev to benefit from versioned symbols. + * [debian/control] Updated Standards-Version. + + -- J.H.M. Dassen (Ray) Sat, 19 Jul 2003 13:50:36 +0200 + +pstoedit (3.33-8) unstable; urgency=medium + + * New imagemagick; updated build dependencies accordingly. + * Updated Standards-Version. + + -- J.H.M. Dassen (Ray) Fri, 16 May 2003 09:44:34 +0200 + +pstoedit (3.33-7) unstable; urgency=medium + + * [src/Makefile.am] Added "-ldl" to libpstoedit_la_LIBADD to make prelink + users happy. (Closes: #191879) + * Re-auto*-ed sources. + + -- J.H.M. Dassen (Ray) Sun, 4 May 2003 19:47:44 +0200 + +pstoedit (3.33-6) unstable; urgency=low + + * New imagemagick; updated build dependencies accordingly. + + -- J.H.M. Dassen (Ray) Mon, 3 Mar 2003 19:46:01 +0100 + +pstoedit (3.33-5) unstable; urgency=low + + * Rebuild against rebuilt imagemagick; updated build dependencies + accordingly. (Closes: #180451) + + -- J.H.M. Dassen (Ray) Sun, 2 Mar 2003 14:14:35 +0100 + +pstoedit (3.33-4) unstable; urgency=low + + * Reenabled building against libplot now that it has made the gcc 3.2 + transition; updated build dependencies. + + -- J.H.M. Dassen (Ray) Wed, 26 Feb 2003 18:47:22 +0100 + +pstoedit (3.33-3) unstable; urgency=low + + * New imagemagick; updated build dependencies. + + -- J.H.M. Dassen (Ray) Thu, 13 Feb 2003 08:13:01 +0100 + +pstoedit (3.33-2) unstable; urgency=low + + * New imagemagick; updated build dependencies. + * Added versioned g++ build dependency. + + -- J.H.M. Dassen (Ray) Tue, 4 Feb 2003 07:24:10 +0100 + +pstoedit (3.33-1) unstable; urgency=low + + * New upstream release. + * GCC 3.2 transition: + * [debian/control] Updated libmagick++-dev build dependency. + * [debian/control] Build-Conflicts: libplot-dev until it has made the + transition. + * [debian/control] Dropped libpng3-dev build dependency which was needed + for getting the right libplot-dev during the libpng transition. + * With this GCC 3.2 built version, the relocation error on an ImageMagick + symbol is no longer reproducible. (Closes: #175183) + * With the libplot plugin no longer built, the ia64 FTBFS should be gone. + (Closes: #175733) + * [debian/rules] Sanity check all plugins and don't give a deceptive message + about what may be wrong. + + -- J.H.M. Dassen (Ray) Sun, 26 Jan 2003 23:28:10 +0100 + +pstoedit (3.32-9) unstable; urgency=low + + * New imagemagick; updated build dependencies. + * Fixed lintian issues: + * manpage-has-bad-whatis-entry: manually fixed the manpage - apparently + latex2man generates bad NAME sections. + * description-synopsis-ends-with-full-stop + + -- J.H.M. Dassen (Ray) Tue, 31 Dec 2002 12:55:41 +0100 + +pstoedit (3.32-8) unstable; urgency=low + + * New imagemagick; updated build dependencies. + * Updated Standards-Version. + + -- J.H.M. Dassen (Ray) Sat, 7 Dec 2002 09:12:23 +0100 + +pstoedit (3.32-7) unstable; urgency=medium + + * Build with CC=c++ so libpstoedit.so has a proper dependency on the + standard C++ library. Hopefully this will fix the FTBFS on s390. + + -- J.H.M. Dassen (Ray) Sat, 2 Nov 2002 23:02:51 +0100 + +pstoedit (3.32-6) unstable; urgency=medium + + * Corrected build dependencies: take imagemagick epoch into account. This + should make things buildable again. + * On i386, -5 was installable already. (Closes: #167411) + + -- J.H.M. Dassen (Ray) Sat, 2 Nov 2002 10:53:30 +0100 + +pstoedit (3.32-5) unstable; urgency=medium + + * Follow imagemagick library packages renaming; updated build dependencies + accordingly. + + -- J.H.M. Dassen (Ray) Fri, 1 Nov 2002 23:06:14 +0100 + +pstoedit (3.32-4) unstable; urgency=medium + + * Really include '.so' links for the plugins in the library package rather + than the -dev package. + + -- J.H.M. Dassen (Ray) Fri, 18 Oct 2002 16:38:25 +0200 + +pstoedit (3.32-3) unstable; urgency=low + + * Include '.so' links for the plugins in the library package as pstoedit + doesn't search for the plugins by their full names. (Closes: #165028) + * [debian/control] Build against current libmagick++. + * [configure.in] put in AM_MAINTAINER_MODE so the generated Makefiles do + not try to rebuild the configure files by default which caused FTBFS on + some archs. + * Regenerated auto*. + * [debian/rules] clean: clean up autom4te.cache as well. + * ps2ai backend appears to be working fine. (Closes: #81899) + + -- J.H.M. Dassen (Ray) Thu, 17 Oct 2002 14:34:51 +0200 + +pstoedit (3.32-2) unstable; urgency=low + + * libpstoedit-dev depends on libpng3-dev, not libpng2-dev. + + -- J.H.M. Dassen (Ray) Mon, 14 Oct 2002 22:08:37 +0200 + +pstoedit (3.32-1) unstable; urgency=low + + * New upstream release. + * New backend using ImageMagick++. + * Redid packaging to deal with changes in the build system and with the + shared libpstoedit. + * Redid auto* files using libtool that can deal with dependencies between + un-installed shared libraries. + * Build-depend on libpng3-dev and on a libplot-dev that uses libpng3. + (Closes: #164075) + * Updated Standards-Version. + + -- J.H.M. Dassen (Ray) Sun, 13 Oct 2002 16:44:16 +0200 + +pstoedit (3.31-2) unstable; urgency=medium + + * pstoedit's SWF support via libming is currently broken. Disabled + building/linking against libming explicitly. (Closes: #132329) + + -- J.H.M. Dassen (Ray) Mon, 4 Feb 2002 19:49:45 +0100 + +pstoedit (3.31-1) unstable; urgency=low + + * New upstream release. + * As noted by Philipp Hahn: + * Compilation with g++ 3 was fixed upstream. (Closes: #125957) + * pstoedit supports idraw rasters since 3.17. (Closes: #54581) + * /usr/doc/pstoedit not being deleted was fixed in 3.13-3 (Closes: #45068) + + -- J.H.M. Dassen (Ray) Sat, 26 Jan 2002 16:58:16 +0100 + +pstoedit (3.30-2) unstable; urgency=low + + * On PowerPC, __linux isn't defined when cpp is called -ansi. Switch + src/dynload.cpp to use __linux__ instead. (Closes: #117813) + * KIllustrator was renamed to Kontour. + * Moved fontmap.mpost to /usr/share/pstoedit/ as it's not a conffile. + (Closes: #63814) + + -- J.H.M. Dassen (Ray) Sun, 4 Nov 2001 21:41:32 +0100 + +pstoedit (3.30-1) unstable; urgency=low + + * New upstream release with better xfig support (Closes: #114772) + * Updated Standards-Version. + * Updated and extended build dependencies. + + -- J.H.M. Dassen (Ray) Tue, 9 Oct 2001 22:00:44 +0200 + +pstoedit (3.21-2) unstable; urgency=low + + * config/config.sub, config/config.guess: copied new versions from libtool + so HPPA is recognised properly. (Closes: #104716) + + -- J.H.M. Dassen (Ray) Sun, 15 Jul 2001 15:26:26 +0200 + +pstoedit (3.21-1) unstable; urgency=low + + * New upstream release. + * Build dependencies were fixed already. (Closes: #67802, #68457). + * Included README about supported backends. (Closes: #65087). + + -- J.H.M. Dassen (Ray) Mon, 4 Dec 2000 20:35:12 +0100 + +pstoedit (3.20-3) unstable; urgency=low + + * Added lynx to build dependencies. (Fixes: 68457) + + -- J.H.M. Dassen (Ray) Sun, 6 Aug 2000 16:58:59 +0200 + +pstoedit (3.20-2) unstable; urgency=low + + * Added sysutils and debhelper to build dependencies (Fixes: #67802). + * Updated my email address. + + -- J.H.M. Dassen (Ray) Sat, 29 Jul 2000 17:50:06 +0200 + +pstoedit (3.20-1) unstable; urgency=low + + * New upstream release. + * Compiled without plotutils support (as plotutils has no separate + run-time library package). + + -- J.H.M. Dassen (Ray) Sun, 23 Jul 2000 15:56:03 +0200 + +pstoedit (3.15-1) unstable; urgency=low + + * New upstream release. + + -- J.H.M. Dassen (Ray) Fri, 29 Oct 1999 19:26:41 +0200 + +pstoedit (3.13-3) unstable; urgency=low + + * Oops. Still had a FSSTND location in the "doc-base" file messing things + up; added a preinst to deal with this. (Fixes #45068) + + -- J.H.M. Dassen (Ray) Sat, 25 Sep 1999 11:18:17 +0200 + +pstoedit (3.13-2) unstable; urgency=low + + * FHS migration. + + -- J.H.M. Dassen (Ray) Sat, 11 Sep 1999 12:51:22 +0200 + +pstoedit (3.13-1) unstable; urgency=low + + * New upstream release. + + -- J.H.M. Dassen (Ray) Thu, 5 Aug 1999 22:04:34 +0200 + +pstoedit (3.12-3) unstable; urgency=medium + + * Do the default fontmap handling for the MetaPost backend properly (only + * when the MetaPost backend is requested, and no other fontmap has been + loaded); install the fontmap as /etc/pstoedit/fontmap.mpost. + (Fixes Bug#40610) + * Partial FHS migration (manpage). + + -- J.H.M. Dassen (Ray) Sat, 17 Jul 1999 14:40:38 +0200 + +pstoedit (3.12-2) unstable; urgency=low + + * Install fontmap in /etc/pstoedit with Unix end of line convention, + and make it the default fontmap. Fixed drawing of rectangles by the + MetaPost backend. (Fixes: #40610). + + -- J.H.M. Dassen (Ray) Wed, 7 Jul 1999 14:41:24 +0200 + +pstoedit (3.12-1) unstable; urgency=low + + * New upstream release. + * Include fontmap.mpost in the package. (Fixes: #40463) + + -- J.H.M. Dassen (Ray) Wed, 30 Jun 1999 17:03:37 +0200 + +pstoedit (3.11-2) unstable; urgency=low + + * Include the upstream changelog. Fixes #37040. + * Fixed filenames in doc-base registration. + + -- J.H.M. Dassen (Ray) Wed, 5 May 1999 13:40:03 +0200 + +pstoedit (3.11-1) unstable; urgency=low + + * New upstream release. + * Added -DBUGGYGPP and -D__STRICT_ANSI_ to get it to compile. + * Updated description. + + -- J.H.M. Dassen (Ray) Sun, 11 Apr 1999 14:44:09 +0200 + +pstoedit (3.03-1) unstable; urgency=low + + * New upstream release. No longer contains a manpage; use the old one, + with a warning. + * Now built using debhelper. + * Updated Standards-Version. + + -- J.H.M. Dassen (Ray) Mon, 1 Feb 1999 20:59:33 +0100 + +pstoedit (2.60-4) unstable; urgency=low + + * Applied patch to make pstoedit work with gs-aladdin 5.50. Thanks to Elad + Tsur for proving me with it. (Fixes #27733). + + -- J.H.M. Dassen (Ray) Sun, 18 Oct 1998 21:51:47 +0200 + +pstoedit (2.60-3) unstable; urgency=low + + * Recompiled to update libstdc++ dependency from libstdc++2.8 to + libstdc++2.9. + + -- J.H.M. Dassen (Ray) Fri, 16 Oct 1998 08:51:33 +0200 + +pstoedit (2.60-2) frozen unstable; urgency=low + + * New maintainer. + * Fixes all reported bugs; lintian-clean. + * Acknowledge non-maintainer upload (Fixes #16499). + * Fixed typo and spello in Description (Fixes #19011, #16576). + * Downgraded Recommends: (vector format graphics editors/converters) + to Suggests: ; use "or" rather than "and"; added ivtools-bin (for idraw) + and transfig. (Fixes #20314, #20976; brings compliance to policy wrt + relationships between packages in and outside main). + * Disabled the "sample" driver (which is an actual driver, albeit a dummy + one). (Fixes #20429) + * Updated Standards-Version. + * Lintian fixes: + E: pstoedit: old-fsf-address-in-copyright-file + E: pstoedit: changelog-file-not-compressed usr/doc/pstoedit/changelog + W: pstoedit: executable-not-elf-or-script usr/man/man1/pstoedit.1.gz + E: pstoedit: manpage-not-compressed-with-max-compression usr/man/man1/pstoedit.1.gz + + -- J.H.M. Dassen (Ray) Sun, 24 May 1998 18:57:16 +0200 + +pstoedit (2.60-1.1) unstable; urgency=low + + * Non-maintainer release. + * Compiled with libc6. + * Applied fix from bug #14125. It replaces "deviceinfo" with + "currentpagedevice" in pstoedit.ph, which makes it work with + newer gs versions. + + -- Richard Braakman Fri, 2 Jan 1998 23:30:45 +0100 + +pstoedit (2.60-1) unstable; urgency=low + + * Upgraded to upstream source. + * Include proper copyright file, in proper location. + + -- joost witteveen Fri, 2 May 1997 22:31:07 +0200 + +pstoedit (2.3.3-3) unstable; urgency=low + * Converted to new source format + * stripped makeedit + -- joost witteveen Wed, 1 Jan 1997 20:45:28 +0100 --- pstoedit-3.45.orig/debian/compat +++ pstoedit-3.45/debian/compat @@ -0,0 +1 @@ +5 --- pstoedit-3.45.orig/debian/pstoedit.manpages +++ pstoedit-3.45/debian/pstoedit.manpages @@ -0,0 +1 @@ +doc/pstoedit.1 --- pstoedit-3.45.orig/debian/pstoedit.preinst +++ pstoedit-3.45/debian/pstoedit.preinst @@ -0,0 +1,15 @@ +#! /bin/sh +set -e + +if [ -e /usr/doc/pstoedit ] ; then + if [ ! -L /usr/doc/pstoedit ] ; then + rm -f /usr/doc/pstoedit/.dhelp + rmdir /usr/doc/pstoedit || true + fi +fi + +#DEBHELPER# + +exit 0 + + --- pstoedit-3.45.orig/debian/rules +++ pstoedit-3.45/debian/rules @@ -0,0 +1,168 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# The debhelper compatibility version to use is now set in debian/compat. +#export DH_COMPAT=3 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS += -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +confflags = --disable-maintainer-mode \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + -v + +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build $(DEB_HOST_GNU_TYPE) +else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +# Ensure at build time that the library has no dependencies on undefined +# symbols. +LDFLAGS += -Wl,-z,defs + +# Speed up loading. +LDFLAGS += -Wl,-O1 + +export LDFLAGS + +# shared library versions, option 1 +#version=2.0.5 +#major=2 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so +version=`ls src/.libs/lib*.so.* | \ + awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +major=`ls src/.libs/lib*.so.* | \ + awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + +upstreamversion=$(shell dpkg-parsechangelog | grep Version | head -1 | sed -e 's/Version: //g' -e 's/-[A-Za-z0-9\.]*$$//g') + + +source-updates: + # Update files generated by autotools + libtoolize --force --copy + aclocal + autoconf + automake --gnu --add-missing --copy + rm -rf autom4te.cache + +config.status: configure + dh_testdir + # Add here commands to configure the package. + env CXX="c++ -Wl,--as-needed -Wl,-O1" ./configure $(confflags) + +build: build-stamp +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) distclean + + # Update config.{sub,guess} from autotools-dev, if possible. + -for f in config.sub config.guess ; do \ + if test -r /usr/share/misc/$$f ; then \ + OLDDATE=`./$$f -t | tr -d -` ; \ + NEWDATE=`/usr/share/misc/$$f -t | tr -d -` ; \ + if [ $$OLDDATE -lt $$NEWDATE ] ; then \ + echo "GNU config automated update of $$f (replacing $$OLDDATE with $$NEWDATE)" 1>&2 ; \ + cp -f /usr/share/misc/$$f $$f ; \ + fi; \ + fi; \ + done + + rm -f debian/buildinfo + rm -rf autom4te.cache + -find -type f -name 'Makefile.in' | sed -e 's/\.in$$//' | xargs rm -f + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp + $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr + + @for plugin in libp2edrvstd libp2edrvmagick++ ; do \ + if ! test -r $(CURDIR)/debian/tmp/usr/lib/pstoedit/$$plugin.la ; then \ + echo "" ; \ + echo "pstoedit plugins \"$$plugin\" didn't get installed properly" ; \ + echo "Please investigate" ; \ + exit 1; \ + fi ; \ + done + + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_movefiles + + # Ensure there are no leftover files + find `pwd`/debian/tmp -depth -type d | xargs rmdir 2>&1 + +# dh_installdebconf + dh_installdocs + dh_installexamples + dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit + dh_installcron + dh_installman + dh_installinfo +# dh_undocumented + dh_installchangelogs doc/changelog.htm + dh_link + dh_strip + dh_compress + dh_buildinfo + dh_fixperms + dh_makeshlibs -plibpstoedit0c2a -V 'libpstoedit0c2a (>= $(upstreamversion))' + dh_installdeb +# dh_perl + dh_shlibdeps -Llibpstoedit0c2a -ldebian/libpstoedit0c2a/usr/lib + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- pstoedit-3.45.orig/debian/control +++ pstoedit-3.45/debian/control @@ -0,0 +1,37 @@ +Source: pstoedit +Section: graphics +Priority: optional +Maintainer: J.H.M. Dassen (Ray) +Build-Depends: debhelper (>> 3.0.0), dh-buildinfo, docbook-to-man, + g++ (>= 4:4.0), libwmf-dev, libmagick++9-dev (>= 6:6.2.4.5-0.3), + libplot-dev (>= 2.4.1-14), libpng12-dev (>= 1.2.5.0-4), gs, pkg-config +Standards-Version: 3.7.2 + +Package: libpstoedit-dev +Section: devel +Architecture: any +Depends: libpstoedit0c2a (= ${Source-Version}), libmagick++9-dev (>= 6:6.2.4.5-0.3), libplot-dev (>= 2.4.1-14) +Description: PostScript to editable vector graphics library (development files) + pstoedit is a framework for converting Postscript and PDF files to various + editable vector graphic formats. + . + This package contains files to build programs that use libpstoedit. + +Package: libpstoedit0c2a +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: libpstoedit0, libpstoedit0c2 +Replaces: libpstoedit-dev (<= 3.32-3), libpstoedit0, libpstoedit0c2 +Description: PostScript to editable vector graphics library (runtime files) + pstoedit is a framework for converting Postscript and PDF files to various + editable vector graphic formats. + +Package: pstoedit +Architecture: any +Depends: ${shlibs:Depends}, gs +Suggests: xfig|ivtools-bin|tgif|transfig +Description: PostScript and PDF files to editable vector graphics converter + pstoedit converts Postscript and PDF files to various editable + vector graphic formats including tgif, xfig, PDF graphics, gnuplot format, + idraw, MetaPost, GNU Metafile, PIC, Kontour and flattened PostScript. --- pstoedit-3.45.orig/debian/libpstoedit-dev.files +++ pstoedit-3.45/debian/libpstoedit-dev.files @@ -0,0 +1,8 @@ +usr/include/pstoedit/* +usr/lib/pkgconfig/pstoedit.pc +usr/lib/lib*.so +usr/lib/lib*.la +usr/lib/lib*.a +usr/lib/pstoedit/*.la +usr/lib/pstoedit/*.a +usr/share/aclocal/*.m4 --- pstoedit-3.45.orig/debian/pstoedit.docs +++ pstoedit-3.45/debian/pstoedit.docs @@ -0,0 +1,2 @@ +doc/index.htm +doc/pstoedit.htm --- pstoedit-3.45.orig/debian/pstoedit.dirs +++ pstoedit-3.45/debian/pstoedit.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/man/man1 +usr/share/pstoedit --- pstoedit-3.45.orig/debian/docs +++ pstoedit-3.45/debian/docs @@ -0,0 +1,2 @@ +readme.install +doc/readme.txt --- pstoedit-3.45.orig/debian/dirs +++ pstoedit-3.45/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin --- pstoedit-3.45.orig/debian/copyright +++ pstoedit-3.45/debian/copyright @@ -0,0 +1,52 @@ +This package was re-debianized using debhelper by J.H.M. Dassen (Ray). +Previous versions were maintained by joost witteveen, + +pstoedit sources can be found at http://www.pstoedit.net/pstoedit . + +Copyright: + +PSTOEDIT +Copyright (C) 1993 - 2002 Wolfgang Glunz, wglunz@pstoedit.net + +License: +-------- + + 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 2 of the License, or + (at your option) any later version. + +A copy of this license can be found in /usr/share/common-licenses/GPL. + + +Although the readme.txt file contains a requests for CD's to +be sent to the author, he assured Joost of the following: + +From Wolfgang.Glunz@mchp.siemens.de Fri May 2 19:16:12 1997 +Message-Id: <199705021714.TAA20432@weisshorn.mchp.siemens.de> +Subject: Re: pstoedit licence +To: joost@rulcmc.leidenuniv.nl (joost witteveen) +Date: Fri, 2 May 1997 19:14:51 +0200 (MET DST) + +> The new (2.60) pstoedit still has the GNU copyleft licence, but also +> the remark: +> +> If you include this program on a CDROM, please send me a copy of the CD, +> or if it goes with a book, of the book. +> +> Although I find this on itself a very reasonable request, "we" +> (the Debian volunteers) cannot fulfill that requrement, and we want +> CD producers to be able to just blindly copy the core part of the debian +> distribution, without looking at all copyrights involved (all +> programmes in the core section are GPL or similar). +> +> So, would you like pstoedit-2.60 not to be included with Debian +> (we cannot fulfill the readme.txt requrements), or is the remark +> above just to be read like "it would be nice if you sent me one of +> those CD's, but it's up to you"? +> +I explicitly wrote "please send ..." and not "you have to". So +your last interpretation is what I had in mind. So feel free +to include pstoedit in your Linux distribution. No problem ! + +[...] --- pstoedit-3.45.orig/debian/pstoedit.doc-base +++ pstoedit-3.45/debian/pstoedit.doc-base @@ -0,0 +1,11 @@ +Document: pstoedit-man +Title: pstoedit +Author: Dr. Wolfgang Glunz +Abstract: + pstoedit translates PostScript and PDF graphics into other vector formats. +Section: Graphics + +Format: HTML +Index: /usr/share/doc/pstoedit/index.htm +Files: + /usr/share/doc/pstoedit/pstoedit.htm --- pstoedit-3.45.orig/debian/pstoedit-dev.dirs +++ pstoedit-3.45/debian/pstoedit-dev.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/include --- pstoedit-3.45.orig/debian/README.Debian +++ pstoedit-3.45/debian/README.Debian @@ -0,0 +1,7 @@ +pstoedit for Debian +------------------- + +For a list of supported backends, do "pstoedit -help". Note that the WMF +backend is specific to Windows systems; it is not supported under Un*x. + +J.H.M. Dassen (Ray) , Sat Dec 2 16:31:01 CET 2000 --- pstoedit-3.45.orig/examples/Makefile.in +++ pstoedit-3.45/examples/Makefile.in @@ -35,7 +35,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -LIBOBJDIR = subdir = examples DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --- pstoedit-3.45.orig/Makefile.in +++ pstoedit-3.45/Makefile.in @@ -35,7 +35,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -LIBOBJDIR = DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/configure config.guess \ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs --- pstoedit-3.45.orig/config/Makefile.in +++ pstoedit-3.45/config/Makefile.in @@ -36,7 +36,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -LIBOBJDIR = subdir = config DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/pstoedit.pc.in --- pstoedit-3.45.orig/config.guess +++ pstoedit-3.45/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-02-10' +timestamp='2007-07-22' # 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 @@ -17,13 +18,15 @@ # # 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. + # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -66,11 +69,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,7 +107,7 @@ 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 -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$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 ; } ; @@ -123,7 +126,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +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 1994-08-24) @@ -136,16 +139,6 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_MACHINE}" in - i?86) - test -z "$VENDOR" && VENDOR=pc - ;; - *) - test -z "$VENDOR" && VENDOR=unknown - ;; -esac -test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -168,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -206,55 +200,23 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - luna88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-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 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + 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 0 ;; + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -307,40 +269,43 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + 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 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; *:z/VM:*:*) echo s390-ibm-zvmoe - exit 0 ;; + exit ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit 0 ;; + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + 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;; + 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 @@ -348,32 +313,32 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; + 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 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) + exit ;; + i86pc:SunOS:5.*:* | i86xen: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*) @@ -382,10 +347,10 @@ 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 @@ -397,10 +362,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${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 @@ -411,40 +376,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; + 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 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -468,32 +433,33 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $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 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + 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` @@ -509,29 +475,29 @@ 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 ' + 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` @@ -539,7 +505,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -554,14 +520,18 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - 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 ;; + 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 @@ -575,28 +545,28 @@ 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 ;; + 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 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -658,9 +628,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + 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 @@ -668,11 +648,11 @@ 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 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -700,161 +680,182 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $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 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + 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 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + 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 "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + 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 0 ;; + 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 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + 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 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; - amd64:CYGWIN*:*:*) + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin - exit 0 ;; + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + 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 ;; + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit 0 ;; + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) - echo cris-axis-linux - exit 0 ;; + echo cris-axis-linux-gnu + exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux - exit 0 ;; + echo crisv32-axis-linux-gnu + exit ;; frv:Linux:*:*) - echo frv-${VENDOR}-linux - exit 0 ;; + echo frv-unknown-linux-gnu + exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -871,8 +872,12 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0 + 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; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -890,15 +895,22 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0 + 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-${VENDOR}-linux - exit 0 ;; + echo powerpc-unknown-linux-gnu + exit ;; ppc64:Linux:*:*) - echo powerpc64-${VENDOR}-linux - exit 0 ;; + echo powerpc64-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -910,35 +922,41 @@ 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}-${VENDOR}-linux${LIBC} - exit 0 ;; + 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-${VENDOR}-linux ;; - PA8*) echo hppa2.0-${VENDOR}-linux ;; - *) echo hppa-${VENDOR}-linux ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-${VENDOR}-linux - exit 0 ;; + echo hppa64-unknown-linux-gnu + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) - echo x86_64-${VENDOR}-linux - exit 0 ;; + echo x86_64-unknown-linux-gnu + exit ;; + xtensa:Linux:*:*) + echo xtensa-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 @@ -952,19 +970,19 @@ p'` case "$ld_supported_targets" in elf32-i386) - TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux" + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; a.out-i386-linux) - echo "${UNAME_MACHINE}-${VENDOR}-linuxaout" - exit 0 ;; + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit ;; coff-i386) - echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff" - exit 0 ;; + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit ;; "") - # Either a pre-BFD a.out linker (linuxoldld) or + # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. - echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld" - exit 0 ;; + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -981,7 +999,7 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -991,16 +1009,23 @@ LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + 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 ;; + 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... @@ -1008,27 +1033,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + 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 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:syllable:*:*) + exit ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + 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 @@ -1036,15 +1061,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + 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 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /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 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; + exit ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + 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 ;; + && { 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 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + 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 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + 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` @@ -1136,69 +1162,81 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + 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 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + 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 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1206,25 +1244,25 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1235,41 +1273,47 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms && exit 0 ;; - I*) echo ia64-dec-vms && exit 0 ;; - V*) echo vax-dec-vms && exit 0 ;; + 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 0 ;; + 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 @@ -1301,7 +1345,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) @@ -1390,11 +1434,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$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) @@ -1403,22 +1448,22 @@ 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 @@ -1429,7 +1474,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess +and + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be --- pstoedit-3.45.orig/config.sub +++ pstoedit-3.45/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-02-10' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,14 +22,15 @@ # # 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. # @@ -83,11 +85,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +101,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,8 +120,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + 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/'` ;; @@ -170,6 +173,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -186,6 +193,10 @@ # 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/'` @@ -230,14 +241,16 @@ | 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 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | 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 | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -246,6 +259,7 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -254,20 +268,24 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -278,6 +296,9 @@ ;; 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 @@ -297,18 +318,18 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -319,6 +340,7 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -327,23 +349,26 @@ | 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[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) @@ -450,8 +475,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -658,6 +683,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -683,6 +712,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -758,9 +790,8 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff ;; os400) basic_machine=powerpc-ibm @@ -791,6 +822,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -847,6 +884,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -873,6 +914,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -884,6 +929,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1086,13 +1134,10 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1165,20 +1210,23 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -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* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -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*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1196,7 +1244,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1205,6 +1253,9 @@ -linux-dietlibc) os=-linux-dietlibc ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; -sunos5*) os=`echo $os | sed -e 's|sunos5|solaris2|'` ;; @@ -1327,6 +1378,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1336,9 +1393,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1364,6 +1421,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1382,6 +1442,9 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; @@ -1553,7 +1616,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp)