* aclocal.m4 (AC_LIBRARY_NET): Newer versions of autoconf are more

	sensative to using macros within macros without quoting. Quote
	AC_CHECK_LIB calls within AC_CHECK_LIB macro.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12826 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index 98bfe262dc3e29af1734b8c08e3a97dc3eb6d0a9..3614b930a8e08f0fd2c973e4880e7fa0163eee87 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-31  Ezra Peisach  <epeisach@mit.edu>
+
+       * aclocal.m4 (AC_LIBRARY_NET): Newer versions of autoconf are more
+       sensative to using macros within macros without quoting. Quote
+       AC_CHECK_LIB calls within AC_CHECK_LIB macro.
+
 2000-10-27  Ezra Peisach  <epeisach@mit.edu>
 
        * aclocal.m4 (ac_config_fragdir): Set AUTOCONFFLAGS to use the

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 267ea43b9c4f50e21ae6d5738a1b07b6660eac9d..7b917a7965c6de895cf7d14460c3154ff1e036e7 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1155,22 +1155,22 @@ dnl
 AC_DEFUN(AC_LIBRARY_NET, [
    # Most operating systems have gethostbyname() in the default searched
    # libraries (i.e. libc):
-   AC_CHECK_FUNC(gethostbyname, ,
+   AC_CHECK_FUNC(gethostbyname, , [
      # Some OSes (eg. Solaris) place it in libnsl:
-     AC_CHECK_LIB(nsl, gethostbyname, , 
+     AC_CHECK_LIB(nsl, gethostbyname, , [
        # Some strange OSes (SINIX) have it in libsocket:
-       AC_CHECK_LIB(socket, gethostbyname, ,
+       AC_CHECK_LIB(socket, gethostbyname, , [
           # Unfortunately libsocket sometimes depends on libnsl.
           # AC_CHECK_LIB's API is essentially broken so the following
           # ugliness is necessary:
           AC_CHECK_LIB(socket, gethostbyname,
              LIBS="-lsocket -lnsl $LIBS",
-               AC_CHECK_LIB(resolv, gethostbyname,
-                           LIBS="-lresolv $LIBS" ; RESOLV_LIB=-lresolv),
+               [AC_CHECK_LIB(resolv, gethostbyname,
+                            LIBS="-lresolv $LIBS" ; RESOLV_LIB=-lresolv)],
              -lnsl)
-       )
-     )
-   )
+       ])
+     ])
+   ])
   AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket, ,
     AC_CHECK_LIB(socket, socket, LIBS="-lsocket -lnsl $LIBS", , -lnsl)))
   KRB5_AC_ENABLE_DNS