Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Version 3.5a

  • Loading branch information...
commit 99cd30338084a22a2c0ce7eccd5efd9d5c8539cd 1 parent b2f9024
@pinard authored
Showing with 20,151 additions and 17,178 deletions.
  1. +1,383 −786 BACKLOG
  2. +45 −0 ChangeLog
  3. +10 −2 Makefile.am
  4. +27 −15 Makefile.in
  5. +6 −0 NEWS
  6. +13 −13 README
  7. +24 −0 README-alpha
  8. +113 −50 THANKS
  9. +16 −10 TODO
  10. +6 −3 acconfig.h
  11. +430 −0 acinclude.m4
  12. +319 −171 aclocal.m4
  13. +64 −30 config.guess
  14. +14 −56 config.h.in
  15. +31 −14 config.sub
  16. +686 −1,732 configure
  17. +16 −10 configure.in
  18. +5 −3 contrib/Makefile.in
  19. +8 −0 contrib/README
  20. +35 −0 doc/ChangeLog
  21. +2 −16 doc/Makefile.am
  22. +17 −73 doc/Makefile.in
  23. +22 −25 doc/Makemore
  24. +531 −0 doc/charset.texi
  25. +318 −198 doc/help2man
  26. +97 −72 doc/recode.info
  27. +107 −103 doc/recode.info-1
  28. +108 −75 doc/recode.info-2
  29. +51 −51 doc/recode.info-3
  30. +69 −68 doc/recode.info-4
  31. +310 −8 doc/recode.info-5
  32. +721 −0 doc/recode.info-6
  33. +674 −224 doc/recode.texi
  34. +3 −3 doc/stamp-vti
  35. +0 −1,198 doc/tables.pl
  36. +1,305 −0 doc/tables.py
  37. +3 −3 doc/version.texi
  38. +22 −1 {po → i18n}/ChangeLog
  39. +75 −0 i18n/Makefile.am
  40. +281 −0 i18n/Makefile.in
  41. 0  po/da.gmo → i18n/da.mo
  42. 0  {po → i18n}/da.po
  43. BIN  i18n/de.mo
  44. +83 −135 {po → i18n}/de.po
  45. BIN  i18n/el.mo
  46. +497 −0 i18n/el.po
  47. 0  po/es.gmo → i18n/es.mo
  48. 0  {po → i18n}/es.po
  49. BIN  po/fr.gmo → i18n/fr.mo
  50. +4 −4 {po → i18n}/fr.po
  51. BIN  i18n/it.mo
  52. +502 −0 i18n/it.po
  53. 0  po/nl.gmo → i18n/nl.mo
  54. 0  {po → i18n}/nl.po
  55. BIN  i18n/pl.mo
  56. +184 −151 {po → i18n}/pl.po
  57. 0  po/pt.gmo → i18n/pt.mo
  58. 0  {po → i18n}/pt.po
  59. +9 −9 {po → i18n}/recode.pot
  60. 0  po/sl.gmo → i18n/sl.mo
  61. 0  {po → i18n}/sl.po
  62. BIN  po/sv.gmo → i18n/sv.mo
  63. +66 −105 {po → i18n}/sv.po
  64. +0 −1,086 intl/ChangeLog
  65. +0 −214 intl/Makefile.in
  66. +0 −1  intl/VERSION
  67. +0 −203 intl/bindtextdom.c
  68. +0 −262 intl/cat-compat.c
  69. +0 −624 intl/dcgettext.c
  70. +0 −59 intl/dgettext.c
  71. +0 −188 intl/explodename.c
  72. +0 −216 intl/finddomain.c
  73. +0 −70 intl/gettext.c
  74. +0 −105 intl/gettext.h
  75. +0 −89 intl/gettextP.h
  76. +0 −59 intl/hash-string.h
  77. +0 −76 intl/intl-compat.c
  78. +0 −411 intl/l10nflist.c
  79. +0 −100 intl/linux-msg.sed
  80. +0 −76 intl/loadinfo.h
  81. +0 −222 intl/loadmsgcat.c
  82. +0 −424 intl/localealias.c
  83. +0 −102 intl/po2tbl.sed.in
  84. +0 −108 intl/textdomain.c
  85. +0 −104 intl/xopen-msg.sed
  86. +17 −0 lib/ChangeLog
  87. +19 −6 lib/Makefile.am
  88. +29 −13 lib/Makefile.in
  89. +494 −0 lib/alloca.c
  90. +2,592 −0 lib/gettext.c
  91. +8 −13 intl/libgettext.h → lib/gettext.h
  92. +39 −0 lib/malloc.c
  93. +44 −0 lib/realloc.c
  94. +201 −90 ltconfig
  95. +208 −92 ltmain.sh
  96. +7 −0 m4/ChangeLog
  97. +1 −1  m4/Makefile.am
  98. +6 −4 m4/Makefile.in
  99. +50 −2 m4/{nls.m4 → gettext.m4}
  100. +0 −248 po/Makefile.in.in
  101. +0 −12 po/POTFILES.in
  102. +0 −168 po/cat-id-tbl.c
  103. BIN  po/de.gmo
  104. BIN  po/pl.gmo
  105. +0 −1  po/stamp-cat-id
  106. +78 −0 src/ChangeLog
  107. +23 −15 src/Makefile.am
  108. +91 −25 src/Makefile.in
  109. +96 −94 src/african.c
  110. +36 −36 src/atarist.c
  111. +5 −8 src/base64.c
  112. +811 −811 src/charname.h
  113. +24 −60 src/combine.c
  114. +2 −0  src/decsteps.h
  115. +4,422 −4,421 src/fr-charname.h
  116. +345 −349 src/html.c
  117. +1 −0  src/inisteps.h
  118. +14 −8 src/main.c
  119. +87 −28 src/merged.c
  120. +0 −181 src/mergelex.awk
  121. +144 −0 src/mergelex.py
  122. +8 −5 src/outer.c
  123. +121 −125 src/quoted.c
  124. +15 −15 {doc → src}/recode.1
  125. +2 −2 src/recode.c
  126. +8 −0 src/recode.h
  127. +11 −1 src/recodext.h
  128. +1 −1  src/rfc1345.h
  129. +1 −1  src/strip-data.c
  130. +1 −1  src/strip-pool.c
  131. +434 −0 src/vn.c
  132. +35 −2 tests/ChangeLog
  133. +2 −1  tests/Makefile.am
  134. +7 −4 tests/Makefile.in
  135. +10 −10 tests/african.m4
  136. +49 −2 tests/atconfig.in
  137. +175 −54 tests/atgeneral.m4
  138. +5 −5 tests/base64.m4
  139. +5 −1 tests/bigauto.sh
  140. +45 −45 tests/dumps.m4
  141. +8 −0 tests/names.m4
  142. +2 −1  tests/suite.m4
