From: David MacKenzie <djm@djmnet.org>
Date: Fri, 17 Nov 1995 20:31:31 +0000 (+0000)
Subject: fix some bugs reported by users
X-Git-Tag: fsf-origin~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eae1e2893bcdb5938c1cb8da08556340108c0d66;p=thirdparty%2Fautoconf.git

fix some bugs reported by users
---

diff --git a/ChangeLog b/ChangeLog
index 2a49bbc4e..5ba897ced 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@ Fri Nov 17 15:05:44 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
 	* Version 2.5 released.
 
+Fri Nov 17 15:23:04 1995  David J. MacKenzie  <djm@catapult.va.pubnix.com>
+
+	* acgeneral.m4 (AC_CHECK_LIB): Don't start tr argument with '+',
+	  so as not to confuse old GNU tr's.  From
+	  Ian Lance Taylor <ian@cygnus.com>.
+	  (AC_INIT_PARSE_ARGS): Make sure MFLAGS and MAKEFLAGS are empty.
+	  From Paul Townsend (aab@cc.purdue.edu).
+
+	* acspecific.m4 (AC_USG): Define USG if we don't have rindex and
+	  bzero, not if we do have them.
+	  From Viktor Dukhovni <viktor@anaheim.esm.com>.
+
 Sun Oct 29 15:13:37 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
 	* acgeneral.m4 (AC_CHECK_PROG): Use arg 5 as search list, not arg 4.
diff --git a/acgeneral.m4 b/acgeneral.m4
index 9fcdbddc8..29aa19b8e 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -199,6 +199,7 @@ mandir='${prefix}/man'
 
 # Initialize some other variables.
 subdirs=
+MFLAGS= MAKEFLAGS=
 
 ac_prev=
 for ac_option
@@ -1359,7 +1360,7 @@ dnl              [, OTHER-LIBRARIES]]])
 AC_DEFUN(AC_CHECK_LIB,
 [AC_MSG_CHECKING([for -l$1])
 changequote(, )dnl
-ac_lib_var=`echo $1 | tr '+./' 'p__'`
+ac_lib_var=`echo $1 | tr './+' '__p'`
 changequote([, ])dnl
 AC_CACHE_VAL(ac_cv_lib_$ac_lib_var,
 [ac_save_LIBS="$LIBS"
diff --git a/acspecific.m4 b/acspecific.m4
index 6693292cb..b3b520af8 100644
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -136,7 +136,8 @@ else
   ac_cv_prog_gxx_g=no
 fi
 rm -f conftest*
-])dnl
+])
+dnl
     if test $ac_cv_prog_gxx_g = yes; then
       CXXFLAGS="-g -O"
     else
@@ -346,7 +347,8 @@ ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 AC_TRY_LINK(`cat $LEX_OUTPUT_ROOT.c`, , ac_cv_prog_lex_yytext_pointer=yes)
 LIBS="$ac_save_LIBS"
-rm -f "${LEX_OUTPUT_ROOT}.c"])dnl
+rm -f "${LEX_OUTPUT_ROOT}.c"])
+dnl
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
   AC_DEFINE(YYTEXT_POINTER)
 fi
@@ -486,7 +488,7 @@ AC_DEFUN(AC_USG,
   [; instead use AC_CHECK_HEADERS(string.h) and HAVE_STRING_H])dnl
 AC_MSG_CHECKING([for BSD string and memory functions])
 AC_TRY_LINK([#include <strings.h>], [rindex(0, 0); bzero(0, 0);],
-  [AC_MSG_RESULT(yes); AC_DEFINE(USG)], [AC_MSG_RESULT(no)])])
+  [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no); AC_DEFINE(USG)])])
 
 
 dnl If memchr and the like aren't declared in <string.h>, include <memory.h>.
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 9fcdbddc8..29aa19b8e 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -199,6 +199,7 @@ mandir='${prefix}/man'
 
 # Initialize some other variables.
 subdirs=
+MFLAGS= MAKEFLAGS=
 
 ac_prev=
 for ac_option
@@ -1359,7 +1360,7 @@ dnl              [, OTHER-LIBRARIES]]])
 AC_DEFUN(AC_CHECK_LIB,
 [AC_MSG_CHECKING([for -l$1])
 changequote(, )dnl
-ac_lib_var=`echo $1 | tr '+./' 'p__'`
+ac_lib_var=`echo $1 | tr './+' '__p'`
 changequote([, ])dnl
 AC_CACHE_VAL(ac_cv_lib_$ac_lib_var,
 [ac_save_LIBS="$LIBS"
diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 6693292cb..b3b520af8 100644
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -136,7 +136,8 @@ else
   ac_cv_prog_gxx_g=no
 fi
 rm -f conftest*
-])dnl
+])
+dnl
     if test $ac_cv_prog_gxx_g = yes; then
       CXXFLAGS="-g -O"
     else
@@ -346,7 +347,8 @@ ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 AC_TRY_LINK(`cat $LEX_OUTPUT_ROOT.c`, , ac_cv_prog_lex_yytext_pointer=yes)
 LIBS="$ac_save_LIBS"
-rm -f "${LEX_OUTPUT_ROOT}.c"])dnl
+rm -f "${LEX_OUTPUT_ROOT}.c"])
+dnl
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
   AC_DEFINE(YYTEXT_POINTER)
 fi
@@ -486,7 +488,7 @@ AC_DEFUN(AC_USG,
   [; instead use AC_CHECK_HEADERS(string.h) and HAVE_STRING_H])dnl
 AC_MSG_CHECKING([for BSD string and memory functions])
 AC_TRY_LINK([#include <strings.h>], [rindex(0, 0); bzero(0, 0);],
-  [AC_MSG_RESULT(yes); AC_DEFINE(USG)], [AC_MSG_RESULT(no)])])
+  [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no); AC_DEFINE(USG)])])
 
 
 dnl If memchr and the like aren't declared in <string.h>, include <memory.h>.