Browse Source

dpkg (1.13.1.0.1) experimental; urgency=low

  * Bin-MU; recompile against Debian unstable, to make dselect actually
    installable.

 -- Scott James Remnant <scott@netsplit.com>  Fri, 11 Mar 2005 09:00:14 +0000
Scott James Remnant 16 years ago
parent
commit
841a630143
100 changed files with 19693 additions and 12964 deletions
  1. 574 802
      ABOUT-NLS
  2. 32 0
      AUTHORS
  3. 6 5
      COPYING
  4. 733 262
      ChangeLog
  5. 98 45
      INSTALL
  6. 73 0
      Makefile.am
  7. 0 101
      Makefile.conf.in
  8. 715 27
      Makefile.in
  9. 1 0
      NEWS
  10. 5 0
      README
  11. 835 1983
      aclocal.m4
  12. 34 64
      archtable
  13. 0 68
      automake/dpkg.m4
  14. 0 209
      automake/tl_canon.m4
  15. 0 233
      automake/tools.m4
  16. 40 34
      config.guess
  17. 210 206
      config.h.in
  18. 30 53
      config.rpath
  19. 17 34
      config.sub
  20. 9570 4823
      configure
  21. 123 0
      configure.ac
  22. 0 513
      configure.in
  23. 0 16
      debian/README.compile
  24. 58 14
      debian/changelog
  25. 1 0
      debian/compat
  26. 14 46
      debian/control
  27. 49 41
      debian/copyright
  28. 0 2
      debian/dpkg-dev.conffiles
  29. 50 0
      debian/dpkg-dev.install
  30. 0 11
      debian/dpkg-doc.doc-base
  31. 0 11
      debian/dpkg-doc.postinst
  32. 0 14
      debian/dpkg-doc.prerm
  33. 3 9
      debian/dpkg.cfg
  34. 0 2
      debian/dpkg.conffiles
  35. 3 0
      debian/dpkg.docs
  36. 43 0
      debian/dpkg.install
  37. 145 120
      debian/dpkg.postinst
  38. 44 6
      debian/dpkg.postrm
  39. 146 57
      debian/dpkg.preinst
  40. 31 11
      debian/dpkg.prerm
  41. 3 4
      debian/dselect.cfg
  42. 0 1
      debian/dselect.conffiles
  43. 9 0
      debian/dselect.install
  44. 39 33
      debian/pseudo-tags
  45. 89 297
      debian/rules
  46. 4 9
      debian/shlibs.default
  47. 3 8
      debian/shlibs.override
  48. 526 0
      depcomp
  49. 0 153
      doc/ChangeLog
  50. 0 49
      doc/Makefile.in
  51. 0 487
      doc/database-structure.fig
  52. 0 976
      doc/en/reference.sgml
  53. 0 544
      doc/internals.sgml
  54. 0 56
      dpkg-deb/Makefile
  55. 19 0
      dpkg-deb/Makefile.am
  56. 474 40
      dpkg-deb/Makefile.in
  57. 1 1
      dpkg-deb/build.c
  58. 1 1
      dpkg-deb/extract.c
  59. 1 2
      dpkg-deb/main.c
  60. 38 0
      dpkg-split/Makefile.am
  61. 530 0
      dpkg-split/Makefile.in
  62. 0 0
      dpkg-split/dpkg-split.h
  63. 0 0
      dpkg-split/info.c
  64. 0 0
      dpkg-split/join.c
  65. 0 2
      split/main.c
  66. 0 0
      dpkg-split/mksplit.pl
  67. 0 0
      dpkg-split/queue.c
  68. 0 0
      dpkg-split/split.c
  69. 0 60
      dselect/Makefile
  70. 48 0
      dselect/Makefile.am
  71. 535 44
      dselect/Makefile.in
  72. 0 17
      dselect/checkunimp.pl
  73. 0 91
      dselect/keys.c
  74. 0 1
      dselect/main.cc
  75. 17 0
      getopt/Makefile.am
  76. 468 0
      getopt/Makefile.in
  77. 0 0
      getopt/closeout.c
  78. 0 0
      getopt/closeout.h
  79. 2 4
      optlib/error.h
  80. 0 1
      optlib/getopt.c
  81. 0 0
      getopt/getopt.h
  82. 0 0
      getopt/getopt1.c
  83. 0 0
      getopt/long-options.c
  84. 0 0
      getopt/long-options.h
  85. 0 0
      getopt/obstack.c
  86. 0 0
      getopt/obstack.h
  87. 0 25
      include/Makefile
  88. 0 25
      include/Makefile.in
  89. 285 211
      install-sh
  90. 4 0
      intl/ChangeLog
  91. 493 0
      intl/Makefile.in
  92. 1 0
      intl/VERSION
  93. 363 0
      intl/bindtextdom.c
  94. 608 0
      intl/config.charset
  95. 56 0
      intl/dcgettext.c
  96. 1219 0
      intl/dcigettext.c
  97. 57 0
      intl/dcngettext.c
  98. 58 0
      intl/dgettext.c
  99. 59 0
      intl/dngettext.c
  100. 0 0
      intl/eval-plural.h

File diff suppressed because it is too large
+ 574 - 802
ABOUT-NLS


+ 32 - 0
AUTHORS

@@ -0,0 +1,32 @@
+The C implementation of dpkg was originally written by:
+
+	Ian Jackson <ian@chiark.greenend.org.uk>
+
+based on the Perl implementation by:
+
+	Matt Welsh <mdw@sunsite.unc.edu>
+	Carl Streeter <streeter@cae.wisc.edu>
+	Ian Murdock <imurdock@debian.org>
+
+
+It is currently maintained by:
+
+	Scott James Remnant <scott@netsplit.com>
+
+and has previously been maintained by:
+
+	Adam Heath <doogie@brainfood.com> (2001-2003)
+	Wichert Akkerman <wakkerma@debian.org> (1999-2003)
+	Ben Collins <bcollins@debian.org> (1999-2001)
+	Daniel Jacobowitz <dan@debian.org> (1998)
+	J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl> (1998)
+	James Troup <jjtroup@comp.brad.ac.uk> (1998)
+	Nils Rennebarth <nils@debian.org> (1998)
+	Klee Dienes <klee@debian.org> (1997)
+	Guy Maor <maor@ece.utexas.edu> (1997)
+	Heiko Schlittermann <heiko@lotte.sax.de> (1996)
+
+
+Countless other people have contributed to dpkg (see THANKS) and provided
+code for which they claim copyright (see debian/copyright).  Many thanks
+to them all.

+ 6 - 5
COPYING

@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -279,7 +279,7 @@ POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
 
-	Appendix: How to Apply These Terms to Your New Programs
+	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     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
@@ -305,14 +305,15 @@ the "copyright" line and a pointer to where the full notice is found.
 
     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., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year  name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

File diff suppressed because it is too large
+ 733 - 262
ChangeLog


+ 98 - 45
INSTALL

@@ -1,3 +1,9 @@
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
 Basic Installation
 ==================
 
@@ -8,20 +14,27 @@ various system-dependent variables used during compilation.  It uses
 those values to create a `Makefile' in each directory of the package.
 It may also create one or more `.h' files containing system-dependent
 definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
 
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
 
 The simplest way to compile this package is:
 
@@ -31,7 +44,7 @@ The simplest way to compile this package is:
      `sh ./configure' instead to prevent `csh' from trying to execute
      `configure' itself.
 
-     Running `configure' takes a while.  While running, it prints some
+     Running `configure' takes awhile.  While running, it prints some
      messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
@@ -55,14 +68,16 @@ Compilers and Options
 =====================
 
    Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
 
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
@@ -75,11 +90,11 @@ directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
 
 Installation Names
 ==================
@@ -95,6 +110,11 @@ give `configure' the option `--exec-prefix=PATH', the package will use
 PATH as the prefix for installing programs and libraries.
 Documentation and other data files will still use the regular prefix.
 
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
@@ -117,22 +137,32 @@ you can use the `configure' options `--x-includes=DIR' and
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
      CPU-COMPANY-SYSTEM
 
