diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.in | 497 | ||||
| -rw-r--r-- | NEWS | 38 | ||||
| -rw-r--r-- | README | 13 | ||||
| -rw-r--r-- | THANKS | 14 | ||||
| -rw-r--r-- | TODO | 76 | ||||
| -rw-r--r-- | acconfig.h | 42 | ||||
| -rw-r--r-- | aclocal.m4 | 418 | ||||
| -rw-r--r-- | config.h.in | 156 | ||||
| -rwxr-xr-x | configure | 2590 | ||||
| -rw-r--r-- | configure.in | 149 | ||||
| -rwxr-xr-x | idtest | 53 |
12 files changed, 3142 insertions, 914 deletions
@@ -1,13 +1,3 @@ -Wed Mar 1 11:21:37 1995 Greg McGary <gkm@magilla.cichlid.com> - - * idtest: Write to temp dir rather than current directory - (Thanks, Simon Leinen). - -Mon Feb 27 18:43:56 1995 Greg McGary <gkm@magilla.cichlid.com> - - * Makefile.in (DIST_DOC_FILES): Removed unsupported man pages. - (DIST_MISC_FILES): Added symfunc.el. - Sat Feb 25 16:23:49 1995 Greg McGary <gkm@magilla.cichlid.com> * Version 3.0.8 released. diff --git a/Makefile.in b/Makefile.in index bfb16f7..8cdf6a4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,320 +1,283 @@ -# Main Makefile for `mkid'. +# Makefile.in generated automatically by automake 1.0 from Makefile.am -# Copyright (C) 1986, 1995 Greg McGary +# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. -# 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, 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. +SHELL = /bin/sh -# You should have received a copy of the GNU General Public License -# along with this program; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ -############################################################################## +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ -PREV_VERSION = @PREV_VERSION@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ -SHELL = /bin/sh -VPATH = @srcdir@ -@SET_MAKE@ - -prefix = @prefix@ -srcdir = @srcdir@ -exec_prefix = @exec_prefix@ -bindir = $(exec_prefix)/bin -infodir = $(prefix)/info -datadir = @datadir@ +top_builddir = . -############################################################################## - -CC = @CC@ -YACC = @YACC@ -LN_S = @LN_S@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ +INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -ANSI2KNR = @ANSI2KNR@ -MAKEINFO = makeinfo -TEXI2DVI = texi2dvi -TOUCH = echo timestamp > - -CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -DEFS = @DEFS@ -IID_HELP_FILE = @IID_HELP_FILE@ -DEPEND = @DEPEND@ - -REGEXP = @REGEXP@ -STRCASECMP = @STRCASECMP@ -LIB_OFILES = error$o @ALLOCA@ @GETOPT@ @STRERROR@ - -############################################################################## - -TARGETS = $(PROGRAMS) $(LID_LINKS) -PROGRAMS = mkid lid fid idx iid -LID_LINKS = eid aid gid pid - -######################################## - -MKID_OFILES = mkid$o misc$o scanners$o idfile$o filenames$o bitops$o hash$o $(LIB_OFILES) -LID_OFILES = lid$o misc$o idfile$o filenames$o bitops$o token$o $(REGEXP) $(LIB_OFILES) -FID_OFILES = fid$o misc$o idfile$o filenames$o bitops$o token$o $(LIB_OFILES) -IDX_OFILES = idx$o scanners$o filenames$o misc$o $(LIB_OFILES) -IID_OFILES = iid$o $(STRCASECMP) $(LIB_OFILES) - -ALL_OFILES = $(MKID_OFILES) $(LID_OFILES) $(FID_OFILES) $(IDX_OFILES) $(IID_OFILES) - -######################################## - -SRC_YFILES = iid.y -GEN_CFILES = iid.c - -SRC_CFILES = mkid.c lid.c fid.c idx.c misc.c scanners.c idfile.c \ - filenames.c bitops.c token.c -LIB_CFILES = regex.c alloca.c getopt.c getopt1.c strcasecmp.c strerror.c -ALL_CFILES = $(SRC_CFILES) $(LIB_CFILES) $(GEN_CFILES) - -SRC_HFILES = alloc.h bitops.h filenames.h hash.h \ - idfile.h misc.h scanners.h strxtra.h token.h -LIB_HFILES = regex.h getopt.h - -TAG_SRC_FILES = $(SRC_HFILES) $(LIB_HFILES) $(SRC_CFILES) $(LIB_CFILES) $(SRC_YFILES) -DIST_SRC_FILES= $(ALL_CFILES) $(SRC_HFILES) $(LIB_HFILES) $(SRC_YFILES) - -INFO_FILES = id.info -DIST_DOC_FILES= id.texinfo version.texi stamp-vti $(INFO_FILES) iid.help texinfo.tex -DIST_CONF_FILES=aclocal.m4 acconfig.h configure.in Makefile.in mkdirhier install-sh \ - stamp-h.in config.h.in configure $(DEPEND) ansi2knr.c ansi2knr.1 -DIST_MISC_FILES=COPYING README README.alpha-test INSTALL NEWS TODO THANKS \ - idtest gid.el symfunc.el ChangeLog - -DIST_FILES = $(DIST_CONF_FILES) $(DIST_SRC_FILES) $(DIST_DOC_FILES) $(DIST_MISC_FILES) -DIFF_EXCLUDE = -x iid.c -x '*.info*' - -######################################## - -DIST_DIR = $(PACKAGE)-$(VERSION) -DIST_TGZ = $(DIST_DIR).tar.gz -DIST_UU = $(DIST_TGZ).uu -DIST_SHAR = $(DIST_DIR).shar - -OLD_DIST_DIR = $(PACKAGE)-$(PREV_VERSION) - -CDIFF_GZ = $(OLD_DIST_DIR)-$(VERSION).diff.gz -UDIFF_GZ = $(OLD_DIST_DIR)-$(VERSION).udiff.gz -CDIFF_UU = $(CDIFF_GZ).uu - -############################################################################## - -.PRECIOUS: $(DEPEND) Makefile configure config.h config.h.in - -.SUFFIXES: -.SUFFIXES: .c .i ._c ._i ._o .o +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ -o = .@U@o -INCLUDES = -I. -I$(srcdir) -CC_FLAGS = $(DEFS) $(CPPFLAGS) $(INCLUDES) $(CFLAGS) -LINK = $(CC) $(LDFLAGS) -o $@ -COMPILE = $(CC) -c $(CC_FLAGS) -PRE_PROCESS = $(CPP) $(CC_FLAGS) +SUBDIRS = lib intl src doc po -######################################## +TESTS = idtest -# This is a convenient diagnostic aid: get a cpp'ed foo.c with "make foo.i" -.c.i: - $(PRE_PROCESS) $< >$@ -.c.o: - $(COMPILE) $< +EXTRA_DIST = idtest @README_ALPHA@ +ACLOCAL = aclocal.m4 +ACCONFIG = acconfig.h +CONFIG_HEADER_IN = config.h.in +mkinstalldirs = $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ./config.h +DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \ +Makefile.am Makefile.in NEWS README THANKS TODO acconfig.h aclocal.m4 \ +config.h.in configure configure.in install-sh mkinstalldirs stamp-h.in -######################################## -.c._c: - ./ansi2knr $< > $@.tmp && mv $@.tmp $@ -._c._o: - @echo $(COMPILE) $< - @rm -f _$*.c - @ln $< _$*.c && $(COMPILE) _$*.c && mv _$*.o $@ && rm _$*.c -.c._o: - ./ansi2knr $< > $*._c.tmp && mv $*._c.tmp $*._c - @echo $(COMPILE) $*._c - @rm -f _$*.c - @ln $*._c _$*.c && $(COMPILE) _$*.c && mv _$*.o $@ && rm _$*.c +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ -._c._i: - @echo $(PRE_PROCESS) $< - @rm -f _$*.c - @ln $< _$*.c && $(PRE_PROCESS) _$*.c >$@ -.c._i: - ./ansi2knr $< > $*._c.tmp && mv $*._c.tmp $*._c - @echo $(PRE_PROCESS) $*._c - @rm -f _$*.c - @ln $*._c _$*.c && $(PRE_PROCESS) _$*.c >$@ +DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \ + $(TEXINFOS) $(INFOS) $(MANS) $(EXTRA_DIST) $(DATA) +DEP_DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \ + $(TEXINFOS) $(INFO_DEPS) $(MANS) $(EXTRA_DIST) $(DATA) -############################################################################## +TAR = tar +default: all -all: $(TARGETS) -mkid: $(MKID_OFILES) - $(LINK) $(MKID_OFILES) $(LIBS) +$(srcdir)/Makefile.in: @MAINT@Makefile.am configure.in + cd $(srcdir) && automake Makefile -lid: $(LID_OFILES) - $(LINK) $(LID_OFILES) $(LIBS) +# For an explanation of the following Makefile rules, see node +# `Automatic Remaking' in GNU Autoconf documentation. +Makefile: Makefile.in config.status + CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status +config.status: configure + ./config.status --recheck +$(srcdir)/configure: @MAINT@configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && autoconf -fid: $(FID_OFILES) - $(LINK) $(FID_OFILES) $(LIBS) +$(CONFIG_HEADER): @MAINT@stamp-h +stamp-h: $(CONFIG_HEADER_IN) config.status + CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER) ./config.status + @echo timestamp > stamp-h +$(srcdir)/$(CONFIG_HEADER_IN): @MAINT@stamp-h.in +$(srcdir)/stamp-h.in: configure.in $(ACLOCAL) $(ACCONFIG) $(CONFIG_TOP) $(CONFIG_BOT) + cd $(srcdir) && autoheader + echo timestamp > $(srcdir)/stamp-h.in -idx: $(IDX_OFILES) - $(LINK) $(IDX_OFILES) $(LIBS) +# 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. -iid: $(IID_OFILES) - $(LINK) $(IID_OFILES) $(LIBS) +@SET_MAKE@ -$(LID_LINKS): lid - rm -f $@; $(LN_S) lid $@ +all-recursive install-data-recursive install-exec-recursive \ +installdirs-recursive install-recursive uninstall-recursive \ +check-recursive installcheck-recursive info-recursive dvi-recursive \ +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + for subdir in $(SUBDIRS); do \ + target=`echo $@ | sed s/-recursive//`; \ + echo making $$target in $$subdir; \ + (cd $$subdir && $(MAKE) $$target) \ + || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" -iid.c: iid.y - $(YACC) $(srcdir)/iid.y && mv -f y.tab.c $@ +tags: TAGS -######################################## +tags-recursive: + list="$(SUBDIRS)"; for subdir in $$list; do \ + (cd $$subdir && $(MAKE) tags); \ + done -$(ALL_OFILES): $(ANSI2KNR) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(CONFIG_HEADER) \ + $(TAGS_DEPENDENCIES) + tags=; \ + here=`pwd`; \ + for subdir in $(SUBDIRS); do \ + test -f $$subdir/TAGS && { \ + tags="$$tags -i $$here/$$subdir/TAGS"; \ + } \ + done; \ + test -z "$(ETAGS_ARGS)$(CONFIG_HEADER)$(SOURCES)$(HEADERS)$$tags" \ + || etags $(ETAGS_ARGS) $$tags $(CONFIG_HEADER) $(SOURCES) $(HEADERS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(PACKAGE)-$(VERSION) +# 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 + rm -rf $(distdir) + $(TAR) zxf $(distdir).tar.gz + mkdir $(distdir)/=build + mkdir $(distdir)/=inst + dc_install_base=`cd $(distdir)/=inst && pwd`; \ + cd $(distdir)/=build \ + && ../configure --srcdir=.. --prefix=$$dc_install_base \ + && $(MAKE) \ + && $(MAKE) check \ + && $(MAKE) install \ + && $(MAKE) installcheck \ + && $(MAKE) dist + rm -rf $(distdir) + @echo "========================"; \ + echo "$(distdir).tar.gz is ready for distribution"; \ + echo "========================" +dist: distdir + chmod -R a+r $(distdir) + $(TAR) chozf $(distdir).tar.gz $(distdir) + rm -rf $(distdir) +distdir: $(DEP_DISTFILES) + rm -rf $(distdir) + mkdir $(distdir) + chmod 777 $(distdir) + @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \ + test -f $(distdir)/$$file \ + || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $(srcdir)/$$file $(distdir)/$$file; \ + done + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + done +check-TESTS: $(TESTS) + @failed=0; all=0; \ + srcdir=$(srcdir); export srcdir; \ + for tst in $(TESTS); do \ + all=`expr $$all + 1`; \ + if test -f $$tst; then dir=.; \ + else dir="$(srcdir)"; fi; \ + if $$dir/$$tst; then \ + echo "PASS: $$tst"; \ + else \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + echo "========================"; \ + echo "All $$all tests passed"; \ + echo "========================"; \ + else \ + echo "$$failed of $$all tests failed"; \ + fi +info: info-recursive -ansi2knr: ansi2knr.o - $(LINK) ansi2knr.o $(LIBS) +dvi: dvi-recursive -############################################################################## +check: check-recursive check-TESTS -info: $(INFO_FILES) +installcheck: installcheck-recursive -$(INFO_FILES): id.texinfo version.texi - cd $(srcdir) && $(MAKEINFO) id.texinfo +all-recursive-hack: $(CONFIG_HEADER) + $(MAKE) all-recursive -dvi: id.dvi -id.dvi: id.texinfo version.texi - $(TEXI2DVI) $(srcdir)/id.texinfo +all-am: Makefile config.h -version.texi: stamp-vti -stamp-vti: configure.in - if echo "@set VERSION $(VERSION)" |cmp -s - $(srcdir)/version.texi; then \ - :; else \ - echo "@set VERSION $(VERSION)" >$(srcdir)/version.texi; \ - fi - $(TOUCH) stamp-vti +install-exec: install-exec-recursive -############################################################################## +install-data: install-data-recursive -install: all - $(srcdir)/mkdirhier $(bindir) $(datadir) $(infodir) - @for file in $(PROGRAMS); do \ - cmd="$(INSTALL_PROGRAM) $$file $(bindir)/`echo $$file | sed '$(transform)'`"; \ - (echo $$cmd; eval $$cmd); \ - done - @lid=`echo lid |sed '$(transform)'`; \ - for file in $(LID_LINKS); do \ - file=`echo $$file |sed '$(transform)'`; \ - cmd="cd $(bindir); rm -f $$file; $(LN_S) $$lid $$file"; \ - (echo $$cmd; eval $$cmd); \ - done - $(INSTALL_DATA) $(srcdir)/iid.help $(IID_HELP_FILE) - @for file in $(INFO_FILES); do \ - cmd="$(INSTALL_DATA) $(srcdir)/$$file $(infodir)/$$file"; \ - (echo $$cmd; eval $$cmd); \ - done - -uninstall: - @for file in $(TARGETS); do \ - cmd="rm -f $(bindir)/`echo $$file |sed '$(transform)'`"; \ - (echo $$cmd; eval $$cmd); \ - done - rm -f $(IID_HELP_FILE) - @for file in `cd $(infodir) && echo id.info*`; do \ - cmd="rm -f $(infodir)/$$file"; \ - (echo $$cmd; eval $$cmd); \ - done +install: install-recursive + @: -############################################################################## +uninstall: uninstall-recursive -check: mkid lid fid idx - ENV=; here=`pwd`; PATH=$$here:$$PATH; export PATH; cd $(srcdir) \ - && $$here/mkid -f$$here/ID $(TAG_SRC_FILES) \ - && $(SHELL) ./idtest -f$$here/ID $(TAG_SRC_FILES) \ - && rm -f $$here/ID +all: all-recursive-hack all-am -id: ID -ID: $(TAG_SRC_FILES) - ENV=; here=`pwd`; PATH=$$here:$$PATH; export PATH; cd $(srcdir) \ - && mkid -f$$here/ID $$here/config.h $(TAG_SRC_FILES) +install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install +installdirs: installdirs-recursive -tags: TAGS -TAGS: $(TAG_SRC_FILES) - here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(TAG_SRC_FILES) -############################################################################## +mostlyclean-generic: + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) -mostlyclean: - rm -f a.out *.o *._? core *.core core.* *.aux *.cp *.cps *.fn *.fns - rm -f *.dvi *.ky *.kys *.log *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs *.tmp +clean-generic: + test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) -clean: mostlyclean - rm -f $(TARGETS) - rm -f iid.c +distclean-generic: + rm -f Makefile $(DISTCLEANFILES) + rm -f config.cache config.log $(CONFIG_HEADER) stamp-h -distclean: clean - rm -f ansi2knr ID TAGS - rm -f Makefile config.h config.status config.cache stamp-h +maintainer-clean-generic: + test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean-am: mostlyclean-tags mostlyclean-generic -maintainer-clean: distclean - @echo "This command is intended only for maintainers to use;" - @echo "rebuilding the deleted files may require special tools." - rm -f stamp-vti version.texi id.info* +clean-am: clean-tags clean-generic mostlyclean-am -############################################################################## +distclean-am: distclean-tags distclean-generic clean-am -dist: $(DIST_TGZ) $(UDIFF_GZ) $(CDIFF_GZ) +maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am -dist-tgz: $(DIST_TGZ) -$(DIST_TGZ): $(DIST_DIR) - tar cfzho $@ $(DIST_DIR) +mostlyclean: mostlyclean-am mostlyclean-recursive -dist-dir: $(DIST_DIR) -$(DIST_DIR): $(DIST_FILES) - rm -fr $@ - mkdir $@ - chmod 777 $@ - distdir=`pwd`/$@; cd $(srcdir); cp -p $(DIST_FILES) $$distdir - chmod -R a+r $@ +clean: clean-am clean-recursive -############################################################################## +distclean: distclean-am distclean-recursive + rm -f config.status -Makefile: Makefile.in config.status $(DEPEND) - CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status -config.status: configure - ./config.status --recheck -$(srcdir)/configure: configure.in aclocal.m4 - cd $(srcdir) && autoconf +maintainer-clean: maintainer-clean-am maintainer-clean-recursive + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + rm -f config.status -config.h: stamp-h -stamp-h: $(srcdir)/config.h.in config.status - CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status - $(TOUCH) stamp-h -$(srcdir)/config.h.in: stamp-h.in -$(srcdir)/stamp-h.in: configure.in aclocal.m4 acconfig.h - cd $(srcdir) && autoheader - $(TOUCH) $(srcdir)/stamp-h.in +.PHONY: default install-data-recursive uninstall-data-recursive \ +install-exec-recursive uninstall-exec-recursive installdirs-recursive \ +uninstalldirs-recursive all-recursive check-recursive \ +installcheck-recursive info-recursive dvi-recursive \ +mostlyclean-recursive distclean-recursive clean-recursive \ +maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ +distclean-tags clean-tags maintainer-clean-tags distdir check-TESTS \ +info dvi check installcheck all-recursive-hack all-am install-exec \ +install-data install uninstall all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean -depend $(DEPEND): - (cd $(srcdir) && $(CC) $(CC_FLAGS) -MM $(ALL_CFILES)) \ - | sed -e 's/\.o:/$$o:/' >$(DEPEND) -############################################################################## +idtest-real: all + $(SHELL) $(top_srcdir)/idtest $(top_srcdir) $(top_builddir) +.SUFFIXES: -@DEPEND_FILE@ +# 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,4 +1,40 @@ -`mkid' NEWS - User visible changes. +id-utils NEWS - User visible changes. + +Version 3.0.9 - May 1996, by Greg McGary + +* The package name has been changed from `mkid' to `id-utils', and is now + officially a part of GNU. + +* Command-line arguments have been revised to conform with GNU standards. + Each command now processes --help and --version long arguments. + +* The texinfo manual is out-of-date. Please use the `--help' option for + correct information about command-line arguments. I'll work on updating + it tonight. + +* `mkid' and `idx' use a file-tree walker. Give them one or more directory + names on the command-line, and they'll recursively descend looking for + source files. lib/language.map (installe as $(prefix)/share/language.map) + contains patterns for mapping file names to the appropriate language scanner. + +* id-utils now uses automake. + +* gid, aid and eid are now shell-script wrappers that + call `lid' with the apropriate argument. + +* A new environment `IDPATH' contains a colon-separated list of ID ID file + names for use by `fid' and `lid'. It is only partially implemented at + this time only the first ID file is actually handled, the rest are + ignored. + +* pid is temporarily gone, but will reappear soon. + +* iid has been removed from the distribution. + +* Support for non-ANSI compilers is broken. Don't expect it to work. + If you use gcc, all will be well. + +* Miscellaneous bugs are fixed. Version 3.0 - February 1995, by Greg McGary @@ -7,7 +7,7 @@ form, literal numbers, or words of human-readable text. Database queries can be issued from the command-line, or from within emacs, serving as an augmented tags facility. -`mkid' was originally written by Greg McGary <gkm@magilla.cichlid.com> +`mkid' was originally written by Greg McGary <gkm@gnu.ai.mit.edu> and posted to comp.sources.unix in September 1987. It was then maintained and enhanced by a loose knit group of programmers on the Internet led by Tom Horsley <Tom.Horsley@mail.hcsc.com>. Tom released @@ -23,10 +23,13 @@ See file `NEWS' for a list of major changes in the current release. See file `THANKS' for a list of contributors. See file `TODO' for planned enhancements. -Send bug reports to <gkm@magilla.cichlid.com>. Please describe your -problem adequately: your input, what you expected, what you got, and -why it is wrong. Diffs are welcome, but please include a description -of the problem as well, since this is sometimes difficult to infer. +Mail suggestions and bug reports for these programs to +<bug-gnu-utils@prep.ai.mit.edu>. + +Please describe bugs completely: your input, what you expected, what you +got, and why it is wrong. Diffs are welcome, but please include a +description of the problem as well, since this is sometimes difficult to +infer. Local Variables: @@ -1,11 +1,10 @@ `mkid' THANKS file -mkid, lid, fid, and idx were originally written by Greg McGary. iid -and pid were written by Tom Horsley, who also maintained the programs -for a time and released mkid2 to comp.sources.unix. id.texinfo was -originally written by Tom Horsley and revised for mkid-3.0 by Karl Berry. +All programs were written by Greg McGary. Tom Horsley maintained the +programs for a time and released mkid2 to comp.sources.unix. The +texinfo manual was originally written by Tom Horsley. -Special thanks go to Francois Pinard who worked tirelessly to refine +Special thanks go to Francois Pinard worked tirelessly to refine mkid's autoconfiscation, ensure mkid's conformance to GNU standards, and generally pick all the nits that were fit to pick. ;-) @@ -15,7 +14,6 @@ these people. If you contributed, but don't see your name here, please notify me (Greg McGary) at the address in the README file. Help keep this list complete and accurate. -Greg McGary <gkm@magilla.cichlid.com> Tom Horsley <Tom.Horsley@mail.hcsc.com> Wolfgang Rupprecht <wolfgang@wsrcc.com> Marty Leisner <leisner@sdsp.mc.xerox.com> @@ -31,6 +29,4 @@ Dave Wiggins <dpw@x.org> Thomas Neumann <tom@smart.ruhr.de> Jim Meyering <meyering@comco.com> Kazushi (Jam)Marukawa <kazusi-m@is.aist-nara.ac.jp> -Simon Leinen <simon@lia.di.epfl.ch> -Nelson H. F. Beebe <beebe@math.utah.edu> -Scott Bartram <scottb@clark.net> +Tom Tromey <tromey@cygnus.com> @@ -1,28 +1,31 @@ `mkid' TODO - Future directions -* Bring all code into conformance with GNU project coding standards. - - Use command-line arguments, not the name of the program in argv[0] - to determine lid's behavior - - Revise the command-line argument syntax, in particular the mkid - scanner-arg syntax. - - Use getopt_long () in all programs to parse command-line arguments - - Handle GNU standard arguments: In particular, --version & --help - - use xmalloc - -* Portability & uniformity - - configure tests for lots of things, but code doesn't use all - results. Either use the results, or drop the tests. +* Portability - Fix filenames.c to handle non-UNIX file names properly (notably DOS & OS/2). - Fix assumption that (sizeof (int) == sizeof (long)) - - use alloca - - use xmalloc * all query interfaces - - add environment variable for setting default ID file name--allow this - variable to be a "path" to handle multiple ID files, e.g., - IDFILE=/usr/src/ID:/usr/local/src/ID:$HOME/src/ID - also allow dirs (considered to contain a file named "ID" by default) + - add environment variable for setting default ID file name. + +* lid + - use "long long" (if the compiler supports it) integer comparisons + in find_number(). + - generalize the command-line interface for different behaviors. + User passes a command-format string for operating on the results + of a query: + %p = pattern, %f = crunched file list, %F = uncrunched file list + filename list options: + {,} -vs- expanded; space -vs- newline separator + pattern list options: + tokens -vs- regexp + Recommend the following aliases to emulate old behavior: + alias lid="findid --format='echo %p %f'" + alias eid="findid --format='vi +/\\<%p\\>/ %F'" # for vi users + alias gid="findid --format='egrep \\<%p\\> %F'" + alias aid="findid --format='fgrep -i %p %F'" + alias pid="findid --format='echo %p %f' -f" + alias fid="findid --format='echo %t ' -f" * mkid & lid - store & retrieve floating point literals @@ -30,8 +33,6 @@ you can index and search archived source without having to unpack it. * mkid - - add a recursive file tree walker, so a complete list of file names - need not be supplied--implement with ftw(3)? - (Optinally?) store tokenized contents of comments. - Store attributes with symbols: type, func, variable struct-tag enum-tag, keyword, etc. Store caller/callee relationships between @@ -39,38 +40,11 @@ is needed to support a cscope interface. - Add times(2) results to statistics output. - treat \ specially for TeX files and do likewise with @ for Texinfo. - - add time(1) style output to statistics report at end - - control stats reports with a command-line arg. - -* lid - - change the name of the program to something a bit more - descriptive, e.g., "findid". - - use "long long" (if the compiler supports it) integer comparisons - in find_number(). - - generalize the command-line interface for different behaviors. - User passes a command-format string for operating on the results - of a query: - %t = token, %f = crunched file list, %F = uncrunched file list - Recommend the following aliases to emulate old behavior: - alias lid="findid -e 'echo %t %f'" - alias eid="findid -e 'vi +/\\<%t\\>/ %F'" # for vi users - alias gid="findid -e 'egrep \\<%t\\> %F'" - - make `pid' a separate program - - standardize & document regexp syntax (currently, it depends on whether - you link rx.o or your vendor's regexp stuff). - - gid bug: "gid -e file_" yeilds nothing. - -* iid - - don't use $PS1 for the prompt. Use (iid), or iid> or something like that - - review (revise?) syntax - -* gid.el - - associate ID file with buffers so future `gid's will use the right ID. - - wire completion on token names -* cscope - - add a cscope work-alike query interface (this is being done by - Maureen Lecuona <lecuona@paul.rutgers.edu>) +* gscope + - add a cscope work-alike query interface + - rewrite scanners to be scanner/parsers that can distinguish defn + from use, lvalues from rvalues, types from vars from funcs from macros. * grep - Hack GNU grep to use a mkid database for hints about which files to @@ -1,5 +1,5 @@ -/* Special definitions for `mkid', processed by autoheader. - This file is in the public domain. +/* Special definitions for GNU id-utils, processed by autoheader. + Copyright (C) 1995, 96 Free Software Foundation, Inc. */ #ifndef _config_h_ @@ -7,27 +7,45 @@ @TOP@ -/* Define to `unsigned short' if <sys/types.h> doesn't define. */ -#undef dev_t +/* Define to 1 if NLS is requested. */ +#undef ENABLE_NLS -/* Define if you have the <sys/ioctl.h> header file. */ -#undef HAVE_SYS_IOCTL_H +/* Define as 1 if you have catgets and don't want to use GNU gettext. */ +#undef HAVE_CATGETS + +/* Define if the sbrk system call is declared in unistd.h. */ +#undef HAVE_DECL_SBRK + +/* Define if the sys_errlist array is declared in errno.h, error.h or stdio.h. */ +#undef HAVE_DECL_SYS_ERRLIST + +/* Define as 1 if you have gettext and don't want to use GNU gettext. */ +#undef HAVE_GETTEXT -/* Define to filename of iid help text. */ -#undef IID_HELP_FILE +/* Define if your locale.h file contains LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES -/* Define to `unsigned long' if <sys/types.h> doesn't define. */ -#undef ino_t +/* Define to 1 if you have the stpcpy function. */ +#undef HAVE_STPCPY + +/* Define if you have the <sys/ioctl.h> header file. */ +#undef HAVE_SYS_IOCTL_H /* Define to the name of the distribution. */ #undef PACKAGE +/* The concatenation of the strings PACKAGE, "-", and VERSION. */ +#undef PACKAGE_VERSION + /* Define to 1 if ANSI function prototypes are usable. */ #undef PROTOTYPES /* Define to the major.minor version # of the distribution. */ #undef VERSION +/* Define to 1 if GNU regex should be used instead of GNU rx. */ +#undef WITH_REGEX + @BOTTOM@ /* According to Thomas Neumann, NeXT POSIX termios support is losing, @@ -42,9 +60,9 @@ #ifndef __P # ifndef PROTOTYPES -# define __P(args) () +# define __P(protos) () /* traditional C */ # else -# define __P(args) args +# define __P(protos) protos /* full-blown ANSI C */ # endif #endif @@ -1,6 +1,80 @@ -# All fp_* macros are: -# Copyright (C) 1992, 1994 Free Software Foundation, Inc. -# Francois Pinard <pinard@iro.umontreal.ca>, 1992. +# Local additions to Autoconf macros. +# Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. +# François Pinard <pinard@iro.umontreal.ca>, 1992. + +AC_DEFUN(jm_MAINTAINER_MODE, +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT($USE_MAINTAINER_MODE) + if test $USE_MAINTAINER_MODE = yes; then + MAINT= + else + MAINT='#M#' + fi + AC_SUBST(MAINT)dnl +] +) + +AC_DEFUN(gm_DECL_SBRK, +[AC_CACHE_CHECK(for sbrk declaration in unistd.h, ac_cv_decl_sbrk, +[AC_EGREP_HEADER(sbrk, unistd.h, + ac_cv_decl_sbrk=yes, ac_cv_decl_sbrk=no)]) +if test $ac_cv_decl_sbrk = yes; then + AC_DEFINE(HAVE_DECL_SBRK) +fi +]) + +AC_DEFUN(gm_DECL_SYS_ERRLIST, +[AC_CACHE_CHECK(for sys_errlist declaration, ac_cv_decl_sys_errlist, +[ac_cv_decl_sys_errlist=no + AC_EGREP_HEADER(sys_errlist, errno.h, ac_cv_decl_sys_errlist=yes) + AC_EGREP_HEADER(sys_errlist, stdio.h, ac_cv_decl_sys_errlist=yes) + AC_EGREP_HEADER(sys_errlist, error.h, ac_cv_decl_sys_errlist=yes) + ]) +if test $ac_cv_decl_sys_errlist = yes; then + AC_DEFINE(HAVE_DECL_SYS_ERRLIST) +fi +]) + + +## --------------------------------------------------------- ## +## Use A*_PROG_INSTALL, supplementing it with INSTALL_SCRIPT ## +## substitution. ## +## --------------------------------------------------------- ## + +AC_DEFUN(fp_PROG_INSTALL, +[AC_PROG_INSTALL +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755' +AC_SUBST(INSTALL_SCRIPT)dnl +]) + +## ------------------------------- ## +## Check for function prototypes. ## +## ------------------------------- ## + +AC_DEFUN(fp_C_PROTOTYPES, +[AC_REQUIRE([fp_PROG_CC_STDC]) +AC_MSG_CHECKING([for function prototypes]) +if test "$ac_cv_prog_cc_stdc" != no; then + AC_MSG_RESULT(yes) + AC_DEFINE(PROTOTYPES) + U= ANSI2KNR= +else + AC_MSG_RESULT(no) + U=_ ANSI2KNR=./ansi2knr +fi +AC_SUBST(U)dnl +AC_SUBST(ANSI2KNR)dnl +]) + +## ----------------------------------------- ## +## ANSIfy the C compiler whenever possible. ## +## ----------------------------------------- ## # @defmac AC_PROG_CC_STDC # @maindex PROG_CC_STDC @@ -10,7 +84,7 @@ # options that select ANSI C on some system or another. It considers the # compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and # handles function prototypes correctly. -# +# # If you use this macro, you should check after calling it whether the C # compiler has been set to accept ANSI C; if not, the shell variable # @code{ac_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source @@ -18,7 +92,7 @@ # program @code{ansi2knr}, which comes with Ghostscript. # @end defmac -define(fp_PROG_CC_STDC, +AC_DEFUN(fp_PROG_CC_STDC, [AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) AC_CACHE_VAL(ac_cv_prog_cc_stdc, [ac_cv_prog_cc_stdc=no @@ -28,15 +102,14 @@ ac_save_CFLAGS="$CFLAGS" # AIX -qlanglvl=ansi # Ultrix and OSF/1 -std1 # HP-UX -Aa -D_HPUX_SOURCE -# CX/UX -Xa (-Xc is strict ANSI) -# SVR4 -Xc -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" -Xa -Xc +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CFLAGS="$ac_save_CFLAGS $ac_arg" AC_TRY_COMPILE( [#if !defined(__STDC__) || __STDC__ != 1 choke me -#endif +#endif ], [int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);};], @@ -51,19 +124,320 @@ case "x$ac_cv_prog_cc_stdc" in esac ]) -# Check for function prototypes. +## -------------------------------------------- ## +## Check if --with-regex was given. ## +## Slightly modified version of fp_WITH_REGEX. ## +## -------------------------------------------- ## -AC_DEFUN(fp_C_PROTOTYPES, -[AC_REQUIRE([fp_PROG_CC_STDC]) -AC_MSG_CHECKING([for function prototypes]) -if test "$ac_cv_prog_cc_stdc" != no; then - AC_MSG_RESULT(yes) - AC_DEFINE(PROTOTYPES) - U= ANSI2KNR= -else - AC_MSG_RESULT(no) - U=_ ANSI2KNR=ansi2knr +AC_DEFUN(ud_WITH_REGEX, +[AC_MSG_CHECKING(which of rx or regex is wanted) +AC_ARG_WITH(regex, +[ --with-regex use older regex in lieu of GNU rx for matching], +[if test "$withval" = yes; then + ac_with_regex=1 + AC_MSG_RESULT(regex) + AC_DEFINE(WITH_REGEX) + REGEXOBJ=regex.o +fi]) +if test -z "$ac_with_regex"; then + AC_MSG_RESULT(rx) + AC_CHECK_FUNC(re_rx_search, , [REGEXOBJ=rx.o]) fi -AC_SUBST(U)dnl -AC_SUBST(ANSI2KNR)dnl +AC_SUBST(REGEXOBJ)dnl +]) + +dnl ------------------------ +dnl Emacs LISP file handling +dnl ------------------------ +AC_DEFUN(ud_PATH_LISPDIR, + [AC_PATH_PROG(EMACS, emacs, no) + if test $EMACS != "no"; then + AC_MSG_CHECKING([where .elc files should go]) + dnl Set default value + LISPDIR="\$(datadir)/emacs/site-lisp" + if test "x$prefix" = "xNONE"; then + if test -d $ac_default_prefix/share/emacs/site-lisp; then + LISPDIR="\$(prefix)/share/emacs/site-lisp" + else + if test -d $ac_default_prefix/lib/emacs/site-lisp; then + LISPDIR="\$(prefix)/lib/emacs/site-lisp" + fi + fi + else + if test -d $prefix/share/emacs/site-lisp; then + LISPDIR="\$(prefix)/share/emacs/site-lisp" + else + if test -d $prefix/lib/emacs/site-lisp; then + LISPDIR="\$(prefix)/lib/emacs/site-lisp" + fi + fi + fi + AC_MSG_RESULT($LISPDIR) + ELCFILES="\$(ELCFILES)" + fi + AC_SUBST(LISPDIR) + AC_SUBST(ELCFILES)]) + +dnl --------------------------------------------------------- ## +dnl The following definitions all have to go into the ## +dnl aclocal.m4 files of the packages to be internationalized. ## +dnl Last updated for gettext-0.10.11. ## +dnl --------------------------------------------------------- ## + +AC_DEFUN(md_PATH_PROG, + [AC_PATH_PROG($1,$2,$3)dnl + if echo $$1 | grep openwin > /dev/null; then + echo "WARNING: Do not use OpenWin's $2. (Better remove it.)" >&AC_FD_MSG + ac_cv_path_$1=$2 + $1=$2 + fi +]) + +dnl Check NLS options + +AC_DEFUN(ud_LC_MESSAGES, + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], ud_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], + ud_cv_val_LC_MESSAGES=yes, ud_cv_val_LC_MESSAGES=no)]) + if test $ud_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES) + fi + fi]) + +AC_DEFUN(ud_WITH_NLS, + [AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + AC_DEFINE(ENABLE_NLS) + AC_MSG_CHECKING([for explicitly using GNU gettext]) + AC_ARG_WITH(gnu-gettext, + [ --with-gnu-gettext use the GNU gettext library], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE + + AC_CHECK_HEADER(libintl.h, + [AC_CHECK_LIB(intl, main) + AC_CHECK_FUNC(gettext, + [AC_DEFINE(HAVE_GETTEXT) + md_PATH_PROG(MSGFMT, msgfmt, no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + md_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + md_PATH_PROG(XGETTEXT, xgettext, :) + CATOBJEXT=.mo + INSTOBJEXT=.mo + DATADIRNAME=lib + fi])]) + + if test "$CATOBJEXT" = "NONE"; then + AC_MSG_CHECKING([whether catgets can be used]) + AC_ARG_WITH(catgets, + [ --with-catgets use catgets functions if available], + nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) + AC_MSG_RESULT($nls_cv_use_catgets) + + if test "$nls_cv_use_catgets" = "yes"; then + dnl No gettext in C library. Try catgets next. + AC_CHECK_LIB(i, main) + AC_CHECK_FUNC(catgets, + [AC_DEFINE(HAVE_CATGETS) + INTLOBJS="\$(CATOBJS)" + AC_PATH_PROG(GENCAT, gencat, no)dnl + if test "$GENCAT" != "no"; then + AC_PATH_PROGS(GMSGFMT, [gmsgfmt msgfmt], msgfmt) + md_PATH_PROG(XGETTEXT, xgettext, :) + CATOBJEXT=.cat + INSTOBJEXT=.cat + DATADIRNAME=lib + INTLDEPS="../intl/libintl.a" + INTLLIBS=$INTLDEPS + INTLSUB=intl + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi]) + fi + fi + + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. + dnl Fall back on GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + INTLOBJS="\$(GETTOBJS)" + md_PATH_PROG(MSGFMT, msgfmt, msgfmt) + md_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + md_PATH_PROG(XGETTEXT, xgettext, :) + AC_SUBST(MSGFMT) + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS="../intl/libintl.a" + INTLLIBS=$INTLDEPS + INTLSUB=intl + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext programs is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi + + # We need to process the po/ directory. + POSUB=po + else + DATADIRNAME=share + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLDEPS) + AC_SUBST(INTLLIBS) + AC_SUBST(INTLOBJS) + AC_SUBST(INTLSUB) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) + +AC_DEFUN(ud_GNU_GETTEXT, + [AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + + AC_CHECK_HEADERS([limits.h locale.h nl_types.h malloc.h string.h unistd.h values.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp]) + + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + AC_DEFINE(HAVE_STPCPY) + fi + + ud_LC_MESSAGES + ud_WITH_NLS + + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi + + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + dnl Determine which catalog format we have (if any is needed) + dnl For now we know about two different formats: + dnl Linux and the normal X/Open format + test -d intl || mkdir intl + if test "$CATOBJEXT" = ".cat"; then + AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) + + dnl Transform the SED scripts while copying because some dumb SEDs + dnl cannot handle comments. + sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed + fi + dnl po2tbl.sed is always needed. + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) + +dnl AC_REPLACE_GNU_GETOPT +AC_DEFUN(AC_REPLACE_GNU_GETOPT, +[AC_CHECK_FUNC(getopt_long, , [LIBOBJS="$LIBOBJS getopt1.o getopt.o"]) +AC_SUBST(LIBOBJS)dnl +]) + +dnl AC_REPLACE_OBSTACK +AC_DEFUN(AC_REPLACE_OBSTACK, +[AC_CACHE_CHECK([for obstacks], gt_cv_func_obstack, +[AC_TRY_LINK([#include "obstack.h"], +[struct obstack *mem;obstack_free(mem,NULL)], + gt_cv_func_obstack=yes, gt_cv_func_obstack=no)]) +if test $gt_cv_func_obstack = no; then + LIBOBJS="$LIBOBJS obstack.o" +fi +AC_SUBST(LIBOBJS)dnl ]) diff --git a/config.h.in b/config.h.in index 15c0b45..6936d5e 100644 --- a/config.h.in +++ b/config.h.in @@ -1,12 +1,19 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ -/* Special definitions for `mkid', processed by autoheader. - This file is in the public domain. +/* Special definitions for GNU id-utils, processed by autoheader. + Copyright (C) 1995, 96 Free Software Foundation, Inc. */ #ifndef _config_h_ #define _config_h_ +/* Define if on AIX 3. + System headers sometimes define this. + We just want to avoid a redefinition error message. */ +#ifndef _ALL_SOURCE +#undef _ALL_SOURCE +#endif + /* Define if using alloca.c. */ #undef C_ALLOCA @@ -23,12 +30,28 @@ /* Define if you have <alloca.h> and it should be used (not on Ultrix). */ #undef HAVE_ALLOCA_H +/* Define if you have a working `mmap' system call. */ +#undef HAVE_MMAP + /* Define if you have <sys/wait.h> that is POSIX.1 compatible. */ #undef HAVE_SYS_WAIT_H +/* Define as __inline if that's what the C compiler calls it. */ +#undef inline + +/* 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 + +/* Define if you need to in order for stat and other things to work. */ +#undef _POSIX_SOURCE + /* Define as the return type of signal handlers (int or void). */ #undef RETSIGTYPE @@ -44,52 +67,64 @@ */ #undef STACK_DIRECTION +/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */ +#undef STAT_MACROS_BROKEN + /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define to `unsigned short' if <sys/types.h> doesn't define. */ -#undef dev_t +/* Define to 1 if NLS is requested. */ +#undef ENABLE_NLS -/* Define to filename of iid help text. */ -#undef IID_HELP_FILE +/* Define as 1 if you have catgets and don't want to use GNU gettext. */ +#undef HAVE_CATGETS -/* Define to `unsigned long' if <sys/types.h> doesn't define. */ -#undef ino_t +/* Define if the sbrk system call is declared in unistd.h. */ +#undef HAVE_DECL_SBRK + +/* Define if the sys_errlist array is declared in errno.h, error.h or stdio.h. */ +#undef HAVE_DECL_SYS_ERRLIST + +/* Define as 1 if you have gettext and don't want to use GNU gettext. */ +#undef HAVE_GETTEXT + +/* Define if your locale.h file contains LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if you have the stpcpy function. */ +#undef HAVE_STPCPY /* Define to the name of the distribution. */ #undef PACKAGE +/* The concatenation of the strings PACKAGE, "-", and VERSION. */ +#undef PACKAGE_VERSION + /* Define to 1 if ANSI function prototypes are usable. */ #undef PROTOTYPES /* Define to the major.minor version # of the distribution. */ #undef VERSION +/* Define to 1 if GNU regex should be used instead of GNU rx. */ +#undef WITH_REGEX + #ifndef __P # ifndef PROTOTYPES -# define __P(args) () +# define __P(protos) () /* traditional C */ # else -# define __P(args) args +# define __P(protos) protos /* full-blown ANSI C */ # endif #endif -/* Define if you have the basename function. */ -#undef HAVE_BASENAME - -/* Define if you have the bcopy function. */ -#undef HAVE_BCOPY - -/* Define if you have the bzero function. */ -#undef HAVE_BZERO - -/* Define if you have the dirname function. */ -#undef HAVE_DIRNAME +/* Define if you have the dcgettext function. */ +#undef HAVE_DCGETTEXT /* Define if you have the getcwd function. */ #undef HAVE_GETCWD -/* Define if you have the getopt_long function. */ -#undef HAVE_GETOPT_LONG +/* Define if you have the getpagesize function. */ +#undef HAVE_GETPAGESIZE /* Define if you have the getwd function. */ #undef HAVE_GETWD @@ -97,20 +132,20 @@ /* Define if you have the link function. */ #undef HAVE_LINK -/* Define if you have the memcpy function. */ -#undef HAVE_MEMCPY +/* Define if you have the munmap function. */ +#undef HAVE_MUNMAP -/* Define if you have the memset function. */ -#undef HAVE_MEMSET +/* Define if you have the putenv function. */ +#undef HAVE_PUTENV -/* Define if you have the re_comp function. */ -#undef HAVE_RE_COMP +/* Define if you have the setenv function. */ +#undef HAVE_SETENV -/* Define if you have the regcmp function. */ -#undef HAVE_REGCMP +/* Define if you have the setlocale function. */ +#undef HAVE_SETLOCALE -/* Define if you have the regcomp function. */ -#undef HAVE_REGCOMP +/* Define if you have the stpcpy function. */ +#undef HAVE_STPCPY /* Define if you have the strcasecmp function. */ #undef HAVE_STRCASECMP @@ -118,32 +153,26 @@ /* 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 strrchr function. */ -#undef HAVE_STRRCHR +/* Define if you have the valloc function. */ +#undef HAVE_VALLOC -/* Define if you have the <assert.h> header file. */ -#undef HAVE_ASSERT_H - -/* Define if you have the <ctype.h> header file. */ -#undef HAVE_CTYPE_H - -/* Define if you have the <errno.h> header file. */ -#undef HAVE_ERRNO_H +/* Define if you have the <dirent.h> header file. */ +#undef HAVE_DIRENT_H /* Define if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H +/* 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 <memory.h> header file. */ -#undef HAVE_MEMORY_H +/* Define if you have the <ndir.h> header file. */ +#undef HAVE_NDIR_H + +/* Define if you have the <nl_types.h> header file. */ +#undef HAVE_NL_TYPES_H /* Define if you have the <regex.h> header file. */ #undef HAVE_REGEX_H @@ -151,24 +180,24 @@ /* Define if you have the <sgtty.h> header file. */ #undef HAVE_SGTTY_H -/* Define if you have the <stddef.h> header file. */ -#undef HAVE_STDDEF_H - /* Define if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H /* Define if you have the <string.h> header file. */ #undef HAVE_STRING_H +/* Define if you have the <sys/dir.h> header file. */ +#undef HAVE_SYS_DIR_H + /* Define if you have the <sys/ioctl.h> header file. */ #undef HAVE_SYS_IOCTL_H +/* Define if you have the <sys/ndir.h> header file. */ +#undef HAVE_SYS_NDIR_H + /* Define if you have the <sys/param.h> header file. */ #undef HAVE_SYS_PARAM_H -/* Define if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - /* Define if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H @@ -181,6 +210,15 @@ /* Define if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define if you have the <values.h> header file. */ +#undef HAVE_VALUES_H + +/* Define if you have the i library (-li). */ +#undef HAVE_LIBI + +/* Define if you have the intl library (-lintl). */ +#undef HAVE_LIBINTL + /* According to Thomas Neumann, NeXT POSIX termios support is losing, and sgtty is the way to go. Note: the comment between #undef & HAVE_TERMIOS_H is necessary to defeat configure's edits. */ @@ -193,9 +231,9 @@ #ifndef __P # ifndef PROTOTYPES -# define __P(args) () +# define __P(protos) () /* traditional C */ # else -# define __P(args) args +# define __P(protos) protos /* full-blown ANSI C */ # endif #endif @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.2 -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. +# Generated automatically using autoconf version 2.10 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -11,6 +11,17 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer" +ac_help="$ac_help + --with-regex use older regex in lieu of GNU rx for matching" +ac_help="$ac_help + --disable-nls do not use Native Language Support" +ac_help="$ac_help + --with-gnu-gettext use the GNU gettext library" +ac_help="$ac_help + --with-catgets use catgets functions if available" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -33,9 +44,22 @@ target=NONE verbose= x_includes=NONE x_libraries=NONE +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' +includedir='${prefix}/include' +oldincludedir='/usr/include' +infodir='${prefix}/info' +mandir='${prefix}/man' # Initialize some other variables. subdirs= +MFLAGS= MAKEFLAGS= ac_prev= for ac_option @@ -57,9 +81,14 @@ do case "$ac_option" in - -build | --build | --buil | --bui | --bu | --b) + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir="$ac_optarg" ;; + + -build | --build | --buil | --bui | --bu) ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*) + -build=* | --build=* | --buil=* | --bui=* | --bu=*) build="$ac_optarg" ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ @@ -69,6 +98,12 @@ do | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) cache_file="$ac_optarg" ;; + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir="$ac_optarg" ;; + -disable-* | --disable-*) ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` # Reject names that are not valid shell variable names. @@ -119,12 +154,29 @@ Configuration: Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] - --exec-prefix=PREFIX install architecture-dependent files in PREFIX + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] --srcdir=DIR find the sources in DIR [configure dir or ..] --program-prefix=PREFIX prepend PREFIX to installed program names --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF Host type: --build=BUILD configure for building on BUILD [BUILD=HOST] --host=HOST configure for HOST [guessed] @@ -136,8 +188,10 @@ Features and packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR ---enable and --with options recognized:$ac_help EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi exit 0 ;; -host | --host | --hos | --ho) @@ -145,6 +199,44 @@ EOF -host=* | --host=* | --hos=* | --ho=*) host="$ac_optarg" ;; + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir="$ac_optarg" ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir="$ac_optarg" ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir="$ac_optarg" ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir="$ac_optarg" ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir="$ac_optarg" ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir="$ac_optarg" ;; + -nfp | --nfp | --nf) # Obsolete; use --without-fp. with_fp=no ;; @@ -157,6 +249,15 @@ EOF | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) no_recursion=yes ;; + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir="$ac_optarg" ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) @@ -197,6 +298,23 @@ EOF | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir="$ac_optarg" ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir="$ac_optarg" ;; + -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) @@ -207,6 +325,13 @@ EOF -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) srcdir="$ac_optarg" ;; + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir="$ac_optarg" ;; + -target | --target | --targe | --targ | --tar | --ta | --t) ac_prev=target ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) @@ -216,7 +341,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.2" + echo "configure generated by autoconf version 2.10" exit 0 ;; -with-* | --with-*) @@ -262,7 +387,7 @@ EOF -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ;; - *) + *) if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then echo "configure: warning: $ac_option: invalid host type" 1>&2 fi @@ -331,7 +456,7 @@ echo > confdefs.h # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=mkid.c +ac_unique_file=src/mkid.c # Find the source files, if location was not specified. if test -z "$srcdir"; then @@ -382,8 +507,8 @@ fi ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5' -ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. @@ -400,12 +525,33 @@ fi +if test "$program_transform_name" = s,x,x,; then + program_transform_name= +else + # Double any \ or $. echo might interpret backslashes. + cat <<\EOF_SED > conftestsed +s,\\,\\\\,g; s,\$,$$,g +EOF_SED + program_transform_name="`echo $program_transform_name|sed -f conftestsed`" + rm -f conftestsed +fi +test "$program_prefix" != NONE && + program_transform_name="s,^,${program_prefix},; $program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" + +# sed with no file args requires a program. +test "$program_transform_name" = "" && program_transform_name="s,x,x," + + +############################################################################## +################ Identify Package ############################################ ############################################################################## -### Package identification -PACKAGE=mkid +PACKAGE=id-utils VERSION=3.0.9 -PREV_VERSION=3.0.8 +PACKAGE_VERSION="$PACKAGE-$VERSION" cat >> confdefs.h <<EOF #define PACKAGE "$PACKAGE" EOF @@ -414,48 +560,78 @@ cat >> confdefs.h <<EOF #define VERSION "$VERSION" EOF +cat >> confdefs.h <<EOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +EOF + +############################################################################## +################ Maintainer Stuff ############################################ ############################################################################## -### Checks for programs. -for ac_prog in 'bison -y' byacc -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" + USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 + if test $USE_MAINTAINER_MODE = yes; then + MAINT= + else + MAINT='#M#' + fi + + + +ALL_LINGUAS="de fr" + +case $VERSION in +*.*.*) README_ALPHA=README-alpha;; +*) README_ALPHA=;; +esac + + +############################################################################## +################ Check for tools ############################################# +############################################################################## + +# Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$YACC"; then - ac_cv_prog_YACC="$YACC" # Let the user override the test. + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_YACC="$ac_prog" + ac_cv_prog_CC="gcc" break fi done IFS="$ac_save_ifs" fi fi -YACC="$ac_cv_prog_YACC" -if test -n "$YACC"; then - echo "$ac_t""$YACC" 1>&6 +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 else echo "$ac_t""no" 1>&6 fi -test -n "$YACC" && break -done -test -n "$YACC" || YACC="yacc" - -# Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -464,15 +640,33 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + ac_prog_rejected=no for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" break fi done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi fi fi CC="$ac_cv_prog_CC" @@ -482,6 +676,8 @@ else echo "$ac_t""no" 1>&6 fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then @@ -492,12 +688,13 @@ else yes; #endif EOF -if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no fi fi + echo "$ac_t""$ac_cv_prog_gcc" 1>&6 if test $ac_cv_prog_gcc = yes; then GCC=yes @@ -515,7 +712,8 @@ fi rm -f conftest* fi - echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 + +echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 if test $ac_cv_prog_gcc_g = yes; then CFLAGS="-g -O" else @@ -605,10 +803,17 @@ else esac done IFS="$ac_save_ifs" - # As a last resort, use the slow shell script. - test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh" + fi - INSTALL="$ac_cv_path_install" + if test "${ac_cv_path_install+set}" = set; then + INSTALL="$ac_cv_path_install" + else + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL="$ac_install_sh" + fi fi echo "$ac_t""$INSTALL" 1>&6 @@ -618,6 +823,8 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755' + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 set dummy ${MAKE-make}; ac_make=$2 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then @@ -644,13 +851,6 @@ else SET_MAKE="MAKE=${MAKE-make}" fi - -############################################################################## -### Checks for libraries. - -############################################################################## -### Checks for header files. - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -666,12 +866,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 670 "configure" +#line 870 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -680,12 +881,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 684 "configure" +#line 885 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -699,10 +901,305 @@ fi rm -f conftest* ac_cv_prog_CPP="$CPP" fi + CPP="$ac_cv_prog_CPP" +else + ac_cv_prog_CPP="$CPP" fi -CPP="$ac_cv_prog_CPP" echo "$ac_t""$CPP" 1>&6 +if test $ac_cv_prog_gcc = yes; then + echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_pattern="Autoconf.*'x'" + cat > conftest.$ac_ext <<EOF +#line 918 "configure" +#include "confdefs.h" +#include <sgtty.h> +Autoconf TIOCGETP +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "$ac_pattern" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_prog_gcc_traditional=yes +else + rm -rf conftest* + ac_cv_prog_gcc_traditional=no +fi +rm -f conftest* + + + if test $ac_cv_prog_gcc_traditional = no; then + cat > conftest.$ac_ext <<EOF +#line 936 "configure" +#include "confdefs.h" +#include <termio.h> +Autoconf TCGETA +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "$ac_pattern" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_prog_gcc_traditional=yes +fi +rm -f conftest* + + fi +fi + +echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 + if test $ac_cv_prog_gcc_traditional = yes; then + CC="$CC -traditional" + fi +fi + +# Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="ranlib" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +echo $ac_n "checking for AIX""... $ac_c" 1>&6 +cat > conftest.$ac_ext <<EOF +#line 987 "configure" +#include "confdefs.h" +#ifdef _AIX + yes +#endif + +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "yes" >/dev/null 2>&1; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF +#define _ALL_SOURCE 1 +EOF + +else + rm -rf conftest* + echo "$ac_t""no" 1>&6 +fi +rm -f conftest* + + +ac_safe=`echo "minix/config.h" | tr './\055' '___'` +echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1014 "configure" +#include "confdefs.h" +#include <minix/config.h> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + MINIX=yes +else + echo "$ac_t""no" 1>&6 +MINIX= +fi + +if test "$MINIX" = yes; then + cat >> confdefs.h <<\EOF +#define _POSIX_SOURCE 1 +EOF + + cat >> confdefs.h <<\EOF +#define _POSIX_1_SOURCE 2 +EOF + + cat >> confdefs.h <<\EOF +#define _MINIX 1 +EOF + +fi + +echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 +if test -d /etc/conf/kconfig.d && + grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 +then + echo "$ac_t""yes" 1>&6 + ISC=yes # If later tests want to check for ISC. + cat >> confdefs.h <<\EOF +#define _POSIX_SOURCE 1 +EOF + + if test "$GCC" = yes; then + CC="$CC -posix" + else + CC="$CC -Xp" + fi +else + echo "$ac_t""no" 1>&6 + ISC= +fi + + +############################################################################## +################ Check for libraries ######################################### +############################################################################## + + +############################################################################## +################ Check for header files ###################################### +############################################################################## + +ac_header_dirent=no +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h +do +ac_safe=`echo "$ac_hdr" | tr './\055' '___'` +echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1093 "configure" +#include "confdefs.h" +#include <sys/types.h> +#include <$ac_hdr> +int main() { return 0; } +int t() { +DIR *dirp = 0; +; return 0; } +EOF +if { (eval echo configure:1102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=yes" +else + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=no" +fi +rm -f conftest* + +fi +if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdedfghijklmnopqrstuvwxyz./\055' 'ABCDEDFGHIJKLMNOPQRSTUVWXYZ___'` + cat >> confdefs.h <<EOF +#define $ac_tr_hdr 1 +EOF + ac_header_dirent=$ac_hdr; break +else + echo "$ac_t""no" 1>&6 +fi +done +# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +if test $ac_header_dirent = dirent.h; then +echo $ac_n "checking for -ldir""... $ac_c" 1>&6 +ac_lib_var=`echo dir'_'opendir | tr './+\055' '__p_'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ldir $LIBS" +cat > conftest.$ac_ext <<EOF +#line 1133 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir(); + +int main() { return 0; } +int t() { +opendir() +; return 0; } +EOF +if { (eval echo configure:1145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -ldir" +else + echo "$ac_t""no" 1>&6 +fi + +else +echo $ac_n "checking for -lx""... $ac_c" 1>&6 +ac_lib_var=`echo x'_'opendir | tr './+\055' '__p_'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lx $LIBS" +cat > conftest.$ac_ext <<EOF +#line 1172 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir(); + +int main() { return 0; } +int t() { +opendir() +; return 0; } +EOF +if { (eval echo configure:1184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -lx" +else + echo "$ac_t""no" 1>&6 +fi + +fi + # If we cannot run a trivial program, we must be cross compiling. echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then @@ -712,11 +1209,11 @@ else ac_cv_c_cross=yes else cat > conftest.$ac_ext <<EOF -#line 716 "configure" +#line 1213 "configure" #include "confdefs.h" main(){return(0);} EOF -eval $ac_link +{ (eval echo configure:1217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_c_cross=no else @@ -725,22 +1222,24 @@ fi fi rm -fr conftest* fi -cross_compiling=$ac_cv_c_cross + echo "$ac_t""$ac_cv_c_cross" 1>&6 +cross_compiling=$ac_cv_c_cross echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 737 "configure" +#line 1235 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> #include <string.h> #include <float.h> EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -755,7 +1254,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 759 "configure" +#line 1258 "configure" #include "confdefs.h" #include <string.h> EOF @@ -773,7 +1272,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 777 "configure" +#line 1276 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -791,10 +1290,10 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. if test "$cross_compiling" = yes; then - ac_cv_header_stdc=no + : else cat > conftest.$ac_ext <<EOF -#line 798 "configure" +#line 1297 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -805,7 +1304,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -eval $ac_link +{ (eval echo configure:1308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then : else @@ -815,6 +1314,7 @@ fi rm -fr conftest* fi fi + echo "$ac_t""$ac_cv_header_stdc" 1>&6 if test $ac_cv_header_stdc = yes; then cat >> confdefs.h <<\EOF @@ -823,12 +1323,67 @@ EOF fi +echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1332 "configure" +#include "confdefs.h" +#include <sys/types.h> +#include <sys/stat.h> + +#if defined(S_ISBLK) && defined(S_IFDIR) +# if S_ISBLK (S_IFDIR) +You lose. +# endif +#endif + +#if defined(S_ISBLK) && defined(S_IFCHR) +# if S_ISBLK (S_IFCHR) +You lose. +# endif +#endif + +#if defined(S_ISLNK) && defined(S_IFREG) +# if S_ISLNK (S_IFREG) +You lose. +# endif +#endif + +#if defined(S_ISSOCK) && defined(S_IFREG) +# if S_ISSOCK (S_IFREG) +You lose. +# endif +#endif + +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "You lose" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_header_stat_broken=yes +else + rm -rf conftest* + ac_cv_header_stat_broken=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_header_stat_broken" 1>&6 +if test $ac_cv_header_stat_broken = yes; then + cat >> confdefs.h <<\EOF +#define STAT_MACROS_BROKEN 1 +EOF + +fi + echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 832 "configure" +#line 1387 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -845,7 +1400,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -855,6 +1410,7 @@ fi rm -f conftest* fi + echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6 if test $ac_cv_header_sys_wait_h = yes; then cat >> confdefs.h <<\EOF @@ -863,7 +1419,7 @@ EOF fi -for ac_hdr in limits.h stddef.h sys/types.h sys/stat.h sys/param.h +for ac_hdr in limits.h sys/types.h sys/param.h stdlib.h unistd.h string.h do ac_safe=`echo "$ac_hdr" | tr './\055' '___'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -871,11 +1427,12 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 875 "configure" +#line 1431 "configure" #include "confdefs.h" #include <$ac_hdr> EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -889,7 +1446,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` cat >> confdefs.h <<EOF #define $ac_tr_hdr 1 EOF @@ -899,7 +1456,7 @@ else fi done -for ac_hdr in stdlib.h unistd.h string.h malloc.h memory.h assert.h ctype.h errno.h +for ac_hdr in malloc.h sys/ioctl.h termios.h termio.h sgtty.h regex.h do ac_safe=`echo "$ac_hdr" | tr './\055' '___'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -907,11 +1464,12 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 911 "configure" +#line 1468 "configure" #include "confdefs.h" #include <$ac_hdr> EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -925,43 +1483,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'` - cat >> confdefs.h <<EOF -#define $ac_tr_hdr 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi -done - -for ac_hdr in sys/ioctl.h termios.h termio.h sgtty.h regex.h -do -ac_safe=`echo "$ac_hdr" | tr './\055' '___'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 947 "configure" -#include "confdefs.h" -#include <$ac_hdr> -EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -ac_err=`grep -v '^ *+' conftest.out` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` cat >> confdefs.h <<EOF #define $ac_tr_hdr 1 EOF @@ -973,75 +1495,15 @@ done ############################################################################## -### Checks for typedefs, structures, and compiler characteristics. - -echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_prog_cc_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_cv_prog_cc_stdc=no -ac_save_CFLAGS="$CFLAGS" -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX -Aa -D_HPUX_SOURCE -# CX/UX -Xa (-Xc is strict ANSI) -# SVR4 -Xc -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" -Xa -Xc -do - CFLAGS="$ac_save_CFLAGS $ac_arg" - cat > conftest.$ac_ext <<EOF -#line 996 "configure" -#include "confdefs.h" -#if !defined(__STDC__) || __STDC__ != 1 -choke me -#endif - -int main() { return 0; } -int t() { -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -; return 0; } -EOF -if eval $ac_compile; then - rm -rf conftest* - ac_cv_prog_cc_stdc="$ac_arg"; break -fi -rm -f conftest* - -done -CFLAGS="$ac_save_CFLAGS" - -fi - -echo "$ac_t""$ac_cv_prog_cc_stdc" 1>&6 -case "x$ac_cv_prog_cc_stdc" in - x|xno) ;; - *) CC="$CC $ac_cv_prog_cc_stdc" ;; -esac - - -echo $ac_n "checking for function prototypes""... $ac_c" 1>&6 -if test "$ac_cv_prog_cc_stdc" != no; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define PROTOTYPES 1 -EOF - - U= ANSI2KNR= -else - echo "$ac_t""no" 1>&6 - U=_ ANSI2KNR=ansi2knr -fi +################ Check for typedefs, structs, and compiler params ############ +############################################################################## echo $ac_n "checking for working const""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1045 "configure" +#line 1507 "configure" #include "confdefs.h" int main() { return 0; } @@ -1054,7 +1516,7 @@ char const *const *ccp; char **p; /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; -static struct point const zero; +static struct point const zero = {0,0}; /* AIX XL C 1.02.0.0 rejects this. It does not let you subtract one const X* pointer from another in an arm of an if-expression whose if-part is not a constant expression */ @@ -1091,7 +1553,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1101,6 +1563,7 @@ fi rm -f conftest* fi + echo "$ac_t""$ac_cv_c_const" 1>&6 if test $ac_cv_c_const = no; then cat >> confdefs.h <<\EOF @@ -1109,12 +1572,72 @@ EOF fi +echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_prog_cc_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CFLAGS="$CFLAGS" +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CFLAGS="$ac_save_CFLAGS $ac_arg" + cat > conftest.$ac_ext <<EOF +#line 1592 "configure" +#include "confdefs.h" +#if !defined(__STDC__) || __STDC__ != 1 +choke me +#endif + +int main() { return 0; } +int t() { +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +; return 0; } +EOF +if { (eval echo configure:1605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_prog_cc_stdc="$ac_arg"; break +fi +rm -f conftest* + +done +CFLAGS="$ac_save_CFLAGS" + +fi + +echo "$ac_t""$ac_cv_prog_cc_stdc" 1>&6 +case "x$ac_cv_prog_cc_stdc" in + x|xno) ;; + *) CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + + +echo $ac_n "checking for function prototypes""... $ac_c" 1>&6 +if test "$ac_cv_prog_cc_stdc" != no; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define PROTOTYPES 1 +EOF + + U= ANSI2KNR= +else + echo "$ac_t""no" 1>&6 + U=_ ANSI2KNR=./ansi2knr +fi + echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1118 "configure" +#line 1641 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -1122,15 +1645,17 @@ else #undef signal #endif #ifdef __cplusplus -extern "C" -#endif +extern "C" void (*signal (int, void (*)(int)))(int); +#else void (*signal ()) (); +#endif + int main() { return 0; } int t() { int i; ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1140,6 +1665,7 @@ fi rm -f conftest* fi + echo "$ac_t""$ac_cv_type_signal" 1>&6 cat >> confdefs.h <<EOF #define RETSIGTYPE $ac_cv_type_signal @@ -1151,7 +1677,7 @@ if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1155 "configure" +#line 1681 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1182,7 +1708,7 @@ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1186 "configure" +#line 1712 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1208,136 +1734,402 @@ EOF fi -echo $ac_n "checking for dev_t""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_type_dev_t'+set}'`\" = set"; then + +############################################################################## +################ Set default compilation flags ############################### +############################################################################## + +: ${CFLAGS=-g} +: ${LDFLAGS=-g} + + + +############################################################################## +################ Check for library functions & system calls ################## +############################################################################## + +# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works +# for constant arguments. Useless! +echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1217 "configure" +#line 1759 "configure" #include "confdefs.h" -#include <sys/types.h> -#if STDC_HEADERS -#include <stdlib.h> +#include <alloca.h> +int main() { return 0; } +int t() { +char *p = alloca(2 * sizeof(int)); +; return 0; } +EOF +if { (eval echo configure:1767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + rm -rf conftest* + ac_cv_header_alloca_h=yes +else + rm -rf conftest* + ac_cv_header_alloca_h=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 +if test $ac_cv_header_alloca_h = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_ALLOCA_H 1 +EOF + +fi + +echo $ac_n "checking for alloca""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1791 "configure" +#include "confdefs.h" + +#ifdef __GNUC__ +# define alloca __builtin_alloca +#else +# if HAVE_ALLOCA_H +# include <alloca.h> +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +# endif #endif + +int main() { return 0; } +int t() { +char *p = (char *) alloca(1); +; return 0; } EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "dev_t" >/dev/null 2>&1; then +if { (eval echo configure:1815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* - ac_cv_type_dev_t=yes + ac_cv_func_alloca=yes else rm -rf conftest* - ac_cv_type_dev_t=no + ac_cv_func_alloca=no fi rm -f conftest* fi -echo "$ac_t""$ac_cv_type_dev_t" 1>&6 -if test $ac_cv_type_dev_t = no; then + +echo "$ac_t""$ac_cv_func_alloca" 1>&6 +if test $ac_cv_func_alloca = yes; then cat >> confdefs.h <<\EOF -#define dev_t unsigned short +#define HAVE_ALLOCA 1 EOF fi -echo $ac_n "checking for ino_t""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then +if test $ac_cv_func_alloca = no; then + # The SVR3 libPW and SVR4 libucb both contain incompatible functions + # that cause trouble. Some versions do not even contain alloca or + # contain a buggy version. If you still want to use their alloca, + # use ar to extract alloca.o from them instead of compiling alloca.c. + ALLOCA=alloca.o + cat >> confdefs.h <<\EOF +#define C_ALLOCA 1 +EOF + + +echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1248 "configure" +#line 1850 "configure" #include "confdefs.h" -#include <sys/types.h> -#if STDC_HEADERS -#include <stdlib.h> +#if defined(CRAY) && ! defined(CRAY2) +webecray +#else +wenotbecray #endif + EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ino_t" >/dev/null 2>&1; then + egrep "webecray" >/dev/null 2>&1; then rm -rf conftest* - ac_cv_type_ino_t=yes + ac_cv_os_cray=yes else rm -rf conftest* - ac_cv_type_ino_t=no + ac_cv_os_cray=no fi rm -f conftest* fi -echo "$ac_t""$ac_cv_type_ino_t" 1>&6 -if test $ac_cv_type_ino_t = no; then - cat >> confdefs.h <<\EOF -#define ino_t unsigned long + +echo "$ac_t""$ac_cv_os_cray" 1>&6 +if test $ac_cv_os_cray = yes; then +for ac_func in _getb67 GETB67 getb67; do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1879 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { return 0; } +int t() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } EOF +if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* fi +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<EOF +#define CRAY_STACKSEG_END $ac_func +EOF + break +else + echo "$ac_t""no" 1>&6 +fi -CFLAGS=${CFLAGS--g} -LDFLAGS=${LDFLAGS--g} +done +fi +echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_c_stack_direction=0 +else +cat > conftest.$ac_ext <<EOF +#line 1935 "configure" +#include "confdefs.h" +find_stack_direction () +{ + static char *addr = 0; + auto char dummy; + if (addr == 0) + { + addr = &dummy; + return find_stack_direction (); + } + else + return (&dummy > addr) ? 1 : -1; +} +main () +{ + exit (find_stack_direction() < 0); +} +EOF +{ (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +if test -s conftest && (./conftest; exit) 2>/dev/null; then + ac_cv_c_stack_direction=1 +else + ac_cv_c_stack_direction=-1 +fi +fi +rm -fr conftest* +fi +echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 +cat >> confdefs.h <<EOF +#define STACK_DIRECTION $ac_cv_c_stack_direction +EOF -############################################################################## -### Checks for library functions & system calls. +fi -if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then +echo $ac_n "checking for sbrk declaration in unistd.h""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_decl_sbrk'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 1290 "configure" +#line 1976 "configure" #include "confdefs.h" -#include <sgtty.h> -Autoconf TIOCGETP +#include <unistd.h> EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then + egrep "sbrk" >/dev/null 2>&1; then rm -rf conftest* - ac_cv_prog_gcc_traditional=yes + ac_cv_decl_sbrk=yes else rm -rf conftest* - ac_cv_prog_gcc_traditional=no + ac_cv_decl_sbrk=no fi rm -f conftest* +fi - if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext <<EOF -#line 1308 "configure" +echo "$ac_t""$ac_cv_decl_sbrk" 1>&6 +if test $ac_cv_decl_sbrk = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_DECL_SBRK 1 +EOF + +fi + +echo $ac_n "checking for sys_errlist declaration""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_decl_sys_errlist'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_cv_decl_sys_errlist=no + cat > conftest.$ac_ext <<EOF +#line 2006 "configure" #include "confdefs.h" -#include <termio.h> -Autoconf TCGETA +#include <errno.h> EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then + egrep "sys_errlist" >/dev/null 2>&1; then rm -rf conftest* - ac_cv_prog_gcc_traditional=yes + ac_cv_decl_sys_errlist=yes fi rm -f conftest* - fi + cat > conftest.$ac_ext <<EOF +#line 2018 "configure" +#include "confdefs.h" +#include <stdio.h> +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "sys_errlist" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_decl_sys_errlist=yes fi - echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi +rm -f conftest* + + cat > conftest.$ac_ext <<EOF +#line 2030 "configure" +#include "confdefs.h" +#include <error.h> +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "sys_errlist" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_decl_sys_errlist=yes +fi +rm -f conftest* + + +fi + +echo "$ac_t""$ac_cv_decl_sys_errlist" 1>&6 +if test $ac_cv_decl_sys_errlist = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_DECL_SYS_ERRLIST 1 +EOF + fi -for ac_func in getwd getcwd getopt_long basename dirname +echo $ac_n "checking which of rx or regex is wanted""... $ac_c" 1>&6 +# Check whether --with-regex or --without-regex was given. +if test "${with_regex+set}" = set; then + withval="$with_regex" + if test "$withval" = yes; then + ac_with_regex=1 + echo "$ac_t""regex" 1>&6 + cat >> confdefs.h <<\EOF +#define WITH_REGEX 1 +EOF + + REGEXOBJ=regex.o +fi +fi + +if test -z "$ac_with_regex"; then + echo "$ac_t""rx" 1>&6 + echo $ac_n "checking for re_rx_search""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_func_re_rx_search'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 2074 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char re_rx_search(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char re_rx_search(); + +int main() { return 0; } +int t() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_re_rx_search) || defined (__stub___re_rx_search) +choke me +#else +re_rx_search(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_func_re_rx_search=yes" +else + rm -rf conftest* + eval "ac_cv_func_re_rx_search=no" +fi +rm -f conftest* + +fi +if eval "test \"`echo '$ac_cv_func_'re_rx_search`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +REGEXOBJ=rx.o +fi + +fi + +for ac_func in getwd getcwd link do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1335 "configure" +#line 2125 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ #include <assert.h> /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); int main() { return 0; } int t() { @@ -1353,7 +2145,7 @@ $ac_func(); ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:2149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1365,7 +2157,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <<EOF #define $ac_tr_func 1 EOF @@ -1375,20 +2167,22 @@ else fi done -for ac_func in strdup strchr strrchr strcasecmp strerror +for ac_func in strcasecmp strdup strndup strtok fnmatch do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1386 "configure" +#line 2178 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ #include <assert.h> /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); int main() { return 0; } int t() { @@ -1404,7 +2198,7 @@ $ac_func(); ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:2202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1416,7 +2210,229 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` + : +else + echo "$ac_t""no" 1>&6 +LIBOBJS="$LIBOBJS ${ac_func}.o" +fi + +done + +for ac_func in basename dirname error memcpy memset +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 2229 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { return 0; } +int t() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* + +fi +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +LIBOBJS="$LIBOBJS ${ac_func}.o" +fi + +done + +echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 2278 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char getopt_long(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char getopt_long(); + +int main() { return 0; } +int t() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getopt_long) || defined (__stub___getopt_long) +choke me +#else +getopt_long(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_func_getopt_long=yes" +else + rm -rf conftest* + eval "ac_cv_func_getopt_long=no" +fi +rm -f conftest* + +fi +if eval "test \"`echo '$ac_cv_func_'getopt_long`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +LIBOBJS="$LIBOBJS getopt1.o getopt.o" +fi + + +echo $ac_n "checking for obstacks""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'gt_cv_func_obstack'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 2326 "configure" +#include "confdefs.h" +#include "obstack.h" +int main() { return 0; } +int t() { +struct obstack *mem;obstack_free(mem,NULL) +; return 0; } +EOF +if { (eval echo configure:2334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + rm -rf conftest* + gt_cv_func_obstack=yes +else + rm -rf conftest* + gt_cv_func_obstack=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$gt_cv_func_obstack" 1>&6 +if test $gt_cv_func_obstack = no; then + LIBOBJS="$LIBOBJS obstack.o" +fi + + +############################################################################## +################ Internationalization ######################################## +############################################################################## + +echo $ac_n "checking for inline""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat > conftest.$ac_ext <<EOF +#line 2362 "configure" +#include "confdefs.h" + +int main() { return 0; } +int t() { +} $ac_kw foo() { +; return 0; } +EOF +if { (eval echo configure:2370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_inline=$ac_kw; break +fi +rm -f conftest* + +done + +fi + +echo "$ac_t""$ac_cv_c_inline" 1>&6 +case "$ac_cv_c_inline" in + inline | yes) ;; + no) cat >> confdefs.h <<\EOF +#define inline +EOF + ;; + *) cat >> confdefs.h <<EOF +#define inline $ac_cv_c_inline +EOF + ;; +esac + +for ac_func in valloc getpagesize +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 2400 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { return 0; } +int t() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* + +fi +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <<EOF #define $ac_tr_func 1 EOF @@ -1426,20 +2442,155 @@ else fi done -for ac_func in memcpy bcopy memset bzero +echo $ac_n "checking for working mmap""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_func_mmap'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_func_mmap=no +else +cat > conftest.$ac_ext <<EOF +#line 2454 "configure" +#include "confdefs.h" + +/* Thanks to Mike Haertel and Jim Avera for this test. */ +#include <sys/types.h> +#include <fcntl.h> +#include <sys/mman.h> + +#ifndef HAVE_GETPAGESIZE +# include <sys/param.h> +# ifdef EXEC_PAGESIZE +# define getpagesize() EXEC_PAGESIZE +# else +# ifdef NBPG +# define getpagesize() NBPG * CLSIZE +# ifndef CLSIZE +# define CLSIZE 1 +# endif +# else +# ifdef NBPC +# define getpagesize() NBPC +# else +# define getpagesize() PAGESIZE /* SVR4 */ +# endif +# endif +# endif +#endif + +#ifndef HAVE_VALLOC +# define valloc malloc +#endif + +#ifdef __cplusplus +extern "C" { void *valloc(unsigned), *malloc(unsigned); } +#else +char *valloc(), *malloc(); +#endif + +int +main() +{ + char *buf1, *buf2, *buf3; + int i = getpagesize(), j; + int i2 = i * 2; + int fd; + + buf1 = (char *)valloc(i2); + buf2 = (char *)valloc(i); + buf3 = (char *)malloc(i2); + for (j = 0; j < i2; ++j) + *(buf1 + j) = rand(); + fd = open("conftestmmap", O_CREAT | O_RDWR, 0666); + write(fd, buf1, i2); + mmap(buf2, i, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, fd, 0); + for (j = 0; j < i; ++j) + if (*(buf1 + j) != *(buf2 + j)) + exit(1); + lseek(fd, (long)i, 0); + read(fd, buf2, i); /* read into mapped memory -- file should not change */ + /* (it does in i386 SVR4.0 - Jim Avera, jima@netcom.com) */ + lseek(fd, (long)0, 0); + read(fd, buf3, i2); + for (j = 0; j < i2; ++j) + if (*(buf1 + j) != *(buf3 + j)) + exit(1); + exit(0); +} + +EOF +{ (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +if test -s conftest && (./conftest; exit) 2>/dev/null; then + ac_cv_func_mmap=yes +else + ac_cv_func_mmap=no +fi +fi +rm -fr conftest* +fi + +echo "$ac_t""$ac_cv_func_mmap" 1>&6 +if test $ac_cv_func_mmap = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_MMAP 1 +EOF + +fi + + + for ac_hdr in limits.h locale.h nl_types.h malloc.h string.h unistd.h values.h +do +ac_safe=`echo "$ac_hdr" | tr './\055' '___'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 2550 "configure" +#include "confdefs.h" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` + cat >> confdefs.h <<EOF +#define $ac_tr_hdr 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi +done + + for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1437 "configure" +#line 2586 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ #include <assert.h> /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); int main() { return 0; } int t() { @@ -1455,7 +2606,7 @@ $ac_func(); ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:2610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1467,7 +2618,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <<EOF #define $ac_tr_func 1 EOF @@ -1477,20 +2628,24 @@ else fi done -for ac_func in regcomp regcmp re_comp link + + if test "${ac_cv_func_stpcpy+set}" != "set"; then + for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1488 "configure" +#line 2641 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ #include <assert.h> /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); int main() { return 0; } int t() { @@ -1506,7 +2661,7 @@ $ac_func(); ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:2665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1518,7 +2673,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <<EOF #define $ac_tr_func 1 EOF @@ -1528,137 +2683,243 @@ else fi done -# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works -# for constant arguments. Useless! -echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_STPCPY 1 +EOF + + fi + + if test $ac_cv_header_locale_h = yes; then + echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ud_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1539 "configure" +#line 2701 "configure" #include "confdefs.h" -#include <alloca.h> +#include <locale.h> int main() { return 0; } int t() { -char *p = alloca(2 * sizeof(int)); +return LC_MESSAGES ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:2709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* - ac_cv_header_alloca_h=yes + ud_cv_val_LC_MESSAGES=yes else rm -rf conftest* - ac_cv_header_alloca_h=no + ud_cv_val_LC_MESSAGES=no fi rm -f conftest* fi -echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 -if test $ac_cv_header_alloca_h = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ALLOCA_H 1 + +echo "$ac_t""$ud_cv_val_LC_MESSAGES" 1>&6 + if test $ud_cv_val_LC_MESSAGES = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_LC_MESSAGES 1 EOF + fi + fi + echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 + # Check whether --enable-nls or --disable-nls was given. +if test "${enable_nls+set}" = set; then + enableval="$enable_nls" + USE_NLS=$enableval +else + USE_NLS=yes fi -echo $ac_n "checking for alloca""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then + echo "$ac_t""$USE_NLS" 1>&6 + + + if test "$USE_NLS" = "yes"; then + cat >> confdefs.h <<\EOF +#define ENABLE_NLS 1 +EOF + + echo $ac_n "checking for explicitly using GNU gettext""... $ac_c" 1>&6 + # Check whether --with-gnu-gettext or --without-gnu-gettext was given. +if test "${with_gnu_gettext+set}" = set; then + withval="$with_gnu_gettext" + nls_cv_force_use_gnu_gettext=$withval +else + nls_cv_force_use_gnu_gettext=no +fi + + echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6 + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE + + ac_safe=`echo "libintl.h" | tr './\055' '___'` +echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1570 "configure" +#line 2768 "configure" +#include "confdefs.h" +#include <libintl.h> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for -lintl""... $ac_c" 1>&6 +ac_lib_var=`echo intl'_'main | tr './+\055' '__p_'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lintl $LIBS" +cat > conftest.$ac_ext <<EOF +#line 2795 "configure" #include "confdefs.h" - -#ifdef __GNUC__ -# define alloca __builtin_alloca -#else -# if HAVE_ALLOCA_H -# include <alloca.h> -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -#endif int main() { return 0; } int t() { -char *p = (char *) alloca(1); +main() ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:2803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* - ac_cv_func_alloca=yes + eval "ac_cv_lib_$ac_lib_var=yes" else rm -rf conftest* - ac_cv_func_alloca=no + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* +LIBS="$ac_save_LIBS" fi -echo "$ac_t""$ac_cv_func_alloca" 1>&6 -if test $ac_cv_func_alloca = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ALLOCA 1 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo intl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <<EOF +#define $ac_tr_lib 1 EOF -fi - -if test $ac_cv_func_alloca = no; then - # The SVR3 libPW and SVR4 libucb both contain incompatible functions - # that cause trouble. Some versions do not even contain alloca or - # contain a buggy version. If you still want to use their alloca, - # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.o - cat >> confdefs.h <<\EOF -#define C_ALLOCA 1 -EOF + LIBS="-lintl $LIBS" +else + echo "$ac_t""no" 1>&6 +fi -echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then + echo $ac_n "checking for gettext""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_func_gettext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1628 "configure" +#line 2832 "configure" #include "confdefs.h" -#if defined(CRAY) && ! defined(CRAY2) -webecray +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gettext(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gettext(); + +int main() { return 0; } +int t() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gettext) || defined (__stub___gettext) +choke me #else -wenotbecray +gettext(); #endif +; return 0; } EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "webecray" >/dev/null 2>&1; then +if { (eval echo configure:2856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* - ac_cv_os_cray=yes + eval "ac_cv_func_gettext=yes" else rm -rf conftest* - ac_cv_os_cray=no + eval "ac_cv_func_gettext=no" fi rm -f conftest* fi -echo "$ac_t""$ac_cv_os_cray" 1>&6 -if test $ac_cv_os_cray = yes; then -for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +if eval "test \"`echo '$ac_cv_func_'gettext`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_GETTEXT 1 +EOF + + # Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$MSGFMT" in + /*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_MSGFMT="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" + ;; +esac +fi +MSGFMT="$ac_cv_path_MSGFMT" +if test -n "$MSGFMT"; then + echo "$ac_t""$MSGFMT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + if echo $MSGFMT | grep openwin > /dev/null; then + echo "WARNING: Do not use OpenWin's msgfmt. (Better remove it.)" >&6 + ac_cv_path_MSGFMT=msgfmt + MSGFMT=msgfmt + fi + if test "$MSGFMT" != "no"; then + for ac_func in dcgettext +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1656 "configure" +#line 2915 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ #include <assert.h> /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); int main() { return 0; } int t() { @@ -1674,7 +2935,7 @@ $ac_func(); ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:2939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1686,100 +2947,559 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <<EOF -#define CRAY_STACKSEG_END $ac_func +#define $ac_tr_func 1 EOF - - break + else echo "$ac_t""no" 1>&6 fi - done + + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$GMSGFMT" in + /*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_GMSGFMT="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT="$ac_cv_path_GMSGFMT" +if test -n "$GMSGFMT"; then + echo "$ac_t""$GMSGFMT" 1>&6 +else + echo "$ac_t""no" 1>&6 fi + if echo $GMSGFMT | grep openwin > /dev/null; then + echo "WARNING: Do not use OpenWin's gmsgfmt. (Better remove it.)" >&6 + ac_cv_path_GMSGFMT=gmsgfmt + GMSGFMT=gmsgfmt + fi -echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then + # Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$cross_compiling" = yes; then - ac_cv_c_stack_direction=0 + case "$XGETTEXT" in + /*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test -n "$XGETTEXT"; then + echo "$ac_t""$XGETTEXT" 1>&6 else + echo "$ac_t""no" 1>&6 +fi + if echo $XGETTEXT | grep openwin > /dev/null; then + echo "WARNING: Do not use OpenWin's xgettext. (Better remove it.)" >&6 + ac_cv_path_XGETTEXT=xgettext + XGETTEXT=xgettext + fi + + CATOBJEXT=.mo + INSTOBJEXT=.mo + DATADIRNAME=lib + fi +else + echo "$ac_t""no" 1>&6 +fi + +else + echo "$ac_t""no" 1>&6 +fi + + + if test "$CATOBJEXT" = "NONE"; then + echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 + # Check whether --with-catgets or --without-catgets was given. +if test "${with_catgets+set}" = set; then + withval="$with_catgets" + nls_cv_use_catgets=$withval +else + nls_cv_use_catgets=no +fi + + echo "$ac_t""$nls_cv_use_catgets" 1>&6 + + if test "$nls_cv_use_catgets" = "yes"; then + echo $ac_n "checking for -li""... $ac_c" 1>&6 +ac_lib_var=`echo i'_'main | tr './+\055' '__p_'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-li $LIBS" cat > conftest.$ac_ext <<EOF -#line 1710 "configure" +#line 3067 "configure" #include "confdefs.h" -find_stack_direction () -{ - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; -} -main () -{ - exit (find_stack_direction() < 0); -} + +int main() { return 0; } +int t() { +main() +; return 0; } EOF -eval $ac_link -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_c_stack_direction=1 +if { (eval echo configure:3075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" else - ac_cv_c_stack_direction=-1 -fi + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -fr conftest* +rm -f conftest* +LIBS="$ac_save_LIBS" + fi -echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 -cat >> confdefs.h <<EOF -#define STACK_DIRECTION $ac_cv_c_stack_direction +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo i | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <<EOF +#define $ac_tr_lib 1 EOF + LIBS="-li $LIBS" + +else + echo "$ac_t""no" 1>&6 fi + echo $ac_n "checking for catgets""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 3104 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char catgets(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char catgets(); -if test "$ac_cv_func_re_comp" = no; then REGEXP="regex.o"; fi +int main() { return 0; } +int t() { -if test "$ac_cv_func_getopt_long" = no; then GETOPT="getopt.o getopt1.o"; fi +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_catgets) || defined (__stub___catgets) +choke me +#else +catgets(); +#endif -if test "$ac_cv_func_strcasecmp" = no; then STRCASECMP="strcasecmp.o"; fi +; return 0; } +EOF +if { (eval echo configure:3128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_func_catgets=yes" +else + rm -rf conftest* + eval "ac_cv_func_catgets=no" +fi +rm -f conftest* -if test "$ac_cv_func_strerror" = no; then STRERROR="strerror.o"; fi +fi +if eval "test \"`echo '$ac_cv_func_'catgets`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_CATGETS 1 +EOF + INTLOBJS="\$(CATOBJS)" + # Extract the first word of "gencat", so it can be a program name with args. +set dummy gencat; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$GENCAT" in + /*) + ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_GENCAT="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_GENCAT" && ac_cv_path_GENCAT="no" + ;; +esac +fi +GENCAT="$ac_cv_path_GENCAT" +if test -n "$GENCAT"; then + echo "$ac_t""$GENCAT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + if test "$GENCAT" != "no"; then + for ac_prog in gmsgfmt msgfmt +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$GMSGFMT" in + /*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_GMSGFMT="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +GMSGFMT="$ac_cv_path_GMSGFMT" +if test -n "$GMSGFMT"; then + echo "$ac_t""$GMSGFMT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi -############################################################################## -### Directory locations. +test -n "$GMSGFMT" && break +done +test -n "$GMSGFMT" || GMSGFMT="msgfmt" -if test "x$prefix" != xNONE; then - datadir=$prefix/share + # Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$XGETTEXT" in + /*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test -n "$XGETTEXT"; then + echo "$ac_t""$XGETTEXT" 1>&6 else - datadir=$ac_default_prefix/share + echo "$ac_t""no" 1>&6 +fi + if echo $XGETTEXT | grep openwin > /dev/null; then + echo "WARNING: Do not use OpenWin's xgettext. (Better remove it.)" >&6 + ac_cv_path_XGETTEXT=xgettext + XGETTEXT=xgettext + fi + + CATOBJEXT=.cat + INSTOBJEXT=.cat + DATADIRNAME=lib + INTLDEPS="../intl/libintl.a" + INTLLIBS=$INTLDEPS + INTLSUB=intl + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi +else + echo "$ac_t""no" 1>&6 fi -IID_HELP_FILE=$datadir/iid.help + fi + fi -cat >> confdefs.h <<EOF -#define IID_HELP_FILE "$datadir/iid.help" -EOF + if test "$CATOBJEXT" = "NONE"; then + nls_cv_use_gnu_gettext=yes + fi + fi + if test "$nls_cv_use_gnu_gettext" = "yes"; then + INTLOBJS="\$(GETTOBJS)" + # Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$MSGFMT" in + /*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_MSGFMT="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt" + ;; +esac +fi +MSGFMT="$ac_cv_path_MSGFMT" +if test -n "$MSGFMT"; then + echo "$ac_t""$MSGFMT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + if echo $MSGFMT | grep openwin > /dev/null; then + echo "WARNING: Do not use OpenWin's msgfmt. (Better remove it.)" >&6 + ac_cv_path_MSGFMT=msgfmt + MSGFMT=msgfmt + fi -############################################################################## -### Makefile dependencies. + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$GMSGFMT" in + /*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_GMSGFMT="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT="$ac_cv_path_GMSGFMT" +if test -n "$GMSGFMT"; then + echo "$ac_t""$GMSGFMT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + if echo $GMSGFMT | grep openwin > /dev/null; then + echo "WARNING: Do not use OpenWin's gmsgfmt. (Better remove it.)" >&6 + ac_cv_path_GMSGFMT=gmsgfmt + GMSGFMT=gmsgfmt + fi -case x$srcdir in -x) DEPEND=depend.out;; -*) DEPEND=$srcdir/depend.out;; + # Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$XGETTEXT" in + /*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; esac -DEPEND_FILE=$DEPEND +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test -n "$XGETTEXT"; then + echo "$ac_t""$XGETTEXT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + if echo $XGETTEXT | grep openwin > /dev/null; then + echo "WARNING: Do not use OpenWin's xgettext. (Better remove it.)" >&6 + ac_cv_path_XGETTEXT=xgettext + XGETTEXT=xgettext + fi + + + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS="../intl/libintl.a" + INTLLIBS=$INTLDEPS + INTLSUB=intl + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi + + if test "$XGETTEXT" != ":"; then + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + echo "$ac_t""found xgettext programs is not GNU xgettext; ignore it" 1>&6 + XGETTEXT=":" + fi + fi + + # We need to process the po/ directory. + POSUB=po + else + DATADIRNAME=share + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi + + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + + + + + + + + + + + + + + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 + NEW_LINGUAS= + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac + done + LINGUAS=$NEW_LINGUAS + echo "$ac_t""$LINGUAS" 1>&6 + fi + + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + test -d intl || mkdir intl + if test "$CATOBJEXT" = ".cat"; then + ac_safe=`echo "linux/version.h" | tr './\055' '___'` +echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 3455 "configure" +#include "confdefs.h" +#include <linux/version.h> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:3460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + msgformat=linux +else + echo "$ac_t""no" 1>&6 +msgformat=xopen +fi + + sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed + fi + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + + +############################################################################## +################ Generate the configure script ############################### ############################################################################## -### Autoconf results generation. trap '' 1 2 15 cat > confcache <<\EOF @@ -1857,7 +3577,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.2" + echo "$CONFIG_STATUS generated by autoconf version 2.10" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1868,11 +3588,13 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo Makefile config.h | tr : " "` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile doc/Makefile lib/Makefile src/Makefile intl/Makefile po/Makefile.in config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS <<EOF -# Protect against being on the right side of a sed subst in config.status. -sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; - s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF +# Protect against being on the right side of a sed subst in config.status. +sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub s%@CFLAGS@%$CFLAGS%g @@ -1884,34 +3606,58 @@ s%@LIBS@%$LIBS%g s%@exec_prefix@%$exec_prefix%g s%@prefix@%$prefix%g s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g s%@PACKAGE@%$PACKAGE%g s%@VERSION@%$VERSION%g -s%@PREV_VERSION@%$PREV_VERSION%g -s%@YACC@%$YACC%g +s%@PACKAGE_VERSION@%$PACKAGE_VERSION%g +s%@MAINT@%$MAINT%g +s%@README_ALPHA@%$README_ALPHA%g s%@CC@%$CC%g s%@LN_S@%$LN_S%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@SET_MAKE@%$SET_MAKE%g s%@CPP@%$CPP%g +s%@RANLIB@%$RANLIB%g s%@U@%$U%g s%@ANSI2KNR@%$ANSI2KNR%g s%@ALLOCA@%$ALLOCA%g -s%@REGEXP@%$REGEXP%g -s%@GETOPT@%$GETOPT%g -s%@STRCASECMP@%$STRCASECMP%g -s%@STRERROR@%$STRERROR%g -s%@datadir@%$datadir%g -s%@IID_HELP_FILE@%$IID_HELP_FILE%g -s%@DEPEND@%$DEPEND%g -/@DEPEND_FILE@/r $DEPEND_FILE -s%@DEPEND_FILE@%%g +s%@REGEXOBJ@%$REGEXOBJ%g +s%@LIBOBJS@%$LIBOBJS%g +s%@USE_NLS@%$USE_NLS%g +s%@MSGFMT@%$MSGFMT%g +s%@GMSGFMT@%$GMSGFMT%g +s%@XGETTEXT@%$XGETTEXT%g +s%@GENCAT@%$GENCAT%g +s%@CATALOGS@%$CATALOGS%g +s%@CATOBJEXT@%$CATOBJEXT%g +s%@DATADIRNAME@%$DATADIRNAME%g +s%@GMOFILES@%$GMOFILES%g +s%@INSTOBJEXT@%$INSTOBJEXT%g +s%@INTLDEPS@%$INTLDEPS%g +s%@INTLLIBS@%$INTLLIBS%g +s%@INTLOBJS@%$INTLOBJS%g +s%@INTLSUB@%$INTLSUB%g +s%@POFILES@%$POFILES%g +s%@POSUB@%$POSUB%g CEOF EOF cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"Makefile"} +CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile lib/Makefile src/Makefile intl/Makefile po/Makefile.in"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then @@ -2004,13 +3750,13 @@ EOF # Transform confdefs.h into a sed script conftest.vals that substitutes # the proper values into config.h.in to produce config.h. And first: -# Protect against being on the right side of a sed subst in config.status. +# Protect against being on the right side of a sed subst in config.status. # Protect against being in an unquoted here document in config.status. rm -f conftest.vals cat > conftest.hdr <<\EOF s/[\\&%]/\\&/g s%[\\$`]%\\&%g -s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp s%ac_d%ac_u%gp s%ac_u%ac_e%gp EOF @@ -2058,16 +3804,72 @@ cat >> $CONFIG_STATUS <<\EOF echo "$ac_file is unchanged" rm -f conftest.h else + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + fi rm -f $ac_file mv conftest.h $ac_file fi fi; done +EOF -test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h +cat >> $CONFIG_STATUS <<EOF +ac_sources="$nls_cv_header_libgt" +ac_dests="$nls_cv_header_intl" +EOF + +cat >> $CONFIG_STATUS <<\EOF +srcdir=$ac_given_srcdir +while test -n "$ac_sources"; do + set $ac_dests; ac_dest=$1; shift; ac_dests=$* + set $ac_sources; ac_source=$1; shift; ac_sources=$* + + echo "linking $srcdir/$ac_source to $ac_dest" + + if test ! -r $srcdir/$ac_source; then + { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; } + fi + rm -f $ac_dest + + # Make relative symlinks. + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'` + if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then + # The dest file is in a subdirectory. + test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir" + ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`" + # A "../" for each directory in $ac_dest_dir_suffix. + ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'` + else + ac_dest_dir_suffix= ac_dots= + fi + + case "$srcdir" in + [/$]*) ac_rel_source="$srcdir/$ac_source" ;; + *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;; + esac + + # Make a symlink if possible; otherwise try a hard link. + if ln -s $ac_rel_source $ac_dest 2>/dev/null || + ln $srcdir/$ac_source $ac_dest; then : + else + { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; } + fi +done + +sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile; \ + test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h exit 0 EOF chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 + +############################################################################## +################ Done ######################################################## +############################################################################## diff --git a/configure.in b/configure.in index 3c4755b..19c8f63 100644 --- a/configure.in +++ b/configure.in @@ -1,106 +1,129 @@ dnl Process this file with autoconf to produce a configure script. +dnl Note: the banner comments below are intentionally done in shell syntax. +dnl These help me identify sections of the configure script produced +dnl by autoconf. Some comments might appear inane and obvious, but again +dnl they are there to delimit sections in the output configure script. + +############################################################################## +################ Setup ####################################################### ############################################################################## -### Autoconf setup -AC_INIT(mkid.c) +AC_INIT(src/mkid.c) AC_CONFIG_HEADER(config.h) +AC_PREREQ(2.10) +AC_ARG_PROGRAM ############################################################################## -### Package identification +################ Identify Package ############################################ +############################################################################## -PACKAGE=mkid +PACKAGE=id-utils VERSION=3.0.9 -PREV_VERSION=3.0.8 +PACKAGE_VERSION="$PACKAGE-$VERSION" AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") +AC_DEFINE_UNQUOTED(PACKAGE_VERSION, "$PACKAGE_VERSION") AC_SUBST(PACKAGE) AC_SUBST(VERSION) -AC_SUBST(PREV_VERSION) +AC_SUBST(PACKAGE_VERSION) + +############################################################################## +################ Maintainer Stuff ############################################ +############################################################################## + +jm_MAINTAINER_MODE + +ALL_LINGUAS="de fr" + +changequote(,)dnl +case $VERSION in +*.*.*) README_ALPHA=README-alpha;; +*) README_ALPHA=;; +esac +changequote([, ])dnl +AC_SUBST(README_ALPHA) ############################################################################## -### Checks for programs. +################ Check for tools ############################################# +############################################################################## -AC_PROG_YACC AC_PROG_CC AC_PROG_LN_S -AC_PROG_INSTALL +fp_PROG_INSTALL AC_PROG_MAKE_SET +AC_PROG_CPP +AC_PROG_GCC_TRADITIONAL +AC_PROG_RANLIB +AC_AIX +AC_MINIX +AC_ISC_POSIX ############################################################################## -### Checks for libraries. +################ Check for libraries ######################################### +############################################################################## + +dnl no library checks ############################################################################## -### Checks for header files. +################ Check for header files ###################################### +############################################################################## -dnl AC_HEADER_DIRENT +AC_HEADER_DIRENT AC_HEADER_STDC +AC_HEADER_STAT AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(limits.h stddef.h sys/types.h sys/stat.h sys/param.h) -AC_CHECK_HEADERS(stdlib.h unistd.h string.h malloc.h memory.h assert.h ctype.h errno.h) -AC_CHECK_HEADERS(sys/ioctl.h termios.h termio.h sgtty.h regex.h) +AC_CHECK_HEADERS(limits.h sys/types.h sys/param.h stdlib.h unistd.h string.h) +AC_CHECK_HEADERS(malloc.h sys/ioctl.h termios.h termio.h sgtty.h regex.h) ############################################################################## -### Checks for typedefs, structures, and compiler characteristics. +################ Check for typedefs, structs, and compiler params ############ +############################################################################## -fp_C_PROTOTYPES AC_C_CONST +fp_C_PROTOTYPES AC_TYPE_SIGNAL AC_TYPE_OFF_T AC_TYPE_SIZE_T -AC_CHECK_TYPE(dev_t, unsigned short) -AC_CHECK_TYPE(ino_t, unsigned long) -CFLAGS=${CFLAGS--g} -LDFLAGS=${LDFLAGS--g} +############################################################################## +################ Set default compilation flags ############################### +############################################################################## + +: ${CFLAGS=-g} +: ${LDFLAGS=-g} AC_SUBST(CFLAGS) AC_SUBST(LDFLAGS) ############################################################################## -### Checks for library functions & system calls. +################ Check for library functions & system calls ################## +############################################################################## -AC_PROG_GCC_TRADITIONAL -AC_CHECK_FUNCS(getwd getcwd getopt_long basename dirname) -AC_CHECK_FUNCS(strdup strchr strrchr strcasecmp strerror) -AC_CHECK_FUNCS(memcpy bcopy memset bzero) -AC_CHECK_FUNCS(regcomp regcmp re_comp link) AC_FUNC_ALLOCA -AC_SUBST(ALLOCA) -if test "$ac_cv_func_re_comp" = no; then REGEXP="regex.o"; fi -AC_SUBST(REGEXP) -if test "$ac_cv_func_getopt_long" = no; then GETOPT="getopt.o getopt1.o"; fi -AC_SUBST(GETOPT) -if test "$ac_cv_func_strcasecmp" = no; then STRCASECMP="strcasecmp.o"; fi -AC_SUBST(STRCASECMP) -if test "$ac_cv_func_strerror" = no; then STRERROR="strerror.o"; fi -AC_SUBST(STRERROR) - -############################################################################## -### Directory locations. - -if test "x$prefix" != xNONE; then - datadir=$prefix/share -else - datadir=$ac_default_prefix/share -fi -IID_HELP_FILE=$datadir/iid.help -AC_SUBST(datadir) -AC_SUBST(IID_HELP_FILE) -AC_DEFINE_UNQUOTED(IID_HELP_FILE, "$datadir/iid.help") - -############################################################################## -### Makefile dependencies. - -case x$srcdir in -x) DEPEND=depend.out;; -*) DEPEND=$srcdir/depend.out;; -esac -DEPEND_FILE=$DEPEND -AC_SUBST(DEPEND) -AC_SUBST_FILE(DEPEND_FILE) +gm_DECL_SBRK +gm_DECL_SYS_ERRLIST +ud_WITH_REGEX +AC_CHECK_FUNCS(getwd getcwd link) +AC_REPLACE_FUNCS(strcasecmp strdup strndup strtok fnmatch) +AC_REPLACE_FUNCS(basename dirname error memcpy memset) +AC_REPLACE_GNU_GETOPT +AC_REPLACE_OBSTACK ############################################################################## -### Autoconf results generation. +################ Internationalization ######################################## +############################################################################## + +ud_GNU_GETTEXT +AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) + +############################################################################## +################ Generate the configure script ############################### +############################################################################## + +AC_OUTPUT([Makefile doc/Makefile lib/Makefile src/Makefile intl/Makefile po/Makefile.in], + [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile; \ + test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h]) -AC_OUTPUT(Makefile, - [test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h]) +############################################################################## +################ Done ######################################################## +############################################################################## @@ -2,49 +2,60 @@ export LANG; LANG=C -: ${TMP=/tmp} -ID_idx=$TMP/ID.idx -ID_lid=$TMP/ID.lid -tmp_idx=$TMP/$$.idx -tmp_fid=$TMP/$$.fid - case $# in -0) 1>&2 echo Usage: $0 files...; exit 1;; -esac -case $1 in --f*) idfile_arg=$1; shift;; +0) exec make idtest-real;; esac +srcdir=$1 +buildir=$2 +PATH=$buildir/src:$PATH + +f_ID="-f $buildir/ID" + +files="`find $srcdir -name \*.h; + find $srcdir -name \*.c |egrep -v 'lib/ansi2knr\.c$'`" + +cmd="mkid $f_ID -m $srcdir/lib/language.map $files" +echo $cmd +eval $cmd + errors= -if idx "$@" |sort -u >$ID_idx && - lid $idfile_arg |sed -e 's/[ ].*//' |sort -u >$ID_lid && - cmp -s $ID_idx $ID_lid +if idx $files |sort -u >ID.idx && + lid $idfile_arg |sed -e 's/[ ].*//' |sort -u >ID.lid && + cmp -s ID.idx ID.lid then - rm -f $ID_idx $ID_lid + rm -f ID.idx ID.lid echo "Good. idx and lid agree." else - 1>&2 echo "Oops! idx and lid disagree--look at $ID_idx and $ID_lid" + mv ID.idx ID.bad-idx + mv ID.fid ID.bad-fid + 1>&2 echo "Oops! idx and lid disagree--look in ID.bad-{idx,lid}" errors=t fi -for file +idx_file=$$.idx +fid_file=$$.fid + +for file in $files do case x$file in x-*) scan_args="$scan_args $file" continue;; esac - if fid $idfile_arg $file >$tmp_fid && - idx $scan_args $file |sort -u >$tmp_idx && - cmp -s $tmp_idx $tmp_fid; + if fid $idfile_arg $file >$fid_file && + idx $scan_args $file |sort -u >$idx_file && + cmp -s $idx_file $fid_file; then echo "Good. idx and fid agree for $file" else - 1>&2 echo "Oops! idx and fid disagree for $file" + 1>&2 echo "Oops! idx and fid disagree for $file--look in $file.bad-{idx,fid}" + mv $idx_file $file.bad-idx + mv $fid_file $file.bad-fid errors=t fi done -rm -f $tmp_idx $tmp_fid +rm -f $idx_file $fid_file case x$errors in xt) echo "Some checks failed." |