*** empty log message ***

7 files changed, 591 insertions, 476 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 21ccc73..7b2f015 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,20 +1,13 @@
-## Process this file with automake to create Makefile.in
-
-AUTOMAKE_OPTIONS = ansi2knr
 
 bin_PROGRAMS = mkid lid fid fnid xtokid
-bin_SCRIPTS = eid aid gid defid
-
-EXTRA_DIST = ansi2knr.1 ansi2knr.c $(bin_SCRIPTS)
+dist_bin_SCRIPTS = eid aid gid defid
 
-localedir = $(datadir)/locale
+AM_CPPFLAGS = -I$(top_srcdir)/libidu \
+              -I$(top_srcdir)/lib \
+              -I$(top_srcdir)/intl \
+              -DDATADIR=\"$(datadir)\" \
+              -DLOCALEDIR=\"$(datadir)/locale\" \
+              -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\"
 
-INCLUDES = -I. -I$(srcdir) \
-	   -I../libidu -I$(top_srcdir)/libidu \
-	   -I../lib -I$(top_srcdir)/lib \
-	   -I../intl -I$(top_srcdir)/intl \
-	   -I.. -I$(top_srcdir) 
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-LDADD = @INTLLIBS@ ../libidu/libidu.a ../lib/libsys.a
+LDADD = ../libidu/libidu.a $(LIBINTL) ../lib/libgnu.a 
 