-See the file `config.sub' for the possible values of each field.  If
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
+need to know the machine type.
 
-   If you are building compiler tools for cross-compiling, you can also
+   If you are _building_ compiler tools for cross-compiling, you should
 use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
 
 Sharing Defaults
 ================
@@ -145,32 +175,55 @@ default values for variables like `CC', `cache_file', and `prefix'.
 `CONFIG_SITE' environment variable to the location of the site script.
 A warning: not all `configure' scripts look for a site script.
 
-Operation Controls
+Defining Variables
 ==================
 
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
    `configure' recognizes the following options to control how it
 operates.
 
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
 `--help'
+`-h'
      Print a summary of the options to `configure', and exit.
 
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
 `--quiet'
 `--silent'
 `-q'
-     Do not print messages saying which checks are being made.
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
 
 `--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
 

+ 73 - 0
Makefile.am

@@ -0,0 +1,73 @@
+## Process this file with automake to produce Makefile.in
+
+if WITH_DSELECT
+  MAYBE_DSELECT = dselect
+endif
+
+SUBDIRS = \
+	intl \
+	getopt \
+	lib \
+	src \
+	$(MAYBE_DSELECT) \
+	dpkg-deb \
+	dpkg-split \
+	utils \
+	scripts \
+	po \
+	methods \
+	origins \
+	man
+
+ACLOCAL_AMFLAGS = -I m4
+
+
+dist_pkgdata_DATA = archtable
+
+EXTRA_DIST = \
+	debian/changelog \
+	debian/compat \
+	debian/control \
+	debian/copyright \
+	debian/dpkg-dev.install \
+	debian/dpkg.cfg \
+	debian/dpkg.docs \
+	debian/dpkg.install \
+	debian/dpkg.postinst \
+	debian/dpkg.postrm \
+	debian/dpkg.preinst \
+	debian/dpkg.prerm \
+	debian/dselect.cfg \
+	debian/dselect.install \
+	debian/pseudo-tags \
+	debian/rules \
+	debian/shlibs.default \
+	debian/shlibs.override
+
+
+GAIN_ROOT_COMMAND=fakeroot
+TARGET_ARGS=
+DPKG_BUILDPACKAGE_ARGS=
+LINTIAN_ARGS=
+
+package: distdir
+	cd $(distdir) && dpkg-buildpackage \
+		-r$(GAIN_ROOT_COMMAND) \
+		$(TARGET_ARGS) $(DPKG_BUILDPACKAGE_ARGS)
+	$(am__remove_distdir)
+	@set -e; \
+	if test "x$(TARGET_ARGS)" = "x-S"; then \
+	  arch=source; \
+	else \
+	  arch=`dpkg-architecture $(TARGET_ARGS) -qDEB_HOST_ARCH`; \
+	fi; \
+	changes=$(PACKAGE)_$(VERSION)_$$arch.changes; \
+	test -f $$changes || { echo $$changes missing; exit 1;}; \
+	if which lintian >/dev/null; then \
+	  echo lintian $(LINTIAN_ARGS) $$changes; \
+	  lintian $(LINTIAN_ARGS) $$changes || true; \
+	fi; \
+	(echo "$(distdir) package files ready for upload: "; \
+	  echo $$changes; \
+	  sed -e '1,/^Files:/d;/^$$/,$$d;s/.* //g' $$changes) | \
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'

+ 0 - 101
Makefile.conf.in

@@ -1,101 +0,0 @@
-
-# What are we building anyway?
-PACKAGE			= @PACKAGE@
-VERSION			= @VERSION@
-
-# Directory settings
-prefix			= @prefix@
-exec_prefix		= $(prefix)
-sharedir		= $(prefix)/share
-
-docdir			= $(sharedir)/doc/$(PACKAGE)
-copyingfile		= $(docdir)/copyright
-infodir			= @infodir@
-
-datadir			= @datadir@
-localedir		= $(datadir)/locale
-bindir			= @bindir@
-sbindir			= @sbindir@
-
-libdir			= @libdir@
-dpkglibdir		= $(libdir)/$(PACKAGE)
-dpkgsharedir		= $(sharedir)/$(PACKAGE)
-
-methodsdir		= $(dpkglibdir)/methods
-parsechangelogdir	= $(dpkglibdir)/parsechangelog
-
-admindir		= @admindir@
-
-mandir			= @mandir@
-man1dir			= $(mandir)/man1
-man5dir			= $(mandir)/man5
-man8dir			= $(mandir)/man8
-
-sysconfdir		= @sysconfdir@
-dpkgconfdir		= $(sysconfdir)/$(PACKAGE)
-alternativesdir		= $(sysconfdir)/alternatives
-
-abs_builddir		= @abs_builddir@
-abs_top_srcdir		= @abs_top_srcdir@
-ifeq ($(strip $(srcdir)),$(strip $(top_srcdir)))
-subdir =
-else
-subdir = $(patsubst $(top_srcdir)/%,%,$(srcdir))/
-endif
-PERL			= @PERL@
-mkinstalldirs		= $(SHELL) $(top_srcdir)/mkinstalldirs
-LN			= @LN_S@
-INSTALL			= @INSTALL@
-INSTALL_PROGRAM		= @INSTALL_PROGRAM@
-INSTALL_DATA		= @INSTALL_DATA@
-INSTALL_SCRIPT		= @INSTALL_SCRIPT@
-SED			= @SED@
-RM			= @RM@
-
-CC			= @CC@
-CFLAGS			= @CFLAGS@ @CWARNS@
-
-CXX			= @CXX@
-CXXFLAGS		= @CXXFLAGS@
-
-CPPFLAGS		= @CPPFLAGS@
-LD			= @LD@
-LDFLAGS			= @LDFLAGS@ -L../lib -L../optlib
-LIBS			= @LIBS@ -ldpkg -lopt $(ZLIB_LIBS) $(BZ2LIB_LIBS)
-
-RANLIB			= @RANLIB@
-
-DEFS			= @DEFS@ -D_GNU_SOURCE
-INCLUDE_CFLAGS		= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) -I../include -I.. -I. -I$(top_srcdir)/optlib
-
-NLS_CFLAGS		= -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl -I../intl
-NLS_LIBS		= @INTLLIBS@ 
-
-SSD_LIBS		= @SSD_LIBS@
-
-CURSES_LIBS		= @CURSES_LIBS@
-
-ZLIB_CFLAGS		= @ZLIB_CFLAGS@
-ZLIB_LIBS		= @ZLIB_LIBS@
-ZLIB_LIBS_ALSO_STATIC	= @ZLIB_LIBS_ALSO_STATIC@
-
-BZ2LIB_CFLAGS		= @BZ2LIB_CFLAGS@
-BZ2LIB_LIBS		= @BZ2LIB_LIBS@
-BZ2LIB_LIBS_ALSO_STATIC	= @BZ2LIB_LIBS_ALSO_STATIC@
-
-ALL_CFLAGS		= $(CPPFLAGS) $(CFLAGS) $(DEFS) $(NLS_CFLAGS) $(INCLUDE_CFLAGS) $(ZLIB_CFLAGS) $(BZ2LIB_CFLAGS)
-ALL_CXXFLAGS		= $(ALL_CFLAGS) $(CXXFLAGS)
-
-ALSO_STATIC		= @ALSO_STATIC@
-.c.o:
-	$(CC) $(ALL_CFLAGS) -c $<
-
-.cc.o:
-	$(CXX) $(ALL_CXXFLAGS) -c $<
-
-Makefile: $(srcdir)/Makefile.in
-	(cd $(abs_builddir);CONFIG_FILES=$(subdir)$@ $(abs_builddir)/config.status)
-
-foobar:
-	@echo "srcdir='$(srcdir)'"
-	@echo "subdir='$(subdir)'"

+ 715 - 27
Makefile.in

@@ -1,40 +1,728 @@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-top_srcdir	= @top_srcdir@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-VERSION		= $(shell cat version-nr)
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  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.
 
-GENFILES	= version.h
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-default: all
-include Makefile.conf
+@SET_MAKE@
 
-SUBDIRS		= include optlib lib dpkg-deb split scripts utils main \
-		  @DSELECTDIR@ po methods man doc
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+DIST_COMMON = README $(am__configure_deps) $(dist_pkgdata_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in $(top_srcdir)/configure \
+	$(top_srcdir)/intl/Makefile.in ABOUT-NLS AUTHORS COPYING \
+	ChangeLog INSTALL NEWS THANKS TODO config.guess config.rpath \
+	config.sub depcomp install-sh missing mkinstalldirs
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+	$(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \
+	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \
+	$(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = intl/Makefile
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_pkgdata_DATA)
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = intl getopt lib src dselect dpkg-deb dpkg-split utils \
+	scripts po methods origins man
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BZ2_CFLAGS = @BZ2_CFLAGS@
+BZ2_LIBS = @BZ2_LIBS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@
+WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@
+WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@
+WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@
+XGETTEXT = @XGETTEXT@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+ZLIB_LIBS = @ZLIB_LIBS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+admindir = @admindir@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+@WITH_DSELECT_TRUE@MAYBE_DSELECT = dselect
+SUBDIRS = \
+	intl \
+	getopt \
+	lib \
+	src \
+	$(MAYBE_DSELECT) \
+	dpkg-deb \
+	dpkg-split \
+	utils \
+	scripts \
+	po \
+	methods \
+	origins \
+	man
 
-all: version.h all-recursive
+ACLOCAL_AMFLAGS = -I m4
+dist_pkgdata_DATA = archtable
+EXTRA_DIST = \
+	debian/changelog \
+	debian/compat \
+	debian/control \
+	debian/copyright \
+	debian/dpkg-dev.install \
+	debian/dpkg.cfg \
+	debian/dpkg.docs \
+	debian/dpkg.install \
+	debian/dpkg.postinst \
+	debian/dpkg.postrm \
+	debian/dpkg.preinst \
+	debian/dpkg.prerm \
+	debian/dselect.cfg \
+	debian/dselect.install \
+	debian/pseudo-tags \
+	debian/rules \
+	debian/shlibs.default \
+	debian/shlibs.override
 
-install: all install-recursive
-	$(mkinstalldirs) $(DESTDIR)$(dpkgconfdir)/origins
-	$(mkinstalldirs) $(DESTDIR)$(dpkgsharedir)/origins
-	$(INSTALL_DATA) $(srcdir)/origin $(DESTDIR)$(dpkgconfdir)/origins/debian
-	$(INSTALL_DATA) $(srcdir)/archtable $(DESTDIR)$(dpkgsharedir)/archtable
+GAIN_ROOT_COMMAND = fakeroot
+TARGET_ARGS = 
+DPKG_BUILDPACKAGE_ARGS = 
+LINTIAN_ARGS = 
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
+.SUFFIXES:
+am--refresh:
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in:  $(am__configure_deps) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+uninstall-info-am:
+install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+	  $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+	done
+
+uninstall-dist_pkgdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  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; \
+	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; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  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 \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	mkdir $(distdir)
+	$(mkdir_p) $(distdir)/debian $(distdir)/intl $(distdir)/m4 $(distdir)/po
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || mkdir "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="../$(top_distdir)" \
+	        distdir="../$(distdir)/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+dist-bzip2: distdir
+	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    --with-included-gettext \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+distuninstallcheck:
+	@cd $(distuninstallcheck_dir) \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA) config.h
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
-	rm -f $(GENFILES)
 
-distclean: clean distclean-recursive
-	rm -f Makefile.conf Makefile config.cache config.h config.log config.status
-	rm -f automake/gettext.m4 automake/progtest.m4 automake/lcmessage.m4
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-dist_pkgdataDATA
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am
 
-version.h: version-nr
-	echo "#define DPKG_VERSION \"$(VERSION)\" /* This line modified by Makefile */" > version.h
+uninstall-info: uninstall-info-recursive
 
-all-recursive install-recursive clean-recursive distclean-recursive: %-recursive:
-	$(MAKE) $(MFLAGS) $(patsubst %,$*-%,$(SUBDIRS))
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+	check-am clean clean-generic clean-recursive ctags \
+	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
+	dist-tarZ dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-recursive distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dist_pkgdataDATA install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_pkgdataDATA \
+	uninstall-info-am
 
-$(foreach target,all install clean distclean,$(patsubst %,$(target)-%,$(SUBDIRS))):
-	$(MAKE) $(MFLAGS) -C "$(shell echo "$@" | sed 's/[^-]*-//')" "$(shell echo "$@" | sed 's/-.*//')"
 
-.PHONY: all install clean distclean 
-.PHONY: all-recursive install-recursive clean-recursive distclean-recursive
+package: distdir
+	cd $(distdir) && dpkg-buildpackage \
+		-r$(GAIN_ROOT_COMMAND) \
+		$(TARGET_ARGS) $(DPKG_BUILDPACKAGE_ARGS)
+	$(am__remove_distdir)
+	@set -e; \
+	if test "x$(TARGET_ARGS)" = "x-S"; then \
+	  arch=source; \
+	else \
+	  arch=`dpkg-architecture $(TARGET_ARGS) -qDEB_HOST_ARCH`; \
+	fi; \
+	changes=$(PACKAGE)_$(VERSION)_$$arch.changes; \
+	test -f $$changes || { echo $$changes missing; exit 1;}; \
+	if which lintian >/dev/null; then \
+	  echo lintian $(LINTIAN_ARGS) $$changes; \
+	  lintian $(LINTIAN_ARGS) $$changes || true; \
+	fi; \
+	(echo "$(distdir) package files ready for upload: "; \
+	  echo $$changes; \
+	  sed -e '1,/^Files:/d;/^$$/,$$d;s/.* //g' $$changes) | \
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+# 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:

+ 1 - 0
NEWS

@@ -0,0 +1 @@
+See debian/changelog for major changes between dpkg releases.

+ 5 - 0
README

@@ -0,0 +1,5 @@
+This is dpkg, Debian's package maintenance system.
+
+The primary interface for the dpkg suite is the `dselect' program;
+a more low-level and less user-friendly interface is available in
+the form of the `dpkg' command.

File diff suppressed because it is too large
+ 835 - 1983
aclocal.m4


+ 34 - 64
archtable

@@ -1,66 +1,36 @@
-# This file contains a table of known architecture strings, with
-# things to map them to.
+# This file contains the table of known architecture strings.
 #
-# Column 1 contains the $target_cpu-$target_os string as determined
-# by configure.
-# Column 2 contains the Debian architecture string, which is
-# returned by `dpkg --print-installation-architecture'.
-# Column 3 is returned by `dpkg --print-architecture'.
+# Column 1 is determined by dpkg's configure script based on the output
+# of the config.guess script.
+# Column 2 contains the Debian name for the architecture, which is returned
+# by ‘dpkg --print-installation-architecture’.
+# 
+# <cpu-os>			<Debian name>
+i386-linux			i386
+ia64-linux			ia64
+alpha-linux			alpha
+x86_64-linux			amd64
+arm-linux			arm
+hppa-linux			hppa
+m32r-linux			m32r
+m68k-linux			m68k
+mips-linux			mips
+mipsel-linux			mipsel
+powerpc-linux			powerpc
+s390-linux			s390
+s390x-linux			s390x
+sh3-linux			sh3
+sh3eb-linux			sh3eb
+sh4-linux			sh4
+sh4eb-linux			sh4eb
+sparc-linux			sparc
 
