entered into RCS

diff --git a/Makefile.in b/Makefile.in
index 192db90b26cb5855e8b7743a809632949d6f95d5..5976cac4ecd5014ac5c80fe6c0b996639624454e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,7 +44,7 @@ infodir = $(prefix)/info
 SHELL = /bin/sh
 
 DISTFILES = README Makefile.in INSTALL NEWS COPYING ChangeLog \
-autoconf.texi autoconf.info* standards.texi make-stds.texi standards.info* \
+autoconf.texi autoconf.info standards.texi make-stds.texi standards.info \
 texinfo.tex acconfig.h autoconf.sh acgeneral.m4 acspecific.m4 \
 configure configure.in autoheader.sh mkinstalldirs install.sh
 

diff --git a/acgeneral.m4 b/acgeneral.m4
index f30a437a9b515390d0e5266e9b3b8638374b8a79..36a3de95d77fd5c6bcf77a2e1c6bb5ed65976200 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -174,7 +174,7 @@ if test "${LANG+set}"   = 'set' ; then LANG=C;   export LANG;   fi
 rm -rf conftest* confdefs.h
 # AIX cpp loses on an empty file, so make sure it contains at least a newline.
 echo > confdefs.h
-compile='${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >/dev/null 2>&1'
+compile='${CC-cc} $CFLAGS $LDFLAGS conftest.c -o conftest $LIBS >/dev/null 2>&1'
 
 # A filename unique to this package, relative to the directory that
 # configure is in, which we can look for to find out if srcdir is correct.

diff --git a/acspecific.m4 b/acspecific.m4
index 9fa76047a0c80856ad26ed1f8df142ed24473ed7..b6139cae65fd9f4d03475bdc58ff8f71181466ab 100644 (file)
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -153,15 +153,21 @@ define(AC_PROG_INSTALL,
 # or the SunOS /usr/etc/install directory, or the AIX /bin/install,
 # or the AFS install, which mishandles nonexistent args, or
 # /usr/ucb/install on SVR4, which tries to use the nonexistent group
-# `staff'.  On most BSDish systems install is in /usr/bin, not /usr/ucb
-# anyway.  Sigh.
+# `staff', or /sbin/install on IRIX which has incompatible command-line
+# syntax.  Sigh.
+#
+#     On most BSDish systems install is in /usr/bin, not /usr/ucb
+#     anyway.
+# This turns out not to be true, so the mere pathname isn't an indication
+# of whether the program works.  What we really need is a set of tests for
+# the install program to see if it actually works in all the required ways.
 if test "z${INSTALL}" = "z" ; then
   echo checking for install
   IFS="${IFS=  }"; saveifs="$IFS"; IFS="${IFS}:"
   for dir in $PATH; do
     #test -z "$dir" && dir=.
     case "$dir" in
-    ''|.|/etc|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;;
+    ''|.|/etc|/sbin|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;;
     *)
       if test -f $dir/installbsd; then
        INSTALL="$dir/installbsd -c" # OSF1
@@ -1203,4 +1209,4 @@ AC_COMPILE_CHECK(sys_siglist declaration in signal.h or unistd.h,
 #include <unistd.h>
 #endif], [char *msg = *(sys_siglist + 1);],
                 AC_DEFINE(SYS_SIGLIST_DECLARED))])dnl
-dnl
\ No newline at end of file
+dnl

diff --git a/autoconf.in b/autoconf.in
index 10aa1b6a35609dc767102ecd6f526c82105b6440..16c2e130931a92f82c65b8aba549544e47252be1 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -38,7 +38,7 @@ print_version=
 while test $# -gt 0 ; do
    case "z${1}" in 
       z-h | z--help | z--h* )
-         echo "${usage}" 1>&2; exit 1 ;;
+         echo "${usage}" 1>&2; exit 0 ;;
       z--macrodir=* | z--m*=* )
          AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
          shift ;;

diff --git a/autoconf.sh b/autoconf.sh
index 10aa1b6a35609dc767102ecd6f526c82105b6440..16c2e130931a92f82c65b8aba549544e47252be1 100644 (file)
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -38,7 +38,7 @@ print_version=
 while test $# -gt 0 ; do
    case "z${1}" in 
       z-h | z--help | z--h* )
-         echo "${usage}" 1>&2; exit 1 ;;
+         echo "${usage}" 1>&2; exit 0 ;;
       z--macrodir=* | z--m*=* )
          AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
          shift ;;

