summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1999-01-27 21:29:38 +0000
committerJim Meyering <jim@meyering.net>1999-01-27 21:29:38 +0000
commit9acb5c85febed10014f6a78ce9867631f6a8c5c8 (patch)
tree341b0a6cbaf321edc33f3da61c908c10722b9e66
parenta8284194a9040775b36ab6fe1fe0d308ef9d1a3e (diff)
downloadidutils-9acb5c85febed10014f6a78ce9867631f6a8c5c8.tar.gz
idutils-9acb5c85febed10014f6a78ce9867631f6a8c5c8.tar.bz2
idutils-9acb5c85febed10014f6a78ce9867631f6a8c5c8.zip
.
Diffstat
-rw-r--r--GNUmakefile27
-rw-r--r--Makefile.in11
-rw-r--r--Makefile.maint95
-rw-r--r--aclocal.m433
-rw-r--r--config.h.in130
-rwxr-xr-xconfigure432
-rw-r--r--doc/Makefile.in6
-rw-r--r--doc/id-utils.info1176
-rw-r--r--doc/stamp-vti3
-rw-r--r--doc/version.texi3
-rw-r--r--lib/.cvsignore1
-rw-r--r--lib/Makefile.in105
-rw-r--r--lib/ansi2knr.119
-rw-r--r--lib/ansi2knr.c439
-rw-r--r--libidu/Makefile.in57
-rw-r--r--libidu/ansi2knr.119
-rw-r--r--libidu/ansi2knr.c439
-rw-r--r--lisp/.cvsignore1
-rw-r--r--lisp/Makefile.in2
-rw-r--r--m4/Makefile.in6
-rw-r--r--m4/README7
-rw-r--r--po/de.po74
-rw-r--r--src/Makefile.in2
-rw-r--r--testsuite/Makefile.in2
24 files changed, 566 insertions, 2523 deletions
diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644
index 0000000..0f4e21c
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,27 @@
+# Having a separate GNUmakefile lets me `include' the dynamically
+# generated rules created via Makefile.maint as well as Makefile.maint itself.
+# This makefile is used only if you run GNU Make.
+# It is necessary if you want to build targets usually of interest
+# only to the maintainer.
+
+# Systems where /bin/sh is not the default shell need this. The $(shell)
+# command below won't work with e.g. stock DOS/Windows shells.
+SHELL = /bin/sh
+
+have-Makefile := $(shell test -f Makefile && echo yes)
+
+# If the user runs GNU make but has not yet run ./configure,
+# give them a diagnostic.
+ifeq ($(have-Makefile),yes)
+
+include Makefile
+include $(srcdir)/Makefile.maint
+
+else
+
+all:
+ @echo There seems to be no Makefile in this directory.
+ @echo "You must run ./configure before running \`make'."
+ @exit 1
+
+endif
diff --git a/Makefile.in b/Makefile.in
index ac38e5b..6069adc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,6 @@ LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LN_S = @LN_S@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -118,20 +117,20 @@ TAR = gtar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnits Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in m4/gettext.m4 \
- m4/lcmessage.m4 m4/progtest.m4
+$(ACLOCAL_M4): configure.in m4/gettext.m4 m4/lcmessage.m4 \
+ m4/progtest.m4
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
config.h: stamp-h
@@ -144,7 +143,7 @@ stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
&& CONFIG_FILES= CONFIG_HEADERS=config.h \
$(SHELL) ./config.status
@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
+$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
@if test ! -f $@; then \
rm -f $(srcdir)/stamp-h.in; \
$(MAKE) $(srcdir)/stamp-h.in; \
diff --git a/Makefile.maint b/Makefile.maint
new file mode 100644
index 0000000..c657c8c
--- /dev/null
+++ b/Makefile.maint
@@ -0,0 +1,95 @@
+# -*-Makefile-*-
+# This Makefile fragment is shared between fileutils, sh-utils, textutils.
+
+maintainer-check:
+ if head ChangeLog| grep 'Version $(VERSION)' > /dev/null; then \
+ :; \
+ else \
+ echo "$(VERSION) not in ChangeLog; not tagging" 1>&2; \
+ exit 1; \
+ fi
+ $(MAKE) distcheck
+ $(MAKE) my-distcheck
+
+# Tag before making distribution. Also, don't make a distribution if
+# checks fail. Also, make sure the NEWS file is up-to-date.
+cvs-dist: maintainer-check
+ pkg=`echo "$(PACKAGE)" | tr a-z A-Z`; \
+ ver=`echo "$(VERSION)" | sed 's/\./_/g'`; \
+ tag="$$pkg-$$ver"; \
+ echo tag=$$tag; \
+ if cvs -n log -h README| grep -e $$tag: > /dev/null; then \
+ echo "VERSION not new; not tagging" 1>&2; \
+ exit 1; \
+ fi; \
+ cvs update po; \
+ cvs tag -c $$tag
+ $(MAKE) dist
+
+t=./=test
+my-distcheck: dist
+ -rm -rf $(t)
+ mkdir $(t)
+ GZIP=$(GZIP) $(TAR) -C $(t) -zxf $(distdir).tar.gz
+ cd $(t)/$(distdir) \
+ && ./configure --disable-nls \
+ && $(MAKE) CFLAGS='-Wformat -Werror' \
+ && $(MAKE) dvi \
+ && $(MAKE) check \
+ && $(MAKE) distclean
+ cd $(t) && mv $(distdir) $(distdir).old \
+ && $(TAR) -zxf ../$(distdir).tar.gz
+ diff -ur $(t)/$(distdir).old $(t)/$(distdir)
+ -rm -rf $(t)
+ @echo "========================"; \
+ echo "$(distdir).tar.gz is ready for distribution"; \
+ echo "========================"
+
+THIS_VERSION_REGEXP = $(subst .,\.,$(VERSION))
+# FIXME: this works only for Gnits-style test releases.
+PREV_VERSION := $(shell echo $(VERSION)|tr a-z Xa-y)
+PREV_VERSION_REGEXP := $(shell echo $(PREV_VERSION)|sed 's/\./\\./g')
+v = Version
+url-host-prefix = ftp://alpha.gnu.org
+url = $(url-host-prefix)/gnu/fetish/$(distdir).tar.gz
+md5 = $(shell md5sum < $(distdir).tar.gz|sed 's/ -//')
+
+rel-check:
+ tarz=/tmp/rel-check-tarz-$$$$; \
+ md5_tmp=/tmp/rel-check-md5-$$$$; \
+ set -e; \
+ trap 'status=$$?; rm -f $$tarz $$md5_tmp; exit $$status' 0 1 2 3 15; \
+ wget -q --output-document=$$tarz $(url); \
+ echo "$(md5) -" > $$md5_tmp; \
+ md5sum -c $$md5_tmp < $$tarz
+
+announcement: NEWS ChangeLog $(distdir).tar.gz
+ @( \
+ echo Subject: $(distdir) released; \
+ echo; \
+ echo FIXME: put comments here; \
+ echo; \
+ echo " $(url)"; \
+ echo; \
+ echo "$(md5) $(distdir).tar.gz"; \
+ echo; \
+ echo NEWS:; \
+ sed -n "/$(THIS_VERSION_REGEXP)/,/$(PREV_VERSION_REGEXP)/p" NEWS \
+ | grep -v '^\['; \
+ echo; \
+ echo ChangeLog entries:; \
+ sed -n "1,/$v $(PREV_VERSION_REGEXP)/p" \
+ ChangeLog; \
+ )
+
+alpha:
+ $(MAKE) cvs-dist
+ $(MAKE) -s announcement > /tmp/announcement
+ ln $(distdir).tar.gz ../release
+ chmod a-w $(distdir).tar.gz
+ @echo =====================================
+ @echo 'ncftp -u $(url-host-prefix)/fs/share/ftp/gnu/fetish/'
+ @echo '# put $(distdir).tar.gz'
+ @echo '# send the /tmp/announcement e-mail'
+ @echo 'pot-mail $(distdir).tar.gz | bash'
+ @echo =====================================
diff --git a/aclocal.m4 b/aclocal.m4
index 96c305a..ba4c929 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -125,39 +125,6 @@ else
fi
AC_SUBST($1)])
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN(AM_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)
- AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
- MAINT=$MAINTAINER_MODE_TRUE
- AC_SUBST(MAINT)dnl
-]
-)
-
-# Define a conditional.
-
-AC_DEFUN(AM_CONDITIONAL,
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi])
-
# serial 1
diff --git a/config.h.in b/config.h.in
index 384f96f..932fa02 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,6 +1,6 @@
/* config.h.in. Generated automatically from configure.in by autoheader. */
/* Special definitions for GNU id-utils, processed by autoheader.
- Copyright (C) 1995, 96 Free Software Foundation, Inc.
+ Copyright (C) 1995, 96, 99 Free Software Foundation, Inc.
*/
#ifndef _config_h_
@@ -67,9 +67,9 @@
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown
*/
#undef STACK_DIRECTION
@@ -79,50 +79,9 @@
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Define to 1 if NLS is requested. */
-#undef ENABLE_NLS
-
-/* Define as 1 if you have catgets and don't want to use GNU gettext. */
-#undef HAVE_CATGETS
-
-/* Define as 1 if you have 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 if your sys/types.h file defines the type ptrdiff_t. */
-#undef HAVE_PTRDIFF_T
-
-/* Define to 1 if you have the stpcpy function. */
-#undef HAVE_STPCPY
-
/* Define to the name of the installed language map file. */
#undef LANGUAGE_MAP_FILE
-/* 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(protos) () /* traditional C */
-# else
-# define __P(protos) protos /* full-blown ANSI C */
-# endif
-#endif
-
/* Define if you have the __argz_count function. */
#undef HAVE___ARGZ_COUNT
@@ -132,6 +91,9 @@
/* Define if you have the __argz_stringify function. */
#undef HAVE___ARGZ_STRINGIFY
+/* Define if you have the basename function. */
+#undef HAVE_BASENAME
+
/* Define if you have the bcopy function. */
#undef HAVE_BCOPY
@@ -141,6 +103,15 @@
/* Define if you have the dcgettext function. */
#undef HAVE_DCGETTEXT
+/* Define if you have the dirname function. */
+#undef HAVE_DIRNAME
+
+/* Define if you have the error function. */
+#undef HAVE_ERROR
+
+/* Define if you have the fnmatch function. */
+#undef HAVE_FNMATCH
+
/* Define if you have the getcwd function. */
#undef HAVE_GETCWD
@@ -159,6 +130,9 @@
/* Define if you have the memcpy function. */
#undef HAVE_MEMCPY
+/* Define if you have the memset function. */
+#undef HAVE_MEMSET
+
/* Define if you have the munmap function. */
#undef HAVE_MUNMAP
@@ -180,11 +154,29 @@
/* Define if you have the strchr function. */
#undef HAVE_STRCHR
+/* Define if you have the strcspn function. */
+#undef HAVE_STRCSPN
+
+/* 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 valloc function. */
-#undef HAVE_VALLOC
+/* Define if you have the strndup function. */
+#undef HAVE_STRNDUP
+
+/* Define if you have the strpbrk function. */
+#undef HAVE_STRPBRK
+
+/* Define if you have the strspn function. */
+#undef HAVE_STRSPN
+
+/* Define if you have the strstr function. */
+#undef HAVE_STRSTR
+
+/* Define if you have the strtok function. */
+#undef HAVE_STRTOK
/* Define if you have the <argz.h> header file. */
#undef HAVE_ARGZ_H
@@ -255,14 +247,48 @@
/* 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
+/* Name of package */
+#undef PACKAGE
+
+/* Version number of package */
+#undef VERSION
+
+/* The concatenation of the strings `GNU ', and PACKAGE. */
+#undef GNU_PACKAGE
+
+/* The concatenation of `GNU', and the macros PACKAGE and VERSION. */
+#undef PACKAGE_VERSION
+
+/* Define if compiler has function prototypes */
+#undef PROTOTYPES
+
+/* Define if system has ptrdiff_t type */
+#undef HAVE_PTRDIFF_T
+
+/* Define if using GNU regex */
+#undef WITH_REGEX
+
+/* Define if libc includes obstacks */
+#undef HAVE_OBSTACK
+
+/* Define to 1 if you have the stpcpy function. */
+#undef HAVE_STPCPY
+
+/* Define if your locale.h file contains LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
+
+/* Define to 1 if NLS is requested. */
+#undef ENABLE_NLS
+
+/* Define to 1 if you have gettext and don't want to use GNU gettext. */
+#undef HAVE_GETTEXT
+
+/* Define as 1 if you have catgets and don't want to use GNU gettext. */
+#undef HAVE_CATGETS
+
/* According to Thomas Neumann, NeXT POSIX termios support is losing,
and sgtty is the way to go. Note: the comment between #undef &
diff --git a/configure b/configure
index 6f27c68..8349822 100755
--- a/configure
+++ b/configure
@@ -12,9 +12,6 @@ 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
--without-regex use GNU rx in lieu of gawk's regex for matching"
ac_help="$ac_help
--disable-nls do not use Native Language Support"
@@ -568,7 +565,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:572: checking for a BSD compatible install" >&5
+echo "configure:569: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -621,7 +618,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:625: checking whether build environment is sane" >&5
+echo "configure:622: checking whether build environment is sane" >&5
# Just in case
sleep 1
echo timestamp > conftestfile
@@ -678,7 +675,7 @@ test "$program_suffix" != NONE &&
test "$program_transform_name" = "" && program_transform_name="s,x,x,"
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:682: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:679: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -724,7 +721,7 @@ EOF
missing_dir=`cd $ac_aux_dir && pwd`
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:728: checking for working aclocal" >&5
+echo "configure:725: checking for working aclocal" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -737,7 +734,7 @@ else
fi
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:741: checking for working autoconf" >&5
+echo "configure:738: checking for working autoconf" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -750,7 +747,7 @@ else
fi
echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:754: checking for working automake" >&5
+echo "configure:751: checking for working automake" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -763,7 +760,7 @@ else
fi
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:767: checking for working autoheader" >&5
+echo "configure:764: checking for working autoheader" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -776,7 +773,7 @@ else
fi
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:780: checking for working makeinfo" >&5
+echo "configure:777: checking for working makeinfo" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -808,30 +805,6 @@ EOF
################ Maintainer Stuff ############################################
##############################################################################
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:813: checking whether to enable maintainer-specific portions of Makefiles" >&5
- # 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
- MAINTAINER_MODE_TRUE=
- MAINTAINER_MODE_FALSE='#'
-else
- MAINTAINER_MODE_TRUE='#'
- MAINTAINER_MODE_FALSE=
-fi
- MAINT=$MAINTAINER_MODE_TRUE
-
-
-
ALL_LINGUAS="de fr"
case $VERSION in
@@ -847,7 +820,7 @@ esac
# 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
-echo "configure:851: checking for $ac_word" >&5
+echo "configure:824: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -877,7 +850,7 @@ 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
-echo "configure:881: checking for $ac_word" >&5
+echo "configure:854: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -928,7 +901,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:932: checking for $ac_word" >&5
+echo "configure:905: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -960,7 +933,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:964: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:937: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -971,12 +944,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 975 "configure"
+#line 948 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1002,12 +975,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1006: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:979: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1011: checking whether we are using GNU C" >&5
+echo "configure:984: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1016,7 +989,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:993: \"$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
@@ -1035,7 +1008,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1039: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1012: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1067,7 +1040,7 @@ else
fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1071: checking whether ln -s works" >&5
+echo "configure:1044: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1099,7 +1072,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1103: checking for a BSD compatible install" >&5
+echo "configure:1076: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1152,7 +1125,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1156: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1129: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1179,7 +1152,7 @@ else
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1183: checking how to run the C preprocessor" >&5
+echo "configure:1156: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1194,13 +1167,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 1198 "configure"
+#line 1171 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1211,13 +1184,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1215 "configure"
+#line 1188 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1228,13 +1201,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1232 "configure"
+#line 1205 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1260,13 +1233,13 @@ 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
-echo "configure:1264: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:1237: checking whether ${CC-cc} needs -traditional" >&5
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 1270 "configure"
+#line 1243 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -1284,7 +1257,7 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 1288 "configure"
+#line 1261 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -1308,7 +1281,7 @@ 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
-echo "configure:1312: checking for $ac_word" >&5
+echo "configure:1285: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1336,9 +1309,9 @@ else
fi
echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1340: checking for AIX" >&5
+echo "configure:1313: checking for AIX" >&5
cat > conftest.$ac_ext <<EOF
-#line 1342 "configure"
+#line 1315 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
@@ -1361,17 +1334,17 @@ rm -f conftest*
ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1365: checking for minix/config.h" >&5
+echo "configure:1338: checking for minix/config.h" >&5
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 1370 "configure"
+#line 1343 "configure"
#include "confdefs.h"
#include <minix/config.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1409,7 +1382,7 @@ EOF
fi
echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1413: checking for POSIXized ISC" >&5
+echo "configure:1386: checking for POSIXized ISC" >&5
if test -d /etc/conf/kconfig.d &&
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
then
@@ -1444,12 +1417,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:1448: checking for $ac_hdr that defines DIR" >&5
+echo "configure:1421: checking for $ac_hdr that defines DIR" >&5
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 1453 "configure"
+#line 1426 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -1457,7 +1430,7 @@ int main() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:1461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -1482,7 +1455,7 @@ 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 opendir in -ldir""... $ac_c" 1>&6
-echo "configure:1486: checking for opendir in -ldir" >&5
+echo "configure:1459: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1490,7 +1463,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1494 "configure"
+#line 1467 "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
@@ -1501,7 +1474,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:1505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1523,7 +1496,7 @@ fi
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1527: checking for opendir in -lx" >&5
+echo "configure:1500: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1531,7 +1504,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1535 "configure"
+#line 1508 "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
@@ -1542,7 +1515,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:1546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1565,12 +1538,12 @@ fi
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1569: checking for ANSI C header files" >&5
+echo "configure:1542: checking for ANSI C header files" >&5
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 1574 "configure"
+#line 1547 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1578,7 +1551,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1595,7 +1568,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 1599 "configure"
+#line 1572 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1613,7 +1586,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 1617 "configure"
+#line 1590 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1634,7 +1607,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1638 "configure"
+#line 1611 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1645,7 +1618,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1669,12 +1642,12 @@ EOF
fi
echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:1673: checking whether stat file-mode macros are broken" >&5
+echo "configure:1646: checking whether stat file-mode macros are broken" >&5
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 1678 "configure"
+#line 1651 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -1725,12 +1698,12 @@ EOF
fi
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:1729: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:1702: checking for sys/wait.h that is POSIX.1 compatible" >&5
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 1734 "configure"
+#line 1707 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -1746,7 +1719,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:1750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -1770,17 +1743,17 @@ for ac_hdr in sys/types.h sys/param.h sys/stat.h sys/ioctl.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1774: checking for $ac_hdr" >&5
+echo "configure:1747: checking for $ac_hdr" >&5
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 1779 "configure"
+#line 1752 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1810,17 +1783,17 @@ for ac_hdr in limits.h stddef.h stdlib.h unistd.h string.h fcntl.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1814: checking for $ac_hdr" >&5
+echo "configure:1787: checking for $ac_hdr" >&5
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 1819 "configure"
+#line 1792 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1850,17 +1823,17 @@ for ac_hdr in malloc.h termios.h termio.h sgtty.h regex.h memory.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1854: checking for $ac_hdr" >&5
+echo "configure:1827: checking for $ac_hdr" >&5
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 1859 "configure"
+#line 1832 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1895,7 +1868,7 @@ done
echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:1899: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:1872: checking for ${CC-cc} option to accept ANSI C" >&5
if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1911,7 +1884,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__
do
CC="$ac_save_CC $ac_arg"
cat > conftest.$ac_ext <<EOF
-#line 1915 "configure"
+#line 1888 "configure"
#include "confdefs.h"
#include <stdarg.h>
#include <stdio.h>
@@ -1948,7 +1921,7 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
; return 0; }
EOF
-if { (eval echo configure:1952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
am_cv_prog_cc_stdc="$ac_arg"; break
else
@@ -1974,7 +1947,7 @@ esac
echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
-echo "configure:1978: checking for function prototypes" >&5
+echo "configure:1951: checking for function prototypes" >&5
if test "$am_cv_prog_cc_stdc" != no; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
@@ -1987,12 +1960,12 @@ else
U=_ ANSI2KNR=./ansi2knr
# Ensure some checks needed by ansi2knr itself.
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1991: checking for ANSI C header files" >&5
+echo "configure:1964: checking for ANSI C header files" >&5
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 1996 "configure"
+#line 1969 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -2000,7 +1973,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2017,7 +1990,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 2021 "configure"
+#line 1994 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -2035,7 +2008,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 2039 "configure"
+#line 2012 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -2056,7 +2029,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 2060 "configure"
+#line 2033 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2067,7 +2040,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:2071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -2094,17 +2067,17 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2098: checking for $ac_hdr" >&5
+echo "configure:2071: checking for $ac_hdr" >&5
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 2103 "configure"
+#line 2076 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2133,12 +2106,12 @@ done
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2137: checking for working const" >&5
+echo "configure:2110: checking for working const" >&5
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 2142 "configure"
+#line 2115 "configure"
#include "confdefs.h"
int main() {
@@ -2187,7 +2160,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:2191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -2208,12 +2181,12 @@ EOF
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2212: checking return type of signal handlers" >&5
+echo "configure:2185: checking return type of signal handlers" >&5
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 2217 "configure"
+#line 2190 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -2230,7 +2203,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:2234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -2249,12 +2222,12 @@ EOF
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2253: checking for off_t" >&5
+echo "configure:2226: checking for off_t" >&5
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 2258 "configure"
+#line 2231 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2282,12 +2255,12 @@ EOF
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2286: checking for size_t" >&5
+echo "configure:2259: checking for size_t" >&5
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 2291 "configure"
+#line 2264 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2315,19 +2288,19 @@ EOF
fi
echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6
-echo "configure:2319: checking for ptrdiff_t" >&5
+echo "configure:2292: checking for ptrdiff_t" >&5
if eval "test \"`echo '$''{'am_cv_type_ptrdiff_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2324 "configure"
+#line 2297 "configure"
#include "confdefs.h"
#include <stddef.h>
int main() {
ptrdiff_t p
; return 0; }
EOF
-if { (eval echo configure:2331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
am_cv_type_ptrdiff_t=yes
else
@@ -2364,19 +2337,19 @@ EOF
# 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
-echo "configure:2368: checking for working alloca.h" >&5
+echo "configure:2341: checking for working alloca.h" >&5
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 2373 "configure"
+#line 2346 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -2397,12 +2370,12 @@ EOF
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2401: checking for alloca" >&5
+echo "configure:2374: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2406 "configure"
+#line 2379 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -2430,7 +2403,7 @@ int main() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:2434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
@@ -2462,12 +2435,12 @@ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2466: checking whether alloca needs Cray hooks" >&5
+echo "configure:2439: checking whether alloca needs Cray hooks" >&5
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 2471 "configure"
+#line 2444 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -2492,12 +2465,12 @@ 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
-echo "configure:2496: checking for $ac_func" >&5
+echo "configure:2469: checking for $ac_func" >&5
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 2501 "configure"
+#line 2474 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2521,7 +2494,7 @@ f = $ac_func;
; return 0; }
EOF
-if { (eval echo configure:2525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2548,7 +2521,7 @@ done
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2552: checking stack direction for C alloca" >&5
+echo "configure:2525: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2556,7 +2529,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 2560 "configure"
+#line 2533 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -2575,7 +2548,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
@@ -2597,7 +2570,7 @@ EOF
fi
echo $ac_n "checking which of GNU rx or gawk's regex is wanted""... $ac_c" 1>&6
-echo "configure:2601: checking which of GNU rx or gawk's regex is wanted" >&5
+echo "configure:2574: checking which of GNU rx or gawk's regex is wanted" >&5
# Check whether --with-regex or --without-regex was given.
if test "${with_regex+set}" = set; then
withval="$with_regex"
@@ -2613,19 +2586,19 @@ if test -n "$am_with_regex"; then
EOF
echo $ac_n "checking for GNU regex in libc""... $ac_c" 1>&6
-echo "configure:2617: checking for GNU regex in libc" >&5
+echo "configure:2590: checking for GNU regex in libc" >&5
if eval "test \"`echo '$''{'am_cv_gnu_regex'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2622 "configure"
+#line 2595 "configure"
#include "confdefs.h"
int main() {
extern int re_max_failures; re_max_failures = 1
; return 0; }
EOF
-if { (eval echo configure:2629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
am_cv_gnu_regex=yes
else
@@ -2644,12 +2617,12 @@ echo "$ac_t""$am_cv_gnu_regex" 1>&6
else
echo "$ac_t""rx" 1>&6
echo $ac_n "checking for re_rx_search""... $ac_c" 1>&6
-echo "configure:2648: checking for re_rx_search" >&5
+echo "configure:2621: checking for re_rx_search" >&5
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 2653 "configure"
+#line 2626 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char re_rx_search(); below. */
@@ -2673,7 +2646,7 @@ f = re_rx_search;
; return 0; }
EOF
-if { (eval echo configure:2677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_re_rx_search=yes"
else
@@ -2696,12 +2669,12 @@ fi
fi
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2700: checking for vprintf" >&5
+echo "configure:2673: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2705 "configure"
+#line 2678 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@@ -2725,7 +2698,7 @@ f = vprintf;
; return 0; }
EOF
-if { (eval echo configure:2729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -2749,12 +2722,12 @@ fi
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2753: checking for _doprnt" >&5
+echo "configure:2726: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2758 "configure"
+#line 2731 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@@ -2778,7 +2751,7 @@ f = _doprnt;
; return 0; }
EOF
-if { (eval echo configure:2782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -2803,19 +2776,19 @@ fi
fi
echo $ac_n "checking for obstacks""... $ac_c" 1>&6
-echo "configure:2807: checking for obstacks" >&5
+echo "configure:2780: checking for obstacks" >&5
if eval "test \"`echo '$''{'am_cv_func_obstack'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2812 "configure"
+#line 2785 "configure"
#include "confdefs.h"
#include "obstack.h"
int main() {
struct obstack *mem;obstack_free(mem,(char *) 0)
; return 0; }
EOF
-if { (eval echo configure:2819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
am_cv_func_obstack=yes
else
@@ -2840,12 +2813,12 @@ EOF
for ac_func in getwd getcwd link strerror isascii bcopy bzero memcpy
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2844: checking for $ac_func" >&5
+echo "configure:2817: checking for $ac_func" >&5
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 2849 "configure"
+#line 2822 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2869,7 +2842,7 @@ f = $ac_func;
; return 0; }
EOF
-if { (eval echo configure:2873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2896,12 +2869,12 @@ done
for ac_func in strdup strndup strspn strcspn strpbrk strstr strtok
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2900: checking for $ac_func" >&5
+echo "configure:2873: checking for $ac_func" >&5
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 2905 "configure"
+#line 2878 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2925,7 +2898,7 @@ f = $ac_func;
; return 0; }
EOF
-if { (eval echo configure:2929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2954,12 +2927,12 @@ done
for ac_func in basename dirname fnmatch error memcpy memset
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2958: checking for $ac_func" >&5
+echo "configure:2931: checking for $ac_func" >&5
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 2963 "configure"
+#line 2936 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2983,7 +2956,7 @@ f = $ac_func;
; return 0; }
EOF
-if { (eval echo configure:2987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3015,21 +2988,21 @@ done
##############################################################################
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3019: checking for inline" >&5
+echo "configure:2992: checking for inline" >&5
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 3026 "configure"
+#line 2999 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:3033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -3058,17 +3031,17 @@ for ac_hdr in unistd.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3062: checking for $ac_hdr" >&5
+echo "configure:3035: checking for $ac_hdr" >&5
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 3067 "configure"
+#line 3040 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3097,12 +3070,12 @@ done
for ac_func in getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3101: checking for $ac_func" >&5
+echo "configure:3074: checking for $ac_func" >&5
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 3106 "configure"
+#line 3079 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3126,7 +3099,7 @@ f = $ac_func;
; return 0; }
EOF
-if { (eval echo configure:3130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3151,7 +3124,7 @@ fi
done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3155: checking for working mmap" >&5
+echo "configure:3128: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3159,7 +3132,7 @@ else
ac_cv_func_mmap_fixed_mapped=no
else
cat > conftest.$ac_ext <<EOF
-#line 3163 "configure"
+#line 3136 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test.
@@ -3299,7 +3272,7 @@ main()
}
EOF
-if { (eval echo configure:3303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_mmap_fixed_mapped=yes
else
@@ -3327,17 +3300,17 @@ unistd.h sys/param.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3331: checking for $ac_hdr" >&5
+echo "configure:3304: checking for $ac_hdr" >&5
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 3336 "configure"
+#line 3309 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3367,12 +3340,12 @@ done
strdup __argz_count __argz_stringify __argz_next
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3371: checking for $ac_func" >&5
+echo "configure:3344: checking for $ac_func" >&5
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 3376 "configure"
+#line 3349 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3396,7 +3369,7 @@ f = $ac_func;
; return 0; }
EOF
-if { (eval echo configure:3400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3425,12 +3398,12 @@ done
for ac_func in stpcpy
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3429: checking for $ac_func" >&5
+echo "configure:3402: checking for $ac_func" >&5
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 3434 "configure"
+#line 3407 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3454,7 +3427,7 @@ f = $ac_func;
; return 0; }
EOF
-if { (eval echo configure:3458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3488,19 +3461,19 @@ EOF
if test $ac_cv_header_locale_h = yes; then
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3492: checking for LC_MESSAGES" >&5
+echo "configure:3465: checking for LC_MESSAGES" >&5
if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3497 "configure"
+#line 3470 "configure"
#include "confdefs.h"
#include <locale.h>
int main() {
return LC_MESSAGES
; return 0; }
EOF
-if { (eval echo configure:3504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
am_cv_val_LC_MESSAGES=yes
else
@@ -3521,7 +3494,7 @@ EOF
fi
fi
echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3525: checking whether NLS is requested" >&5
+echo "configure:3498: checking whether NLS is requested" >&5
# Check whether --enable-nls or --disable-nls was given.
if test "${enable_nls+set}" = set; then
enableval="$enable_nls"
@@ -3541,7 +3514,7 @@ fi
EOF
echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:3545: checking whether included gettext is requested" >&5
+echo "configure:3518: checking whether included gettext is requested" >&5
# Check whether --with-included-gettext or --without-included-gettext was given.
if test "${with_included_gettext+set}" = set; then
withval="$with_included_gettext"
@@ -3560,17 +3533,17 @@ fi
ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3564: checking for libintl.h" >&5
+echo "configure:3537: checking for libintl.h" >&5
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 3569 "configure"
+#line 3542 "configure"
#include "confdefs.h"
#include <libintl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3587,19 +3560,19 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:3591: checking for gettext in libc" >&5
+echo "configure:3564: checking for gettext in libc" >&5
if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3596 "configure"
+#line 3569 "configure"
#include "confdefs.h"
#include <libintl.h>
int main() {
return (int) gettext ("")
; return 0; }
EOF
-if { (eval echo configure:3603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
gt_cv_func_gettext_libc=yes
else
@@ -3615,7 +3588,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
if test "$gt_cv_func_gettext_libc" != "yes"; then
echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:3619: checking for bindtextdomain in -lintl" >&5
+echo "configure:3592: checking for bindtextdomain in -lintl" >&5
ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3623,7 +3596,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3627 "configure"
+#line 3600 "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
@@ -3634,7 +3607,7 @@ int main() {
bindtextdomain()
; return 0; }
EOF
-if { (eval echo configure:3638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3650,12 +3623,12 @@ fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:3654: checking for gettext in libintl" >&5
+echo "configure:3627: checking for gettext in libintl" >&5
if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:3659: checking for gettext in -lintl" >&5
+echo "configure:3632: checking for gettext in -lintl" >&5
ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3663,7 +3636,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3667 "configure"
+#line 3640 "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
@@ -3674,7 +3647,7 @@ int main() {
gettext()
; return 0; }
EOF
-if { (eval echo configure:3678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3718,7 +3691,7 @@ 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
-echo "configure:3722: checking for $ac_word" >&5
+echo "configure:3695: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3752,12 +3725,12 @@ fi
for ac_func in dcgettext
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3756: checking for $ac_func" >&5
+echo "configure:3729: checking for $ac_func" >&5
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 3761 "configure"
+#line 3734 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3781,7 +3754,7 @@ f = $ac_func;
; return 0; }
EOF
-if { (eval echo configure:3785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3808,7 +3781,7 @@ 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
-echo "configure:3812: checking for $ac_word" >&5
+echo "configure:3785: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3844,7 +3817,7 @@ fi
# 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
-echo "configure:3848: checking for $ac_word" >&5
+echo "configure:3821: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3876,7 +3849,7 @@ else
fi
cat > conftest.$ac_ext <<EOF
-#line 3880 "configure"
+#line 3853 "configure"
#include "confdefs.h"
int main() {
@@ -3884,7 +3857,7 @@ extern int _nl_msg_cat_cntr;
return _nl_msg_cat_cntr
; return 0; }
EOF
-if { (eval echo configure:3888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
CATOBJEXT=.gmo
DATADIRNAME=share
@@ -3907,7 +3880,7 @@ fi
if test "$CATOBJEXT" = "NONE"; then
echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:3911: checking whether catgets can be used" >&5
+echo "configure:3884: checking whether catgets can be used" >&5
# Check whether --with-catgets or --without-catgets was given.
if test "${with_catgets+set}" = set; then
withval="$with_catgets"
@@ -3920,7 +3893,7 @@ fi
if test "$nls_cv_use_catgets" = "yes"; then
echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:3924: checking for main in -li" >&5
+echo "configure:3897: checking for main in -li" >&5
ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3928,14 +3901,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-li $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3932 "configure"
+#line 3905 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3963,12 +3936,12 @@ else
fi
echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:3967: checking for catgets" >&5
+echo "configure:3940: checking for catgets" >&5
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 3972 "configure"
+#line 3945 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char catgets(); below. */
@@ -3992,7 +3965,7 @@ f = catgets;
; return 0; }
EOF
-if { (eval echo configure:3996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_catgets=yes"
else
@@ -4014,7 +3987,7 @@ EOF
# 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
-echo "configure:4018: checking for $ac_word" >&5
+echo "configure:3991: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4050,7 +4023,7 @@ fi
# 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
-echo "configure:4054: checking for $ac_word" >&5
+echo "configure:4027: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4087,7 +4060,7 @@ fi
# 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
-echo "configure:4091: checking for $ac_word" >&5
+echo "configure:4064: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4122,7 +4095,7 @@ fi
# 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
-echo "configure:4126: checking for $ac_word" >&5
+echo "configure:4099: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4180,7 +4153,7 @@ fi
# 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
-echo "configure:4184: checking for $ac_word" >&5
+echo "configure:4157: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4214,7 +4187,7 @@ fi
# 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
-echo "configure:4218: checking for $ac_word" >&5
+echo "configure:4191: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4250,7 +4223,7 @@ fi
# 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
-echo "configure:4254: checking for $ac_word" >&5
+echo "configure:4227: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4347,7 +4320,7 @@ fi
LINGUAS=
else
echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4351: checking for catalogs to be installed" >&5
+echo "configure:4324: checking for catalogs to be installed" >&5
NEW_LINGUAS=
for lang in ${LINGUAS=$ALL_LINGUAS}; do
case "$ALL_LINGUAS" in
@@ -4375,17 +4348,17 @@ echo "configure:4351: checking for catalogs to be installed" >&5
if test "$CATOBJEXT" = ".cat"; then
ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:4379: checking for linux/version.h" >&5
+echo "configure:4352: checking for linux/version.h" >&5
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 4384 "configure"
+#line 4357 "configure"
#include "confdefs.h"
#include <linux/version.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4478,7 +4451,7 @@ 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
-echo "configure:4482: checking for $ac_word" >&5
+echo "configure:4455: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4516,7 +4489,7 @@ test -n "$EMACS" || EMACS="no"
if test $EMACS != "no"; then
echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:4520: checking where .elc files should go" >&5
+echo "configure:4493: checking where .elc files should go" >&5
lispdir="\$(datadir)/emacs/site-lisp"
emacs_flavor=`echo "$EMACS" | sed -e 's,^.*/,,'`
if test "x$prefix" = "xNONE"; then
@@ -4702,9 +4675,6 @@ s%@AUTOMAKE@%$AUTOMAKE%g
s%@AUTOHEADER@%$AUTOHEADER%g
s%@MAKEINFO@%$MAKEINFO%g
s%@SET_MAKE@%$SET_MAKE%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
s%@README_ALPHA@%$README_ALPHA%g
s%@CC@%$CC%g
s%@LN_S@%$LN_S%g
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ec58770..f9b2286 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -115,7 +115,7 @@ GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
.SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnits doc/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -123,7 +123,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-$(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@stamp-vti
+$(srcdir)/version.texi: stamp-vti
@:
$(srcdir)/stamp-vti: id-utils.texi $(top_srcdir)/configure.in
@@ -144,7 +144,7 @@ clean-vti:
distclean-vti:
maintainer-clean-vti:
- -@MAINTAINER_MODE_TRUE@rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
+ -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
id-utils.info: id-utils.texi version.texi
id-utils.dvi: id-utils.texi version.texi
diff --git a/doc/id-utils.info b/doc/id-utils.info
deleted file mode 100644
index c4289df..0000000
--- a/doc/id-utils.info
+++ /dev/null
@@ -1,1176 +0,0 @@
-This is Info file id-utils.info, produced by Makeinfo-1.63 from the
-input file id-utils.texi.
-
-START-INFO-DIR-ENTRY
-* ID database: (id-utils). Identifier database utilities.
-* mkid: (id-utils)mkid invocation. Creating an ID database.
-* lid: (id-utils)lid invocation. Matching words and patterns.
-* fid: (id-utils)fid invocation. Listing a file's tokens.
-* fnid: (id-utils)fnid invocation. Looking up file names.
-* xtokid: (id-utils)xtokid invocation. Testing mkid scanners.
-END-INFO-DIR-ENTRY
-
- This file documents the `id-utils' database utilities.
-
- Copyright (C) 1996 Free Software Foundation, Inc.
-
- Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
-
- Permission is granted to copy and distribute modified versions of
-this manual under the conditions for verbatim copying, provided that
-the entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
- Permission is granted to copy and distribute translations of this
-manual into another language, under the above conditions for modified
-versions, except that this permission notice may be stated in a
-translation.
-
-
-File: id-utils.info, Node: Top, Next: Introduction, Up: (dir)
-
-ID utilities
-************
-
- This manual documents version 3.2 of the ID utilities.
-
-* Menu:
-
-* Introduction:: Overview of the tools with tutorial.
-* Quick start:: Quick start procedure.
-* Common options:: Common command-line options.
-* mkid invocation:: Creating an ID database.
-* lid invocation:: Querying an ID database by token.
-* fid invocation:: Listing a file's tokens.
-* fnid invocation:: Looking up file names.
-* xtokid invocation:: Testing language scanners.
-* Past and Future:: History and future directions.
-* Index:: General index.
-
-
-File: id-utils.info, Node: Introduction, Next: Quick start, Prev: Top, Up: Top
-
-Introduction
-************
-
- An "ID database" is a binary file containing a list of file names, a
-list of tokens, and a sparse matrix indicating which tokens appear in
-which files.
-
- With this database and some tools to query it (described in this
-manual), many text-searching tasks become simpler and faster. For
-example, you can list all files that reference a particular `#include'
-file throughout a huge source hierarchy, search for all the memos
-containing references to a project, or automatically invoke an editor
-on all files containing references to some function or variable.
-Anyone with a large software project to maintain, or a large set of text
-files to organize, can benefit from the ID utilities.
-
- Although the name `ID' is short for `identifier', the ID utilities
-handle more than just identifiers; they also treat other kinds of
-tokens, most notably numeric constants, and the contents of certain
-character strings. Thus, this manual will use the word "token" as a
-term that is inclusive of identifiers, numbers and strings.
-
- There are several programs in the ID utilities family:
-
-`mkid'
- scans files for tokens and builds the ID database file.
-
-`lid'
- queries the ID database for tokens, then reports matching file
- names or matching lines.
-
-`fid'
- lists all tokens recorded in the database for given files, or
- tokens common to two files.
-
-`fnid'
- matches the file names in the database, rather than the tokens.
-
-`xtokid'
- extracts raw tokens--helps with testing of new `mkid' scanners.
-
- In addition, the ID utilities have historically provided several
-query programs which are specializations of `lid':
-
-`gid'
- (alias for `lid -R grep') lists all lines containing the requested
- pattern.
-
-`eid'
- (alias for `lid -R edit') invokes an editor on all files
- containing the requested pattern, and if possible, initiates a
- text search for that pattern.
-
-`aid'
- (alias for `lid -ils') treats the requested pattern as a
- case-insensitive literal substring.
-
- Please report bugs to `bug-gnu-utils@gnu.ai.mit.edu'. Remember to
-include the version number, machine architecture, input files, and any
-other information needed to reproduce the bug: 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. *Note Bugs: (gcc)Bugs.
-
-
-File: id-utils.info, Node: Quick start, Next: Common options, Prev: Introduction, Up: Top
-
-Quick Start Procedure
-*********************
-
- Unpack the distribution.
-
- Type `./configure'
-
- Type `make'
-
- Type `make install' as a user with the appropriate privileges
- (e.g., `bin' or perhaps even `root').
-
- Type `cd /usr/include; mkid' to build an ID database covering all
- of the system header files.
-
- Type `lid FILE', then `gid strtok', then `aid stdout'.
-
- You have just built, installed and used the most common commands of
-the GNU ID utilities. If you ever need help remembering which system
-header files contain a particular declaration, or reference a
-particular symbol, you'll want to keep the ID file you built in
-`/usr/include' for later use. If your working directory is elsewhere
-at the time, simply provide the `-f /usr/include' option to `lid'
-(*note Reading options::.).
-
-
-File: id-utils.info, Node: Common options, Next: mkid invocation, Prev: Quick start, Up: Top
-
-Common command-line options
-***************************
-
- Certain options, and regular expression syntax, are shared by various
-groupings of the ID utilities. We describe these in the sections below,
-rather than repeating them for each program.
-
-* Menu:
-
-* Universal options:: Options common to all programs.
-* Extraction options:: Options for programs that extract tokens from source files.
-* Walker options:: Options for programs that walk file and directory trees.
-* Reading options:: Options for programs that read ID databases.
-* Writing options:: Options for programs that write ID databases.
-* File listing options:: Options for programs that list file names.
-
-
-File: id-utils.info, Node: Universal options, Next: Extraction options, Up: Common options
-
-Options Common to All Programs
-==============================
-
-`--help'
- Print a usage message listing all available options, then exit
- successfully.
-
-`--version'
- Print the version number, then exit successfully.
-
-
-File: id-utils.info, Node: Reading options, Next: Writing options, Prev: Walker options, Up: Common options
-
-Options for Programs that Read ID Databases
-===========================================
-
-`-f FILENAME'
-`--file=FILENAME'
- FILENAME is the ID database to read when processing queries. At
- present, only a single `--file' option is processed, but in future
- releases, more than one ID database may be named on the command
- line.
-
-`$IDPATH'
- `IDPATH' is an environment variable that contains a
- colon-separated list of ID database names. If this variable is
- present, and no `--file' options are presented on the command
- line, the ID databases named in `IDPATH' are implied.(1)
-
- If no ID databases are specified either on the command line or via
-the `IDPATH' environment variable, then the ID utilities search for a
-file named `ID' in the current working directory, and then in
-successive parent directories.
-
- ---------- Footnotes ----------
-
- (1) At present, this feature is fully implemented, since only the
-first of a list of ID database names is processed.
-
-
-File: id-utils.info, Node: Writing options, Next: File listing options, Prev: Reading options, Up: Common options
-
-Options for Programs that Write ID Databases
-============================================
-
-`-o FILENAME'
-`--output=FILENAME'
- The `--output' option names the file in which to write a new ID
- database. If no `--output' (or `--file') option is present, an
- output file named `ID' is implied.
-
-`-f FILENAME'
-`--file=FILENAME'
- This is a synonym for `--output'
-
-
-File: id-utils.info, Node: Walker options, Next: Reading options, Prev: Extraction options, Up: Common options
-
-Options for Programs that Walk File and Directory Trees.
-========================================================
-
- The programs `mkid' and `xtokid' accept the names of files and
-directories on the command line. Files are scanned if there is a
-scanner available and enabled for the file's source language.
-Directories are recursively descended, searching for files whose names
-match the rules listed in the *language map* file (*note Language
-map::.).
-
- The following option controls the file tree walker:
-
-`-p NAMES'
-`--prune=NAMES'
- One or more file or directory names may appear in NAMES. The file
- tree walker will stop short at these files and directories and
- their contents will not be scanned.
-
-
-File: id-utils.info, Node: File listing options, Prev: Writing options, Up: Common options
-
-Options for Programs that List File Names
-=========================================
-
- The programs `lid' and `fnid' can print lists of file names as the
-result of queries. The following option controls how these lists are
-formatted:
-
-`-S STYLE'
-`--separator=STYLE'
- STYLE may be one of `braces', `space' or `newline'.
-
- The STYLE of `braces' means that file names with common directory
- prefix and common suffix are printed using the shell's brace
- notation in order to compress the output. For example,
- `../src/foo.c ../src/bar.c' can be printed in brace notation as
- `../src/{foo,bar}.c'.
-
- The STYLEs of `space' and `newline' mean that file names are
- separated spaces or by newlines, respectively.
-
- If the list of files is being printed on a terminal, brace
- notation is the default. If not, file names are separated by
- spaces if the KEY is included in the output, and by newlines the
- KEY STYLE is `none' (*note lid invocation::.).
-
-
-File: id-utils.info, Node: Extraction options, Next: Walker options, Prev: Universal options, Up: Common options
-
-Options for Programs that Scan Source Files
-===========================================
-
- `mkid' and `xtokid' walk file trees, select source files by name,
-and extract tokens from source files. They accept the following
-options:
-
-`-m MAPFILE'
-`--lang-map=MAPFILE'
- MAPFILE contains rules for determining the source languages from
- file names. *Note Language map::
-
-`-i LANGUAGES'
-`--include=LANGUAGES'
- The `--include' option names LANGUAGES whose source files should
- be scanned and incorporated into the ID database. By default, all
- languages known to the ID utilities are enabled.
-
-`-x LANGUAGES'
-`--exclude=LANGUAGES'
- The `--exclude' option names LANGUAGES whose source files should
- NOT be scanned. The default list of excluded languages is empty.
- Note that only one of `--include' or `--exclude' may be specified
- on the command line for a single run.
-
-`-l LANGUAGE:OPTIONS'
-`--lang-option=LANGUAGE:OPTIONS'
- Language-specific scanners also accept options. LANGUAGE denotes
- the desired scanner, and OPTION are the command-line options that
- should be passed through to it. For example, to pass the -X
- -COKE-BOTTLE options to the scanner for the language SWIZZLE, pass
- this: -L SWIZZLE:"-X -COKE-BOTTLE", or this:
- -LANG-OPTION=SWIZZLE:"-X -COKE-BOTTLE", or this: -L SWIZZLE-X -L
- SWIZZLE:-COKE-BOTTLE. Use the `--help' option to see the
- command-line option summary for
-
- To determine which tokens to extract from a file and store in the
-database, `mkid' calls a "scanner"; we say a scanner "recognizes" a
-particular language. Scanners for several languages are built-in to
-`mkid'; you can add your own scanners as well, as explained in *Note
-Defining scanners::.
-
- The ID utilities determine which scanner to use for a particular
-file by consulting the language-map file. Scanners for several are
-already built-in to the ID utilities. You can see which languages have
-built-in scanners, and examine their language-specific options by
-invoking `mkid --help' or `xtokid --help'.
-
-* Menu:
-
-* Language map:: Mapping file names to source languages.
-* C/C++ scanner:: For the C and C++ programming language.
-* Assembler scanner:: For assembly language.
-* Text scanner:: For documents or other non-source code.
-* Defining scanners:: Defining new scanners in the source code.
-
-
-File: id-utils.info, Node: Language map, Next: C/C++ scanner, Up: Extraction options
-
-Mapping file names to source languages
---------------------------------------
-
- The file `id-lang.map', installed by default in
-`$(prefix)/share/id-lang.map', contains rules for mapping file names to
-source languages. Each rule comprises three parts: a shell GLOB
-pattern, a language name, and language-specific scanner options.
-
- The special pattern `**' denotes the default source language. This
-is the language that's assigned to file names that don't match any other
-pattern.
-
- The special pattern `***' should be followed by a file name. The
-named file should contain more language-map rules and is included at
-this point.
-
- The order in which rules are presented in a language-map file is
-significant. This order influences the order in which files are
-displayed as the result of queries. For example, the distributed
-language-map file places all rules for C .H files ahead of .C files, so
-that in general, declarations will precede definitions in query output.
-The same thing is done for C++ and its many different source file name
-extensions.
-
- Here is a pared-down version of the `id-lang.map' file distributed
-with the ID utilities:
-
-
- # Default language
- ** IGNORE # Although this is listed first,
- # the default language pattern is
- # logically matched last.
-
- # Backup files
- *~ IGNORE
- *.bak IGNORE
- *.bk[0-9] IGNORE
-
- # SCCS files
- [sp].* IGNORE
-
- # list header files before code files
- *.h C
- *.h.in C
- *.H C++
- *.hh C++
- *.hpp C++
- *.hxx C++
-
- # list C `meta' files next
- *.l C
- *.lex C
- *.y C
- *.yacc C
-
- # list C code files after header files
- *.c C
- *.C C++
- *.cc C++
- *.cpp C++
- *.cxx C++
-
- # list assembly language after C
- *.[sS] asm --comment=;
- *.asm asm --comment=;
-
- # [nt]roff
- *.[0-9] roff
- *.ms roff
- *.me roff
- *.mm roff
-
- # TeX and friends
- *.tex TeX
- *.ltx TeX
- *.texi texinfo
- *.texinfo texinfo
-
-
-File: id-utils.info, Node: C/C++ scanner, Next: Assembler scanner, Prev: Language map, Up: Extraction options
-
-C/C++ Language Scanner
-----------------------
-
- The C scanner is the most commonly used. Files that match the glob
-pattern `*.h', `*.c', as well as `yacc' files that match `*.y' or
-`*.yacc', and `lex' files that match `*.l' or `*.lex', are processed
-with this scanner.
-
- Scanner-specific options (Note, these options are presented WITHOUT
-the required `-l' or `--lang-option=' prefix):
-
-`-k CHARACTER-CLASS'
-`--keep=CHARACTER-CLASS'
- Consider the characters in CHARACTER-CLASS as valid constituents of
- identifier names. For example, if you are indexing C code that
- contains `$' in some of its identifiers, you can include these by
- using `--lang-option=C:--keep=$', or `-l C:"-k $"' (if you don't
- like to type so much).
-
-`-i CHARACTER-CLASS'
-`--ignore=CHARACTER-CLASS'
- x mkiConsider the characters in CHARACTER-CLASS as valid
- constituents of identifier names, but discard all tokens
- containing these characters. For example, if some C code has
- identifiers containing `$', but you don't want these cluttering up
- your ID database, use `--lang-option=C:--ignore=$', or the terser
- equivalent `-l C:"-i $"'.
-
-`-u'
-`--strip-underscore'
- Strip one leading underscore from C identifiers encapsulated as
- character strings. This option is useful if you are indexing C
- code that contains symbol-table name strings for systems that
- prepend an underscore to external symbols. By default, the
- leading underscore is retained.
-
-
-File: id-utils.info, Node: Assembler scanner, Next: Text scanner, Prev: C/C++ scanner, Up: Extraction options
-
-Assembly Language Scanner
--------------------------
-
- Assembly languages use a variety of commenting conventions, and
-allow a variety of special characters to *dirty up* local symbols,
-preventing name space conflicts with symbols defined by higher-level
-languages. Also, some compilation systems prepend an underscore to
-external symbols. The options listed below are designed to address
-these differences.
-
-`-c CHARACTER-CLASS'
-`--comment=CHARACTER-CLASS'
- The characters in CHARACTER-CLASS are considered left delimiters
- for comments that extend until the end of the current line.
-
-`-k CHARACTER-CLASS'
-`--keep=CHARACTER-CLASS'
- Consider the characters of CHARACTER-CLASS as valid constituents of
- identifier names. For example, if you are indexing assembly code
- that prepends `.' to assembler directives, and prepends `%' to
- register names, you can keep these characters in the tokens by
- specifying `--lang-option=asm:--keep=.%', or `-l asm:"-k .%"'.
-
-`-i CHARACTER-CLASS'
-`--ignore=CHARACTER-CLASS'
- Consider the characters of CHARACTER-CLASS as valid consituents of
- identifier names, but discard all tokens containing these
- characters. For example, if you don't want to clutter your ID
- database with assembler directives that begin with a leading `.'
- or with assembler labels that contain `@', use
- `--lang-option=asm:--ignore=.@', or `-l asm:"-i .@"'.
-
-`-u'
-`--strip-underscore'
- Strip one leading underscore from identifiers. This option is
- useful if your compilation system prepends an underscore to
- external symbols. By stripping the underscore, you can
- canonicalize such names and bring them into conformance the way
- they are expressed in the C language. By default, the leading
- underscore is retained.
-
-`-n'
-`--no-cpp'
- Do not recognize C preprocessor directives. By default, such
- lines are handled in the same way as they are by the C language
- scanner.
-
-
-File: id-utils.info, Node: Text scanner, Next: Defining scanners, Prev: Assembler scanner, Up: Extraction options
-
-Text Scanner
-------------
-
- The plain text scanner is intended for human-language documents, or
-as the scanner of last resort for files that have no scanner that is
-more specific. It is customizable to the extent that character classes
-can be designated as token constituents or as token delimiters. The
-default token constituents are the alpha-numerics; all other characters
-are considered token delimiters.
-
-`-i CHARACTER-CLASS'
-`--include=CHARACTER-CLASS'
- Include characters belonging to CHARACTER-CLASS in tokens.
-
-`-x CHARACTER-CLASS'
-`--exclude=CHARACTER-CLASS'
- Exclude characters belonging to CHARACTER-CLASS from tokens, i.e.,
- treat them as token delimiters.
-
-
-File: id-utils.info, Node: Defining scanners, Prev: Text scanner, Up: Extraction options
-
-Defining New Scanners in the Source Code
-----------------------------------------
-
- To add a new scanner in source code, you should add a new section to
-the file `scanners.c'. It might be easiest to clone one of the
-existing scanners and modify it as necessary. For the hypothetical
-language FOO, you must define the functions `get_token_foo',
-`parse_args_foo', `help_me_foo', as well as the tables
-`long_options_foo' and `args_foo'. If your scanner is modelled after
-one of the existing scanners, you'll also need a character-attribute
-table `ctype_foo'.
-
- This is not a terribly difficult programming task, but it requires
-recompiling and installing the new version of `mkid' and `xtokid'. You
-should use `xtokid' to test the operation of the new scanner.
-
- Once these functions and tables are ready, add function prototypes
-and an entry to to the `languages_0' table near the beginning of the
-file.
-
- Be warned that the existing scanners are built for speed, not
-elegance or readability. You might wish to create a new scanner that's
-easier to read and understand if you don't feel that speed is so
-important.
-
-
-File: id-utils.info, Node: mkid invocation, Next: lid invocation, Prev: Common options, Up: Top
-
-`mkid': Creating an ID Database
-*******************************
-
- `mkid' builds an ID database. It accepts the names of files and/or
-directories on the command line, selects files that have an enabled
-scanner, then extracts and stores tokens from those files. The
-resulting ID database is architecture- and byte-order-independent so it
-can be shared among all systems.
-
- The primary virtues of `mkid' are speed and high capacity. The size
-of the source trees it can index is limited only by available system
-memory. `mkid''s indexing algorithm is very space-efficient and
-exhibits excellent locality-of-reference, and so is capable of
-operating with a working-set size that is only half the size of its
-virtual address space. A typical UNIX-like operating system with 16
-megabytes of system memory should be able to build an ID database
-covering approximately 12,000-14,000 source files totalling
-approximately 50-100 Megabytes. A 66 Mhz 486 computer can build such a
-large ID database in approximately 10-15 minutes.
-
- In a future release, `mkid' will be able to incrementally update an
-ID database much faster than it can build one from scratch. Until this
-feature becomes available, it might be a good idea to schedule a `cron'
-job to regularly update large ID databases during off-hours.
-
- `mkid' writes the ID file, therefore it accepts the `--output' (and
-`--file') options as described in *Note Writing options::. `mkid'
-extracts tokens from source files, therefore it accepts the
-`--lang-map', `--include', `--exclude', and `--lang-option' options, as
-well as the language-specific scanner options, all of which are
-described in *Note Extraction options::. `mkid' walks file trees,
-therefore it handles file and directory names on its command line and
-the `--prune' option as described in *Note Walker options::.
-
- In addition, `mkid' accepts the following command-line options:
-
-`-s'
-`--statistics'
- `mkid' reports statistics about resource usage at the end of its
- run.
-
-`-v'
-`--verbose'
- `mkid' reports statistics about each file as it is scanned, and
- about the resource usage of its indexing algorithm at regular
- intervals.
-
-
-File: id-utils.info, Node: lid invocation, Next: fid invocation, Prev: mkid invocation, Up: Top
-
-`lid': Querying an ID Database by Token
-***************************************
-
- The `lid' program accepts PATTERNS on the command line which it
-matches against the tokens stored in an ID database. The
-interpretation of a PATTERN is determined by the makeup of the PATTERN
-string itself, or can be overridden by command-line options. If a
-PATTERN contains regular expression meta-characters, it is used to
-perform a regular-expression substring search. If no such
-meta-characters are present, PATTERN is used to perform a literal word
-search. (By default, all searches are sensitive to alphabetic case.)
-If no PATTERN is supplied on the command line, `lid' lists every entry
-in the ID database.
-
- `lid' reads the ID database, therefore it accepts the `--file'
-option, and consults the `IDPATH' environment variable, as described in
-*Note Reading options::. `lid' lists file names, therefore it accepts
-the `--separator' option, as described in *Note File listing options::.
-
- In addition, `lid' accepts the following command-line options:
-
-`-i'
-`--ignore-case'
- Ignoring differences in alphabetic case between the PATTERN and
- the tokens in the ID database.
-
-`-l'
-`--literal'
- Match PATTERN as a literal string. Use this option if PATTERN
- contains regular-expression meta-characters, but you don't wish to
- perform a regular-expression search.
-
-`-r'
-`--regexp'
- Match PATTERN as an *extended* regular expression(1). Use this
- option if no regular-expression expression meta-characters are
- present in PATTERN, but you wish to force a regular-expression
- search (note: in this case, a *literal substring* search might be
- faster).
-
-`-w'
-`--word'
- Match PATTERN using a word-delimited (non substring) search. This
- is the default for literal searches.
-
-`-s'
-`--substring'
- Match PATTERN using a substring (non word-delimited) search. This
- is the default for regular expression searches.
-
-`-k STYLE'
-`--key=STYLE'
- STYLE can be one of `token', `pattern' or `none'. This option
- controls how the subject of the query is presented. This is best
- illustrated by example:
-
- $ lid --key=token '^dest.'
- destaddr libsys/memcpy.c
- destination libsys/regex.c
- destlst libsys/rx.c
- destpos libsys/rx.c
- destset libsys/rx.h libsys/rx.c
-
- $ lid --key=pattern '^dest.'
- ^dest. libsys/rx.h libsys/{memcpy,regex,rx}.c
-
- $ lid --key=none '^dest.'
- libsys/rx.h libsys/{memcpy,regex,rx}.c
-
- When `--key' is either `token' or `pattern', the first column of
- output is a TOKEN or PATTERN, respectively. When `--key' is
- `none', neither of these is printed, and the file name list begins
- immediately. The default is `token'.
-
-`-R STYLE'
-`--result=STYLE'
- STYLE can be one of `filenames', `grep', `edit' or `none'. This
- option controls how the value associated with the query's KEY
- presented. When STYLE is `filenames', a list of file names is
- printed (this is the default). When STYLE is `grep', the lines
- that match PATTERN are printed in the same format as `egrep -n'.
- When STYLE is `edit', the file names are passed to an editor, and
- if possible PATTERN is passed as an initial search string (*note
- eid invocation::.). When STYLE is `none', the file names are not
- processed in any way. This can be useful if you wish to see what
- tokens match a PATTERN, but don't care about where they reside.
-
-`-d'
-`-o'
-`-x'
- These options may be used in any combination to specify the radix
- of numeric matches. `-d' allows matching on decimal numbers, `-o'
- on octal numbers, and `-x' on hexadecimal numbers. Any
- combination of these options may be used. The default is to match
- all three radixes.
-
-`-F RANGE'
-`--frequency=RANGE'
- Match tokens whose occurrence count falls in RANGE. RANGE may be
- expressed as a single number N, or as a range N`..'M. Either
- limit of the range may be omitted (e.g., `..'M, or N..`..'). If
- the lower limit N is omitted, it defaults to `1'. If the upper
- limit is omitted, it defaults in the present implementation to
- `65535', the maximum value of an unsigned 16-bit integer.
-
- Particularly useful queries are `lid -F1', which helps locate
- identifiers that are defined but never used, or are used but never
- defined. Similarly, `lid -F2' can help find functions that possess
- a prototype declaration and a definition, but are never called.
-
-`-a NUMBER'
-`--ambiguous=NUMBER'
- List identifiers (not numbers) that are ambiguous for the first
- NUMBER characters. This feature might be in useful when porting
- programs to ancient pea-brained compilers that don't support long
- identifier names. However, the best long-term option is to set
- such systems on fire.
-
-* Menu:
-
-* lid aliases:: Aliases for specialized lid queries
-* Emacs gid interface:: GNU Emacs query interface
-* eid invocation:: Invoking an editor on query results
-
- ---------- Footnotes ----------
-
- (1) Extended regular expressions are the same as those accepted by
-`egrep'.
-
-
-File: id-utils.info, Node: lid aliases, Next: Emacs gid interface, Up: lid invocation
-
-Aliases for Specialized `lid' Queries
-=====================================
-
- Historically, the ID utilities have provided several query interfaces
-which are specializations of `lid' (*note lid invocation::.).
-
-`gid'
- (alias for `lid -R grep') lists all lines containing the requested
- pattern.
-
-`eid'
- (alias for `lid -R edit') invokes an editor on all files
- containing the requested pattern, and optionally initiates a text
- search for that pattern.
-
-`aid'
- (alias for `lid -ils') treats the requested pattern as a
- case-insensitive literal substring.
-
-
-File: id-utils.info, Node: Emacs gid interface, Next: eid invocation, Prev: lid aliases, Up: lid invocation
-
-GNU Emacs query interface
-=========================
-
- The `id-utils' source distribution comes with a file `id-utils.el',
-which defines a GNU Emacs interface to `gid'. To install it, put
-`id-utils.el' somewhere that Emacs will find it (i.e., in your
-`load-path') and put
-
- (autoload 'gid "gid" nil t)
-
-in one of Emacs' initialization files, e.g., `~/.emacs'. You will then
-be able to use `M-x gid' to run the command.
-
- The `gid' function prompts you with the word around point. If you
-want to search for something else, simply delete the line and type the
-pattern of interest.
-
- The function then runs the `gid' program in a `*compilation*'
-buffer, so the normal `next-error' function can be used to visit all
-the places the identifier is found (*note Compilation:
-(emacs)Compilation.).
-
-
-File: id-utils.info, Node: eid invocation, Prev: Emacs gid interface, Up: lid invocation
-
-`eid': Invoking an Editor on Query Results
-==========================================
-
- `lid -R edit' is an editing interface for the ID utilities that is
-most commonly used with `vi'. Emacs users should use the interface
-defined in `id-utils.el' (*note Emacs gid interface::.). The ID
-utilities include an alias called `eid', and for the sake of brevity,
-we'll use this alias for the remainder of this section. `eid' performs
-a `lid'-style, then asks if you wish to edit the files. If your query
-yields more than one line of output, you will be prompted after each
-line. This is the prompt you'll see:
-
- Edit? [y1-9^S/nq]
-
-You may respond with:
-
-`y'
- Edit all files listed.
-
-`1...9'
- Edit all files starting at the N + 1'st file.
-
-`/STRING or `CTRL-S'REGEXP'
- Search into the file list, and begin editing with the first file
- name that matches the regular expression REGEXP.
-
-`n'
- Don't edit any files. If another line of query output is pending,
- advance to that line, for which another `Edit?' prompt will appear.
-
-`q'
- Quit--don't edit any files, and don't process any more lines of
- query output.
-
- Here is an example:
-
- prompt$ eid FILE \^print
- FILE {ansi2knr,fid,filenames,idfile,idx,lid,misc,...}.c
- Edit? [y1-9^S/nq] n
- ^print {ansi2knr,fid,getopt,getopt1,lid,mkid,regex,scanners}.c
- Edit? [y1-9^S/nq] 2
-
-This will start editing at `getopt'.c.
-
- `eid' invokes the editor defined by the environment variable
-`VISUAL'. If `VISUAL' is undefined, it uses the environment variable
-`EDITOR' instead. If `EDITOR' is undefined, it defaults to `vi'. It
-is possible for `eid' to pass the editor an initial search pattern so
-that your cursor will immediately alight on the token of interest.
-This feature is controlled by the following environment variables:
-
-`EIDARG'
- A printf(3) format string for the editor argument to search for the
- matching token. For `vi', this should be `+/%s/'.
-
-`EIDLDEL'
- The regular-expression meta-character(s) for delimiting the
- beginning of a word (the ``eid' Left DELimiter'). `eid' inserts
- this in front of the matching token when a word-search is desired.
- For `vi', this should be `\<'.
-
-`EIDRDEL'
- The regular-expression meta-character(s) for delimiting the end of
- a word (the ``eid' Right DELimiter'). `eid' inserts this in end
- of the matching token when a word-search is desired. For `vi',
- this should be `\>'.
-
-
-File: id-utils.info, Node: fid invocation, Next: fnid invocation, Prev: lid invocation, Up: Top
-
-`fid': Listing a file's tokens
-******************************
-
- `fid' prints the tokens found in a given file. If two file names
-are passed on the command line, `fid' prints the tokens that are common
-to both files (i.e., the *set intersection* of the two token sets).
-
- `lid' reads the ID database, therefore it accepts the `--file'
-option, and consults the `IDPATH' environment variable, as described in
-*Note Reading options::.
-
- If the standard output is attached to a terminal, the printed tokens
-are separated by spaces. Otherwise, the tokens are printed one per
-line.
-
-
-File: id-utils.info, Node: fnid invocation, Next: xtokid invocation, Prev: fid invocation, Up: Top
-
-`fnid': Looking up filenames
-****************************
-
- `fnid' queries the list of file names stored in the ID database. It
-accepts shell *wildcard* patterns on the command line. If no pattern
-is supplied, `*' is implied. `fnid' prints the file names that match
-the given patterns.
-
- `fnid' prints file names, and as such accepts the `--separator'
-option as described in *Note File listing options::.
-
- For example, the command:
-
- fnid \*.c
-
-lists all the `.c' files in the database. (The `\' here protects the
-`*' from being expanded by the shell.)
-
-
-File: id-utils.info, Node: xtokid invocation, Next: Past and Future, Prev: fnid invocation, Up: Top
-
-`xtokid': Testing Language Scanners
-***********************************
-
- `xtokid' accepts the names of files and/or directories on the
-command line, then extracts and prints a stream of tokens from those
-files for which it has a valid, enabled scanner. This is useful
-primarily for debugging new `mkid' scanners (*note Defining
-scanners::.).
-
- `xtokid' extracts tokens from source files, therefore it accepts the
-`--lang-map', `--include', `--exclude', and `--lang-option' options, as
-well as the language-specific scanner options, all of which are
-described in *Note Extraction options::. `xtokid' walks file trees,
-therefore it handles file and directory names on its command line and
-the `--prune' option as described in *Note Walker options::.
-
- The name `xtokid' indicates that it is the "eXtract TOKens ID
-utility".
-
-
-File: id-utils.info, Node: Past and Future, Next: Index, Prev: xtokid invocation, Up: Top
-
-Past and Future
-***************
-
- Greg McGary conceived of the ideas behind the ID utilities when he
-began working on the Unix kernel in 1984. He needed a navigation tool
-to help him find his way around the expansive, unfamiliar landscape.
-The first `id-utils'-like tools were shell scripts, and produced an
-ASCII database that looks much like the output of `lid ".*"'. It took
-over an hour on a VAX 11/750 to build a database for a 4.1BSD derived
-kernel. The first version of `lid' used the UNIX system utility
-`look', modified to handle very long lines.
-
- In 1986, Greg rewrote the shell scripts in C to improve performance.
-Build times for the ID file were shortened by an order of magnitude.
-The ID utilities were first posted to `comp.sources.unix' in September
-1987 under the name `id'.
-
- Over the next few years, several versions diverged from the original
-source. Tom Horsley at Harris Computer Systems Division stepped forward
-to take over maintenance and integrated some of the fixes from divergent
-versions. A first release of the renamed `mkid' version 2 was posted
-to `alt.sources' near the end of 1990. At that time, Tom wrote a
-Texinfo manual with the encouragement the net community. (Tom
-especially thanks Doug Scofield and Bill Leonard whom he dragooned into
-helping poorfraed and edit--they found several problems in the initial
-version.) Karl Berry revamped the manual for Texinfo style, indexing,
-and organization in 1995.
-
- In January 1995, Greg McGary reemerged as the primary maintainer and
-launched development of `mkid' version 3, whose primary new feature is
-an efficient algorithm for building databases that is linear in both
-time and space over the size of the input text. (The old algorithm was
-quadratic in space so it was incapable of handling very large source
-trees.) For the first time, the code was released under the GNU Public
-License.
-
- In June 1996, the package was renamed again to `id-utils' and was
-released for the first time under FSF copyright as part of the GNU
-system. All programs had their command-line arguments completely
-revised. The `mkid' and `xtokid' programs also gained a file-tree
-walker, so that directory names can be passed on the command line
-instead of the names of every individual file. Greg reorganized and
-rewrote most of the Texinfo manual to reflect these changes.
-
- Future releases of `id-utils' might include:
-
- an optional coupling with GNU `grep', so that `grep' can use an ID
- database for hints
-
- a `cscope' work-alike query interface
-
- incremental update of the ID database.
-
-
-File: id-utils.info, Node: Index, Prev: Past and Future, Up: Top
-
-Index
-*****
-
-* Menu:
-
-* *compilation* Emacs buffer: Emacs gid interface.
-* -ambiguous: lid invocation.
-* -comment: Assembler scanner.
-* -exclude <1>: Text scanner.
-* -exclude: Extraction options.
-* -file <1>: Writing options.
-* -file: Reading options.
-* -frequency: lid invocation.
-* -help: Universal options.
-* -ignore <1>: Assembler scanner.
-* -ignore: C/C++ scanner.
-* -ignore-case: lid invocation.
-* -include <1>: Text scanner.
-* -include: Extraction options.
-* -keep <1>: Assembler scanner.
-* -keep: C/C++ scanner.
-* -lang-map: Extraction options.
-* -lang-option: Extraction options.
-* -lang-option=asm:-comment: Assembler scanner.
-* -lang-option=asm:-ignore: Assembler scanner.
-* -lang-option=asm:-keep: Assembler scanner.
-* -lang-option=asm:-no-cpp: Assembler scanner.
-* -lang-option=asm:-strip-underscore: Assembler scanner.
-* -lang-option=asm:-c: Assembler scanner.
-* -lang-option=asm:-i: Assembler scanner.
-* -lang-option=asm:-k: Assembler scanner.
-* -lang-option=asm:-n: Assembler scanner.
-* -lang-option=asm:-u: Assembler scanner.
-* -lang-option=C:-ignore: C/C++ scanner.
-* -lang-option=C:-keep: C/C++ scanner.
-* -lang-option=C:-strip-underscore: C/C++ scanner.
-* -lang-option=C:-i: C/C++ scanner.
-* -lang-option=C:-k: C/C++ scanner.
-* -lang-option=C:-u: C/C++ scanner.
-* -lang-option=text:-exclude: Text scanner.
-* -lang-option=text:-include: Text scanner.
-* -lang-option=text:-i: Text scanner.
-* -lang-option=text:-x: Text scanner.
-* -literal: lid invocation.
-* -no-cpp: Assembler scanner.
-* -output: Writing options.
-* -prune: Walker options.
-* -regexp: lid invocation.
-* -result: lid invocation.
-* -separator: File listing options.
-* -statistics: mkid invocation.
-* -strip-underscore <1>: Assembler scanner.
-* -strip-underscore: C/C++ scanner.
-* -substring: lid invocation.
-* -verbose: mkid invocation.
-* -version: Universal options.
-* -word: lid invocation.
-* -a: lid invocation.
-* -c: Assembler scanner.
-* -d: lid invocation.
-* -F: lid invocation.
-* -f <1>: Writing options.
-* -f: Reading options.
-* -i <1>: lid invocation.
-* -i <1>: Text scanner.
-* -i <1>: Assembler scanner.
-* -i <1>: C/C++ scanner.
-* -i: Extraction options.
-* -k <1>: lid invocation.
-* -k <1>: Assembler scanner.
-* -k: C/C++ scanner.
-* -l <1>: lid invocation.
-* -l: Extraction options.
-* -l asm:-comment: Assembler scanner.
-* -l asm:-ignore: Assembler scanner.
-* -l asm:-keep: Assembler scanner.
-* -l asm:-no-cpp: Assembler scanner.
-* -l asm:-strip-underscore: Assembler scanner.
-* -l asm:-c: Assembler scanner.
-* -l asm:-i: Assembler scanner.
-* -l asm:-k: Assembler scanner.
-* -l asm:-n: Assembler scanner.
-* -l asm:-u: Assembler scanner.
-* -l C:-ignore: C/C++ scanner.
-* -l C:-keep: C/C++ scanner.
-* -l C:-strip-underscore: C/C++ scanner.
-* -l C:-i: C/C++ scanner.
-* -l C:-k: C/C++ scanner.
-* -l C:-u: C/C++ scanner.
-* -l text:-exclude: Text scanner.
-* -l text:-include: Text scanner.
-* -l text:-i: Text scanner.
-* -l text:-x: Text scanner.
-* -m: Extraction options.
-* -n: Assembler scanner.
-* -o <1>: lid invocation.
-* -o: Writing options.
-* -p: Walker options.
-* -r: lid invocation.
-* -s <1>: lid invocation.
-* -s: mkid invocation.
-* -S: File listing options.
-* -u <1>: Assembler scanner.
-* -u: C/C++ scanner.
-* -v: mkid invocation.
-* -w: lid invocation.
-* -x <1>: lid invocation.
-* -x <1>: Text scanner.
-* -x: Extraction options.
-* mkid progress: mkid invocation.
-* alphabetic case, ignoring differences in: lid invocation.
-* ambiguous identifier names, finding: lid invocation.
-* architecture-independence: mkid invocation.
-* assembler scanner: Assembler scanner.
-* assembly language scanner: Assembler scanner.
-* beginning-of-word editor argument: eid invocation.
-* Berry, Karl: Past and Future.
-* bugs, reporting: Introduction.
-* C scanner, predefined: C/C++ scanner.
-* common command-line options: Common options.
-* creating databases: mkid invocation.
-* cron: mkid invocation.
-* cscope: Past and Future.
-* databases, creating: mkid invocation.
-* eid: eid invocation.
-* EIDARG: eid invocation.
-* EIDLDEL: eid invocation.
-* EIDRDEL: eid invocation.
-* Emacs interface to gid: Emacs gid interface.
-* end-of-word editor argument: eid invocation.
-* exclude languages: Extraction options.
-* fid: fid invocation.
-* file name separator: File listing options.
-* file tree pruning: Walker options.
-* filenames, matching: fnid invocation.
-* fnid: fnid invocation.
-* future: Past and Future.
-* gid Emacs function: Emacs gid interface.
-* grep: Past and Future.
-* help, online: Universal options.
-* history: Past and Future.
-* Horsley, Tom: Past and Future.
-* ID database file name <1>: Writing options.
-* ID database file name: Reading options.
-* ID database, definition of: Introduction.
-* ID file format: mkid invocation.
-* id-utils.el interface to Emacs: Emacs gid interface.
-* ignoring differences in alphabetic case: lid invocation.
-* include languages: Extraction options.
-* introduction: Introduction.
-* language map file: Extraction options.
-* language-specific option: Extraction options.
-* languages_0: Defining scanners.
-* left delimiter editor argument: eid invocation.
-* Leonard, Bill: Past and Future.
-* load-path: Emacs gid interface.
-* look and mkid 1: Past and Future.
-* matching filenames: fnid invocation.
-* McGary, Greg: Past and Future.
-* numeric matches, specifying radix of: lid invocation.
-* overview: Introduction.
-* radix of numeric matches, specifying: lid invocation.
-* right delimiter editor argument: eid invocation.
-* scanners: Extraction options.
-* scanners, defining in source code: Defining scanners.
-* scanners.c: Defining scanners.
-* Scofield, Doug: Past and Future.
-* search for token, initial: eid invocation.
-* sharing ID files: mkid invocation.
-* single matches, showing: lid invocation.
-* statistics: mkid invocation.
-* text scanner: Text scanner.
-* tokens common to two files: fid invocation.
-* tokens in a file: fid invocation.
-* version number, finding: Universal options.
-
-
-
-Tag Table:
-Node: Top1278
-Node: Introduction2031
-Node: Quick start4560
-Node: Common options5485
-Node: Universal options6283
-Node: Reading options6608
-Node: Writing options7725
-Node: Walker options8221
-Node: File listing options9060
-Node: Extraction options10151
-Node: Language map12701
-Node: C/C++ scanner14907
-Node: Assembler scanner16522
-Node: Text scanner18618
-Node: Defining scanners19426
-Node: mkid invocation20648
-Node: lid invocation22929
-Node: lid aliases28314
-Node: Emacs gid interface28992
-Node: eid invocation29909
-Node: fid invocation32493
-Node: fnid invocation33180
-Node: xtokid invocation33855
-Node: Past and Future34794
-Node: Index37486
-
-End Tag Table
diff --git a/doc/stamp-vti b/doc/stamp-vti
deleted file mode 100644
index c1d6fc8..0000000
--- a/doc/stamp-vti
+++ /dev/null
@@ -1,3 +0,0 @@
-@set UPDATED 27 January 1999
-@set EDITION 3.2a
-@set VERSION 3.2a
diff --git a/doc/version.texi b/doc/version.texi
deleted file mode 100644
index c1d6fc8..0000000
--- a/doc/version.texi
+++ /dev/null
@@ -1,3 +0,0 @@
-@set UPDATED 27 January 1999
-@set EDITION 3.2a
-@set VERSION 3.2a
diff --git a/lib/.cvsignore b/lib/.cvsignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/lib/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 5d8c4ea..ea32e6d 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -78,7 +78,6 @@ LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LN_S = @LN_S@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -94,6 +93,8 @@ VERSION = @VERSION@
l = @l@
lispdir = @lispdir@
+AUTOMAKE_OPTIONS = ../src/ansi2knr
+
noinst_LIBRARIES = libsys.a
EXTRA_DIST = alloca.c basename.c dirname.c error.c fnmatch.c memcpy.c memset.c obstack.c regex.c rx.c strcasecmp.c strcspn.c strdup.c strndup.c strpbrk.c strspn.c strstr.c strtok.c
@@ -115,18 +116,19 @@ LIBRARIES = $(noinst_LIBRARIES)
CPPFLAGS = @CPPFLAGS@
LIBS = @LIBS@
+ANSI2KNR = ../src/ansi2knr
libsys_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@
-libsys_a_OBJECTS = xgetcwd.o xmalloc.o
+libsys_a_OBJECTS = xgetcwd$U.o xmalloc$U.o
AR = ar
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
HEADERS = $(noinst_HEADERS)
-DIST_COMMON = Makefile.am Makefile.in alloca.c ansi2knr.1 ansi2knr.c \
-basename.c dirname.c error.c fnmatch.c memcpy.c memset.c obstack.c \
-obstack.h regex.c regex.h rx.c rx.h strcspn.c strdup.c strndup.c \
-strpbrk.c strspn.c strstr.c strtok.c
+DIST_COMMON = Makefile.am Makefile.in alloca.c basename.c dirname.c \
+error.c fnmatch.c memcpy.c memset.c obstack.c obstack.h regex.c regex.h \
+rx.c rx.h strcspn.c strdup.c strndup.c strpbrk.c strspn.c strstr.c \
+strtok.c
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -144,7 +146,7 @@ OBJECTS = $(libsys_a_OBJECTS)
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -176,11 +178,68 @@ distclean-compile:
-rm -f *.tab.c
maintainer-clean-compile:
+../src/ansi2knr: ../src/ansi2knr.o
+ cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
+
+../src/ansi2knr.o:
+ cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.o
+
+
+mostlyclean-kr:
+ -rm -f *_.c
+
+clean-kr:
+
+distclean-kr:
+
+maintainer-clean-kr:
libsys.a: $(libsys_a_OBJECTS) $(libsys_a_DEPENDENCIES)
-rm -f libsys.a
$(AR) cru libsys.a $(libsys_a_OBJECTS) $(libsys_a_LIBADD)
$(RANLIB) libsys.a
+alloca_.c: alloca.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/alloca.c; then echo $(srcdir)/alloca.c; else echo alloca.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > alloca_.c
+basename_.c: basename.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/basename.c; then echo $(srcdir)/basename.c; else echo basename.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > basename_.c
+dirname_.c: dirname.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dirname.c; then echo $(srcdir)/dirname.c; else echo dirname.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dirname_.c
+error_.c: error.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/error.c; then echo $(srcdir)/error.c; else echo error.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > error_.c
+fnmatch_.c: fnmatch.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fnmatch.c; then echo $(srcdir)/fnmatch.c; else echo fnmatch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fnmatch_.c
+memcpy_.c: memcpy.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memcpy.c; then echo $(srcdir)/memcpy.c; else echo memcpy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memcpy_.c
+memset_.c: memset.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memset.c; then echo $(srcdir)/memset.c; else echo memset.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memset_.c
+obstack_.c: obstack.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/obstack.c; then echo $(srcdir)/obstack.c; else echo obstack.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > obstack_.c
+regex_.c: regex.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/regex.c; then echo $(srcdir)/regex.c; else echo regex.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > regex_.c
+rx_.c: rx.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rx.c; then echo $(srcdir)/rx.c; else echo rx.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rx_.c
+strcspn_.c: strcspn.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strcspn.c; then echo $(srcdir)/strcspn.c; else echo strcspn.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strcspn_.c
+strdup_.c: strdup.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strdup.c; then echo $(srcdir)/strdup.c; else echo strdup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strdup_.c
+strndup_.c: strndup.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strndup.c; then echo $(srcdir)/strndup.c; else echo strndup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strndup_.c
+strpbrk_.c: strpbrk.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strpbrk.c; then echo $(srcdir)/strpbrk.c; else echo strpbrk.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strpbrk_.c
+strspn_.c: strspn.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strspn.c; then echo $(srcdir)/strspn.c; else echo strspn.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strspn_.c
+strstr_.c: strstr.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strstr.c; then echo $(srcdir)/strstr.c; else echo strstr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strstr_.c
+strtok_.c: strtok.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtok.c; then echo $(srcdir)/strtok.c; else echo strtok.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtok_.c
+xgetcwd_.c: xgetcwd.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xgetcwd.c; then echo $(srcdir)/xgetcwd.c; else echo xgetcwd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xgetcwd_.c
+xmalloc_.c: xmalloc.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xmalloc.c; then echo $(srcdir)/xmalloc.c; else echo xmalloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xmalloc_.c
+alloca_.o basename_.o dirname_.o error_.o fnmatch_.o memcpy_.o \
+memset_.o obstack_.o regex_.o rx_.o strcspn_.o strdup_.o strndup_.o \
+strpbrk_.o strspn_.o strstr_.o strtok_.o xgetcwd_.o xmalloc_.o : \
+$(ANSI2KNR)
tags: TAGS
@@ -299,25 +358,26 @@ distclean-generic:
maintainer-clean-generic:
mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
- mostlyclean-tags mostlyclean-depend mostlyclean-generic
+ mostlyclean-kr mostlyclean-tags mostlyclean-depend \
+ mostlyclean-generic
mostlyclean: mostlyclean-am
-clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
- clean-generic mostlyclean-am
+clean-am: clean-noinstLIBRARIES clean-compile clean-kr clean-tags \
+ clean-depend clean-generic mostlyclean-am
clean: clean-am
-distclean-am: distclean-noinstLIBRARIES distclean-compile \
+distclean-am: distclean-noinstLIBRARIES distclean-compile distclean-kr \
distclean-tags distclean-depend distclean-generic \
clean-am
distclean: distclean-am
maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
- maintainer-clean-compile maintainer-clean-tags \
- maintainer-clean-depend maintainer-clean-generic \
- distclean-am
+ maintainer-clean-compile 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."
@@ -326,14 +386,15 @@ maintainer-clean: maintainer-clean-am
.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-distclean-depend clean-depend maintainer-clean-depend 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 installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \
+maintainer-clean-kr tags mostlyclean-tags distclean-tags clean-tags \
+maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
+clean-depend maintainer-clean-depend 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 installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/lib/ansi2knr.1 b/lib/ansi2knr.1
deleted file mode 100644
index 434ce8f..0000000
--- a/lib/ansi2knr.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.TH ANSI2KNR 1 "31 December 1990"
-.SH NAME
-ansi2knr \- convert ANSI C to Kernighan & Ritchie C
-.SH SYNOPSIS
-.I ansi2knr
-input_file output_file
-.SH DESCRIPTION
-If no output_file is supplied, output goes to stdout.
-.br
-There are no error messages.
-.sp
-.I ansi2knr
-recognizes functions by seeing a non-keyword identifier at the left margin, followed by a left parenthesis, with a right parenthesis as the last character on the line. It will recognize a multi-line header if the last character on each line but the last is a left parenthesis or comma. These algorithms ignore whitespace and comments, except that the function name must be the first thing on the line.
-.sp
-The following constructs will confuse it:
-.br
- - Any other construct that starts at the left margin and follows the above syntax (such as a macro or function call).
-.br
- - Macros that tinker with the syntax of the function header.
diff --git a/lib/ansi2knr.c b/lib/ansi2knr.c
deleted file mode 100644
index 9bcc4ad..0000000
--- a/lib/ansi2knr.c
+++ /dev/null
@@ -1,439 +0,0 @@
-/* Copyright (C) 1989, 1991, 1993, 1994 Aladdin Enterprises. All rights reserved. */
-
-/* ansi2knr.c */
-/* Convert ANSI function declarations to K&R syntax */
-
-/*
-ansi2knr is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY. No author or distributor accepts responsibility
-to anyone for the consequences of using it or for whether it serves any
-particular purpose or works at all, unless he says so in writing. Refer
-to the GNU General Public License for full details.
-
-Everyone is granted permission to copy, modify and redistribute
-ansi2knr, but only under the conditions described in the GNU
-General Public License. A copy of this license is supposed to have been
-given to you along with ansi2knr so you can know your rights and
-responsibilities. It should be in a file named COPYLEFT. Among other
-things, the copyright notice and this notice must be preserved on all
-copies.
-*/
-
-/*
- * Usage:
- ansi2knr [--varargs] input_file [output_file]
- * If no output_file is supplied, output goes to stdout.
- * There are no error messages.
- *
- * ansi2knr recognizes function definitions by seeing a non-keyword
- * identifier at the left margin, followed by a left parenthesis,
- * with a right parenthesis as the last character on the line.
- * It will recognize a multi-line header provided that the last character
- * of the last line of the header is a right parenthesis,
- * and no intervening line ends with a left brace or a semicolon.
- * These algorithms ignore whitespace and comments, except that
- * the function name must be the first thing on the line.
- * The following constructs will confuse it:
- * - Any other construct that starts at the left margin and
- * follows the above syntax (such as a macro or function call).
- * - Macros that tinker with the syntax of the function header.
- *
- * If the --varargs switch is supplied, ansi2knr will attempt to
- * convert a ... argument to va_alist and va_dcl. If this switch is not
- * supplied, ansi2knr will simply drop any such arguments.
- */
-
-/*
- * The original and principal author of ansi2knr is L. Peter Deutsch
- * <ghost@aladdin.com>. Other authors are noted in the change history
- * that follows (in reverse chronological order):
- lpd 94-10-10 removed CONFIG_BROKETS conditional
- lpd 94-07-16 added some conditionals to help GNU `configure',
- suggested by Francois Pinard <pinard@iro.umontreal.ca>;
- properly erase prototype args in function parameters,
- contributed by Jim Avera <jima@netcom.com>;
- correct error in writeblanks (it shouldn't erase EOLs)
- lpd 89-xx-xx original version
- */
-
-/* Most of the conditionals here are to make ansi2knr work with */
-/* the GNU configure machinery. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-
-#ifdef HAVE_CONFIG_H
-
-/*
- For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h).
- This will define HAVE_CONFIG_H and so, activate the following lines.
- */
-
-# if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-# else
-# include <strings.h>
-# endif
-
-#else /* not HAVE_CONFIG_H */
-
-/*
- Without AC_CONFIG_HEADER, merely use <string.h> as in the original
- Ghostscript distribution. This loses on older BSD systems.
- */
-
-# include <string.h>
-
-#endif /* not HAVE_CONFIG_H */
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#else
-/*
- malloc and free should be declared in stdlib.h,
- but if you've got a K&R compiler, they probably aren't.
- */
-char *malloc();
-void free();
-#endif
-
-/* Scanning macros */
-#define isidchar(ch) (isalnum(ch) || (ch) == '_')
-#define isidfirstchar(ch) (isalpha(ch) || (ch) == '_')
-
-/* Forward references */
-char *skipspace();
-void writeblanks();
-int test1();
-int convert1();
-
-/* The main program */
-int
-main(argc, argv)
- int argc;
- char *argv[];
-{ FILE *in, *out;
-#define bufsize 5000 /* arbitrary size */
- char *buf;
- char *line;
- int convert_varargs = 0;
- if ( argc > 1 && argv[1][0] == '-' )
- { if ( !strcmp(argv[1], "--varargs") )
- { convert_varargs = 1;
- argc--;
- argv++;
- }
- else
- { fprintf(stderr, "Unrecognized switch: %s\n", argv[1]);
- exit(1);
- }
- }
- switch ( argc )
- {
- default:
- printf("Usage: ansi2knr [--varargs] input_file [output_file]\n");
- exit(0);
- case 2:
- out = stdout;
- break;
- case 3:
- out = fopen(argv[2], "w");
- if ( out == NULL )
- { fprintf(stderr, "Cannot open output file %s\n", argv[2]);
- exit(1);
- }
- }
- in = fopen(argv[1], "r");
- if ( in == NULL )
- { fprintf(stderr, "Cannot open input file %s\n", argv[1]);
- exit(1);
- }
- fprintf(out, "#line 1 \"%s\"\n", argv[1]);
- buf = malloc(bufsize);
- line = buf;
- while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
- { switch ( test1(buf) )
- {
- case 2: /* a function header */
- convert1(buf, out, 1, convert_varargs);
- break;
- case 1: /* a function */
- convert1(buf, out, 0, convert_varargs);
- break;
- case -1: /* maybe the start of a function */
- line = buf + strlen(buf);
- if ( line != buf + (bufsize - 1) ) /* overflow check */
- continue;
- /* falls through */
- default: /* not a function */
- fputs(buf, out);
- break;
- }
- line = buf;
- }
- if ( line != buf ) fputs(buf, out);
- free(buf);
- fclose(out);
- fclose(in);
- return 0;
-}
-
-/* Skip over space and comments, in either direction. */
-char *
-skipspace(p, dir)
- register char *p;
- register int dir; /* 1 for forward, -1 for backward */
-{ for ( ; ; )
- { while ( isspace(*p) ) p += dir;
- if ( !(*p == '/' && p[dir] == '*') ) break;
- p += dir; p += dir;
- while ( !(*p == '*' && p[dir] == '/') )
- { if ( *p == 0 ) return p; /* multi-line comment?? */
- p += dir;
- }
- p += dir; p += dir;
- }
- return p;
-}
-
-/*
- * Write blanks over part of a string.
- * Don't overwrite end-of-line characters.
- */
-void
-writeblanks(start, end)
- char *start;
- char *end;
-{ char *p;
- for ( p = start; p < end; p++ )
- if ( *p != '\r' && *p != '\n' ) *p = ' ';
-}
-
-/*
- * Test whether the string in buf is a function definition.
- * The string may contain and/or end with a newline.
- * Return as follows:
- * 0 - definitely not a function definition;
- * 1 - definitely a function definition;
- * 2 - definitely a function prototype (NOT USED);
- * -1 - may be the beginning of a function definition,
- * append another line and look again.
- * The reason we don't attempt to convert function prototypes is that
- * Ghostscript's declaration-generating macros look too much like
- * prototypes, and confuse the algorithms.
- */
-int
-test1(buf)
- char *buf;
-{ register char *p = buf;
- char *bend;
- char *endfn;
- int contin;
- if ( !isidfirstchar(*p) )
- return 0; /* no name at left margin */
- bend = skipspace(buf + strlen(buf) - 1, -1);
- switch ( *bend )
- {
- case ';': contin = 0 /*2*/; break;
- case ')': contin = 1; break;
- case '{': return 0; /* not a function */
- default: contin = -1;
- }
- while ( isidchar(*p) ) p++;
- endfn = p;
- p = skipspace(p, 1);
- if ( *p++ != '(' )
- return 0; /* not a function */
- p = skipspace(p, 1);
- if ( *p == ')' )
- return 0; /* no parameters */
- /* Check that the apparent function name isn't a keyword. */
- /* We only need to check for keywords that could be followed */
- /* by a left parenthesis (which, unfortunately, is most of them). */
- { static char *words[] =
- { "asm", "auto", "case", "char", "const", "double",
- "extern", "float", "for", "if", "int", "long",
- "register", "return", "short", "signed", "sizeof",
- "static", "switch", "typedef", "unsigned",
- "void", "volatile", "while", 0
- };
- char **key = words;
- char *kp;
- int len = endfn - buf;
- while ( (kp = *key) != 0 )
- { if ( strlen(kp) == len && !strncmp(kp, buf, len) )
- return 0; /* name is a keyword */
- key++;
- }
- }
- return contin;
-}
-
-/* Convert a recognized function definition or header to K&R syntax. */
-int
-convert1(buf, out, header, convert_varargs)
- char *buf;
- FILE *out;
- int header; /* Boolean */
- int convert_varargs; /* Boolean */
-{ char *endfn;
- register char *p;
- char **breaks;
- unsigned num_breaks = 2; /* for testing */
- char **btop;
- char **bp;
- char **ap;
- char *vararg = 0;
- /* Pre-ANSI implementations don't agree on whether strchr */
- /* is called strchr or index, so we open-code it here. */
- for ( endfn = buf; *(endfn++) != '('; ) ;
-top: p = endfn;
- breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
- if ( breaks == 0 )
- { /* Couldn't allocate break table, give up */
- fprintf(stderr, "Unable to allocate break table!\n");
- fputs(buf, out);
- return -1;
- }
- btop = breaks + num_breaks * 2 - 2;
- bp = breaks;
- /* Parse the argument list */
- do
- { int level = 0;
- char *lp = NULL;
- char *rp;
- char *end = NULL;
- if ( bp >= btop )
- { /* Filled up break table. */
- /* Allocate a bigger one and start over. */
- free((char *)breaks);
- num_breaks <<= 1;
- goto top;
- }
- *bp++ = p;
- /* Find the end of the argument */
- for ( ; end == NULL; p++ )
- { switch(*p)
- {
- case ',':
- if ( !level ) end = p;
- break;
- case '(':
- if ( !level ) lp = p;
- level++;
- break;
- case ')':
- if ( --level < 0 ) end = p;
- else rp = p;
- break;
- case '/':
- p = skipspace(p, 1) - 1;
- break;
- default:
- ;
- }
- }
- /* Erase any embedded prototype parameters. */
- if ( lp )
- writeblanks(lp + 1, rp);
- p--; /* back up over terminator */
- /* Find the name being declared. */
- /* This is complicated because of procedure and */
- /* array modifiers. */
- for ( ; ; )
- { p = skipspace(p - 1, -1);
- switch ( *p )
- {
- case ']': /* skip array dimension(s) */
- case ')': /* skip procedure args OR name */
- { int level = 1;
- while ( level )
- switch ( *--p )
- {
- case ']': case ')': level++; break;
- case '[': case '(': level--; break;
- case '/': p = skipspace(p, -1) + 1; break;
- default: ;
- }
- }
- if ( *p == '(' && *skipspace(p + 1, 1) == '*' )
- { /* We found the name being declared */
- while ( !isidfirstchar(*p) )
- p = skipspace(p, 1) + 1;
- goto found;
- }
- break;
- default: goto found;
- }
- }
-found: if ( *p == '.' && p[-1] == '.' && p[-2] == '.' )
- { if ( convert_varargs )
- { *bp++ = "va_alist";
- vararg = p-2;
- }
- else
- { p++;
- if ( bp == breaks + 1 ) /* sole argument */
- writeblanks(breaks[0], p);
- else
- writeblanks(bp[-1] - 1, p);
- bp--;
- }
- }
- else
- { while ( isidchar(*p) ) p--;
- *bp++ = p+1;
- }
- p = end;
- }
- while ( *p++ == ',' );
- *bp = p;
- /* Make a special check for 'void' arglist */
- if ( bp == breaks+2 )
- { p = skipspace(breaks[0], 1);
- if ( !strncmp(p, "void", 4) )
- { p = skipspace(p+4, 1);
- if ( p == breaks[2] - 1 )
- { bp = breaks; /* yup, pretend arglist is empty */
- writeblanks(breaks[0], p + 1);
- }
- }
- }
- /* Put out the function name and left parenthesis. */
- p = buf;
- while ( p != endfn ) putc(*p, out), p++;
- /* Put out the declaration. */
- if ( header )
- { fputs(");", out);
- for ( p = breaks[0]; *p; p++ )
- if ( *p == '\r' || *p == '\n' )
- putc(*p, out);
- }
- else
- { for ( ap = breaks+1; ap < bp; ap += 2 )
- { p = *ap;
- while ( isidchar(*p) )
- putc(*p, out), p++;
- if ( ap < bp - 1 )
- fputs(", ", out);
- }
- fputs(") ", out);
- /* Put out the argument declarations */
- for ( ap = breaks+2; ap <= bp; ap += 2 )
- (*ap)[-1] = ';';
- if ( vararg != 0 )
- { *vararg = 0;
- fputs(breaks[0], out); /* any prior args */
- fputs("va_dcl", out); /* the final arg */
- fputs(bp[0], out);
- }
- else
- fputs(breaks[0], out);
- }
- free((char *)breaks);
- return 0;
-}
diff --git a/libidu/Makefile.in b/libidu/Makefile.in
index 9e3d79a..612a6af 100644
--- a/libidu/Makefile.in
+++ b/libidu/Makefile.in
@@ -78,7 +78,6 @@ LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LN_S = @LN_S@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -94,7 +93,7 @@ VERSION = @VERSION@
l = @l@
lispdir = @lispdir@
-AUTOMAKE_OPTIONS = ansi2knr
+AUTOMAKE_OPTIONS = ../src/ansi2knr
noinst_LIBRARIES = libidu.a
@@ -106,7 +105,7 @@ idu_DATA = id-lang.map
noinst_HEADERS = dynvec.h hash.h idfile.h scanners.h tokflags.h xnls.h
-INCLUDES = -I. -I$(srcdir) -I../lib -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl -I.. -I$(top_srcdir)
+INCLUDES = -I. -I$(srcdir) -I../lib -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl -I.. -I$(top_srcdir)
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -116,7 +115,7 @@ LIBRARIES = $(noinst_LIBRARIES)
CPPFLAGS = @CPPFLAGS@
LIBS = @LIBS@
-ANSI2KNR = @ANSI2KNR@
+ANSI2KNR = ../src/ansi2knr
libidu_a_LIBADD =
libidu_a_OBJECTS = dynvec$U.o hash$U.o idfile$U.o idread$U.o \
idwrite$U.o fnprint$U.o scanners$U.o walker$U.o
@@ -128,7 +127,7 @@ DATA = $(idu_DATA)
HEADERS = $(noinst_HEADERS)
-DIST_COMMON = Makefile.am Makefile.in ansi2knr.1 ansi2knr.c
+DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -143,7 +142,7 @@ OBJECTS = $(libidu_a_OBJECTS)
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnits libidu/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -175,18 +174,11 @@ distclean-compile:
-rm -f *.tab.c
maintainer-clean-compile:
+../src/ansi2knr: ../src/ansi2knr.o
+ cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-mostlyclean-krextra:
-
-clean-krextra:
- -rm -f ansi2knr
-
-distclean-krextra:
-
-maintainer-clean-krextra:
-ansi2knr: ansi2knr.o
- $(LINK) ansi2knr.o $(LIBS)
-ansi2knr.o: $(CONFIG_HEADER)
+../src/ansi2knr.o:
+ cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.o
mostlyclean-kr:
@@ -340,7 +332,7 @@ install-am: all-am
install: install-am
uninstall-am: uninstall-iduDATA
uninstall: uninstall-am
-all-am: Makefile $(ANSI2KNR) $(LIBRARIES) $(DATA) $(HEADERS)
+all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -358,27 +350,26 @@ distclean-generic:
maintainer-clean-generic:
mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
- mostlyclean-krextra mostlyclean-kr mostlyclean-tags \
- mostlyclean-depend mostlyclean-generic
+ mostlyclean-kr mostlyclean-tags mostlyclean-depend \
+ mostlyclean-generic
mostlyclean: mostlyclean-am
-clean-am: clean-noinstLIBRARIES clean-compile clean-krextra clean-kr \
- clean-tags clean-depend clean-generic mostlyclean-am
+clean-am: clean-noinstLIBRARIES clean-compile clean-kr clean-tags \
+ clean-depend clean-generic mostlyclean-am
clean: clean-am
-distclean-am: distclean-noinstLIBRARIES distclean-compile \
- distclean-krextra distclean-kr distclean-tags \
- distclean-depend distclean-generic clean-am
+distclean-am: distclean-noinstLIBRARIES distclean-compile distclean-kr \
+ distclean-tags distclean-depend distclean-generic \
+ clean-am
distclean: distclean-am
maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
- maintainer-clean-compile maintainer-clean-krextra \
- maintainer-clean-kr maintainer-clean-tags \
- maintainer-clean-depend maintainer-clean-generic \
- distclean-am
+ maintainer-clean-compile 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."
@@ -387,9 +378,8 @@ maintainer-clean: maintainer-clean-am
.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
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-iduDATA install-iduDATA tags \
+maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \
+maintainer-clean-kr uninstall-iduDATA install-iduDATA tags \
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
distdir mostlyclean-depend distclean-depend clean-depend \
maintainer-clean-depend info-am info dvi-am dvi check check-am \
@@ -400,9 +390,6 @@ distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
-ansi2knr.c: $(top_srcdir)/src/ansi2knr.c
- ln $(top_srcdir)/src/ansi2knr.c .
-
# 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:
diff --git a/libidu/ansi2knr.1 b/libidu/ansi2knr.1
deleted file mode 100644
index 434ce8f..0000000
--- a/libidu/ansi2knr.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.TH ANSI2KNR 1 "31 December 1990"
-.SH NAME
-ansi2knr \- convert ANSI C to Kernighan & Ritchie C
-.SH SYNOPSIS
-.I ansi2knr
-input_file output_file
-.SH DESCRIPTION
-If no output_file is supplied, output goes to stdout.
-.br
-There are no error messages.
-.sp
-.I ansi2knr
-recognizes functions by seeing a non-keyword identifier at the left margin, followed by a left parenthesis, with a right parenthesis as the last character on the line. It will recognize a multi-line header if the last character on each line but the last is a left parenthesis or comma. These algorithms ignore whitespace and comments, except that the function name must be the first thing on the line.
-.sp
-The following constructs will confuse it:
-.br
- - Any other construct that starts at the left margin and follows the above syntax (such as a macro or function call).
-.br
- - Macros that tinker with the syntax of the function header.
diff --git a/libidu/ansi2knr.c b/libidu/ansi2knr.c
deleted file mode 100644
index 9bcc4ad..0000000
--- a/libidu/ansi2knr.c
+++ /dev/null
@@ -1,439 +0,0 @@
-/* Copyright (C) 1989, 1991, 1993, 1994 Aladdin Enterprises. All rights reserved. */
-
-/* ansi2knr.c */
-/* Convert ANSI function declarations to K&R syntax */
-
-/*
-ansi2knr is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY. No author or distributor accepts responsibility
-to anyone for the consequences of using it or for whether it serves any
-particular purpose or works at all, unless he says so in writing. Refer
-to the GNU General Public License for full details.
-
-Everyone is granted permission to copy, modify and redistribute
-ansi2knr, but only under the conditions described in the GNU
-General Public License. A copy of this license is supposed to have been
-given to you along with ansi2knr so you can know your rights and
-responsibilities. It should be in a file named COPYLEFT. Among other
-things, the copyright notice and this notice must be preserved on all
-copies.
-*/
-
-/*
- * Usage:
- ansi2knr [--varargs] input_file [output_file]
- * If no output_file is supplied, output goes to stdout.
- * There are no error messages.
- *
- * ansi2knr recognizes function definitions by seeing a non-keyword
- * identifier at the left margin, followed by a left parenthesis,
- * with a right parenthesis as the last character on the line.
- * It will recognize a multi-line header provided that the last character
- * of the last line of the header is a right parenthesis,
- * and no intervening line ends with a left brace or a semicolon.
- * These algorithms ignore whitespace and comments, except that
- * the function name must be the first thing on the line.
- * The following constructs will confuse it:
- * - Any other construct that starts at the left margin and
- * follows the above syntax (such as a macro or function call).
- * - Macros that tinker with the syntax of the function header.
- *
- * If the --varargs switch is supplied, ansi2knr will attempt to
- * convert a ... argument to va_alist and va_dcl. If this switch is not
- * supplied, ansi2knr will simply drop any such arguments.
- */
-
-/*
- * The original and principal author of ansi2knr is L. Peter Deutsch
- * <ghost@aladdin.com>. Other authors are noted in the change history
- * that follows (in reverse chronological order):
- lpd 94-10-10 removed CONFIG_BROKETS conditional
- lpd 94-07-16 added some conditionals to help GNU `configure',
- suggested by Francois Pinard <pinard@iro.umontreal.ca>;
- properly erase prototype args in function parameters,
- contributed by Jim Avera <jima@netcom.com>;
- correct error in writeblanks (it shouldn't erase EOLs)
- lpd 89-xx-xx original version
- */
-
-/* Most of the conditionals here are to make ansi2knr work with */
-/* the GNU configure machinery. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-
-#ifdef HAVE_CONFIG_H
-
-/*
- For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h).
- This will define HAVE_CONFIG_H and so, activate the following lines.
- */
-
-# if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-# else
-# include <strings.h>
-# endif
-
-#else /* not HAVE_CONFIG_H */
-
-/*
- Without AC_CONFIG_HEADER, merely use <string.h> as in the original
- Ghostscript distribution. This loses on older BSD systems.
- */
-
-# include <string.h>
-
-#endif /* not HAVE_CONFIG_H */
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#else
-/*
- malloc and free should be declared in stdlib.h,
- but if you've got a K&R compiler, they probably aren't.
- */
-char *malloc();
-void free();
-#endif
-
-/* Scanning macros */
-#define isidchar(ch) (isalnum(ch) || (ch) == '_')
-#define isidfirstchar(ch) (isalpha(ch) || (ch) == '_')
-
-/* Forward references */
-char *skipspace();
-void writeblanks();
-int test1();
-int convert1();
-
-/* The main program */
-int
-main(argc, argv)
- int argc;
- char *argv[];
-{ FILE *in, *out;
-#define bufsize 5000 /* arbitrary size */
- char *buf;
- char *line;
- int convert_varargs = 0;
- if ( argc > 1 && argv[1][0] == '-' )
- { if ( !strcmp(argv[1], "--varargs") )
- { convert_varargs = 1;
- argc--;
- argv++;
- }
- else
- { fprintf(stderr, "Unrecognized switch: %s\n", argv[1]);
- exit(1);
- }
- }
- switch ( argc )
- {
- default:
- printf("Usage: ansi2knr [--varargs] input_file [output_file]\n");
- exit(0);
- case 2:
- out = stdout;
- break;
- case 3:
- out = fopen(argv[2], "w");
- if ( out == NULL )
- { fprintf(stderr, "Cannot open output file %s\n", argv[2]);
- exit(1);
- }
- }
- in = fopen(argv[1], "r");
- if ( in == NULL )
- { fprintf(stderr, "Cannot open input file %s\n", argv[1]);
- exit(1);
- }
- fprintf(out, "#line 1 \"%s\"\n", argv[1]);
- buf = malloc(bufsize);
- line = buf;
- while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
- { switch ( test1(buf) )
- {
- case 2: /* a function header */
- convert1(buf, out, 1, convert_varargs);
- break;
- case 1: /* a function */
- convert1(buf, out, 0, convert_varargs);
- break;
- case -1: /* maybe the start of a function */
- line = buf + strlen(buf);
- if ( line != buf + (bufsize - 1) ) /* overflow check */
- continue;
- /* falls through */
- default: /* not a function */
- fputs(buf, out);
- break;
- }
- line = buf;
- }
- if ( line != buf ) fputs(buf, out);
- free(buf);
- fclose(out);
- fclose(in);
- return 0;
-}
-
-/* Skip over space and comments, in either direction. */
-char *
-skipspace(p, dir)
- register char *p;
- register int dir; /* 1 for forward, -1 for backward */
-{ for ( ; ; )
- { while ( isspace(*p) ) p += dir;
- if ( !(*p == '/' && p[dir] == '*') ) break;
- p += dir; p += dir;
- while ( !(*p == '*' && p[dir] == '/') )
- { if ( *p == 0 ) return p; /* multi-line comment?? */
- p += dir;
- }
- p += dir; p += dir;
- }
- return p;
-}
-
-/*
- * Write blanks over part of a string.
- * Don't overwrite end-of-line characters.
- */
-void
-writeblanks(start, end)
- char *start;
- char *end;
-{ char *p;
- for ( p = start; p < end; p++ )
- if ( *p != '\r' && *p != '\n' ) *p = ' ';
-}
-
-/*
- * Test whether the string in buf is a function definition.
- * The string may contain and/or end with a newline.
- * Return as follows:
- * 0 - definitely not a function definition;
- * 1 - definitely a function definition;
- * 2 - definitely a function prototype (NOT USED);
- * -1 - may be the beginning of a function definition,
- * append another line and look again.
- * The reason we don't attempt to convert function prototypes is that
- * Ghostscript's declaration-generating macros look too much like
- * prototypes, and confuse the algorithms.
- */
-int
-test1(buf)
- char *buf;
-{ register char *p = buf;
- char *bend;
- char *endfn;
- int contin;
- if ( !isidfirstchar(*p) )
- return 0; /* no name at left margin */
- bend = skipspace(buf + strlen(buf) - 1, -1);
- switch ( *bend )
- {
- case ';': contin = 0 /*2*/; break;
- case ')': contin = 1; break;
- case '{': return 0; /* not a function */
- default: contin = -1;
- }
- while ( isidchar(*p) ) p++;
- endfn = p;
- p = skipspace(p, 1);
- if ( *p++ != '(' )
- return 0; /* not a function */
- p = skipspace(p, 1);
- if ( *p == ')' )
- return 0; /* no parameters */
- /* Check that the apparent function name isn't a keyword. */
- /* We only need to check for keywords that could be followed */
- /* by a left parenthesis (which, unfortunately, is most of them). */
- { static char *words[] =
- { "asm", "auto", "case", "char", "const", "double",
- "extern", "float", "for", "if", "int", "long",
- "register", "return", "short", "signed", "sizeof",
- "static", "switch", "typedef", "unsigned",
- "void", "volatile", "while", 0
- };
- char **key = words;
- char *kp;
- int len = endfn - buf;
- while ( (kp = *key) != 0 )
- { if ( strlen(kp) == len && !strncmp(kp, buf, len) )
- return 0; /* name is a keyword */
- key++;
- }
- }
- return contin;
-}
-
-/* Convert a recognized function definition or header to K&R syntax. */
-int
-convert1(buf, out, header, convert_varargs)
- char *buf;
- FILE *out;
- int header; /* Boolean */
- int convert_varargs; /* Boolean */
-{ char *endfn;
- register char *p;
- char **breaks;
- unsigned num_breaks = 2; /* for testing */
- char **btop;
- char **bp;
- char **ap;
- char *vararg = 0;
- /* Pre-ANSI implementations don't agree on whether strchr */
- /* is called strchr or index, so we open-code it here. */
- for ( endfn = buf; *(endfn++) != '('; ) ;
-top: p = endfn;
- breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
- if ( breaks == 0 )
- { /* Couldn't allocate break table, give up */
- fprintf(stderr, "Unable to allocate break table!\n");
- fputs(buf, out);
- return -1;
- }
- btop = breaks + num_breaks * 2 - 2;
- bp = breaks;
- /* Parse the argument list */
- do
- { int level = 0;
- char *lp = NULL;
- char *rp;
- char *end = NULL;
- if ( bp >= btop )
- { /* Filled up break table. */
- /* Allocate a bigger one and start over. */
- free((char *)breaks);
- num_breaks <<= 1;
- goto top;
- }
- *bp++ = p;
- /* Find the end of the argument */
- for ( ; end == NULL; p++ )
- { switch(*p)
- {
- case ',':
- if ( !level ) end = p;
- break;
- case '(':
- if ( !level ) lp = p;
- level++;
- break;
- case ')':
- if ( --level < 0 ) end = p;
- else rp = p;
- break;
- case '/':
- p = skipspace(p, 1) - 1;
- break;
- default:
- ;
- }
- }
- /* Erase any embedded prototype parameters. */
- if ( lp )
- writeblanks(lp + 1, rp);
- p--; /* back up over terminator */
- /* Find the name being declared. */
- /* This is complicated because of procedure and */
- /* array modifiers. */
- for ( ; ; )
- { p = skipspace(p - 1, -1);
- switch ( *p )
- {
- case ']': /* skip array dimension(s) */
- case ')': /* skip procedure args OR name */
- { int level = 1;
- while ( level )
- switch ( *--p )
- {
- case ']': case ')': level++; break;
- case '[': case '(': level--; break;
- case '/': p = skipspace(p, -1) + 1; break;
- default: ;
- }
- }
- if ( *p == '(' && *skipspace(p + 1, 1) == '*' )
- { /* We found the name being declared */
- while ( !isidfirstchar(*p) )
- p = skipspace(p, 1) + 1;
- goto found;
- }
- break;
- default: goto found;
- }
- }
-found: if ( *p == '.' && p[-1] == '.' && p[-2] == '.' )
- { if ( convert_varargs )
- { *bp++ = "va_alist";
- vararg = p-2;
- }
- else
- { p++;
- if ( bp == breaks + 1 ) /* sole argument */
- writeblanks(breaks[0], p);
- else
- writeblanks(bp[-1] - 1, p);
- bp--;
- }
- }
- else
- { while ( isidchar(*p) ) p--;
- *bp++ = p+1;
- }
- p = end;
- }
- while ( *p++ == ',' );
- *bp = p;
- /* Make a special check for 'void' arglist */
- if ( bp == breaks+2 )
- { p = skipspace(breaks[0], 1);
- if ( !strncmp(p, "void", 4) )
- { p = skipspace(p+4, 1);
- if ( p == breaks[2] - 1 )
- { bp = breaks; /* yup, pretend arglist is empty */
- writeblanks(breaks[0], p + 1);
- }
- }
- }
- /* Put out the function name and left parenthesis. */
- p = buf;
- while ( p != endfn ) putc(*p, out), p++;
- /* Put out the declaration. */
- if ( header )
- { fputs(");", out);
- for ( p = breaks[0]; *p; p++ )
- if ( *p == '\r' || *p == '\n' )
- putc(*p, out);
- }
- else
- { for ( ap = breaks+1; ap < bp; ap += 2 )
- { p = *ap;
- while ( isidchar(*p) )
- putc(*p, out), p++;
- if ( ap < bp - 1 )
- fputs(", ", out);
- }
- fputs(") ", out);
- /* Put out the argument declarations */
- for ( ap = breaks+2; ap <= bp; ap += 2 )
- (*ap)[-1] = ';';
- if ( vararg != 0 )
- { *vararg = 0;
- fputs(breaks[0], out); /* any prior args */
- fputs("va_dcl", out); /* the final arg */
- fputs(bp[0], out);
- }
- else
- fputs(breaks[0], out);
- }
- free((char *)breaks);
- return 0;
-}
diff --git a/lisp/.cvsignore b/lisp/.cvsignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/lisp/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index c024c1b..d50e93a 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -116,7 +116,7 @@ GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
.SUFFIXES: .el .elc
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnits lisp/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
diff --git a/m4/Makefile.in b/m4/Makefile.in
index d8875a5..9b2e15b 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -94,12 +94,12 @@ VERSION = @VERSION@
l = @l@
lispdir = @lispdir@
-EXTRA_DIST = README Makefile.am.in assert.m4 check-decl.m4 check-type.m4 chown.m4 const.m4 d-ino.m4 d-type.m4 decl.m4 error.m4 fnmatch.m4 fstypename.m4 getgroups.m4 getline.m4 getloadavg.m4 gettext.m4 glibc.m4 inttypes_h.m4 isc-posix.m4 jm-glibc-io.m4 jm-macros.m4 jm-mktime.m4 jm-winsz1.m4 jm-winsz2.m4 lchown.m4 lcmessage.m4 lfs.m4 ls-mntd-fs.m4 lstat.m4 malloc.m4 memcmp.m4 mktime.m4 perl.m4 prereq.m4 progtest.m4 putenv.m4 readdir.m4 realloc.m4 regex.m4 st_dm_mode.m4 st_mtim.m4 stat.m4 strftime.m4 uintmax_t.m4 uptime.m4 utimbuf.m4 utime.m4 utimes.m4
+EXTRA_DIST = README Makefile.am.in gettext.m4 lcmessage.m4 progtest.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = README ChangeLog Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -108,7 +108,7 @@ TAR = gtar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnits m4/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
diff --git a/m4/README b/m4/README
new file mode 100644
index 0000000..60f53ec
--- /dev/null
+++ b/m4/README
@@ -0,0 +1,7 @@
+These files are used by a program called aclocal (part of the GNU automake
+package). aclocal uses these files to create aclocal.m4 which is in turn
+used by autoconf to create the configure script at the the top level in
+this distribution.
+
+The Makefile.am file in this directory is automatically generated
+from the template file, Makefile.am.in.
diff --git a/po/de.po b/po/de.po
index e47ece8..f2dcba5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU mkid 3.0.8\n"
-"POT-Creation-Date: 1996-08-06 23:24-0400\n"
+"POT-Creation-Date: 1999-01-27 14:27-0600\n"
"PO-Revision-Date: 1996-03-23 22:34 MET\n"
"Last-Translator: Karl Eichwalder <ke@ke.Central.DE>\n"
"Language-Team: German <de@li.org>\n"
@@ -13,30 +13,30 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: libidu/hash.c:52
+#: libidu/hash.c:51
#, c-format
msgid "can't allocate %ld bytes for hash table: memory exhausted"
msgstr ""
-#: libidu/hash.c:247
+#: libidu/hash.c:258
#, fuzzy
msgid "Load=%ld/%ld=%.0f%%, "
msgstr "\"Load\"=%ld/%ld=%.2f, "
-#: libidu/hash.c:249
+#: libidu/hash.c:260
#, c-format
msgid "Rehash=%d, "
msgstr "\"Rehash\"=%d, "
-#: libidu/hash.c:250
+#: libidu/hash.c:261
msgid "Collisions=%ld/%ld=%.0f%%"
msgstr ""
-#: libidu/idfile.c:106
+#: libidu/idfile.c:105
msgid "can't determine the io_size of a string!"
msgstr ""
-#: libidu/idread.c:45 src/mkid.c:386 src/xtokid.c:214
+#: libidu/idread.c:45 src/mkid.c:386 src/xtokid.c:215
#, c-format
msgid "can't open `%s'"
msgstr ""
@@ -66,45 +66,45 @@ msgstr ""
msgid "unsupported size in io_write (): %d"
msgstr "Nicht unterstützte Größe (`size') in \"io_write ()\": %d"
-#: libidu/scanners.c:93
+#: libidu/scanners.c:94
#, fuzzy, c-format
msgid "unrecognized language: `%s'"
msgstr "Kein Scanner für die Sprache '%s'"
-#: libidu/scanners.c:139
+#: libidu/scanners.c:140
msgid "can't allocate language args obstack: memory exhausted"
msgstr ""
-#: libidu/scanners.c:193 libidu/scanners.c:262
+#: libidu/scanners.c:194 libidu/scanners.c:263
msgid "can't allocate language args: memory exhausted"
msgstr ""
-#: libidu/scanners.c:201
+#: libidu/scanners.c:202
#, c-format
msgid "language name expected following `%s' in file `%s'"
msgstr ""
-#: libidu/scanners.c:256
+#: libidu/scanners.c:257
#, fuzzy, c-format
msgid "can't open language map file `%s'"
msgstr "Kein Scanner für die Sprache '%s'"
-#: libidu/scanners.c:258
+#: libidu/scanners.c:259
#, c-format
msgid "can't get size of map file `%s'"
msgstr ""
-#: libidu/scanners.c:268
+#: libidu/scanners.c:269
#, fuzzy, c-format
msgid "can't read language map file `%s'"
msgstr "Kein Scanner für die Sprache '%s'"
-#: libidu/scanners.c:271
+#: libidu/scanners.c:272
#, c-format
msgid "can't read entire language map file `%s'"
msgstr ""
-#: libidu/scanners.c:412
+#: libidu/scanners.c:413
msgid ""
"C language:\n"
" -k,--keep=CHARS Allow CHARS in single-token strings, keep the "
@@ -115,17 +115,17 @@ msgid ""
"strings\n"
msgstr ""
-#: libidu/scanners.c:681 libidu/scanners.c:986 libidu/scanners.c:1190
+#: libidu/scanners.c:682 libidu/scanners.c:986 libidu/scanners.c:1189
#, c-format
msgid "junk: `%c'"
msgstr "\"junk\": '%c'"
-#: libidu/scanners.c:683 libidu/scanners.c:988 libidu/scanners.c:1192
+#: libidu/scanners.c:684 libidu/scanners.c:988 libidu/scanners.c:1191
#, c-format
msgid "junk: `\\%03o'"
msgstr "\"junk\": '\\%03o'"
-#: libidu/scanners.c:787
+#: libidu/scanners.c:788
msgid ""
"Assembly language:\n"
" -c,--comment=CHARS Any of CHARS starts a comment until end-of-line\n"
@@ -162,37 +162,37 @@ msgstr ""
msgid "directory"
msgstr ""
-#: libidu/walker.c:291
+#: libidu/walker.c:290
#, c-format
msgid "warning: `%s' and `%s' are the same file, but yield different scans!"
msgstr ""
-#: libidu/walker.c:385
+#: libidu/walker.c:384
#, c-format
msgid "notice: scan parameters changed for `%s'"
msgstr ""
-#: libidu/walker.c:580
+#: libidu/walker.c:579
#, fuzzy
msgid "can't get working directory"
msgstr "%s: Name des aktuellen Verzeichnisses nicht zu erreichen."
-#: libidu/walker.c:637
+#: libidu/walker.c:636
#, c-format
msgid "can't chdir to `%s'"
msgstr ""
-#: libidu/walker.c:642
+#: libidu/walker.c:641
#, c-format
msgid "can't chdir to `%s' from `%s'"
msgstr ""
-#: libidu/walker.c:696
+#: libidu/walker.c:695
#, c-format
msgid "can't lstat `%s' from `%s'"
msgstr ""
-#: libidu/walker.c:704
+#: libidu/walker.c:703
#, c-format
msgid "can't stat `%s' from `%s'"
msgstr ""
@@ -273,7 +273,7 @@ msgstr ""
msgid "too many file name arguments"
msgstr ""
-#: src/fid.c:153 src/fnid.c:147 src/lid.c:410
+#: src/fid.c:153 src/fnid.c:148 src/lid.c:411
msgid "can't locate `ID'"
msgstr ""
@@ -364,39 +364,39 @@ msgstr ""
msgid "notice: use of `-e' is deprecated, use `-r' instead"
msgstr ""
-#: src/lid.c:431
+#: src/lid.c:432
#, fuzzy, c-format
msgid "All identifiers are non-ambiguous within the first %d characters\n"
msgstr ""
"Alle Bezeichner (id's) sind verschieden hinsichtlich der ersten %d Zeichen\n"
-#: src/lid.c:466
+#: src/lid.c:467
#, c-format
msgid "invalid `--key' style: `%s'"
msgstr ""
-#: src/lid.c:478
+#: src/lid.c:479
#, c-format
msgid "invalid `--result' style: `%s'"
msgstr ""
# Muss hier auf `_j_ ... / nq' umgestellt werden????
#. FIXME: i18n of responses
-#: src/lid.c:634
+#: src/lid.c:636
#, fuzzy
msgid "edit? [y1-9^S/nq] "
msgstr "Editieren? [y1-9^S/nq] "
-#: src/lid.c:703
+#: src/lid.c:705
msgid "can't fork"
msgstr ""
-#: src/lid.c:721
+#: src/lid.c:723
#, c-format
msgid "can't exec `%s'"
msgstr ""
-#: src/lid.c:851
+#: src/lid.c:853
msgid "can't match regular-expression: memory exhausted"
msgstr ""
@@ -431,17 +431,17 @@ msgid ""
"The following arguments apply to the language-specific scanners:\n"
msgstr ""
-#: src/mkid.c:311
+#: src/mkid.c:312
#, c-format
msgid "can't create `%s' in `%s'"
msgstr ""
-#: src/mkid.c:315
+#: src/mkid.c:316
#, c-format
msgid "can't modify `%s'"
msgstr ""
-#: src/mkid.c:368
+#: src/mkid.c:369
#, c-format
msgid "can't stat `%s'"
msgstr ""
diff --git a/src/Makefile.in b/src/Makefile.in
index 7a6b651..da5de61 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -160,7 +160,7 @@ OBJECTS = mkid$U.o lid$U.o fid$U.o fnid$U.o xtokid$U.o
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(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 $(BUILT_SOURCES)
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index f49bf3d..e1f1529 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -109,7 +109,7 @@ TAR = gtar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnits testsuite/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-01 02:10:48 +0000