-i386-linux-gnu			i386		i486
-i486-linux-gnu			i386		i486
-i586-linux-gnu			i386		i486
-i686-linux-gnu			i386		i486
-pentium-linux-gnu		i386		i486
-sparc-linux-gnu			sparc		sparc
-sparc64-linux-gnu		sparc		sparc
-alpha-linux-gnu			alpha		alpha
-alphaev4-linux-gnu		alpha		alpha
-alphaev5-linux-gnu		alpha		alpha
-alphaev56-linux-gnu		alpha		alpha
-alphapca56-linux-gnu		alpha		alpha
-alphaev6-linux-gnu		alpha		alpha
-alphaev67-linux-gnu		alpha		alpha
-alphaev68-linux-gnu		alpha		alpha
-m68k-linux-gnu			m68k		m68k
-arm-linux-gnu			arm		arm
-armv3l-linux-gnu		arm		arm
-armv4l-linux-gnu		arm		arm
-ppc-linux-gnu			powerpc		powerpc
-powerpc-linux-gnu		powerpc		powerpc
-powerpc				powerpc		powerpc
-mips-linux-gnu			mips		mips
-mipsel-linux-gnu		mipsel		mipsel
-mipseb-linux-gnu		mips		mips
-i386-gnu			hurd-i386	undefined
-i386-gnu0.2			hurd-i386	undefined
-i386-gnu0.3			hurd-i386	undefined
-i486-gnu0.3			hurd-i386	undefined
-i586-gnu0.3			hurd-i386	undefined
-i686-gnu0.3			hurd-i386	undefined
-ia64-linux-gnu			ia64		ia64
-ia64-unknown-linux		ia64		ia64
-ia64-unknown-linux-gnu		ia64		ia64
-x86_64-linux-gnu		amd64		x86_64
-sh3-linux-gnu			sh3		sh3
-sh4-linux-gnu			sh4		sh4
-sh3eb-linux-gnu			sh3eb		sh3eb
-sh4eb-linux-gnu			sh4eb		sh4eb
-hppa-linux-gnu			hppa		hppa
-hppa1.1-linux-gnu		hppa		hppa
-hppa2.0-linux-gnu		hppa		hppa
-hppa64-linux-gnu		hppa		hppa
-i386-freebsd			freebsd-i386	freebsd-i386
-i386-kfreebsd-gnu		kfreebsd-i386	kfreebsd-i386
-i386-netbsdelf-gnu		netbsd-i386	netbsd-i386
-i386-knetbsd-gnu		knetbsd-i386	knetbsd-i386
-s390-linux-gnu			s390		s390
-s390-ibm-linux-gnu		s390		s390
-s390-unknown-linux-gnu		s390		s390
-i386-openbsd			openbsd-i386	openbsd-i386
-i386-unknown-openbsd		openbsd-i386	openbsd-i386
-powerpc-darwin			darwin-powerpc	darwin-powerpc
-i386-darwin			darwin-i386	darwin-i386
-s390x-linux-gnu			s390x		s390x
-s390x-ibm-linux-gnu		s390x		s390x
-s390x-unknown-linux-gnu		s390x		s390x
+i386-darwin			darwin-i386
+powerpc-darwin			darwin-powerpc
+i386-freebsd			freebsd-i386
+i386-gnu			hurd-i386
+i386-kfreebsd-gnu		kfreebsd-i386
+x86_64-kfreebsd-gnu		kfreebsd-amd64
+i386-knetbsd-gnu		knetbsd-i386
+i386-netbsd			netbsd-i386
+i386-openbsd			openbsd-i386