diff --git a/autoconf.texi b/autoconf.texi
index 7d09d4b1c60a102901e283b4d3bbf1a217160c2d..72360c08f8fdcca0083dfa470ae686236f4ed236 100644 (file)
--- a/autoconf.texi
+++ b/autoconf.texi
@@ -1619,8 +1619,8 @@ header file by substituting the correct values into @code{#define}
 statements in a template file.
 
 For example, suppose your @file{configure.in} calls
-@code{AC_CONFIG_HEADER(conf.h)} and @code{AC_UNISTD_H}.  You could have
-code like this in @file{conf.h.in}:
+@code{AC_CONFIG_HEADER(conf.h)} and @code{AC_HAVE_HEADERS(unistd.h)}.
+You could have code like this in @file{conf.h.in}:
 
 @example
 @group
@@ -2482,8 +2482,7 @@ AC_RSH
 AC_CONST
 AC_UID_T
 AC_STDC_HEADERS
-AC_UNISTD_H
-AC_HAVE_HEADERS(string.h fcntl.h utime.h sys/io/trioctl.h)
+AC_HAVE_HEADERS(string.h fcntl.h utime.h unistd.h sys/io/trioctl.h)
 AC_REPLACE_FUNCS(fnmatch bcopy mkdir strdup)
 AC_HAVE_FUNCS(strerror lchown)
 AC_VPRINTF

diff --git a/autoheader.in b/autoheader.in
index 379a98501f0526a5e409d28db85c1053853ef165..84c48068db0ff14f1954d62f0d2235369fe5b28a 100644 (file)
--- a/autoheader.in
+++ b/autoheader.in
@@ -184,7 +184,7 @@ for lib in `for x in $libs; do echo $x; done | sort | uniq`; do
   sym="`echo ${lib} | sed 's/[^a-zA-Z0-9_]/_/g' | tr '[a-z]' '[A-Z]'`"
   echo "
 /* Define if you have the ${lib} library (-l${lib}).  */
-#undef HAVE_${sym}"
+#undef HAVE_LIB${sym}"
 done
 
 status=0

diff --git a/autoheader.sh b/autoheader.sh
index 379a98501f0526a5e409d28db85c1053853ef165..84c48068db0ff14f1954d62f0d2235369fe5b28a 100644 (file)
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -184,7 +184,7 @@ for lib in `for x in $libs; do echo $x; done | sort | uniq`; do
   sym="`echo ${lib} | sed 's/[^a-zA-Z0-9_]/_/g' | tr '[a-z]' '[A-Z]'`"
   echo "
 /* Define if you have the ${lib} library (-l${lib}).  */
-#undef HAVE_${sym}"
+#undef HAVE_LIB${sym}"
 done
 
 status=0

diff --git a/bin/autoconf.in b/bin/autoconf.in
index 10aa1b6a35609dc767102ecd6f526c82105b6440..16c2e130931a92f82c65b8aba549544e47252be1 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -38,7 +38,7 @@ print_version=
 while test $# -gt 0 ; do
    case "z${1}" in 
       z-h | z--help | z--h* )
-         echo "${usage}" 1>&2; exit 1 ;;
+         echo "${usage}" 1>&2; exit 0 ;;
       z--macrodir=* | z--m*=* )
          AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
          shift ;;

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 379a98501f0526a5e409d28db85c1053853ef165..84c48068db0ff14f1954d62f0d2235369fe5b28a 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -184,7 +184,7 @@ for lib in `for x in $libs; do echo $x; done | sort | uniq`; do
   sym="`echo ${lib} | sed 's/[^a-zA-Z0-9_]/_/g' | tr '[a-z]' '[A-Z]'`"
   echo "
 /* Define if you have the ${lib} library (-l${lib}).  */
-#undef HAVE_${sym}"
+#undef HAVE_LIB${sym}"
 done
 
 status=0

diff --git a/configure.in b/configure.in
index b4e93de9d2adac6388c7b8b3f2a8acc369d1f9ff..3b4ca4766feba569f644869e3314b2f098d98b54 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(acgeneral.m4)
-AC_PROGRAMS_CHECK(M4, gnum4 gm4, m4)
+AC_PROGRAMS_PATH(M4, gnum4 gm4 m4, m4)
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 192db90b26cb5855e8b7743a809632949d6f95d5..5976cac4ecd5014ac5c80fe6c0b996639624454e 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -44,7 +44,7 @@ infodir = $(prefix)/info
 SHELL = /bin/sh
 
 DISTFILES = README Makefile.in INSTALL NEWS COPYING ChangeLog \
