Folded in Ezra's changes to support --with-netlib, for support of the

SGI's (and other broken SysV OS's).

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 585a0fec9c4625789adcf46a2264e104618d0611..73622a81c23f0ea54b8cf2900105c5538e6ebe1f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 16:40:23 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+       * aclocal.m4, configure.in: Folded in Ezra's changes to support
+               --with-netlib, for support of the SGI's.
+
 Tue Feb 28 00:00:22 1995  John Gilmore  (gnu at toad.com)
 
        * aclocal.m4 (ADD_DEF):  Add -I...include/krb5 so we won't need

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index c8a70c472dbdc74536ddbd5a205e26a54183f724..125e7950704dc04fa2944a674014d70619ad3a9e 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -348,7 +348,7 @@ dnl set $(LD) from --with-linker=value
 dnl
 define(WITH_LINKER,[
 AC_ARG_WITH([linker],
-[  --with-linker=LINKER      select linker to use],
+[  --with-linker=LINKER    select linker to use],
 AC_MSG_RESULT(LD=$withval)
 LD=$withval,
 if test -z "$LD" ; then LD=$CC; fi
@@ -630,3 +630,20 @@ AC_HEADER_CHECK(flock.h,[echo found flock.h for non-posix locks],
     AC_DEFINE(POSIX_FILE_LOCKS)
   fi
 ])])dnl
+dnl
+dnl WITH_NETLIB
+dnl 
+dnl
+define(WITH_NETLIB,[
+AC_ARG_WITH([netlib],
+[  --with-netlib[=libs]    use user defined resolve library],
+  if test "$withval" = yes -o "$withval" = no ; then
+       AC_MSG_RESULT("netlib will link with C library resolver only")
+  else
+       LIBS="$LIBS $withval"
+       AC_MSG_RESULT("netlib will use \'$withval\'")
+  fi
+,dnl
+[AC_CHECK_LIB(socket,main)
+AC_CHECK_LIB(nsl,main)]
+)])dnl

diff --git a/src/configure.in b/src/configure.in
index 928b5fa8a2f39408545e93ff3c038b56355b56ea..5895b137bcd358d66685004b21b98c47c0689693 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -4,6 +4,7 @@ CONFIG_RULES
 AC_SET_BUILDTOP
 WITH_KRB5ROOT
 WITH_KRB4
+WITH_NETLIB
 AC_ARG_ENABLE([athena],
 [  --enable-athena         build with MIT Project Athena configuration],,)
 CONFIG_DIRS(util include $isode lib kdc admin kadmin slave clients appl tests)