+ 0 - 68
automake/dpkg.m4

@@ -1,68 +0,0 @@
-dnl DPKG_CACHED_TRY_COMPILE(<description>,<cachevar>,<include>,<program>,<ifyes>,<ifno>)
-AC_DEFUN(DPKG_CACHED_TRY_COMPILE,[
- AC_MSG_CHECKING($1)
- AC_CACHE_VAL($2,[
-  AC_TRY_COMPILE([$3],[$4],[$2=yes],[$2=no])
- ])
- if test "x$$2" = xyes; then
-  true
-  $5
- else
-  true
-  $6
- fi
-])
-
-dnl DPKG_C_GCC_ATTRIBUTE(<short-label>,<cachevar>,<func-params>,<attribute>,<HAVE>,<desc>,[<true-cmds>],[<false-cmds>])
-AC_DEFUN(DPKG_C_GCC_ATTRIBUTE,[
-  DPKG_CACHED_TRY_COMPILE(__attribute__(($1)),dpkg_cv_c_attribute_$2,,
-   [extern int testfunction($3) __attribute__(($4))],
-   AC_MSG_RESULT(yes)
-   AC_DEFINE(HAVE_GNUC25_$5,,$6)
-   $7,
-   AC_MSG_RESULT(no)
-   $8)
-])
-
-dnl DPKG_C_GCC_TRY_WARNS(<warnings>,<cachevar>)
-AC_DEFUN(DPKG_C_GCC_TRY_WARNS,[
- AC_MSG_CHECKING([GCC warning flag(s) $1])
- if test "${GCC-no}" = yes
- then
-  AC_CACHE_VAL($2,[
-    if $CC $1 -c /dev/null 2>/dev/null; then
-      $2=yes
-    else
-      $2=
-    fi
-  ])
-  if test "x$$2" = xyes; then
-   CWARNS="${CWARNS} $1"
-   AC_MSG_RESULT(ok)
-  else
-   AC_MSG_RESULT(no)
-  fi
- else
-  AC_MSG_RESULT(no, not using GCC)
- fi
-])
-dnl DPKG_CACHED_TRY_COMPILE(<description>,<cachevar>,<include>,<program>,<ifyes>,<ifno>)
-
-
-dnl Check if a #define is present in an include file
-AC_DEFUN(DPKG_CHECK_DEFINE,
-  [AC_CACHE_CHECK(if $1 is defined in $2,
-     ac_cv_define_$1,
-     [AC_TRY_COMPILE([
-#include <$2>
-        ],[
-int i = $1;
-        ],
-        ac_cv_define_$1=yes,
-        ac_cv_define_$1=no)
-     ])
-   if test "$ac_cv_define_$1" = yes ; then
-    AC_DEFINE(HAVE_$1,,[define if $1 is defined])
-  fi
-])
-

+ 0 - 209
automake/tl_canon.m4

