3 files changed, 6 insertions, 2 deletions

diff --git a/CREDITS b/CREDITS
index e47cf4567..0fd00493a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -23,6 +23,7 @@ David Del Piero <David.DelPiero@qed.qld.gov.au> - bug fixes
 David Hesprich <darkgrue@gue-tech.org> - Configure fixes
 David Rankin <drankin@bohemians.lexington.ky.us> - libwrap, AIX, NetBSD fixes
 Ed Eden <ede370@stl.rural.usda.gov> - configure fixes
+Garrick James <garrick@james.net> - configure fixes
 Gary E. Miller <gem@rellim.com> - SCO support
 Ged Lodder <lodder@yacc.com.au> - HPUX fixes and enhancements
 Gert Doering <gd@hilb1.medat.de> - bug and portability fixes
diff --git a/ChangeLog b/ChangeLog
index 37d9db662..b67efd293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20000626
+ - Better fix to aclocal tests from Garrick James <garrick@james.net>
+ 
 20000623
  - (djm) Use sa_family_t in prototype for rresvport_af. Patch from 
    Svante Signell <svante.signell@telia.com>
diff --git a/aclocal.m4 b/aclocal.m4
index dfa2d0a12..d196b7585 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.3 2000/06/10 06:51:33 djm Exp $
+dnl $Id: aclocal.m4,v 1.4 2000/06/26 00:20:19 djm Exp $
 dnl
 dnl OpenSSH-specific autoconf macros
 dnl
@@ -22,7 +22,7 @@ AC_DEFUN(OSSH_CHECK_HEADER_FOR_FIELD, [
                         eval "$ossh_varname=no" dnl
                 ]) dnl
         ])
-        ossh_result=`eval echo \$"$ossh_varname"`
+        ossh_result=`eval 'echo $'"$ossh_varname"`
         if test -n "`echo $ossh_varname`"; then
                 AC_MSG_RESULT($ossh_result)
                 if test "x$ossh_result" = "xyes"; then