- (djm) [configure.ac] Check whether libroken is required when building

   with Heimdal

diff --git a/ChangeLog b/ChangeLog
index daa1dae753844fa87f83147a7c0ec56604d7d635..42a6f0272fa0ce2620ac829e44e6f6a6aebabf57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@
      spotted by cschneid AT cschneid.com
  - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for 
    above change
+ - (djm) [configure.ac] Check whether libroken is required when building 
+   with Heimdal
 
 20040419
  - (dtucker) OpenBSD CVS Sync

diff --git a/configure.ac b/configure.ac
index e6f4df8d18aea4fddded75cfc0a470adc4cb2984..a7699f41d4edbb4dac0012050cf7a23951d82268 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2207,7 +2207,10 @@ AC_ARG_WITH(kerberos5,
                                       [ char *tmp = heimdal_version; ],
                                       [ AC_MSG_RESULT(yes)
                                         AC_DEFINE(HEIMDAL)
-                                        K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken"
+                                        K5LIBS="-lkrb5 -ldes"
+                                        K5LIBS="$K5LIBS -lcom_err -lasn1"
+                                        AC_CHECK_LIB(roken, net_write, 
+                                          [K5LIBS="$K5LIBS -lroken"])
                                       ],
                                       [ AC_MSG_RESULT(no)
                                         K5LIBS="-lkrb5 -lk5crypto -lcom_err"