@@ -1,209 +0,0 @@
-# Our own versions of the other canonicalizing stuff
-
-dnl replace AC_CANONICAL_xxx
-
-undefine([AC_CANONICAL_HOST])
-define([AC_CANONICAL_HOST], [tl_CANONICAL_HOST])
-undefine([AC_CANONICAL_BUILD])
-define([AC_CANONICAL_BUILD], [tl_CANONICAL_BUILD])
-undefine([AC_CANONICAL_TARGET])
-define([AC_CANONICAL_TARGET], [tl_CANONICAL_TARGET])
-undefine([AC_CANONICAL_SYSTEM])
-define([AC_CANONICAL_SYSTEM], [tl_CANONICAL_SYSTEM])
-
-dnl Canonicalize the host, target, and build system types.
-AC_DEFUN(tl_CANONICAL_SYSTEM,
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_PROVIDE([AC_CANONICAL_SYSTEM])dnl
-AC_BEFORE([$0], [AC_ARG_PROGRAM])
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) AC_MSG_ERROR(can only configure for one host and one target at a time) ;;
-esac
-
-tl_CANONICAL_HOST
-tl_CANONICAL_TARGET
-tl_CANONICAL_BUILD
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-AC_CHECK_TOOL_PREFIX
-])
-
-dnl Subroutines of tl_CANONICAL_SYSTEM.
-
-AC_DEFUN(tl_CANONICAL_HOST,
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_PROVIDE([AC_CANONICAL_HOST])dnl
-
-# Make sure we can run config.sub.
-if $ac_config_sub sun4 >/dev/null 2>&1; then :
-else AC_MSG_ERROR(can not run $ac_config_sub)
-fi
-
-AC_MSG_CHECKING(host system type)
-
-dnl Set host_alias.
-
-if test "${GCC-no}" = "yes"; then
-changequote(, )dnl
-  libgcc="`${CC} --print-libgcc-file-name`"
-  host_alias="`echo ${libgcc} |
-	sed -e 's,^.*/gcc-lib/,,; s,/libgcc\.a$,,; s,/egcs-,/,; s,/[0-9.][0-9.]*$,,'`"
-  case ${host_alias} in
-   *-linux{,elf,aout})
-    host_alias="`echo ${host_alias} | sed 's/\([^-]*\)-linux.*/\1/'`"
-changequote([, ])dnl
-    if ar p "${libgcc}" __main.o 2>/dev/null | file - 2>/dev/null | grep ELF >/dev/null; then
-      host_alias="${host_alias}-linux"
-    else
-      host_alias="${host_alias}-linuxaout"
-    fi ;;
-  esac
-else
-  host_alias=$host
-  case "$host_alias" in
-  NONE)
-    case "$nonopt" in
-    NONE)
-      if host_alias=`$ac_config_guess`; then host_guessed=y
-      else AC_MSG_ERROR(can not guess host type; you must specify one)
-      fi ;;
-    *) host_alias=$nonopt ;;
-    esac ;;
-  esac
-fi
-
-dnl Set the other host vars.
-changequote(<<, >>)dnl
-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/'`
-changequote([, ])dnl
-AC_MSG_RESULT($host)
-AC_SUBST(host)dnl
-AC_SUBST(host_alias)dnl
-AC_SUBST(host_cpu)dnl
-AC_SUBST(host_vendor)dnl
-AC_SUBST(host_os)dnl
-])
-
-dnl Internal use only.
-AC_DEFUN(tl_CANONICAL_TARGET,
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_PROVIDE([AC_CANONICAL_TARGET])dnl
-AC_MSG_CHECKING(target system type)
-
-dnl Set target_alias.
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-  target_cpu="`dpkg --print-architecture`"
-  if test "$target_cpu" = ""; then
-   target_alias=$host_alias
-  else
-   target_alias="`echo ${host_alias} | sed 's/[^-]*-/${target_cpu}-/'`"
-  fi
-  ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-dnl Set the other target vars.
-if test $target_alias = $host_alias; then
-  target=$host
-  target_cpu=$host_cpu
-  target_vendor=$host_vendor
-  target_os=$host_os
-elif test $target_alias = "$build_alias"; then
-  target=$build
-  target_cpu=$build_cpu
-  target_vendor=$build_vendor
-  target_os=$build_os
-else
-changequote(<<, >>)dnl
-  target=`$ac_config_sub $target_alias`
-  target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-  target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-  target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-changequote([, ])dnl
-fi
-AC_MSG_RESULT($target)
-AC_SUBST(target)dnl
-AC_SUBST(target_alias)dnl
-AC_SUBST(target_cpu)dnl
-AC_SUBST(target_vendor)dnl
-AC_SUBST(target_os)dnl
-])
-
-AC_DEFUN(tl_CANONICAL_BUILD,
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_PROVIDE([AC_CANONICAL_BUILD])dnl
-
-# Make sure we can run config.sub.
-#if $ac_config_sub sun4 >/dev/null 2>&1; then :
-#else AC_MSG_ERROR(can not run $ac_config_sub)
-#fi
-
-AC_MSG_CHECKING(build system type)
-
-dnl Set build_alias.
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if test "$host_guessed" = "y"; then
-      build_alias=$host_alias
-    else
-      if build_alias=`$ac_config_guess`; then :
-      else build_alias=$host_alias
-      fi
-    fi ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-dnl Set the other build vars.
-if test $build_alias = $host_alias; then
-  build=$host
-  build_cpu=$host_cpu
-  build_vendor=$host_vendor
-  build_os=$host_os
-else
-changequote(<<, >>)dnl
-  build=`$ac_config_sub $build_alias`
-  build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-  build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-  build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-changequote([, ])dnl
-fi
-AC_MSG_RESULT($build)
-AC_SUBST(build)dnl
-AC_SUBST(build_alias)dnl
-AC_SUBST(build_cpu)dnl
-AC_SUBST(build_vendor)dnl
-AC_SUBST(build_os)dnl
-])

+ 0 - 233
automake/tools.m4