Sorry, we could not display the entire diff because it was too big.
View
2,169 BACKLOG
1,383 additions, 786 deletions not shown
View
45 ChangeLog
@@ -1,3 +1,48 @@
+1999-12-19 Fran�ois Pinard <pinard@iro.umontreal.ca>
+
+ * Makefile.am (BABYL): Adjusted.
+
+1999-12-14 Fran�ois Pinard <pinard@iro.umontreal.ca>
+
+ * configure.in (LIBOBJS): Manage for ANSI2KNR.
+ (LTLIBOBJS): Adjusted to fit the style of the above.
+ Reported by Jim Meyering.
+
+ * configure.in: Delete AC_PROG_AWK.
+
+ * Makefile.am, acconfig.h, configure.in: Adapt to the gettext
+ scheme used in wdiff.
+ * i18n: New name for directory po.
+ * intl: Deleted directory.
+
+ * configure.in: Use AC_FUNC_ALLOCA.
+
+ * acinclude.m4: New file, containing file libtool.m4 from the
+ libtool distribution, which suggest that it should be distributed.
+
+1999-12-12 Fran�ois Pinard <pinard@iro.umontreal.ca>
+
+ * configure.in: Replace strtol and strtoul only when missing.
+ Reported by Tom Hageman.
+
+1999-11-27 Fran�ois Pinard <pinard@iro.umontreal.ca>
+
+ * configure.in (ALL_LINGUAS): Add it.
+
+1999-06-22 Fran�ois Pinard <pinard@iro.umontreal.ca>
+
+ * configure.in (ALL_LINGUAS): Add el.
+
+1999-06-15 Fran�ois Pinard <pinard@iro.umontreal.ca>
+
+ * configure.in: Substitute LIBOBJS, so jm_FUNC_MALLOC and
+ jm_FUNC_REALLOC has some chance to work.
+ Reported by Alexandre Oliva.
+
+1999-06-02 Fran�ois Pinard <pinard@iro.umontreal.ca>
+
+ * configure.in: Version 3.5a.
+
1999-05-31 Fran�ois Pinard <pinard@iro.umontreal.ca>
* configure.in: Version 3.5.
View
12 Makefile.am
@@ -20,6 +20,14 @@
AUTOMAKE_OPTIONS = gnits
ACLOCAL_AMFLAGS = -I m4
-BABYL = ../rmail/* ../rmail/*/* ../admin/*/RMAIL
+BABYL = ../rmail/* ../*/rmail/* ../*/*/RMAIL ../*/*/rmail/*
EXTRA_DIST = rebox.el COPYING-LIB
-SUBDIRS = m4 doc lib intl src po tests contrib
+SUBDIRS = m4 doc lib i18n src tests contrib
+
+POTFILES = src/debug.c src/main.c src/names.c src/outer.c src/recode.c \
+src/request.c src/strip-data.c src/task.c
+
+all-local: $(srcdir)/stamp-pot
+
+$(srcdir)/stamp-pot: $(POTFILES)
+ @echo "$(POTFILES)" > $@
View
42 Makefile.in
@@ -78,9 +78,11 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALL_MOFILES = @ALL_MOFILES@
+ALL_POFILES = @ALL_POFILES@
AS = @AS@
AT_TESTPATH = @AT_TESTPATH@
-AWK = @AWK@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
@@ -99,16 +101,16 @@ INSTOBJEXT = @INSTOBJEXT@
INTLDEPS = @INTLDEPS@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
-LD = @LD@
LEX = @LEX@
+LIBOBJS = @LIBOBJS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTALLOCA = @LTALLOCA@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
+MOFILES = @MOFILES@
MSGFMT = @MSGFMT@
-NM = @NM@
OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
POFILES = @POFILES@
@@ -123,17 +125,21 @@ l = @l@
AUTOMAKE_OPTIONS = gnits
ACLOCAL_AMFLAGS = -I m4
-BABYL = ../rmail/* ../rmail/*/* ../admin/*/RMAIL
+BABYL = ../rmail/* ../*/rmail/* ../*/*/RMAIL ../*/*/rmail/*
EXTRA_DIST = rebox.el COPYING-LIB
-SUBDIRS = m4 doc lib intl src po tests contrib
+SUBDIRS = m4 doc lib i18n src tests contrib
+
+POTFILES = src/debug.c src/main.c src/names.c src/outer.c src/recode.c src/request.c src/strip-data.c src/task.c
+
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS BACKLOG COPYING \
-ChangeLog INSTALL Makefile.am Makefile.in NEWS THANKS TODO acconfig.h \
-aclocal.m4 config.guess config.h.in config.sub configure configure.in \
-install-sh ltconfig ltmain.sh missing mkinstalldirs
+ChangeLog INSTALL Makefile.am Makefile.in NEWS README-alpha THANKS TODO \
+acconfig.h acinclude.m4 aclocal.m4 config.guess config.h.in config.sub \
+configure configure.in install-sh ltconfig ltmain.sh missing \
+mkinstalldirs
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -149,8 +155,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-$(ACLOCAL_M4): configure.in m4/atconfig.m4 m4/malloc.m4 \
- m4/microsoft.m4 m4/nls.m4 m4/realloc.m4
+$(ACLOCAL_M4): configure.in acinclude.m4 m4/atconfig.m4 m4/gettext.m4 \
+ m4/malloc.m4 m4/microsoft.m4 m4/realloc.m4
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -288,7 +294,7 @@ distcheck: dist
mkdir $(distdir)/=inst
dc_install_base=`cd $(distdir)/=inst && pwd`; \
cd $(distdir)/=build \
- && ../configure --with-included-gettext --srcdir=.. --prefix=$$dc_install_base \
+ && ../configure --srcdir=.. --prefix=$$dc_install_base \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -359,7 +365,7 @@ install-am: all-am
install: install-recursive
uninstall-am:
uninstall: uninstall-recursive
-all-am: Makefile config.h
+all-am: Makefile config.h all-local
all-redirect: all-recursive-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -407,10 +413,16 @@ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+install uninstall-am uninstall all-local all-redirect all-am all \
+installdirs-am installdirs mostlyclean-generic distclean-generic \
+clean-generic maintainer-clean-generic clean mostlyclean distclean \
+maintainer-clean
+
+
+all-local: $(srcdir)/stamp-pot
+$(srcdir)/stamp-pot: $(POTFILES)
+ @echo "$(POTFILES)" > $@
# 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.
View
6 NEWS
@@ -1,6 +1,12 @@
Free recode NEWS - User visible changes. -*- outline -*- (allout)
Copyright � 1993, 1994, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+* Version 3.5a - Fran�ois Pinard, 1999-05.
+
+.* The Texinfo manual has been indexed, thanks to Eli.
+.* Program messages are also available in Greek and Italian.
+.* Vietnamese charsets are supported, but still mostly untested.
+
* Version 3.5 - Fran�ois Pinard, 1999-05.
.* Incompatible changes
View
26 README
@@ -1,20 +1,20 @@
* README file for `recode' allout -*- outline -*-
- Here is version 3.5 for the Free `recode' program and library. Glance
+ Here is version 3.5a for the Free `recode' program and library. Glance
through this `README' file before starting configuration. Make sure
you read files `ABOUT-NLS' and `INSTALL' if you are not familiar with
them already.
The canonical distribution point for this version is either:
- http://www.iro.umontreal.ca/contrib/recode/recode-3.5.tar.gz
- ftp://ftp.iro.umontreal.ca/pub/recode/recode-3.5.tar.gz
+ http://www.iro.umontreal.ca/contrib/recode/recode-3.5a.tar.gz
+ ftp://ftp.iro.umontreal.ca/pub/recode/recode-3.5a.tar.gz
yet the second URL (the FTP one) might disappear one day. GNU mirrors
usually hold a copy of non-pretest releases, the canonical distribution
point for the last such release is:
- ftp://ftp.gnu.org/pub/gnu/recode-3.4.tar.gz
+ ftp://ftp.gnu.org/pub/gnu/recode/recode-3.5.tar.gz
.* Introduction
------------
@@ -71,20 +71,20 @@
autoconf ftp://ftp.gnu.org/pub/gnu/autoconf/autoconf-2.13.tar.gz
automake ftp://sourceware.cygnus.com/pub/automake/automake-1.4.tar.gz
- flex ftp://ftp.gnu.org/pub/gnu/flex-2.5.2.tar.gz
- gawk ftp://ftp.gnu.org/pub/gnu/gawk-3.0.3.tar.gz
+ flex ftp://ftp.gnu.org/pub/gnu/flex/flex-2.5.4a.tar.gz
gettext ftp://ftp.cygnus.com/pub/home/drepper/gettext-0.10.35.tar.gz
- help2man http://www.ozemail.com.au/~bod/help2man-1.008.tar.gz
- libtool ftp://ftp.gnu.org/pub/gnu/libtool/libtool-1.3.2.tar.gz
- m4 ftp://ftp.seindal.dk/pub/rene/gnu/m4-1.4l.tar.gz
- perl ftp://ftp.gnu.org/pub/gnu/perl-5.003.tar.gz
- tar ftp://ftp.gnu.org/pub/gnu/tar-1.12.tar.gz
+ help2man http://www.ozemail.com.au/~bod/help2man-1.019.tar.gz
+ libtool http://www.oranda.demon.co.uk/dist/libtool-1.3.4.tar.gz
+ m4 ftp://ftp.seindal.dk/pub/rene/gnu/m4-1.4n.tar.gz
+ perl ftp://ftp.gnu.org/pub/gnu/perl/perl-5.005.03.tar.gz
+ python ftp://ftp.python.org/pub/python/src/py152.tgz
+ tar ftp://ftp.gnu.org/pub/gnu/tar/tar-1.12.tar.gz
Make sure GNU `m4' is fully installed before you start installing
Autoconf. Have Perl installed before Automake and `help2man'.
- `mawk', GNU `awk' or `nawk', and also Flex 2.5 or better, are needed
- for remaking `merged.c', after you modify or add an `.l' source file.
+ Python 1.5 and Flex 2.5, or better, are needed for remaking `merged.c',
+ after you modify or add an `.l' source file.
. + Mailing lists and collaboration
View
24 README-alpha
@@ -0,0 +1,24 @@
+A new pretest for the `recode' program and library is now available as:
+
+ http://www.iro.umontreal.ca/contrib/recode/recode-3.5a.tar.gz
+
+This is beta status software. You are invited to use the mailing list
+mailto:recode-forum@iro.umontreal.ca, but you could also write to me either
+at mailto:recode-bugs@iro.umontreal.ca or mailto:pinard@iro.umontreal.ca.
+
+Most pretesters may skip this pretest, which is more a snapshot to help
+communication with some collaborators on specific matters. There will
+be other pretests before 3.6 goes out. A few reported bugs related to
+portability have been addressed. In this snapshot, many matters are still
+pending. I usually send a letter to a submitter once his/her report has
+been acted upon, you know if I replied to yours! :-)
+
+This pretest contains many changes in the installation engineering, first
+by using newer Autoconf, Automake, Libtool, Help2man, and such things,
+but also by using an experimental Makefile scheme for `gettext' matters.
+A few internal Perl or awk scripts have been rewritten into Python.
+
+Bugs have been corrected, and especially the following ones:
+- HTML with `-d' was spuriously repeating part of the input into the output.
+- Base64 decoding was uselessly requiring `-f' to complete, in many cases.
+- The validation suite should now work in DJGPP/DOSWIN environments.
View
163 THANKS
@@ -7,133 +7,196 @@ for a detailed description of contributions.
Akim Demaille demaille@inf.enst.fr
Alain Labont� alb@riq.qc.ca
Alain Magloire alainm@macs.ee.mcgill.ca
-Alexander L. Belikoff abel@bfr.co.il
+Alan J. Flavell flavell@a5.ph.gla.ac.uk
+Alexander L. Belikoff abel@vallinor4.com
+ http://www.vallinor4.com
+Alexandre Oliva oliva@dcc.unicamp.br
+ http://www.dcc.unicamp.br/~oliva
Andreas Dietrich quasi@mathematik.uni-marburg.de
+Andreas Frick afr@aifb.uni-karlsruhe.de
Andreas Mueller afm@othello.ch
-Andreas Schwab schwab@issan.informatik.uni-dortmund.de
+ http://www.othello.ch
+Andreas Schwab schwab@suse.de
Andries Brouwer Andries.Brouwer@cwi.nl
Arnaldo Mandel am@ime.usp.br
-Bastian Schlueter buzz@cs.tu-berlin.de
+Bastian Schlueter buzz@gmx.de
+ http://home.pages.de/~buzz
Bernt Guldbrandtsen bg@rs580.sh.dk
Bert Schweitzer b.schweitzer@tu-bs.de
-Branimir Dolicki bdolicki@tel.hr
+Branimir Dolicki
+Brendan O'Dea bod@compusol.com.au
+ http://www.ozemail.com.au/~bod/
+Bruno Haible haible@ilog.fr
+ http://clisp.cons.org/~haible/
Christian Limpach Christian.Limpach@nice.ch
-Christian Recktenwald chris@janus.citecs.de
-Christian Rolland Christian.Rolland@irisa.fr
+ http://www.nice.ch/~chris/
+Christian Recktenwald chris@citecs.de
+ http://www.citecs.de/
+Christian Rolland
Claude Goutier goutier@jsp.umontreal.ca
-Colin Plumb colin@nyx10.cs.du.edu
+Colin Plumb
Daniel Quinlan quinlan@best.com
Daniel Taupin taupin@lps.u-psud.fr
-David E. A. Wilson david@cs.uow.edu.au
-David Kastrup dak@pool.informatik.rwth-aachen.de
+David E. A. Wilson david_wilson@uow.edu.au
+ http://www.uow.edu.au/~david
+David Kastrup
David Lebel lebel@iro.umontreal.ca
-David Mentre David.Mentre@enst-bretagne.fr
-David van Leeuwen david@gandalf.tm.tno.nl
+David Mentre
+David van Leeuwen
Detlev Droege droege@informatik.uni-koblenz.de
-Dominique Quatravaux quatrava@clipper.ens.fr
+Dominique Quatravaux Dominique.Quatravaux@quatramaran.ens.fr
+ http://www.piren.epita.fr/~dom
Dominique Schmit dschmit@tabarly.saclay.cea.fr
Duane Ellis duane@franklin.com
+ http://www.franklin.com
Eli Zaretskii eliz@is.elta.co.il
-Eric Backus ericb@lsid.hp.com
-Erick Branderhorst branderh@iaehv.nl
-Erwan Mas emas@bondy.orstom.fr
-Farzad Farid farzy@publicis.fr
+Eric Backus eric_backus@hp.com
+ http://www.wolfenet.com/~ericjb
+Erick Branderhorst Erick.Branderhorst@asml.nl
+Erwan Mas erwanmas@chez.com
+ http://www.chez.com/erwanmas/
+Farzad Farid
Florian Oelmaier 100265.2501@compuserve.com
Fran�ois Pinard pinard@iro.umontreal.ca
-Fran�ois Robitaille f_robita@crim.ca
+ http://www.iro.umontreal.ca/~pinard
+Fran�ois Robitaille
Fran�ois Yergeau yergeau@alis.com
+ http://www.alis.com/~yergeau/
Fran�oise Audebrand audebran@ere.umontreal.ca
-Frederic Albrecht fred@calvacom.fr
+Frederic Albrecht
Fr�re Roy roy@taize.fr
-Gabriel P. Silva gabriel@rio.cos.ufrj.br
-Ghislain Plamondon gplamon@edupac.qc.ca
+ http://www.taize.fr
+Gabriel P. Silva gpsilva@geocities.com
+ http://www.nce.ufrj.br/~gabriel
+Ghislain Plamondon
Georg Haefele haefele@atlas.gis.univie.ac.at
-Greg McGary gkm@cstone.net
+Greg McGary
Guy Lapalme lapalme@iro.umontreal.ca
+ http://www.iro.umontreal.ca/~lapalme
Harald Falkenberg harald.falkenberg@desy.de
Harald Koenig koenig@tat.physik.uni-tuebingen.de
Hermann Hueni hueni@iam.unibe.ch
-Hennus Bergman hennus@sky.ow.nl
+Hennus Bergman
Hilmar Schlegel hs@semic.ag-berlin.mpg.de
+Hrvoje Niksic hniksic@srce.hr
Jacques Madelaine jacques@info.unicaen.fr
-Jacques Richer richer@cerca.umontreal.ca
+ http://www.info.unicaen.r/~jacques
+Jacques Richer Jacques.Richer@CERCA.UMontreal.CA
+ http://www.CERCA.UMontreal.CA/~richer
Jan Djarv jan.djarv@mbox200.swipnet.se
Jean-Claude Nadeau nadeau@jsp.umontreal.ca
Jens Quade jens@ronja.dinoco.de
Jim Meyering meyering@na-net.ornl.gov
-Joelle Stemp stemp@ere.umontreal.ca
-John van Krieken john@atcmp.nl
+Joelle Stemp
+John van Krieken John.van.Krieken@ATComputing.nl
+ http://www.ATComputing.nl/images/pasfotos/john.jpg
J�rg H�hle Joerg.Hoehle@gmd.de
+ http://fit.gmd.de/~hoehle/
Jose Joao Almeida jj@di.uminho.pt
+ http://www.di.uminho.pt/~jj
Julio Sanchez jsanchez@gmv.es
Juliusz Chroboczek jch@clipper.ens.fr
Juergen Zeller zet@rupert.franken.de
-Kai Uwe Rommel rommel@ars.muc.de
+Kai Uwe Rommel
Karl Berry karl@cs.umb.edu
+ http://www.cs.umb.edu/~karl/
Keld J�rn Simonsen keld@dkuug.dk
Kester Habermann kester@unix-ag.uni-kl.de
-Kevin Stuckless kevins@rc.gc.ca
+ http://www.unix-ag.uni-kl.de/~kester/
+Kevin Stuckless kevins@stuck.warped.com
+ http://stuck.warped.com/~kevins
+Kristian K.A��hntopp kk@netuse.de
Laurent Bourbeau bourbeau@progiciels-bpi.ca
Larry W. Virden lvirden@cas.org
+ http://purl.org/net/lvirden/
Liisa R{ih{ lr@cs.uta.fi
-Loic Dachary loic@design.axis.fr
-Lukas Petrlik luki@scylla.zcu.cz
+Loic Dachary
+Lukas Petrlik
Mac Pigman gwp@dido.caltech.edu
-Marc Gingold gingold@amoco.saclay.cea.fr
+Marc Gingold gingold@spht.saclay.cea.fr
+ http:////www-spht.cea.fr/doc.html
Marc Shapiro shapiro@prof.inria.fr
-Marc Verreault vero@iro.umontreal.ca
+Marc Verreault
Mario Gay mgay@ti-edu.ch
-Markus Kuhn mskuhn@faui01.informatik.uni-erlangen.de
-Martin J. D�rst mduerst@ifi.unizh.ch
+Markus Kuhn Markus.Kuhn@cl.cam.ac.uk
+ http://www.cl.cam.ac.uk/~mgk25/
+Martin J. D�rst duerst@w3.org
+ http://www.w3.org/People/D%C3%BCrst
Martin Maechler maechler@stat.math.ethz.ch
Martin Mares mj@ucw.cz
+ http://atrey.karlin.mff.cuni.cz/~mj/
Michael Gschwind mike@vlsivie.tuwien.ac.at
-Michael L. Dowling mike@mo.math.nat.tu-bs.de
+Michael L. Dowling M.Dowling@tu-bs.de
+ http://www.mathematik.tu-bs.de
Michael Schmidt mschmidt@koblenz.fh-rpl.de
-Michael Shields shields@tembel.org
-Mikko Silvonen Mikko.Silvonen@helsinki.fi
-Nathanael Makarevitch Nathanael.MAKAREVITCH@ifp.fr
+Michael Shields shields@msrl.com
+ http://www.msrl.com/
+Mikko Silvonen silvonen@iki.fi
+ http://www.iki.fi/silvonen/
+Nathanael Makarevitch
Nathaniel Borenstein nsb@aa.fv.com
-Nicolas Anquetil anquetil@iro.umontreal.ca
-Nicolas Thiery nthiery@clipper.ens.fr
+Neal McBurnett http://bcn.boulder.co.us/~neal/
+Nguy��n-��ai Qu�� daiquy.nguyen@ulg.ac.be
+Nicolas Anquetil
+Nicolas Thiery Nicolas.Thiery@jonas.univ-lyon1.fr
+ http://www.lmd.univ-lyon1.fr/home/nthiery/
Niels Kr. Bech Jensen nkbj@image.dk
-Olivier Tharan tharan@galaxie.int-evry.fr
+ http://www.image.dk/~nkbj/
+Olivier Tharan olive@laria.u-picardie.fr
+ http://www.laria.u-picardie.fr/~olive/
+Pawel Krawczyk kravietz@ceti.pl
+ http://ceti.pl/~kravietz/
Per Andersson perand@stacken.kth.se
-Per Steinar Iversen PerSteinar.Iversen@fi.uib.no
+Per Starback starback@ling.uu.se
+ http://stp.ling.uu.se/~starback/me.html
+Per Steinar Iversen
+Peter Turcan peter.turcan@minerva-is.sk
Phyllis Frankl phyllis@morph.poly.edu
+ http://ebbets.poly.edu/~pfrankl
Pierre Gaumond gaumondp@ere.umontreal.ca
Pierre Girard pierreg@crt.umontreal.ca
Pierre Mathieu mathieu@geod.emr.ca
Povl H. Pedersen pope@netguide.dk
-Primo.B�� Peterlin peterlin@biofiz.mf.uni-lj.si
-Rejean Payette rpayette@edupac.qc.ca
+Primo.B�� Peterlin primoz.peterlin@biofiz.mf.uni-lj.si
+ http://sizif.mf.uni-lj.si/~peterlin/
+Rejean Payette rejean.payette@rtsq.qc.ca
Ricard Torres torres@upf.es
Richard Plasun plasun@iue.tuwien.ac.at
Richard Stallman rms@gnu.org
Robert Joop rj@rainbow.in-berlin.de
Roman Czyborra czyborra@cs.tu-berlin.de
Ronald C.F. Antony rcfa@cubiculum.com
+ http://www.cubiculum.com/~rcfa
Santiago Vila Doncel sanvila@unex.es
Saverio Pangoli saverio@mystere.sci.sns.it
-Sebastian Huebner cyco@lili.uni-bielefeld.de
+Sebastian Huebner cyco@baud.de
+ http://www.baud.de/cyco/
+Scott Schwartz schwartz@bio.cse.psu.edu
Slaven Rezic eserte@cs.tu-berlin.de
+ http://user.cs.tu-berlin.de/~eserte
Stefan Albertz Stefan.Albertz@rus.uni-stuttgart.de
-Stefan Haubenthal wwwsth@sx1.hrz.uni-dortmund.de
+Stefan Haubenthal haubi@geocities.com
+ http://home.pages.de/~haubi
Steinar Bang sb@metis.no
Stephane Berube berube@iro.umontreal.ca
Sumit Bose bose@physik.tu-berlin.de
Thomas Gebhardt gebhardt@hrz.uni-marburg.de
-Thomas M. Ott Labalutsch@aol.com
-Thomas Seeling Thomas.Seeling@math.uni-giessen.de
+ http://www.uni-marburg.de/hrz/mitarbeiter/gebhardt.html
+Thomas M. Ott
+Thomas Seeling
+Tom Hageman tom@basil.icce.rug.nl
Tom Tromey tromey@cygnus.com
+ http://cafe.colorado.edu/~tromey/
Ulrich Drepper drepper@gnu.org
Ulrich Windl Ulrich.Windl@rz.uni-regensburg.de
+ http://www.uni-regensburg.de/Einrichtungen/Rechenzentrum/Orientierung/Mitarbeiter/windl.html
Vern Paxson vern@ee.lbl.gov
-Vitor Duarte vad@fct.unl.pt
+Vitor Duarte vad@di.fct.unl.pt
Walter M.A��ller walt@pi4.informatik.uni-mannheim.de
-Wiel Seuskens wseuskens@siteways.nl
+Wiel Seuskens wiel@xs4all.nl
+ http://www.xs4all.nl/~wiel/
Wilhelm Zadrapa wfz@aon.at
William Bader wbader@scarecrow.csee.lehigh.edu
Wolfgang Boerner Wolfgang.Boerner@rz.uni-regensburg.de
Wolfgang Wander wwc@hermes.desy.de
-Yves Arrouye Yves.Arrouye@imag.fr
+Yves Arrouye
View
26 TODO
@@ -5,10 +5,16 @@ of these ideas, listed more or less in decreasing order of priority.
Some TODO items are implicit from received email. See file BACKLOG.
Significant contributions require written assignments and disclaimers.
-.* Notes particuli�res
+.* Before next official release
-. + Nouvelles tables RFC 1345
-. + R�vision ORA
+. + Remove TeX edition warnings, rephrase whatever required.
+. + Complete inter-node and menu references, as necessary.
+
+.* Particular notes
+
+. + Autoconf and DOSWIN
+. + New RFC 1345 tables, still many diagnostics
+. + Check notes from ORA
. @ ~/libit/rmail/m4
. @ ~/libit/rmail/gettext
@@ -45,11 +51,11 @@ Significant contributions require written assignments and disclaimers.
. + Take note that ->RFC1345 recodings are non reversible.
.* Notes about MSDOS port
-. + Un touch stamp-h a �t� n�cessaire.
-. + @PRODUCT@ et @VERSION@ n'ont pas �t� substitu�s.
-. + Remplacer PRODUCT par PACKAGE dans config_h.*.
-. + On doit avoir -DHAVE_CONFIG_H=1 (le =1 est requis).
+. + I had to `touch stamp-h'.
+. + @PRODUCT@ and @VERSION@ were not substituted.
+. + Replace PRODUCT by PACKAGE within config_h.*.
+. + One should have -DHAVE_CONFIG_H=1 (the `=1' is required).
. + charset.c:637: Maybe incorrect assignment in init_table_for_rfc1345().
-. + LIBINTL.OBJ et LOCALE.OBJ n'�taient pas compil�s.
-. + La r�gle pour compiler LIBINTL.OBJ �tait absente.
-. + readme.tcc doit devenir README.DOS en cours de route.
+. + LIBINTL.OBJ and LOCALE.OBJ were not compiled.
+. + Rule to compile LIBINTL.OBJ was missing.
+. + readme.tcc should become README.DOS as things go.
View
9 acconfig.h
@@ -1,5 +1,5 @@
/* Special definitions for GNU recode, processed by autoheader.
- Copyright © 1993, 1998 Free Software Foundation, Inc.
+ Copyright © 1993, 1998, 1999 Free Software Foundation, Inc.
François Pinard <pinard@iro.umontreal.ca>, 1993.
*/
@@ -22,8 +22,8 @@
/* Define to 1 if NLS is requested. */
#undef ENABLE_NLS
-/* Define as 1 if you have catgets and don't want to use GNU gettext. */
-#undef HAVE_CATGETS
+/* Define as 1 if you have dcgettext. */
+#undef HAVE_DCGETTEXT
/* Define as 1 if you have gettext and don't want to use GNU gettext. */
#undef HAVE_GETTEXT
@@ -34,6 +34,9 @@
/* Define to 1 if stpcpy function is available. */
#undef HAVE_STPCPY
+/* Define to the installation directory for locales. */
+#undef LOCALEDIR
+
/* Define to rpl_malloc if the replacement function should be used. */
#undef malloc
View
430 acinclude.m4
@@ -0,0 +1,430 @@
+## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
+## Copyright (C) 1996-1999 Free Software Foundation, Inc.
+## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+##
+## 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.
+
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+
+# Save cache, so that ltconfig can load it
+AC_CACHE_SAVE
+
+# Actually configure libtool. ac_aux_dir is where install-sh is found.
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+|| AC_MSG_ERROR([libtool configure failed])
+
+# Reload cache, that may have been modified by ltconfig
+AC_CACHE_LOAD
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Redirect the config.log output again, so that the ltconfig log is not
+# clobbered by the next message.
+exec 5>>./config.log
+])
+
+AC_DEFUN(AC_LIBTOOL_SETUP,
+[AC_PREREQ(2.13)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+dnl
+
+case "$target" in
+NONE) lt_target="$host" ;;
+*) lt_target="$target" ;;
+esac
+
+# Check for any special flags to pass to ltconfig.
+libtool_flags="--cache-file=$cache_file"
+test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
+[libtool_flags="$libtool_flags --enable-dlopen"])
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[libtool_flags="$libtool_flags --enable-win32-dll"])
+AC_ARG_ENABLE(libtool-lock,
+ [ --disable-libtool-lock avoid locking (might break parallel builds)])
+test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case "$lt_target" in
+*-*-irix6*)
+ # Find out which ABI we are using.
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case "`/usr/bin/file conftest.o`" in
+ *32-bit*)
+ LD="${LD-ld} -32"
+ ;;
+ *N32*)
+ LD="${LD-ld} -n32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -64"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+ [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw*)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+ AC_CHECK_TOOL(AS, as, false)
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
+ ;;
+])
+esac
+])
+
+# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+
+# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+
+# AC_ENABLE_SHARED - implement the --enable-shared flag
+# Usage: AC_ENABLE_SHARED[(DEFAULT)]
+# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
+# `yes'.
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(shared,
+changequote(<<, >>)dnl
+<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_shared=yes ;;
+no) enable_shared=no ;;
+*)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+ for pkg in $enableval; do
+ if test "X$pkg" = "X$p"; then
+ enable_shared=yes
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac],
+enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
+])
+
+# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)])
+
+# AC_ENABLE_STATIC - implement the --enable-static flag
+# Usage: AC_ENABLE_STATIC[(DEFAULT)]
+# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
+# `yes'.
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(static,
+changequote(<<, >>)dnl
+<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_static=yes ;;
+no) enable_static=no ;;
+*)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+ for pkg in $enableval; do
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac],
+enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
+])
+
+# AC_DISABLE_STATIC - set the default static flag to --disable-static
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)])
+
+
+# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
+# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
+# `yes'.
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(fast-install,
+changequote(<<, >>)dnl
+<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_fast_install=yes ;;
+no) enable_fast_install=no ;;
+*)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+ for pkg in $enableval; do
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac],
+enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
+])
+
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)])
+
+# AC_PROG_LD - find the path to the GNU or non-GNU linker
+AC_DEFUN(AC_PROG_LD,
+[AC_ARG_WITH(gnu-ld,
+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ac_prog=ld
+if test "$ac_cv_prog_gcc" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ AC_MSG_CHECKING([for ld used by GCC])
+ ac_prog=`($CC -print-prog-name=ld) 2>&5`
+ case "$ac_prog" in
+ # Accept absolute paths.
+changequote(,)dnl
+ [\\/]* | [A-Za-z]:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ AC_MSG_CHECKING([for GNU ld])
+else
+ AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(ac_cv_path_LD,
+[if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ ac_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+ test "$with_gnu_ld" != no && break
+ else
+ test "$with_gnu_ld" != yes && break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+else
+ ac_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$ac_cv_path_LD"
+if test -n "$LD"; then
+ AC_MSG_RESULT($LD)
+else
+ AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_PROG_LD_GNU
+])
+
+AC_DEFUN(AC_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+ ac_cv_prog_gnu_ld=yes
+else
+ ac_cv_prog_gnu_ld=no
+fi])
+])
+
+# AC_PROG_NM - find the path to a BSD-compatible name lister
+AC_DEFUN(AC_PROG_NM,
+[AC_MSG_CHECKING([for BSD-compatible nm])
+AC_CACHE_VAL(ac_cv_path_NM,
+[if test -n "$NM"; then
+ # Let the user override the test.
+ ac_cv_path_NM="$NM"
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
+ # Check to see if the nm accepts a BSD-compat flag.
+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+ ac_cv_path_NM="$ac_dir/nm -B"
+ break
+ elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+ ac_cv_path_NM="$ac_dir/nm -p"
+ break
+ else
+ ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+ continue # so that we can try to find one that supports BSD flags
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+fi])
+NM="$ac_cv_path_NM"
+AC_MSG_RESULT([$NM])
+])
+
+# AC_CHECK_LIBM - check for math library
+AC_DEFUN(AC_CHECK_LIBM,
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case "$lt_target" in
+*-*-beos* | *-*-cygwin*)
+ # These system don't have libm
+ ;;
+*-ncr-sysv4.3*)
+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+ AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
+ ;;
+*)
+ AC_CHECK_LIB(m, main, LIBM="-lm")
+ ;;
+esac
+])
+
+# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'. Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ case "$enable_ltdl_convenience" in
+ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+ "") enable_ltdl_convenience=yes
+ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+ esac
+ LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+ INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
+])
+
+# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'. Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_CHECK_LIB(ltdl, main,
+ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+ [if test x"$enable_ltdl_install" = xno; then
+ AC_MSG_WARN([libltdl not installed, but installation disabled])
+ else
+ enable_ltdl_install=yes
+ fi
+ ])
+ if test x"$enable_ltdl_install" = x"yes"; then
+ ac_configure_args="$ac_configure_args --enable-ltdl-install"
+ LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+ INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
+ else
+ ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+ LIBLTDL="-lltdl"
+ INCLTDL=
+ fi
+])
+
+dnl old names
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
+
+dnl This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])dnl
View
490 aclocal.m4
@@ -10,158 +10,6 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated. We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
- case " <<$>>CONFIG_HEADERS " in
- *" <<$>>am_file "*<<)>>
- echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
- ;;
- esac
- am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
-
-# Do all the work for Automake. This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN(AM_SANITY_CHECK,
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
- if test "[$]*" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftestfile`
- fi
- if test "[$]*" != "X $srcdir/configure conftestfile" \
- && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
- test "[$]2" = conftestfile
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
- $1=$2
- AC_MSG_RESULT(found)
-else
- $1="$3/missing $2"
- AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-
-# Single argument says where are built sources to test, relative to the
-# built test directory. Maybe omitted if the same (flat distribution).
-
-AC_DEFUN(AT_CONFIG,
-[AT_TESTPATH=ifelse($1, , ., $1)
-AC_SUBST(AT_TESTPATH)
-fp_PROG_ECHO
-])
-
-
-# Once this macro is called, you may output with no echo in a Makefile or
-# script using: echo @ECHO_N@ "STRING_TO_OUTPUT@ECHO_C@".
-
-AC_DEFUN(fp_PROG_ECHO,
-[AC_CACHE_CHECK(how to suppress newlines using echo, fp_cv_prog_echo_nonl,
-[if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
- fp_cv_prog_echo_nonl=no
- else
- fp_cv_prog_echo_nonl=option
- fi
-else
- fp_cv_prog_echo_nonl=escape
-fi
-])
-test $fp_cv_prog_echo_nonl = no \
- && echo 2>&1 "WARNING: \`echo' not powerful enough for \`make check'"
-case $fp_cv_prog_echo_nonl in
- no) ECHO_N= ECHO_C= ;;
- option) ECHO_N=-n ECHO_C= ;;
- escape) ECHO_N= ECHO_C='\c' ;;
-esac
-AC_SUBST(ECHO_N)dnl
-AC_SUBST(ECHO_C)dnl
-])
-
# serial 40 AC_PROG_LIBTOOL
AC_DEFUN(AC_PROG_LIBTOOL,
@@ -176,7 +24,7 @@ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
|| AC_MSG_ERROR([libtool configure failed])
# Reload cache, that may have been modified by ltconfig
@@ -208,6 +56,11 @@ AC_REQUIRE([AC_PROG_NM])dnl
AC_REQUIRE([AC_PROG_LN_S])dnl
dnl
+case "$target" in
+NONE) lt_target="$host" ;;
+*) lt_target="$target" ;;
+esac
+
# Check for any special flags to pass to ltconfig.
libtool_flags="--cache-file=$cache_file"
test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
@@ -226,7 +79,7 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
-case "$host" in
+case "$lt_target" in
*-*-irix6*)
# Find out which ABI we are using.
echo '[#]line __oline__ "configure"' > conftest.$ac_ext
@@ -442,7 +295,6 @@ else
AC_MSG_RESULT(no)
fi
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_SUBST(LD)
AC_PROG_LD_GNU
])
@@ -488,14 +340,13 @@ else
fi])
NM="$ac_cv_path_NM"
AC_MSG_RESULT([$NM])
-AC_SUBST(NM)
])
# AC_CHECK_LIBM - check for math library
AC_DEFUN(AC_CHECK_LIBM,
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
-case "$host" in
+case "$lt_target" in
*-*-beos* | *-*-cygwin*)
# These system don't have libm
;;
@@ -568,6 +419,158 @@ AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
dnl This is just to silence aclocal about the macro not being used
ifelse([AC_DISABLE_FAST_INSTALL])dnl
+# Like AC_CONFIG_HEADER, but automatically create stamp file.
+
+AC_DEFUN(AM_CONFIG_HEADER,
+[AC_PREREQ([2.12])
+AC_CONFIG_HEADER([$1])
+dnl When config.status generates a header, we must update the stamp-h file.
+dnl This file resides in the same directory as the config header
+dnl that is generated. We must strip everything past the first ":",
+dnl and everything past the last "/".
+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
+ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
+<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
+<<am_indx=1
+for am_file in <<$1>>; do
+ case " <<$>>CONFIG_HEADERS " in
+ *" <<$>>am_file "*<<)>>
+ echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
+ ;;
+ esac
+ am_indx=`expr "<<$>>am_indx" + 1`
+done<<>>dnl>>)
+changequote([,]))])
+
+# Do all the work for Automake. This macro actually does too much --
+# some checks are only needed if your package does certain things.
+# But this isn't really a big deal.
+
+# serial 1
+
+dnl Usage:
+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
+PACKAGE=[$1]
+AC_SUBST(PACKAGE)
+VERSION=[$2]
+AC_SUBST(VERSION)
+dnl test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+ifelse([$3],,
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
+dnl FIXME This is truly gross.
+missing_dir=`cd $ac_aux_dir && pwd`
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AC_REQUIRE([AC_PROG_MAKE_SET])])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+AC_DEFUN(AM_SANITY_CHECK,
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftestfile
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+ if test "[$]*" = "X"; then
+ # -L didn't work.
+ set X `ls -t $srcdir/configure conftestfile`
+ fi
+ if test "[$]*" != "X $srcdir/configure conftestfile" \
+ && test "[$]*" != "X conftestfile $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+alias in your environment])
+ fi
+
+ test "[$]2" = conftestfile
+ )
+then
+ # Ok.
+ :
+else
+ AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+rm -f conftest*
+AC_MSG_RESULT(yes)])
+
+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
+dnl The program must properly implement --version.
+AC_DEFUN(AM_MISSING_PROG,
+[AC_MSG_CHECKING(for working $2)
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf. Sigh.
+if ($2 --version) < /dev/null > /dev/null 2>&1; then
+ $1=$2
+ AC_MSG_RESULT(found)
+else
+ $1="$3/missing $2"
+ AC_MSG_RESULT(missing)
+fi
+AC_SUBST($1)])
+
+
+# Single argument says where are built sources to test, relative to the
+# built test directory. Maybe omitted if the same (flat distribution).
+
+AC_DEFUN(AT_CONFIG,
+[AT_TESTPATH=ifelse($1, , ., $1)
+AC_SUBST(AT_TESTPATH)
+fp_PROG_ECHO
+])
+
+
+# Once this macro is called, you may output with no echo in a Makefile or
+# script using: echo @ECHO_N@ "STRING_TO_OUTPUT@ECHO_C@".
+
+AC_DEFUN(fp_PROG_ECHO,
+[AC_CACHE_CHECK(how to suppress newlines using echo, fp_cv_prog_echo_nonl,
+[if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+ if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+ fp_cv_prog_echo_nonl=no
+ else
+ fp_cv_prog_echo_nonl=option
+ fi
+else
+ fp_cv_prog_echo_nonl=escape
+fi
+])
+test $fp_cv_prog_echo_nonl = no \
+ && echo 2>&1 "WARNING: \`echo' not powerful enough for \`make check'"
+case $fp_cv_prog_echo_nonl in
+ no) ECHO_N= ECHO_C= ;;
+ option) ECHO_N=-n ECHO_C= ;;
+ escape) ECHO_N= ECHO_C='\c' ;;
+esac
+AC_SUBST(ECHO_N)dnl
+AC_SUBST(ECHO_C)dnl
+])
+
# serial 1
@@ -687,20 +690,6 @@ AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
AC_PROG_LEX
AC_DECL_YYTEXT])
-
-AC_DEFUN(fp_OS_MICROSOFT,
-[AC_CACHE_CHECK([for MSDOS, Win95 or WinNT], fp_cv_os_microsoft,
-[if test -n "$COMSPEC"; then
- # MSDOS or Win95
- fp_cv_os_microsoft=yes
-elif test -n "$ComSpec"; then
- # WinNT
- fp_cv_os_microsoft=yes
-else
- fp_cv_os_microsoft=no
-fi
-])])
-
#serial 1
dnl From Jim Meyering.
@@ -792,6 +781,20 @@ AC_DEFUN(jm_FUNC_REALLOC,
])
+AC_DEFUN(fp_OS_MICROSOFT,
+[AC_CACHE_CHECK([for MSDOS, Win95 or WinNT], fp_cv_os_microsoft,
+[if test -n "$COMSPEC"; then
+ # MSDOS or Win95
+ fp_cv_os_microsoft=yes
+elif test -n "$ComSpec"; then
+ # WinNT
+ fp_cv_os_microsoft=yes
+else
+ fp_cv_os_microsoft=no
+fi
+])])
+
+
# serial 1
AC_DEFUN(AM_WITH_DMALLOC,
@@ -810,6 +813,138 @@ else
fi], [AC_MSG_RESULT(no)])
])
+# Select gettext and choose translations to install. -*- shell-script -*-
+# Fran�ois Pinard <pinard@iro.umontreal.ca>, 1998.
+
+# Here is a check list about how one could use this macro.
+# - In the build directory, execute `make distclean'.
+# - Rename `po/' to `i18n/'.
+# - Recursively delete directory `intl/'.
+# - Add the following files:
+# . `i18n/Makefile.am'
+# . `m4/gettext.m4'
+# . `lib/gettext.c'
+# . `lib/gettext.h'.
+# - In top level `configure.in':
+# . use `fp_WITH_GETTEXT'.
+# . delete `AM_GNU_GETTEXT' and any `AC_LINK_FILES' for $nls variables.
+# . add `i18n/Makefile' to `AC_OUTPUT'.
+# . delete `intl/Makefile' and `po/Makefile.in' from `AC_OUTPUT'.
+# - In top level `Makefile.am':
+# . add `i18n' in SUBDIRS, and remove `intl' and `po'.
+# . define `POTFILES' (peek at previous `i18n/POTFILES.in).
+# . add `$(srcdir)/stamp-pot' to `all-local'.
+# . add rule for `$(srcdir)/stamp-pot'.
+# - In top level `acconfig.h':
+# . document `HAVE_DCGETTEXT' and `LOCALEDIR'.
+# . delete documentation for `HAVE_CATGETS'.
+# - In `lib/Makefile.am':
+# . add `gettext.c' to `EXTRA_DIST'.
+# . add `gettext.h' to `noinstl_HEADERS'.
+# . add definitions for `localdir' and `aliaspath'.
+# . add special rules for `gettext.o' and `gettext._o'.
+# - In `m4/Makefile.am':
+# . add `gettext.m4' to `EXTRA_DIST'.
+# - In `src/Makefile.am':
+# . delete `-I/..intl' from `INCLUDES'.
+# . delete `@INTLLIBS@' from `LDADD'.
+# . delete `localedir' and its references.
+# - Clean up directory `i18n/':
+# . delete `Makefile.in.in' and `POTFILES.in'.
+# . delete all `*.gmo' files, `cat-id-tbl.c' and `stamp-cat-id'.
+# - In the top level distribution directory:
+# . run `aclocal -I m4'.
+# . run `autoreconf'.
+# - In the build directory:
+# . run `$top_srcdir/configure'.
+# . run `make check'.
+
+AC_DEFUN(fp_WITH_GETTEXT, [
+
+ AC_MSG_CHECKING(whether NLS is wanted)
+ AC_ARG_ENABLE(nls,
+ [ --disable-nls disallow Native Language Support],
+ enable_nls=$enableval, enable_nls=yes)
+ AC_MSG_RESULT($enable_nls)
+ use_nls=$enable_nls
+ AM_CONDITIONAL(USE_NLS, test $use_nls = yes)
+
+ if test $enable_nls = yes; then
+ AC_DEFINE(ENABLE_NLS)
+
+ AC_ARG_WITH(catgets,
+ [ --with-catgets say that catgets is not supported],
+ [AC_MSG_WARN([catgets not supported, --with-catgets ignored])])
+
+ AC_CHECK_FUNCS(gettext)
+ AC_CHECK_LIB(intl, gettext, :)
+ if test $ac_cv_lib_intl_gettext$ac_cv_func_gettext != nono; then
+ AC_MSG_CHECKING(whether the included gettext is preferred)
+ AC_ARG_WITH(included-gettext,
+ [ --without-included-gettext avoid our provided version of gettext],
+ with_included_gettext=$withval, with_included_gettext=yes)
+ AC_MSG_RESULT($with_included_gettext)
+ if test $with_included_gettext$ac_cv_func_gettext = nono; then
+ LIBS="$LIBS -lintl"
+ fi
+ else
+ with_included_gettext=yes
+ fi
+ if test $with_included_gettext = yes; then
+ LIBOBJS="$LIBOBJS gettext.o"
+ AC_DEFINE(HAVE_GETTEXT)
+ AC_DEFINE(HAVE_DCGETTEXT)
+ else
+ AC_CHECK_HEADERS(libintl.h)
+ AC_CHECK_FUNCS(dcgettext gettext)
+ fi
+
+ AC_CHECK_HEADERS(locale.h)
+ AC_CHECK_FUNCS(getcwd setlocale stpcpy)
+ AM_LC_MESSAGES
+
+ if test -z "$ALL_LINGUAS"; then
+ AC_MSG_WARN(This package does not install translations yet.)
+ else
+ ac_items="$ALL_LINGUAS"
+ for ac_item in $ac_items; do
+ ALL_POFILES="$ALL_POFILES $ac_item.po"
+ ALL_MOFILES="$ALL_MOFILES $ac_item.mo"
+ done
+ fi
+ AC_SUBST(ALL_LINGUAS)
+ AC_SUBST(ALL_POFILES)
+ AC_SUBST(ALL_MOFILES)
+
+ AC_MSG_CHECKING(which translations to install)
+ if test -z "$LINGUAS"; then
+ ac_print="$ALL_LINGUAS"
+ MOFILES="$ALL_MOFILES"
+ else
+ ac_items="$LINGUAS"
+ for ac_item in $ac_items; do
+ case "$ALL_LINGUAS" in
+ *$ac_item*)
+ ac_print="$ac_print $ac_item"
+ MOFILES="$MOFILES $ac_item.mo"
+ ;;
+ esac
+ done
+ fi
+ AC_SUBST(MOFILES)
+ if test -z "$ac_print"; then
+ AC_MSG_RESULT(none)
+ else
+ AC_MSG_RESULT($ac_print)
+ fi
+
+ if test "x$prefix" = xNONE; then
+ AC_DEFINE_UNQUOTED(LOCALEDIR, "$ac_default_prefix/share/locale")
+ else
+ AC_DEFINE_UNQUOTED(LOCALEDIR, "$prefix/share/locale")
+ fi
+ fi])
+
# Macro to add for using GNU gettext.
# Ulrich Drepper <drepper@cygnus.com>, 1995.
#
@@ -1194,3 +1329,16 @@ AC_DEFUN(AM_LC_MESSAGES,
fi
fi])
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
+fi])
+
View
94 config.guess
@@ -24,7 +24,7 @@
# Written by Per Bothner <bothner@cygnus.com>.
# The master version of this file is at the FSF in /home/gd/gnu/lib.
-# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
+# Please send patches to <autoconf-patches@gnu.org>.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
@@ -156,6 +156,9 @@ EOF
wgrisc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+ exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit 0;;
@@ -328,15 +331,18 @@ EOF
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
- -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
+ then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ [ ${TARGET_BINARY_INTERFACE}x = x ]
+ then
echo m88k-dg-dgux${UNAME_RELEASE}
- else
+ else
echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ fi
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
fi
- else echo i586-dg-dgux${UNAME_RELEASE}
- fi
exit 0 ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
@@ -453,7 +459,7 @@ EOF
exit (0);
}
EOF
- ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+ (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
rm -f $dummy.c $dummy
esac
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -550,7 +556,7 @@ EOF
echo t90-cray-unicos${UNAME_RELEASE}
exit 0 ;;
CRAY*T3E:*:*:*)
- echo t3e-cray-unicosmk${UNAME_RELEASE}
+ echo alpha-cray-unicosmk${UNAME_RELEASE}
exit 0 ;;
CRAY-2:*:*:*)
echo cray2-cray-unicos
@@ -588,7 +594,7 @@ EOF
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
*:NetBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
exit 0 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
@@ -618,12 +624,6 @@ EOF
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;
*:Linux:*:*)
- # uname on the ARM produces all sorts of strangeness, and we need to
- # filter it out.
- case "$UNAME_MACHINE" in
- armv*) UNAME_MACHINE=$UNAME_MACHINE ;;
- arm* | sa110*) UNAME_MACHINE="arm" ;;
- esac
# 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
@@ -636,11 +636,38 @@ EOF
s/ .*//
p'`
case "$ld_supported_emulations" in
- i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
- i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
- sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
- armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
- m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+ *ia64)
+ echo "${UNAME_MACHINE}-unknown-linux"
+ exit 0
+ ;;
+ i?86linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit 0
+ ;;
+ i?86coff)
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ exit 0
+ ;;
+ sparclinux)
+ echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+ exit 0
+ ;;
+ armlinux)
+ echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+ exit 0
+ ;;
+ elf32arm*)
+ echo "${UNAME_MACHINE}-unknown-linux-gnu"
+ exit 0
+ ;;
+ armelf_linux*)
+ echo "${UNAME_MACHINE}-unknown-linux-gnu"
+ exit 0
+ ;;
+ m68klinux)
+ echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+ exit 0
+ ;;
elf32ppc)
# Determine Lib Version
cat >$dummy.c <<EOF
@@ -670,7 +697,9 @@ EOF
fi
fi
rm -f $dummy.c $dummy
- echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
+ echo powerpc-unknown-linux-gnu${LIBC}
+ exit 0
+ ;;
esac
if test "${UNAME_MACHINE}" = "alpha" ; then
@@ -797,19 +826,21 @@ EOF
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;;
i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
exit 0 ;;
i?86:*:5:7*)
- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
- (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
+ # Fixed at (any) Pentium or better
+ UNAME_MACHINE=i586
+ if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+ echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+ else
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+ fi
exit 0 ;;
i?86:*:3.2:*)
if test -f /usr/options/cb.name; then
@@ -943,6 +974,9 @@ EOF
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
+ *:QNX:*:4*)
+ echo i386-qnx-qnx${UNAME_VERSION}
+ exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
View
70 config.h.in
@@ -26,9 +26,6 @@
/* Define if you don't have vprintf but do have _doprnt. */
#undef HAVE_DOPRNT
-/* Define if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
/* Define if you have the vprintf function. */
#undef HAVE_VPRINTF
@@ -38,9 +35,6 @@
/* Define if on MINIX. */
#undef _MINIX
-/* Define to `long' if <sys/types.h> doesn't define. */
-#undef off_t
-
/* Define if the system does not provide POSIX.1 features except
with this defined. */
#undef _POSIX_1_SOURCE
@@ -51,9 +45,6 @@
/* Define as the return type of signal handlers (int or void). */
#undef RETSIGTYPE
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-#undef size_t
-
/* 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.
@@ -79,8 +70,8 @@
/* Define to 1 if NLS is requested. */
#undef ENABLE_NLS
-/* Define as 1 if you have catgets and don't want to use GNU gettext. */
-#undef HAVE_CATGETS
+/* Define as 1 if you have dcgettext. */
+#undef HAVE_DCGETTEXT
/* Define as 1 if you have gettext and don't want to use GNU gettext. */
#undef HAVE_GETTEXT
@@ -88,8 +79,8 @@
/* Define if your locale.h file contains LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
-/* Define to 1 if stpcpy function is available. */
-#undef HAVE_STPCPY
+/* Define to the installation directory for locales. */
+#undef LOCALEDIR
/* Define to rpl_malloc if the replacement function should be used. */
#undef malloc
@@ -103,15 +94,6 @@
/* Define if you have the DONE_WORKING_REALLOC_CHECK function. */
#undef HAVE_DONE_WORKING_REALLOC_CHECK
-/* Define if you have the __argz_count function. */
-#undef HAVE___ARGZ_COUNT
-
-/* Define if you have the __argz_next function. */
-#undef HAVE___ARGZ_NEXT
-
-/* Define if you have the __argz_stringify function. */
-#undef HAVE___ARGZ_STRINGIFY
-
/* Define if you have the dcgettext function. */
#undef HAVE_DCGETTEXT
@@ -121,41 +103,29 @@
/* Define if you have the getcwd function. */
#undef HAVE_GETCWD
-/* Define if you have the getpagesize function. */
-#undef HAVE_GETPAGESIZE
-
-/* Define if you have the munmap function. */
-#undef HAVE_MUNMAP
-
-/* Define if you have the putenv function. */
-#undef HAVE_PUTENV
+/* Define if you have the gettext function. */
+#undef HAVE_GETTEXT
/* Define if you have the rename function. */
#undef HAVE_RENAME
-/* Define if you have the setenv function. */
-#undef HAVE_SETENV
-
/* Define if you have the setlocale function. */
#undef HAVE_SETLOCALE
/* Define if you have the stpcpy function. */
#undef HAVE_STPCPY
-/* Define if you have the strcasecmp function. */
-#undef HAVE_STRCASECMP
-
-/* Define if you have the strchr function. */
-#undef HAVE_STRCHR
-
-/* Define if you have the strdup function. */
-#undef HAVE_STRDUP
-
/* Define if you have the strerror function. */
#undef HAVE_STRERROR
-/* Define if you have the <argz.h> header file. */
-#undef HAVE_ARGZ_H
+/* Define if you have the strtol function. */
+#undef HAVE_STRTOL
+
+/* Define if you have the strtoul function. */
+#undef HAVE_STRTOUL
+
+/* Define if you have the <libintl.h> header file. */
+#undef HAVE_LIBINTL_H
/* Define if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
@@ -163,30 +133,18 @@
/* Define if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
-/* Define if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define if you have the <nl_types.h> header file. */
-#undef HAVE_NL_TYPES_H
-
/* Define if you have the <stdbool.h> header file. */
#undef HAVE_STDBOOL_H
/* Define if you have the <string.h> header file. */
#undef HAVE_STRING_H
-/* Define if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
/* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define if you have the <utime.h> header file. */
#undef HAVE_UTIME_H
-/* Define if you have the i library (-li). */
-#undef HAVE_LIBI
-
/* Name of package */
#undef PACKAGE
View
45 config.sub
@@ -105,7 +105,7 @@ case $os in
-scout)
;;
-wrs)
- os=vxworks
+ os=-vxworks
basic_machine=$1
;;
-hiux*)
@@ -156,13 +156,17 @@ case $os in
-psos*)
os=-psos
;;
+ -mint | -mint[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
esac
# Decode aliases for certain CPU-COMPANY combinations.
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
- tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+ tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
| 580 | i960 | h8300 \
| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
@@ -171,12 +175,12 @@ case $basic_machine in
| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
| mips64orion | mips64orionel | mipstx39 | mipstx39el \
| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
- | mips64vr5000 | miprs64vr5000el \
+ | mips64vr5000 | miprs64vr5000el | mcore \
| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
- | thumb | d10v)
+ | thumb | d10v | fr30)
basic_machine=$basic_machine-unknown
;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
;;
# We use `pc' rather than `unknown'
@@ -191,7 +195,8 @@ case $basic_machine in
exit 1
;;
# Recognize the basic CPU types with company name.
- vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+ # FIXME: clean up the formatting here.
+ vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
@@ -204,10 +209,10 @@ case $basic_machine in
| sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
| mips64el-* | mips64orion-* | mips64orionel-* \
| mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
- | mipstx39-* | mipstx39el-* \
+ | mipstx39-* | mipstx39el-* | mcore-* \
| f301-* | armv*-* | t3e-* \
| m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
- | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
+ | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
@@ -425,7 +430,6 @@ case $basic_machine in
;;
i370-ibm* | ibm*)
basic_machine=i370-ibm
- os=-mvs
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i[34567]86v32)
@@ -460,6 +464,9 @@ case $basic_machine in
basic_machine=i386-unknown
os=-mingw32
;;
+ i386-qnx | qnx)