-$(PROGRAMS): $(LDADD)
diff --git a/src/Makefile.in b/src/Makefile.in
index 0ec184a..545093f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,442 +12,535 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-SHELL = @SHELL@
+@SET_MAKE@
+
+
+SOURCES = fid.c fnid.c lid.c mkid.c xtokid.c
 
 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
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
-@SET_MAKE@
-AMDEP = @AMDEP@
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = mkid$(EXEEXT) lid$(EXEEXT) fid$(EXEEXT) fnid$(EXEEXT) \
+	xtokid$(EXEEXT)
+subdir = src
+DIST_COMMON = $(dist_bin_SCRIPTS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \
+	$(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/closeout.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \
+	$(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \
+	$(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \
+	$(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \
+	$(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \
+	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \
+	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lstat.m4 \
+	$(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \
+	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \
+	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/memcpy.m4 \
+	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memset.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/obstack.m4 \
+	$(top_srcdir)/m4/onceonly_2_57.m4 $(top_srcdir)/m4/pathmax.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
+	$(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/restrict.m4 \
+	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stat-macros.m4 $(top_srcdir)/m4/stdbool.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/strcase.m4 \
+	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
+	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strsep.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
+	$(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+fid_SOURCES = fid.c
+fid_OBJECTS = fid.$(OBJEXT)
+fid_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+fid_DEPENDENCIES = ../libidu/libidu.a $(am__DEPENDENCIES_1) \
+	../lib/libgnu.a
+fnid_SOURCES = fnid.c
+fnid_OBJECTS = fnid.$(OBJEXT)
+fnid_LDADD = $(LDADD)
+fnid_DEPENDENCIES = ../libidu/libidu.a $(am__DEPENDENCIES_1) \
+	../lib/libgnu.a
+lid_SOURCES = lid.c
+lid_OBJECTS = lid.$(OBJEXT)
+lid_LDADD = $(LDADD)
+lid_DEPENDENCIES = ../libidu/libidu.a $(am__DEPENDENCIES_1) \
+	../lib/libgnu.a
+mkid_SOURCES = mkid.c
+mkid_OBJECTS = mkid.$(OBJEXT)
+mkid_LDADD = $(LDADD)
+mkid_DEPENDENCIES = ../libidu/libidu.a $(am__DEPENDENCIES_1) \
+	../lib/libgnu.a
+xtokid_SOURCES = xtokid.c
+xtokid_OBJECTS = xtokid.$(OBJEXT)
+xtokid_LDADD = $(LDADD)
+xtokid_DEPENDENCIES = ../libidu/libidu.a $(am__DEPENDENCIES_1) \
+	../lib/libgnu.a
+dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(dist_bin_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = fid.c fnid.c lid.c mkid.c xtokid.c
+DIST_SOURCES = fid.c fnid.c lid.c mkid.c xtokid.c
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H = @ALLOCA_H@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CATALOGS = @CATALOGS@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EMACS = @EMACS@
+EMACSLOADPATH = @EMACSLOADPATH@
+EXEEXT = @EXEEXT@
+FNMATCH_H = @FNMATCH_H@
 GENCAT = @GENCAT@
-GMOFILES = @GMOFILES@
+GETOPT_H = @GETOPT_H@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
-GT_NO = @GT_NO@
-GT_YES = @GT_YES@
-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE__BOOL = @HAVE__BOOL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
+INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-POFILES = @POFILES@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
-README_ALPHA = @README_ALPHA@
-U = @U@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STDBOOL_H = @STDBOOL_H@
+STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
-l = @l@
+libdir = @libdir@
+libexecdir = @libexecdir@
 lispdir = @lispdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+dist_bin_SCRIPTS = eid aid gid defid
+AM_CPPFLAGS = -I$(top_srcdir)/libidu \
+              -I$(top_srcdir)/lib \
+              -I$(top_srcdir)/intl \
+              -DDATADIR=\"$(datadir)\" \
+              -DLOCALEDIR=\"$(datadir)/locale\" \
+              -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\"
+
+LDADD = ../libidu/libidu.a $(LIBINTL) ../lib/libgnu.a 
+all: all-am
 
-
-AUTOMAKE_OPTIONS = ansi2knr
-
-bin_PROGRAMS = mkid lid fid fnid xtokid
-bin_SCRIPTS = eid aid gid defid
-
-EXTRA_DIST = ansi2knr.1 ansi2knr.c $(bin_SCRIPTS)
-
-localedir = $(datadir)/locale
-
-INCLUDES = -I. -I$(srcdir) \
-	   -I../libidu -I$(top_srcdir)/libidu \
-	   -I../lib -I$(top_srcdir)/lib \
-	   -I../intl -I$(top_srcdir)/intl \
-	   -I.. -I$(top_srcdir) 
-
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-LDADD = @INTLLIBS@ ../libidu/libidu.a ../lib/libsys.a
-subdir = src
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-PROGRAMS =  $(bin_PROGRAMS)
-
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-ANSI2KNR = @ANSI2KNR@
-fid_SOURCES = fid.c
-fid_OBJECTS =  fid$U.o
-fid_LDADD = $(LDADD)
-fid_DEPENDENCIES =  ../libidu/libidu.a ../lib/libsys.a
-fid_LDFLAGS = 
-fnid_SOURCES = fnid.c
-fnid_OBJECTS =  fnid$U.o
-fnid_LDADD = $(LDADD)
-fnid_DEPENDENCIES =  ../libidu/libidu.a ../lib/libsys.a
-fnid_LDFLAGS = 
-lid_SOURCES = lid.c
-lid_OBJECTS =  lid$U.o
-lid_LDADD = $(LDADD)
-lid_DEPENDENCIES =  ../libidu/libidu.a ../lib/libsys.a
-lid_LDFLAGS = 
-mkid_SOURCES = mkid.c
-mkid_OBJECTS =  mkid$U.o
-mkid_LDADD = $(LDADD)
-mkid_DEPENDENCIES =  ../libidu/libidu.a ../lib/libsys.a
-mkid_LDFLAGS = 
-xtokid_SOURCES = xtokid.c
-xtokid_OBJECTS =  xtokid$U.o
-xtokid_LDADD = $(LDADD)
-xtokid_DEPENDENCIES =  ../libidu/libidu.a ../lib/libsys.a
-xtokid_LDFLAGS = 
-SCRIPTS =  $(bin_SCRIPTS)
-
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES =  fid.c fnid.c lid.c mkid.c xtokid.c
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-DEP_FILES =  @AMDEP@ $(DEPDIR)/fid$U.Po $(DEPDIR)/fnid$U.Po \
-$(DEPDIR)/lid$U.Po $(DEPDIR)/mkid$U.Po $(DEPDIR)/xtokid$U.Po
-DIST_COMMON =  Makefile.am Makefile.in ansi2knr.1 ansi2knr.c
-
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-SOURCES = fid.c fnid.c lid.c mkid.c xtokid.c
-OBJECTS = fid$U.o fnid$U.o lid$U.o mkid$U.o xtokid$U.o
-
-all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .c .o
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits src/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-binPROGRAMS:
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-distclean-binPROGRAMS:
-
-maintainer-clean-binPROGRAMS:
-
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
-	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f"; \
-	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f; \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 	done
 
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-mostlyclean-krextra:
-
-clean-krextra:
-	-rm -f ansi2knr
-
-distclean-krextra:
-
-maintainer-clean-krextra:
-ansi2knr: ansi2knr.o
-	$(LINK) ansi2knr.o $(LIBS)
-ansi2knr.o: $(CONFIG_HEADER)
-
-
-mostlyclean-kr:
-	-rm -f *_.c
-
-clean-kr:
-
-distclean-kr:
-
-maintainer-clean-kr:
-
-fid: $(fid_OBJECTS) $(fid_DEPENDENCIES)
-	@rm -f fid
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+fid$(EXEEXT): $(fid_OBJECTS) $(fid_DEPENDENCIES) 
+	@rm -f fid$(EXEEXT)
 	$(LINK) $(fid_LDFLAGS) $(fid_OBJECTS) $(fid_LDADD) $(LIBS)
-
-fnid: $(fnid_OBJECTS) $(fnid_DEPENDENCIES)
-	@rm -f fnid
+fnid$(EXEEXT): $(fnid_OBJECTS) $(fnid_DEPENDENCIES) 
+	@rm -f fnid$(EXEEXT)
 	$(LINK) $(fnid_LDFLAGS) $(fnid_OBJECTS) $(fnid_LDADD) $(LIBS)
-
-lid: $(lid_OBJECTS) $(lid_DEPENDENCIES)
-	@rm -f lid
+lid$(EXEEXT): $(lid_OBJECTS) $(lid_DEPENDENCIES) 
+	@rm -f lid$(EXEEXT)
 	$(LINK) $(lid_LDFLAGS) $(lid_OBJECTS) $(lid_LDADD) $(LIBS)
-
-mkid: $(mkid_OBJECTS) $(mkid_DEPENDENCIES)
-	@rm -f mkid
+mkid$(EXEEXT): $(mkid_OBJECTS) $(mkid_DEPENDENCIES) 
+	@rm -f mkid$(EXEEXT)
 	$(LINK) $(mkid_LDFLAGS) $(mkid_OBJECTS) $(mkid_LDADD) $(LIBS)
-
-xtokid: $(xtokid_OBJECTS) $(xtokid_DEPENDENCIES)
-	@rm -f xtokid
+xtokid$(EXEEXT): $(xtokid_OBJECTS) $(xtokid_DEPENDENCIES) 
+	@rm -f xtokid$(EXEEXT)
 	$(LINK) $(xtokid_LDFLAGS) $(xtokid_OBJECTS) $(xtokid_LDADD) $(LIBS)
-
-install-binSCRIPTS: $(bin_SCRIPTS)
+install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f="`echo $$p|sed '$(transform)'`"; \
-	  if test -f $$p; then \
-	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \
-	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \
-	  elif test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \
-	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	@list='$(dist_bin_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(dist_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	    $(dist_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
 	  else :; fi; \
 	done
 
-uninstall-binSCRIPTS:
+uninstall-dist_binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f="`echo $$p|sed '$(transform)'`"; \
-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	@list='$(dist_bin_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 	done
-fid_.c: fid.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fid.c; then echo $(srcdir)/fid.c; else echo fid.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fid_.c
-fnid_.c: fnid.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fnid.c; then echo $(srcdir)/fnid.c; else echo fnid.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fnid_.c
-lid_.c: lid.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lid.c; then echo $(srcdir)/lid.c; else echo lid.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > lid_.c
-mkid_.c: mkid.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mkid.c; then echo $(srcdir)/mkid.c; else echo mkid.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mkid_.c
-xtokid_.c: xtokid.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xtokid.c; then echo $(srcdir)/xtokid.c; else echo xtokid.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xtokid_.c
-fid_.o fnid_.o lid_.o mkid_.o xtokid_.o : $(ANSI2KNR)
 
-tags: TAGS
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fnid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xtokid.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique $(LISP)
+	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
-
-mostlyclean-tags:
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
 
-clean-tags:
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-@AMDEP@include $(DEPDIR)/fid$U.Po
-@AMDEP@include $(DEPDIR)/fnid$U.Po
-@AMDEP@include $(DEPDIR)/lid$U.Po
-@AMDEP@include $(DEPDIR)/mkid$U.Po
-@AMDEP@include $(DEPDIR)/xtokid$U.Po
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-maintainer-clean-depend:
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir) \
-	    || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || cp -p $$d/$$file $(distdir)/$$file \
 	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am: install-binPROGRAMS install-binSCRIPTS
+all-am: Makefile $(PROGRAMS) $(SCRIPTS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
 install-exec: install-exec-am
-
-install-data-am:
 install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
-uninstall: uninstall-am
-all-am: Makefile $(ANSI2KNR) $(PROGRAMS) $(SCRIPTS)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(bindir)
-
 
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	-rm -f Makefile.in
-mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-		mostlyclean-krextra mostlyclean-kr mostlyclean-tags \
-		mostlyclean-depend mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 
-clean-am:  clean-binPROGRAMS clean-compile clean-krextra clean-kr \
-		clean-tags clean-depend clean-generic mostlyclean-am
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
 
-clean: clean-am
+dvi: dvi-am
 
-distclean-am:  distclean-binPROGRAMS distclean-compile distclean-krextra \
-		distclean-kr distclean-tags distclean-depend \
-		distclean-generic clean-am
+dvi-am:
 
-distclean: distclean-am
+html: html-am
 
-maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-		maintainer-clean-compile maintainer-clean-krextra \
-		maintainer-clean-kr maintainer-clean-tags \
-		maintainer-clean-depend maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \
+	uninstall-info-am
 
-.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-krextra distclean-krextra \
-clean-krextra maintainer-clean-krextra mostlyclean-kr distclean-kr \
-clean-kr maintainer-clean-kr uninstall-binSCRIPTS install-binSCRIPTS \
-tags mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-$(PROGRAMS): $(LDADD)
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dist_binSCRIPTS \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-dist_binSCRIPTS uninstall-info-am
 
 # 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.
diff --git a/src/fid.c b/src/fid.c
index 398c7c2..0e77a28 100644
--- a/src/fid.c
+++ b/src/fid.c
@@ -19,20 +19,23 @@
 #include <config.h>
 #include <stdio.h>
 #include <getopt.h>
-#include "xstring.h"
-#include "xunistd.h"
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
 #include "xnls.h"
 #include "idfile.h"
 #include "error.h"
 #include "pathmax.h"
-#include "xmalloc.h"
-#include "xalloca.h"
+#include "xalloc.h"
+#include "alloca.h"
+#include "iduglobal.h"
 
-int get_file_index __P((char *file_name));
-int is_hit __P((unsigned char const *hits, int file_number));
-int is_hit_1 __P((unsigned char const **hits, int level, int file_number));
-void skip_hits __P((unsigned char const **hits, int level));
-void usage __P((void));
+int get_file_index (char *file_name);
+int is_hit (unsigned char const *hits, int file_number);
+int is_hit_1 (unsigned char const **hits, int level, int file_number);
+void skip_hits (unsigned char const **hits, int level);
+void usage (void);
 
 struct idhead idh;
 int tree8_levels;
@@ -97,13 +100,16 @@ main (int argc, char **argv)
 
   program_name = argv[0];
   idh.idh_file_name = 0;
+  
 
+#if ENABLE_NLS
   /* Set locale according to user's wishes.  */
   setlocale (LC_ALL, "");
 
   /* Tell program which translations to use and where to find.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   for (;;)
     {
@@ -203,7 +209,7 @@ get_file_index (char *file_name)
   struct file_link **members;
   struct file_link **end = &members_0[idh.idh_files];
   struct file_link *fn_flink = 0;
-  char *file_name_buf = ALLOCA (char, PATH_MAX);
+  char *file_name_buf = alloca (PATH_MAX);
   int has_slash = (strchr (file_name, '/') != 0);
   int file_name_length = strlen (file_name);
   int idx = -1;
diff --git a/src/fnid.c b/src/fnid.c
index d91fdad..ddffcb2 100644
--- a/src/fnid.c
+++ b/src/fnid.c
@@ -19,18 +19,22 @@
 #include <config.h>
 #include <stdio.h>
 #include <getopt.h>
-#include "xfnmatch.h"
-#include "xstring.h"
-#include "xmalloc.h"
+#include <fnmatch.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "xalloc.h"
 #include "xnls.h"
 #include "idfile.h"
 #include "pathmax.h"
 #include "error.h"
-#include "xalloca.h"
+#include "alloca.h"
+#include "iduglobal.h"
 
-void scan_files __P((struct idhead *idhp));
-void scan_member_file __P((struct member_file const *member));
-void usage __P((void));
+void scan_files (struct idhead *idhp);
+void scan_member_file (struct member_file const *member);
+void usage (void);
 
 char const *program_name;
 int show_version = 0;
@@ -84,12 +88,14 @@ main (int argc, char **argv)
   program_name = argv[0];
   idh.idh_file_name = 0;
 
+#if ENABLE_NLS
   /* Set locale according to user's wishes.  */
   setlocale (LC_ALL, "");
 
   /* Tell program which translations to use and where to find.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   for (;;)
     {
@@ -154,12 +160,12 @@ main (int argc, char **argv)
   {
     struct file_link **members = read_id_file (idh.idh_file_name, &idh);
     struct file_link **members_N = &members[idh.idh_files];
-    struct file_link **flinkv_0 = MALLOC (struct file_link *, idh.idh_files + 1);
+    struct file_link **flinkv_0 = xmalloc (sizeof(struct file_link *) * (idh.idh_files + 1));
     struct file_link **flinkv = flinkv_0;
-    char **patv_0 = MALLOC (char *, argc * 2);
+    char **patv_0 = xmalloc (sizeof(char *) * (argc * 2));
     char **patv_N;
     char **patv = patv_0;
-    char *file_name = ALLOCA (char, PATH_MAX);
+    char *file_name = alloca (PATH_MAX);
 
     for ( ; argc; argc--, argv++)
       {
@@ -167,7 +173,7 @@ main (int argc, char **argv)
 	*patv++ = arg;
 	if (*arg != '*' && *arg != '/')
 	  {
-	    char *pat = MALLOC (char, strlen (arg) + 2);
+	    char *pat = xmalloc (strlen (arg) + 2);
 	    sprintf (pat, "*/%s", arg);
 	    *patv++ = pat;
 	  }
diff --git a/src/lid.c b/src/lid.c
index 3c2fba4..a07173f 100644
--- a/src/lid.c
+++ b/src/lid.c
@@ -19,29 +19,29 @@
 #include <config.h>
 #include <stdio.h>
 #include <ctype.h>
-#include "xstdlib.h"
+#include <stdlib.h>
 #include <signal.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <assert.h>
-#include <getopt.h>
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
-#include <regex.h>
-#include "xstring.h"
-#include "xunistd.h"
+#include "getopt.h"
+#include <limits.h>
+#include <string.h>
+#include <unistd.h>
+#include <termios.h>
+#include "regex.h"
 #include "xnls.h"
-#include "xmalloc.h"
+#include "xalloc.h"
 #include "idfile.h"
-#include "xstring.h"
 #include "error.h"
 #include "pathmax.h"
-#include "xalloca.h"
+#include "alloca.h"
+#include "iduglobal.h"
 
-typedef void (*report_func_t) __P((char const *name, struct file_link **flinkv));
-typedef int (*query_func_t) __P((char const *arg, report_func_t));
+
+typedef void (*report_func_t) (char const *name, struct file_link **flinkv);
+typedef int (*query_func_t) (char const *arg, report_func_t);
 
 enum delimiter_style
 {
@@ -84,52 +84,56 @@ enum radix
   radix_all = radix_dec | radix_oct | radix_hex
 };
 
-void usage __P((void));
-static void help_me __P((void));
-void lower_caseify __P((char *str));
-enum key_style parse_key_style __P((char const *arg));
-enum result_style parse_result_style __P((char const *arg));
-query_func_t get_query_func __P((char *pattern));
-report_func_t get_report_func __P((void));
-void report_filenames __P((char const *name, struct file_link **flinkv));
-void report_grep __P((char const *name, struct file_link **flinkv));
-void report_edit __P((char const *name, struct file_link **flinkv));
-void report_nothing __P((char const *name, struct file_link **flinkv));
-int vector_cardinality __P((void *vector));
-int search_flinkv __P((struct file_link **flinkv));
-int query_literal_word __P((char const *pattern, report_func_t report_func));
-int query_literal_prefix __P((char const *pattern, report_func_t report_func));
-int query_regexp __P((char const *pattern_0, report_func_t report_func));
-char const *add_regexp_word_delimiters __P((char const *pattern_0));
-int query_number __P((char const *pattern, report_func_t report_func));
-int query_ambiguous_prefix __P((unsigned int, report_func_t report_func));
-int query_literal_substring __P((char const *pattern, report_func_t report_func));
-void parse_frequency_arg __P((char const *arg));
-int desired_frequency __P((char const *tok));
-char *strcasestr __P((char const *s1, char const *s2));
-char const *file_regexp __P((char const *name_0, char const *left_delimit, char const *right_delimit));
-off_t query_binary_search __P((char const *token));
-int is_regexp __P((char *name));
-int has_left_delimiter __P((char const *pattern));
-int has_right_delimiter __P((char const *pattern));
-int file_name_wildcard __P((char const *re, char const *fn));
-int word_match __P((char const *name_0, char const *line));
-int get_radix __P((char const *str));
-int is_number __P((char const *str));
-int stoi __P((char const *str));
-int otoi __P((char const *str));
-int dtoi __P((char const *str));
-int xtoi __P((char const *str));
-unsigned char *tree8_to_bits __P((unsigned char *bits_vec, unsigned char const *hits_tree8));
-void tree8_to_bits_1 __P((unsigned char **bits_vec, unsigned char const **hits_tree8, int level));
-struct file_link **tree8_to_flinkv __P((unsigned char const *hits_tree8));
-struct file_link **bits_to_flinkv __P((unsigned char const *bits_vec));
+void usage (void);
+static void help_me (void);
+void lower_caseify (char *str);
+enum key_style parse_key_style (char const *arg);
+enum result_style parse_result_style (char const *arg);
+query_func_t get_query_func (char *pattern);
+report_func_t get_report_func (void);
+void report_filenames (char const *name, struct file_link **flinkv);
+void report_grep (char const *name, struct file_link **flinkv);
+void report_edit (char const *name, struct file_link **flinkv);
+void report_nothing (char const *name, struct file_link **flinkv);
+int vector_cardinality (void *vector);
+int search_flinkv (struct file_link **flinkv);
+int query_literal_word (char const *pattern, report_func_t report_func);
+int query_literal_prefix (char const *pattern, report_func_t report_func);
+int query_regexp (char const *pattern_0, report_func_t report_func);
+char const *add_regexp_word_delimiters (char const *pattern_0);
+int query_number (char const *pattern, report_func_t report_func);
+int query_ambiguous_prefix (unsigned int, report_func_t report_func);
+int query_literal_substring (char const *pattern, report_func_t report_func);
+void parse_frequency_arg (char const *arg);
+int desired_frequency (char const *tok);
+char *strcasestr (char const *s1, char const *s2);
+char const *file_regexp (char const *name_0, char const *left_delimit, char const *right_delimit);
+off_t query_binary_search (char const *token);
+int is_regexp (char *name);
+int has_left_delimiter (char const *pattern);
+int has_right_delimiter (char const *pattern);
+int file_name_wildcard (char const *re, char const *fn);
+int word_match (char const *name_0, char const *line);
+int get_radix (char const *str);
+int is_number (char const *str);
+int stoi (char const *str);
+int otoi (char const *str);
+int dtoi (char const *str);
+int xtoi (char const *str);
+unsigned char *tree8_to_bits (unsigned char *bits_vec, unsigned char const *hits_tree8);
+void tree8_to_bits_1 (unsigned char **bits_vec, unsigned char const **hits_tree8, int level);
+struct file_link **tree8_to_flinkv (unsigned char const *hits_tree8);
+struct file_link **bits_to_flinkv (unsigned char const *bits_vec);
+
+#if HAVE_TERMIOS_H || HAVE_TERMIO_H || HAVE_SGTTY_H
+#endif
+
+void savetty (void);
+void restoretty (void);
+void linetty (void);
+void chartty (void);
 
 #if HAVE_TERMIOS_H || HAVE_TERMIO_H || HAVE_SGTTY_H
-void savetty __P((void));
-void restoretty __P((void));
-void linetty __P((void));
-void chartty __P((void));
 #endif
 
 #define	TOLOWER(c)	(isupper (c) ? tolower (c) : (c))
@@ -288,12 +292,14 @@ main (int argc, char **argv)
   program_name = argv[0];
   idh.idh_file_name = 0;
 
+#if ENABLE_NLS
   /* Set locale according to user's wishes.  */
   setlocale (LC_ALL, "");
 
   /* Tell program which translations to use and where to find.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   for (;;)
     {
@@ -417,9 +423,9 @@ main (int argc, char **argv)
   bits_vec_size = (idh.idh_files + 7) / 4; /* more than enough */
   tree8_levels = tree8_count_levels (idh.idh_files);
 
-  hits_buf_1 = MALLOC (char, idh.idh_buf_size);
-  hits_buf_2 = MALLOC (char, idh.idh_buf_size);
-  bits_vec = MALLOC (unsigned char, bits_vec_size);
+  hits_buf_1 = xmalloc (idh.idh_buf_size);
+  hits_buf_2 = xmalloc (idh.idh_buf_size);
+  bits_vec = xmalloc (bits_vec_size);
 
   report_function = get_report_func ();
   if (ambiguous_prefix_length)
@@ -533,7 +539,7 @@ report_grep (char const *name, struct file_link **flinkv)
   char line[1<<020];
   char const *pattern = 0;
   regex_t compiled;
-  char *file_name = ALLOCA (char, PATH_MAX);
+  char *file_name = alloca (PATH_MAX);
 
   if (key_style == ks_pattern)
     {
@@ -703,7 +709,7 @@ editit:
 
     case 0:
       {
-	char **argv_0 = MALLOC (char *, 3 + vector_cardinality (flinkv));
+	char **argv_0 = xmalloc (sizeof(char *) * (3 + vector_cardinality (flinkv)));
 	char **argv = argv_0 + 2;
 	while (*flinkv)
 	  *argv++ = maybe_relative_file_name (0, *flinkv++, cw_dlink);
@@ -721,8 +727,8 @@ editit:
 
     default:
       {
-	void (*oldint) __P((int)) = signal (SIGINT, SIG_IGN);
-	void (*oldquit) __P((int)) = signal (SIGQUIT, SIG_IGN);
+	void (*oldint) (int) = signal (SIGINT, SIG_IGN);
+	void (*oldquit) (int) = signal (SIGQUIT, SIG_IGN);
 
 	while (wait (0) == -1 && errno == EINTR)
 	  ;
@@ -757,7 +763,7 @@ search_flinkv (struct file_link **flinkv)
 {
   char pattern[BUFSIZ];
   unsigned int count;
-  char *file_name = ALLOCA (char, PATH_MAX);
+  char *file_name = alloca (PATH_MAX);
   char *eol;
 
   if (fgets (pattern, sizeof (pattern), stdin) == 0)
@@ -885,7 +891,7 @@ add_regexp_word_delimiters (char const *pattern_0)
     return pattern_0;
   else
     {
-      char *pattern = MALLOC (char, length + 4);
+      char *pattern = xmalloc (length + 4);
       if (has_left)
 	strcpy (pattern, pattern_0);
       else
@@ -1006,7 +1012,7 @@ query_literal_substring (char const *arg, report_func_t report_func)
 {
   int count;
   int arg_length = 0;
-  char *(*strstr_func) __P((char const *, char const *));
+  char *(*strstr_func) (char const *, char const *);
 
   fseek (idh.idh_FILE, idh.idh_tokens_offset, SEEK_SET);
 
@@ -1484,7 +1490,7 @@ bits_to_flinkv (unsigned char const *bv)
   struct file_link **end = &members_0[idh.idh_files];
 
   if (flinkv_0 == 0)
-    flinkv_0 = MALLOC (struct file_link *, idh.idh_files + reserved_flinkv_slots + 2);
+    flinkv_0 = xmalloc (sizeof(struct file_link *) * (idh.idh_files + reserved_flinkv_slots + 2));
   flinkv = &flinkv_0[reserved_flinkv_slots];
 
   for (;;)
diff --git a/src/mkid.c b/src/mkid.c
index b58f40a..ae79a8b 100644
--- a/src/mkid.c
+++ b/src/mkid.c
@@ -17,26 +17,27 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 #include <config.h>
-#include "xstdlib.h"
+#include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
 #include <errno.h>
 #include <getopt.h>
-#include "xsysstat.h"
-#include "xstddef.h"
-#include "xunistd.h"
+#include <sys/stat.h>
+#include <stddef.h>
+#include <unistd.h>
 #include "xnls.h"
 #include "pathmax.h"
-#include "xstring.h"
+#include <string.h>
 #include "idfile.h"
-#include "xmalloc.h"
+#include "xalloc.h"
 #include "hash.h"
 #include "scanners.h"
 #include "error.h"
-#include "xalloca.h"
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
+#include "alloca.h"
+#include <limits.h>
+#include "iduglobal.h"
+
+char* dirname(char* path);
 
 struct summary
 {
@@ -55,33 +56,33 @@ struct summary
   int sum_level;
 };
 
-void usage __P((void));
-static void help_me __P((void));
-int main __P((int argc, char **argv));
-int ceil_log_8 __P((unsigned long n));
-int ceil_log_2 __P((unsigned long n));
-void assert_writeable __P((char const *file_name));
-void scan_files __P((struct idhead *idhp));
-void scan_member_file __P((struct member_file const *member));
-void scan_member_file_1 __P((get_token_func_t get_token, void const *args, FILE *source_FILE));
-void report_statistics __P((void));
-void write_id_file __P((struct idhead *idhp));
-unsigned long token_hash_1 __P((void const *key));
-unsigned long token_hash_2 __P((void const *key));
-int token_hash_cmp __P((void const *x, void const *y));
-int token_qsort_cmp __P((void const *x, void const *y));
-void bump_current_hits_signature __P((void));
-void init_hits_signature __P((int i));
-void free_summary_tokens __P((void));
-void summarize __P((void));
-void init_summary __P((void));
-struct summary *make_sibling_summary __P((struct summary *summary));
-int count_vec_size __P((struct summary *summary, unsigned char const *tail_hits));
-int count_buf_size __P((struct summary *summary, unsigned char const *tail_hits));
-void assert_hits __P((struct summary* summary));
-void write_hits __P((FILE *fp, struct summary *summary, unsigned char const *tail_hits));
-void sign_token __P((struct token *token));
-void add_token_to_summary __P((struct summary *summary, struct token *token));
+void usage (void);
+static void help_me (void);
+int main (int argc, char **argv);
+int ceil_log_8 (unsigned long n);
+int ceil_log_2 (unsigned long n);
+void assert_writeable (char const *file_name);
+void scan_files (struct idhead *idhp);
+void scan_member_file (struct member_file const *member);
+void scan_member_file_1 (get_token_func_t get_token, void const *args, FILE *source_FILE);
+void report_statistics (void);
+void write_id_file (struct idhead *idhp);
+unsigned long token_hash_1 (void const *key);
+unsigned long token_hash_2 (void const *key);
+int token_hash_cmp (void const *x, void const *y);
+int token_qsort_cmp (void const *x, void const *y);
+void bump_current_hits_signature (void);
+void init_hits_signature (int i);
+void free_summary_tokens (void);
+void summarize (void);
+void init_summary (void);
+struct summary *make_sibling_summary (struct summary *summary);
+int count_vec_size (struct summary *summary, unsigned char const *tail_hits);
+int count_buf_size (struct summary *summary, unsigned char const *tail_hits);
+void assert_hits (struct summary* summary);
+void write_hits (FILE *fp, struct summary *summary, unsigned char const *tail_hits);
+void sign_token (struct token *token);
+void add_token_to_summary (struct summary *summary, struct token *token);
 
 struct hash_table token_table;
 
@@ -185,12 +186,14 @@ main (int argc, char **argv)
   heap_initial = (char const *) sbrk (0);
   idh.idh_file_name = DEFAULT_ID_FILE_NAME;
 
+#if ENABLE_NLS
   /* Set locale according to user's wishes.  */
   setlocale (LC_ALL, "");
 
   /* Tell program which translations to use and where to find.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   for (;;)
     {
@@ -285,7 +288,7 @@ main (int argc, char **argv)
 
   mark_member_file_links (&idh);
   log_8_member_files = ceil_log_8 (idh.idh_member_file_table.ht_fill);
-  current_hits_signature = MALLOC (char, log_8_member_files);
+  current_hits_signature = xmalloc (log_8_member_files);
 
   /* If scannable files were given, then scan them.  */
   if (idh.idh_member_file_table.ht_fill)
@@ -350,7 +353,7 @@ assert_writeable (char const *file_name)
     {
       if (errno == ENOENT)
 	{
-	  char const *dir_name = dirname (file_name);
+	  char const *dir_name = dirname ((char*)file_name);
 	  if (!dir_name || !*dir_name)
 	    dir_name = ".";
 	  if (access (dir_name, 06) < 0)
@@ -392,7 +395,7 @@ scan_files (struct idhead *idhp)
 
   if (largest_member_file > MAX_LARGEST_MEMBER_FILE)
     largest_member_file = MAX_LARGEST_MEMBER_FILE;
-  scanner_buffer = MALLOC (unsigned char, largest_member_file + 1);
+  scanner_buffer = xmalloc (largest_member_file + 1);
 
   for (;;)
     {
@@ -425,7 +428,7 @@ scan_member_file (struct member_file const *member)
   source_FILE = fopen (flink->fl_name, "r");
   if (source_FILE)
     {
-      char *file_name = ALLOCA (char, PATH_MAX);
+      char *file_name = alloca (PATH_MAX);
       if (statistics_flag)
 	{
 	  if (fstat (fileno (source_FILE), &st) < 0)
@@ -549,7 +552,7 @@ write_id_file (struct idhead *idhp)
   if (verbose_flag)
     printf (_("Sorting tokens...\n"));
   assert (summary_root->sum_hits_count == token_table.ht_fill);
-  tokens = REALLOC (summary_root->sum_tokens, struct token *, token_table.ht_fill);
+  tokens = xrealloc (summary_root->sum_tokens, sizeof(struct token *) * token_table.ht_fill);
   qsort (tokens, token_table.ht_fill, sizeof (struct token *), token_qsort_cmp);
 
   if (verbose_flag)
@@ -705,7 +708,7 @@ summarize (void)
   do
     {
       unsigned long count = summary->sum_hits_count;
-      unsigned char *hits = MALLOC (unsigned char, count + 1);
+      unsigned char *hits = xmalloc (count + 1);
       unsigned int level = summary->sum_level;
       struct token **tokens = summary->sum_tokens;
       unsigned long init_size = INIT_TOKENS_SIZE (summary->sum_level);
@@ -739,9 +742,9 @@ void
 init_summary (void)
 {
   unsigned long size = INIT_TOKENS_SIZE (0);
-  summary_root = summary_leaf = CALLOC (struct summary, 1);
+  summary_root = summary_leaf = xcalloc (1, sizeof(struct summary));
   summary_root->sum_tokens_size = size;
-  summary_root->sum_tokens = MALLOC (struct token *, size);
+  summary_root->sum_tokens = xmalloc (sizeof(struct token *) * size);
 }
 
 struct summary *
@@ -753,7 +756,7 @@ make_sibling_summary (struct summary *summary)
   if (parent == NULL)
     {
       levels++;
-      summary_root = summary->sum_parent = parent = CALLOC (struct summary, 1);
+      summary_root = summary->sum_parent = parent = xcalloc (1, sizeof(struct summary));
       parent->sum_level = levels;
       parent->sum_kids[0] = summary;
       parent->sum_hits_count = summary->sum_hits_count;
@@ -767,19 +770,19 @@ make_sibling_summary (struct summary *summary)
       else
 	{
 	  parent->sum_tokens_size = size;
-	  parent->sum_tokens = REALLOC (summary->sum_tokens, struct token *, size);
+	  parent->sum_tokens = xrealloc (summary->sum_tokens, sizeof(struct token *) * size);
 	}
       summary->sum_tokens = 0;
     }
   if (parent->sum_free_index == 8)
     parent = make_sibling_summary (parent);
-  summary = CALLOC (struct summary, 1);
+  summary = xcalloc (1, sizeof(struct summary));
   summary->sum_level = parent->sum_level - 1;
   parent->sum_kids[parent->sum_free_index++] = summary;
   summary->sum_parent = parent;
   size = INIT_TOKENS_SIZE (summary->sum_level);
   summary->sum_tokens_size = size;
-  summary->sum_tokens = MALLOC (struct token *, size);
+  summary->sum_tokens = xmalloc (sizeof(struct token *) * size);
   return summary;
 }
 
@@ -900,7 +903,7 @@ add_token_to_summary (struct summary *summary, struct token *token)
   if (summary->sum_hits_count >= size)
     {
       size *= 2;
-      summary->sum_tokens = REALLOC (summary->sum_tokens, struct token *, size);
+      summary->sum_tokens = xrealloc (summary->sum_tokens, sizeof(struct token *) * size);
       summary->sum_tokens_size = size;
     }
   summary->sum_tokens[summary->sum_hits_count++] = token;
diff --git a/src/xtokid.c b/src/xtokid.c
index 327a4af..f9be38d 100644
--- a/src/xtokid.c
+++ b/src/xtokid.c
@@ -19,16 +19,20 @@
 #include <config.h>
 #include <stdio.h>
 #include <getopt.h>
-#include "xstring.h"
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "xalloc.h"
 #include "xnls.h"
 #include "scanners.h"
 #include "idfile.h"
 #include "pathmax.h"
 #include "error.h"
+#include "iduglobal.h"
 
-void scan_files __P((struct idhead *idhp));
-void scan_member_file __P((struct member_file const *member));
-void usage __P((void));
+void scan_files (struct idhead *idhp);
+void scan_member_file (struct member_file const *member);
+void usage (void);
 
 char const *program_name;
 char *lang_map_file_name = 0;
@@ -87,12 +91,14 @@ main (int argc, char **argv)
 {
   program_name = argv[0];
 
+#if ENABLE_NLS
   /* Set locale according to user's wishes.  */
   setlocale (LC_ALL, "");
 
   /* Tell program which translations to use and where to find.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   for (;;)
     {
@@ -184,7 +190,7 @@ scan_files (struct idhead *idhp)
 
   if (largest_member_file > MAX_LARGEST_MEMBER_FILE)
     largest_member_file = MAX_LARGEST_MEMBER_FILE;
-  scanner_buffer = MALLOC (unsigned char, largest_member_file + 1);
+  scanner_buffer = xmalloc (largest_member_file + 1);
 
   for (members = members_0; members < end; members++)
     scan_member_file (*members);