@@ -1,233 +0,0 @@
-# tl_CHECK_TOOL_PREFIX will work _BEFORE_ AC_CANONICAL_HOST, etc., has been
-# called. It should be called again after these have been called.
-#
-# Basically we want to check if the host alias specified by the user is
-# different from the build alias. The rules work like this:-
-#
-# If host is not specified, it defaults to NONOPT
-# If build is not specified, it defaults to NONOPT
-# If nonopt is not specified, we guess all other values
-
-dnl Replace AC_CHECK_TOOL_PREFIX
-undefine([AC_CHECK_TOOL_PREFIX])
-define([AC_CHECK_TOOL_PREFIX], [tl_CHECK_TOOL_PREFIX])
-
-AC_DEFUN(tl_CHECK_TOOL_PREFIX,
-[AC_PROVIDE([AC_CHECK_TOOL_PREFIX])
-AC_BEFORE([AC_CANONICAL_HOST])
-AC_BEFORE([AC_CANONICAL_BUILD])
-dnl Quick check
-if test "$host_alias" = ""; then
-  if test $host = NONE && test $build != NONE; then
-    thost=$nonopt
-  else
-    thost=$host
-  fi
-
-  if test $thost != $build && test $thost != NONE; then
-    ac_tool_prefix=${thost}-
-    ac_tool_dir=${thost}
-  else
-    ac_tool_prefix=
-    ac_tool_dir=
-  fi
-else
-  if test $host != $build; then
-    ac_tool_prefix=${host_alias}-
-    ac_tool_dir=${host_alias}
-  else
-    ac_tool_prefix=
-    ac_tool_dir=
-  fi
-fi
-])
-
-dnl replacement for AC_CHECK_TOOL
-undefine([AC_CHECK_TOOL])
-define([AC_CHECK_TOOL], [tl_CHECK_TOOL($1, $2, $3, $4)])
-
-dnl tl_CHECK_TOOL - AC_CHECK_TOOL, with a couple of extra checks
-dnl tl_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH
-dnl [, REJECT]])
-AC_DEFUN(tl_CHECK_TOOL,
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])
-AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2,
-	      ifelse([$3], , [$2], ), $4, $5)
-if test "$ac_tool_dir" != ""; then
-  if test -z "$ac_cv_prog_$1" && test "$5" != "/usr/${ac_tool_dir}/bin/$2" &&
-	test "$5" != "/usr/local/${ac_tool_dir}/bin/$2"; then
-    if test -f /usr/${ac_tool_dir}/bin/$2; then $1="/usr/${ac_tool_dir}/bin/$2"
-    elif test -f /usr/local/${ac_tool_dir}/bin/$2; then $1="/usr/local/${ac_tool_dir}/bin/$2"
-    fi
-  fi
-fi
-ifelse([$3], , , [
-if test -z "$ac_cv_prog_$1"; then
-if test -n "$ac_tool_prefix"; then
-  AC_CHECK_PROG($1, $2, $2, $3, $4, $5)
-else
-  $1="$3"
-fi
-fi])
-])
-
-dnl tl_CHECK_TOOLS -
-dnl  do a tl_CHECK_TOOL for multiple tools (like AC_CHECK_PROGS)
-dnl tl_CHECK_TOOLS(VARIABLE, PROGS-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND
-dnl		   [, PATH]])
-AC_DEFUN(tl_CHECK_TOOLS,
-[for ac_tool in $2
-do
-tl_CHECK_TOOL($1, [$]ac_tool, [$]ac_tool, , $4)
-test -n "[$]$1" && break
-done
-ifelse([$3], , , [test -n "[$]$1" || $1="$3"
-])])
-
-dnl replace AC_PROG_CC and AC_PROG_CXX
-undefine([AC_PROG_CC])
-define([AC_PROG_CC], [tl_PROG_CC])
-undefine([AC_PROG_CXX])
-define([AC_PROG_CXX], [tl_PROG_CXX])
-
-dnl tl_PROG_CC, tl_PROG_CXX - same as old AC_PROG_CC and AC_PROG_CXX, but
-dnl use AC_CHECK_TOOL/tl_CHECK_TOOLS instead of AC_CHECK_PROG, etc.
-AC_DEFUN(tl_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_PROVIDE([AC_PROG_CC])dnl
-tl_CHECK_TOOL(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_TOOL(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-if test -n "$ac_tool_prefix" &&
-   test "`echo $CC | grep '$ac_tool_prefix'`" = "" &&
-   test "`echo $CC | grep -- '-b'`" = ""; then
-  if $CC -v 2>&1 | grep -q gcc; then
-    AC_CACHE_CHECK([if $CC -b${ac_tool_dir} works], tl_cv_prog_cc_bhost,[
-    old_cc="${CC}"
-    CC="${CC} -b${ac_tool_dir}"
-    AC_LANG_SAVE
-    AC_LANG_C
-    AC_TRY_COMPILER([main(){return(0);}], tl_cv_prog_cc_bhost, ac_cv_prog_cc_cross)
-    AC_LANG_RESTORE])
-    if test $tl_cv_prog_cc_bhost = "yes"; then
-      ac_cv_prog_cc_works=yes
-      cctest=yes
-    else
-      CC="${old_cc}"
-    fi
-  fi
-fi
-
-if test "$cctest" != "yes"; then
-  tl_PROG_CC_WORKS
-fi
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-AC_DEFUN(tl_PROG_CXX,
-[AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
-AC_PROVIDE([AC_PROG_CXX])dnl
-tl_CHECK_TOOLS(CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
-if test -n "$CXX"; then
-  if test -n "$ac_tool_prefix" &&
-     test "`echo $CXX | grep '$ac_tool_prefix'`" = "" &&
-     test "`echo $CXX | grep -- '-b'`" = ""; then
-    if $CXX -v 2>&1 | grep -q gcc; then
-      AC_CACHE_CHECK([if $CXX -b${ac_tool_dir} works], tl_cv_prog_cxx_bhost,[
-      old_cxx="${CXX}"
-      CXX="${CXX} -b${ac_tool_dir}"
-      AC_LANG_SAVE
-      AC_LANG_CPLUSPLUS
-      AC_TRY_COMPILER([main(){return(0);}], tl_cv_prog_cxx_bhost, ac_cv_prog_cxx_cross)
-      AC_LANG_RESTORE])
-      if test $tl_cv_prog_cxx_bhost = "yes"; then
-	ac_cv_prog_cxx_works=yes
-	cxxtest=yes
-      else
-	CXX="${old_cxx}"
-      fi
-    fi
-  fi
-  
-  if test "$cxxtest" != "yes"; then
-    tl_PROG_CXX_WORKS
-  fi
-  AC_PROG_CXX_GNU
-  
-  if test $ac_cv_prog_gxx = yes; then
-    GXX=yes
-dnl Check whether -g works, even if CXXFLAGS is set, in case the package
-dnl plays around with CXXFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-    ac_test_CXXFLAGS="${CXXFLAGS+set}"
-    ac_save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS=
-    AC_PROG_CXX_G
-    if test "$ac_test_CXXFLAGS" = set; then
-      CXXFLAGS="$ac_save_CXXFLAGS"
-    elif test $ac_cv_prog_cxx_g = yes; then
-      CXXFLAGS="-g -O2"
-    else
-      CXXFLAGS="-O2"
-    fi
-  else
-    GXX=
-    test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
-  fi
-fi
-])
-
-AC_DEFUN(tl_PROG_CC_WORKS,
-[AC_PROVIDE(AC_PROG_CC_WORKS)
-AC_CACHE_CHECK([whether the C compiler ($CC $CFLAGS $LDFLAGS) works],
-	ac_cv_prog_cc_works, [
-AC_LANG_SAVE
-AC_LANG_C
-AC_TRY_COMPILER([main(){return(0);}], ac_cv_prog_cc_works, ac_cv_prog_cc_cross)
-AC_LANG_RESTORE
-if test $ac_cv_prog_cc_works = no; then
-  AC_MSG_ERROR([installation or configuration problem: C compiler cannot create executables.])
-fi])
-AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler])
-AC_MSG_RESULT($ac_cv_prog_cc_cross)
-cross_compiling=$ac_cv_prog_cc_cross
-])
-
-AC_DEFUN(tl_PROG_CXX_WORKS,
-[AC_PROVIDE(AC_PROG_CXX_WORKS)
-AC_CACHE_CHECK([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works],
-	ac_cv_prog_cxx_works, [
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_TRY_COMPILER([main(){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross)
-AC_LANG_RESTORE
-if test $ac_cv_prog_cxx_works = no; then
-  AC_MSG_ERROR([installation or configuration problem: C++ compiler cannot create executables.])
-fi])
-AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler])
-AC_MSG_RESULT($ac_cv_prog_cxx_cross)
-cross_compiling=$ac_cv_prog_cxx_cross
-])

+ 40 - 34
config.guess

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2004-11-12'
+timestamp='2004-03-12'
 
 # 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
@@ -53,7 +53,7 @@ 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
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -203,15 +203,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-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 ;;
@@ -227,12 +227,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    pegasos:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     sun3:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -298,6 +307,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# 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 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
+	exit 0 ;;
     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
@@ -319,9 +331,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit 0 ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
 	exit 0 ;;
@@ -345,7 +354,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
 	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+    DRS?6000:UNIX_SV:4.2*:7*)
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
 	esac ;;
@@ -755,7 +764,7 @@ EOF
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -778,7 +787,21 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	# Determine whether the default compiler uses glibc.
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#if __GLIBC__ >= 2
+	LIBC=gnu
+	#else
+	LIBC=
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only='k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -827,12 +850,6 @@ EOF
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit 0 ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit 0 ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit 0 ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -1079,9 +1096,9 @@ EOF
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
 	exit 0 ;;
-    M68*:*:R3V[5678]*:*)
+    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    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)
+    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)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1179,10 +1196,9 @@ EOF
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
     *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
+	case `uname -p` in
 	    *86) UNAME_PROCESSOR=i686 ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
+	    powerpc) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
@@ -1244,16 +1260,6 @@ EOF
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
-    *:*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 ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2

+ 210 - 206
config.h.in

@@ -1,80 +1,174 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Set this to the canonical Debian architecture string for this CPU type. */
 #undef ARCHITECTURE
 
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+#undef CRAY_STACKSEG_END
+
+/* Define to 1 if using `alloca.c'. */
+#undef C_ALLOCA
+
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 #undef ENABLE_NLS
 
+/* Define to 1 if you have `alloca', as a function or macro. */
+#undef HAVE_ALLOCA
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+#undef HAVE_ALLOCA_H
+
 /* Define to 1 if you have the `alphasort' function. */
 #undef HAVE_ALPHASORT
 
-/* Define if alphasort is declared. */
-#undef HAVE_ALPHASORT_DECLARATION
+/* Define to 1 if you have the <argz.h> header file. */
+#undef HAVE_ARGZ_H
+
+/* Define to 1 if you have the `asprintf' function. */
+#undef HAVE_ASPRINTF
+
+/* Define to 1 if you have the `bcopy' function. */
+#undef HAVE_BCOPY
 
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
+/* Define to 1 if the compiler supports C99. */
+#undef HAVE_C99
 
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+/* Define to 1 if compiler supports `__attribute__', 0 otherwise. */
+#undef HAVE_C_ATTRIBUTE
 
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT
 