-autoconf.texi autoconf.info* standards.texi make-stds.texi standards.info* \
+autoconf.texi autoconf.info standards.texi make-stds.texi standards.info \
 texinfo.tex acconfig.h autoconf.sh acgeneral.m4 acspecific.m4 \
 configure configure.in autoheader.sh mkinstalldirs install.sh
 

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 7d09d4b1c60a102901e283b4d3bbf1a217160c2d..72360c08f8fdcca0083dfa470ae686236f4ed236 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1619,8 +1619,8 @@ header file by substituting the correct values into @code{#define}
 statements in a template file.
 
 For example, suppose your @file{configure.in} calls
-@code{AC_CONFIG_HEADER(conf.h)} and @code{AC_UNISTD_H}.  You could have
-code like this in @file{conf.h.in}:
+@code{AC_CONFIG_HEADER(conf.h)} and @code{AC_HAVE_HEADERS(unistd.h)}.
+You could have code like this in @file{conf.h.in}:
 
 @example
 @group
@@ -2482,8 +2482,7 @@ AC_RSH
 AC_CONST
 AC_UID_T
 AC_STDC_HEADERS
-AC_UNISTD_H
-AC_HAVE_HEADERS(string.h fcntl.h utime.h sys/io/trioctl.h)
+AC_HAVE_HEADERS(string.h fcntl.h utime.h unistd.h sys/io/trioctl.h)
 AC_REPLACE_FUNCS(fnmatch bcopy mkdir strdup)
 AC_HAVE_FUNCS(strerror lchown)
 AC_VPRINTF

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index f30a437a9b515390d0e5266e9b3b8638374b8a79..36a3de95d77fd5c6bcf77a2e1c6bb5ed65976200 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -174,7 +174,7 @@ if test "${LANG+set}"   = 'set' ; then LANG=C;   export LANG;   fi
 rm -rf conftest* confdefs.h
 # AIX cpp loses on an empty file, so make sure it contains at least a newline.
 echo > confdefs.h
-compile='${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >/dev/null 2>&1'
+compile='${CC-cc} $CFLAGS $LDFLAGS conftest.c -o conftest $LIBS >/dev/null 2>&1'
 
 # A filename unique to this package, relative to the directory that
 # configure is in, which we can look for to find out if srcdir is correct.

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 9fa76047a0c80856ad26ed1f8df142ed24473ed7..b6139cae65fd9f4d03475bdc58ff8f71181466ab 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -153,15 +153,21 @@ define(AC_PROG_INSTALL,
 # or the SunOS /usr/etc/install directory, or the AIX /bin/install,
 # or the AFS install, which mishandles nonexistent args, or
 # /usr/ucb/install on SVR4, which tries to use the nonexistent group
-# `staff'.  On most BSDish systems install is in /usr/bin, not /usr/ucb
-# anyway.  Sigh.
+# `staff', or /sbin/install on IRIX which has incompatible command-line
+# syntax.  Sigh.
+#
+#     On most BSDish systems install is in /usr/bin, not /usr/ucb
+#     anyway.
+# This turns out not to be true, so the mere pathname isn't an indication
+# of whether the program works.  What we really need is a set of tests for
+# the install program to see if it actually works in all the required ways.
 if test "z${INSTALL}" = "z" ; then
   echo checking for install
   IFS="${IFS=  }"; saveifs="$IFS"; IFS="${IFS}:"
   for dir in $PATH; do
     #test -z "$dir" && dir=.
     case "$dir" in
-    ''|.|/etc|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;;
+    ''|.|/etc|/sbin|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;;
     *)
       if test -f $dir/installbsd; then
        INSTALL="$dir/installbsd -c" # OSF1
@@ -1203,4 +1209,4 @@ AC_COMPILE_CHECK(sys_siglist declaration in signal.h or unistd.h,
 #include <unistd.h>
 #endif], [char *msg = *(sys_siglist + 1);],
                 AC_DEFINE(SYS_SIGLIST_DECLARED))])dnl
-dnl
\ No newline at end of file
+dnl