+/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
+   don't. */
+#undef HAVE_DECL_FEOF_UNLOCKED
+
+/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
+   you don't. */
+#undef HAVE_DECL_FGETS_UNLOCKED
+
+/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
+   don't. */
+#undef HAVE_DECL_GETC_UNLOCKED
+
 /* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
    don't. */
 #undef HAVE_DECL_SYS_SIGLIST
 
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
+/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL__SNPRINTF
+
+/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL__SNWPRINTF
 
 /* Define to 1 if you have the <error.h> header file. */
 #undef HAVE_ERROR_H
 
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
+/* Define to 1 if you have the `fwprintf' function. */
+#undef HAVE_FWPRINTF
+
+/* Define to 1 if you have the `getcwd' function. */
+#undef HAVE_GETCWD
 
-/* Define if function attributes a la GCC 2.5 and higher are available. */
-#undef HAVE_GNUC25_ATTRIB
+/* Define to 1 if you have the `getegid' function. */
+#undef HAVE_GETEGID
 
-/* Define if constant functions a la GCC 2.5 and higher are available. */
-#undef HAVE_GNUC25_CONST
+/* Define to 1 if you have the `geteuid' function. */
+#undef HAVE_GETEUID
 
-/* Define if nonreturning functions a la GCC 2.5 and higher are available. */
-#undef HAVE_GNUC25_NORETURN
+/* Define to 1 if you have the `getgid' function. */
+#undef HAVE_GETGID
 
-/* Define if printf-format argument lists a la GCC are available. */
-#undef HAVE_GNUC25_PRINTFFORMAT
+/* Define to 1 if you have the `getpagesize' function. */
+#undef HAVE_GETPAGESIZE
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
 
-/* Define if unused variables la GCC 2.5 and higher are available. */
-#undef HAVE_GNUC25_UNUSED
+/* Define to 1 if you have the `getuid' function. */
+#undef HAVE_GETUID
 
 /* Define if you have the iconv() function. */
 #undef HAVE_ICONV
 
-/* Define if inline functions a la GCC are available. */
-#undef HAVE_INLINE
+/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
+#undef HAVE_INTMAX_T
 
-/* Define to 1 if you have the <inttypes.h> header file. */
+/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
 #undef HAVE_INTTYPES_H
 
+/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
+   declares uintmax_t. */
+#undef HAVE_INTTYPES_H_WITH_UINTMAX
+
+/* Define to 1 if you have the `isascii' function. */
+#undef HAVE_ISASCII
+
+/* Define to 1 if you have the <kvm.h> header file. */
+#undef HAVE_KVM_H
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#undef HAVE_LANGINFO_CODESET
+
 /* Define to 1 if you have the `lchown' function. */
 #undef HAVE_LCHOWN
 
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
+/* Define if you have the 'long double' type. */
+#undef HAVE_LONG_DOUBLE
+
+/* Define if you have the 'long long' type. */
+#undef HAVE_LONG_LONG
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the `mempcpy' function. */
+#undef HAVE_MEMPCPY
+
+/* Define to 1 if you have a working `mmap' system call. */
+#undef HAVE_MMAP
+
+/* Define to 1 if you have the `munmap' function. */
+#undef HAVE_MUNMAP
+
+/* Define to 1 if you have the <nl_types.h> header file. */
+#undef HAVE_NL_TYPES_H
+
+/* Define if your printf() function supports format strings with positions. */
+#undef HAVE_POSIX_PRINTF
+
+/* Define to 1 if you have the `putenv' function. */
+#undef HAVE_PUTENV
+
 /* Define to 1 if you have the `scandir' function. */
 #undef HAVE_SCANDIR
 
-/* Define if setlocale is available. */
+/* Define to 1 if you have the `setenv' function. */
+#undef HAVE_SETENV
+
+/* Define to 1 if you have the `setlocale' function. */
 #undef HAVE_SETLOCALE
 
 /* Define to 1 if you have the `setsid' function. */
@@ -89,9 +183,22 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
+   uintmax_t. */
+#undef HAVE_STDINT_H_WITH_UINTMAX
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
+/* Define to 1 if you have the `stpcpy' function. */
+#undef HAVE_STPCPY
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
+/* Define to 1 if you have the `strdup' function. */
+#undef HAVE_STRDUP
+
 /* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR
 
@@ -107,41 +214,69 @@
 /* Define to 1 if you have the `strtoul' function. */
 #undef HAVE_STRTOUL
 
-/* Define to 1 if you have the <syslog.h> header file. */
-#undef HAVE_SYSLOG_H
-
 /* Define to 1 if you have the <sys/cdefs.h> header file. */
 #undef HAVE_SYS_CDEFS_H
 
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* define if TIOCNOTTY is defined */
+/* Define to 1 if you have the macro `TIOCNOTTY' in `sys/ioctl.h', and to 0 if
+   you don't. */
 #undef HAVE_TIOCNOTTY
 
+/* Define to 1 if you have the `tsearch' function. */
+#undef HAVE_TSEARCH
+
+/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
+#undef HAVE_UINTMAX_T
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
 /* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Whether the va_copy macro exists */
-#undef HAVE_VA_COPY
+/* Define if you have the 'unsigned long long' type. */
+#undef HAVE_UNSIGNED_LONG_LONG
 
-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
+/* Define to 1 if the `va_copy' macro exists */
+#undef HAVE_VA_COPY
 
 /* Define to 1 if you have the `vsnprintf' function. */
 #undef HAVE_VSNPRINTF
 
-/* Defined to the $(libdir) location */
-#undef LLIBDIR
+/* Define if you have the 'wchar_t' type. */
+#undef HAVE_WCHAR_T
+
+/* Define to 1 if you have the `wcslen' function. */
+#undef HAVE_WCSLEN
+
+/* Define if you have the 'wint_t' type. */
+#undef HAVE_WINT_T
 
-/* Defined to $(localstatedir) dir location */
-#undef LOCALSTATEDIR
+/* Define to 1 if you have the `__argz_count' function. */
+#undef HAVE___ARGZ_COUNT
+
+/* Define to 1 if you have the `__argz_next' function. */
+#undef HAVE___ARGZ_NEXT
+
+/* Define to 1 if you have the `__argz_stringify' function. */
+#undef HAVE___ARGZ_STRINGIFY
+
+/* Define to 1 if you have the `__fsetlocking' function. */
+#undef HAVE___FSETLOCKING
+
+/* Define as const if the declaration of iconv() needs const. */
+#undef ICONV_CONST
+
+/* Define if integer division by zero raises signal SIGFPE. */
+#undef INTDIV0_RAISES_SIGFPE
 
 /* Name of package */
 #undef PACKAGE
@@ -161,21 +296,36 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
+#undef PRI_MACROS_BROKEN
+
 /* The size of a `unsigned int', as computed by sizeof. */
 #undef SIZEOF_UNSIGNED_INT
 
 /* The size of a `unsigned long', as computed by sizeof. */
 #undef SIZEOF_UNSIGNED_LONG
 
+/* Define as the maximum value of type 'size_t', if the system doesn't define
+   it. */
+#undef SIZE_MAX
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
+#undef STACK_DIRECTION
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Define if start-stop-daemon is compiled. */
-#undef USE_START_STOP_DAEMON
-
 /* Version number of package */
 #undef VERSION
 
+/* Define to 1 if start-stop-daemon is compiled. */
+#undef WITH_START_STOP_DAEMON
+
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #undef WORDS_BIGENDIAN
@@ -183,6 +333,11 @@
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
@@ -198,176 +353,25 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #undef mode_t
 
+/* Define to `long' if <sys/types.h> does not define. */
+#undef off_t
+
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
-/* Define to `int' if <sys/types.h> does not define. */
+/* Define to `int' if <malloc.h> does not define. */
 #undef ptrdiff_t
 
+/* Define to empty if the C compiler doesn't support this keyword. */
+#undef signed
+
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-
-/* Use the definitions: */
-
-/* Give us an unsigned 32-bit data type. */
-#if SIZEOF_UNSIGNED_LONG==4
-#define UWORD32 unsigned long
-#elif SIZEOF_UNSIGNED_INT==4
-#define UWORD32 unsigned int
-#else
-#error I do not know what to use for a UWORD32.
-#endif
-
-/* The maximum length of a #! interpreter displayed by dpkg-deb. */
-#ifdef PATH_MAX
-#define INTERPRETER_MAX PATH_MAX
-#else
-#define INTERPRETER_MAX 1024
-#endif
-
-/* GNU C attributes. */
-#ifndef FUNCATTR
-#ifdef HAVE_GNUC25_ATTRIB
-#define FUNCATTR(x) __attribute__(x)
-#else
-#define FUNCATTR(x)
-#endif
-#endif
-
-/* GNU C printf formats, or null. */
-#ifndef ATTRPRINTF
-#ifdef HAVE_GNUC25_PRINTFFORMAT
-#define ATTRPRINTF(si,tc) format(printf,si,tc)
-#else
-#define ATTRPRINTF(si,tc)
-#endif
-#endif
-#ifndef PRINTFFORMAT
-#define PRINTFFORMAT(si,tc) FUNCATTR((ATTRPRINTF(si,tc)))
-#endif
-
-/* GNU C nonreturning functions, or null. */
-#ifndef ATTRNORETURN
-#ifdef HAVE_GNUC25_NORETURN
-#define ATTRNORETURN noreturn
-#else /* ! HAVE_GNUC25_NORETURN */
-#define ATTRNORETURN
-#endif /* HAVE_GNUC25_NORETURN */
-#endif /* ATTRNORETURN */
-
-#ifndef NONRETURNING
-#define NONRETURNING FUNCATTR((ATTRNORETURN))
-#endif /* NONRETURNING */
-
-/* Combination of both the above. */
-#ifndef NONRETURNPRINTFFORMAT
-#define NONRETURNPRINTFFORMAT(si,tc) FUNCATTR((ATTRPRINTF(si,tc),ATTRNORETURN))
-#endif
-
-/* GNU C constant functions, or null. */
-#ifndef ATTRCONST
-#ifdef HAVE_GNUC25_CONST
-#define ATTRCONST const
-#else
-#define ATTRCONST
-#endif
-#endif
-#ifndef CONSTANT
-#define CONSTANT FUNCATTR((ATTRCONST))
-#endif
-
-/* GNU C unused functions, or null. */
-#ifndef ATTRUNUSED
-#ifdef HAVE_GNUC25_UNUSED
-#define ATTRUNUSED
-#else
-#define ATTRUNUSED
-#endif
-#endif
-#ifndef UNUSED
-#define UNUSED FUNCATTR((ATTRUNUSED))
-#endif
-
-/* Declare strerror if we don't have it already. */
-#ifndef HAVE_STRERROR
-const char *strerror(int);
-#endif
-
-/* Declare strsignal if we don't have it already. */
-#ifndef HAVE_STRSIGNAL
-const char *strsignal(int);
-#endif
-
-/* Declare scandir if we don't have it already. */
-#ifndef HAVE_SCANDIR
-struct dirent;
-int scandir(const char *dir, struct dirent ***namelist,
-            int (*select)(const struct dirent *),
-            int (*compar)(const void*, const void*));
-#endif
-
-/* Declare alphasort if we don't have it already. */
-#if !defined(HAVE_ALPHASORT) || !defined(HAVE_ALPHASORT_DECLARATION)
-struct dirent;
-int alphasort(const struct dirent *a, const struct dirent *b);
-#endif
-
-/* Declare unsetenv if we don't have it already. */
-#ifndef HAVE_UNSETENV
-void unsetenv(const char *x);
-#endif
-
-/* Define strtoul if we don't have it already. */
-#ifndef HAVE_STRTOUL
-#define strtoul strtol
-#endif
-
-#ifndef HAVE_VA_COPY
-#define va_copy(dest,src)	(dest) = (src)
-#endif
-
-/* Define WCOREDUMP if we don't have it already - coredumps won't be
- * detected, though.
- */
-#ifndef WCOREDUMP
-#define WCOREDUMP(x) 0
-#endif
-
-/* Set BUILDOLDPKGFORMAT to 1 to build old-format archives by default.
- */
-#ifndef BUILDOLDPKGFORMAT
-#define BUILDOLDPKGFORMAT 0
-#endif
-
-/* Take care of NLS matters.  */
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#if !HAVE_SETLOCALE
-# define setlocale(Category, Locale) /* empty */
-#endif
-
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-# define N_(Text) Text
-#else
-# undef bindtextdomain
-# define bindtextdomain(Domain, Directory) /* empty */
-# undef textdomain
-# define textdomain(Domain) /* empty */ 
-# define _(Text) Text
-# define N_(Text) Text
-# define gettext(Text) Text
-#endif
-
+/* Define to unsigned long or unsigned long long if <stdint.h> and
+   <inttypes.h> don't define. */
+#undef uintmax_t
 
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+   code using `volatile' can become incorrect without. Disable with care. */
+#undef volatile

+ 30 - 53
config.rpath

@@ -2,13 +2,28 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2005 Free Software Foundation, Inc.
+#   Copyright 1996-2003 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
-#   This file 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.
+#   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.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#   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.
 #
 # The first argument passed to this file is the canonical host specification,
 #    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
@@ -35,8 +50,6 @@ host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
-
 # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
 
 wl=
@@ -47,13 +60,6 @@ else
     aix*)
       wl='-Wl,'
       ;;
-    darwin*)
-      case "$cc_basename" in
-        xlc*)
-          wl='-Wl,'
-          ;;
-      esac
-      ;;
     mingw* | pw32* | os2*)
       ;;
     hpux9* | hpux10* | hpux11*)
@@ -65,19 +71,13 @@ else
     newsos6)
       ;;
     linux*)
-      case $cc_basename in
-        icc* | ecc*)
-          wl='-Wl,'
-          ;;
-        pgcc | pgf77 | pgf90)
+      case $CC in
+        icc|ecc)
           wl='-Wl,'
           ;;
-        ccc*)
+        ccc)
           wl='-Wl,'
           ;;
-        como)
-          wl='-lopt='
-          ;;
       esac
       ;;
     osf3* | osf4* | osf5*)
@@ -96,9 +96,6 @@ else
       ;;
     sysv4*MP*)
       ;;
-    unicos*)
-      wl='-Wl,'
-      ;;
     uts4*)
       ;;
   esac
@@ -141,7 +138,7 @@ if test "$with_gnu_ld" = yes; then
       # that the semantics of dynamic libraries on AmigaOS, at least up
       # to version 4, is to share data among multiple programs linked
       # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we cannot use
+      # behavior of shared libraries on other platforms, we can use
       # them.
       ld_shlibs=no
       ;;
@@ -176,13 +173,6 @@ if test "$with_gnu_ld" = yes; then
     sunos4*)
       hardcode_direct=yes
       ;;
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
@@ -276,7 +266,7 @@ else
       # see comment about different semantics on the GNU ld section
       ld_shlibs=no
       ;;
-    bsdi[45]*)
+    bsdi4*)
       ;;
     cygwin* | mingw* | pw32*)
       # When not using gcc, we currently assume that we are using
@@ -287,17 +277,8 @@ else
       libext=lib
       ;;
     darwin* | rhapsody*)
-      hardcode_direct=no
-      if test "$GCC" = yes ; then
-        :
-      else
-        case "$cc_basename" in
-          xlc*)
-            ;;
-          *)
-            ld_shlibs=no
-            ;;
-        esac
+      if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+        hardcode_direct=no
       fi
       ;;
     dgux*)
@@ -314,7 +295,7 @@ else
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
@@ -457,7 +438,7 @@ case "$host_os" in
     ;;
   beos*)
     ;;
-  bsdi[45]*)
+  bsdi4*)
     ;;
   cygwin* | mingw* | pw32*)
     shrext=.dll
@@ -469,8 +450,6 @@ case "$host_os" in
     ;;
   freebsd1*)
     ;;
-  kfreebsd*-gnu)
-    ;;
   freebsd*)