From cd9fa0adb8a25151bae2e37c91e43e2d99eda6ff Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Wed, 28 Aug 2002 16:33:29 +0000
Subject: [PATCH] restructure this somewhat

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11264 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 cf/aix.m4 | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/cf/aix.m4 b/cf/aix.m4
index d7d84adf3..dda8aaf95 100644
--- a/cf/aix.m4
+++ b/cf/aix.m4
@@ -4,10 +4,6 @@ dnl
 
 AC_DEFUN(KRB_AIX,[
 
-AC_ARG_ENABLE(dynamic-afs,
-	AC_HELP_STRING([--disable-dynamic-afs],
-		[do not use loaded AFS library with AIX]))
-
 aix=no
 case "$host" in 
 *-*-aix3*)
@@ -17,27 +13,45 @@ case "$host" in
 	aix=4
 	;;
 esac
+
 AM_CONDITIONAL(AIX, test "$aix" != no)dnl
 AM_CONDITIONAL(AIX4, test "$aix" = 4)
-AM_CONDITIONAL(AIX_DYNAMIC_AFS, test "$enable_dynamic_afs" != no)dnl
 
-AC_FIND_FUNC_NO_LIBS(dlopen, dl)
+
+AC_ARG_ENABLE(dynamic-afs,
+	AC_HELP_STRING([--disable-dynamic-afs],
+		[do not use loaded AFS library with AIX]))
 
 if test "$aix" != no; then
 	if test "$enable_dynamic_afs" != no; then
-		if test "$ac_cv_funclib_dlopen" = yes; then
-			AIX_EXTRA_KAFS=
-		elif test "$ac_cv_funclib_dlopen" != no; then
-			AIX_EXTRA_KAFS="$ac_cv_funclib_dlopen"
+		AC_REQUIRE([rk_DLOPEN])
+		if test "$ac_cv_func_dlopen" = no; then
+			AC_FIND_FUNC_NO_LIBS(loadquery, ld)
+		fi
+		if test "$ac_cv_func_dlopen" != no; then
+			AIX_EXTRA_KAFS='$(LIB_dlopen)'
+		elif test "$ac_cv_func_loadquery" != no; then
+			AIX_EXTRA_KAFS='$(LIB_loadquery)'
 		else
-			AIX_EXTRA_KAFS=-lld
+			AC_MSG_NOTICE([not using dynloaded AFS library])
+			AIX_EXTRA_KAFS=
+			enable_dynamic_afs=no
 		fi
 	else
 		AIX_EXTRA_KAFS=
 	fi
 fi
 
-AM_CONDITIONAL(HAVE_DLOPEN, test "$ac_cv_funclib_dlopen" != no)dnl
+AM_CONDITIONAL(AIX_DYNAMIC_AFS, test "$enable_dynamic_afs" != no)dnl
 AC_SUBST(AIX_EXTRA_KAFS)dnl
 
-])
\ No newline at end of file
+AH_BOTTOM([#if _AIX
+#define _ALL_SOURCE
+/* XXX this is gross, but kills about a gazillion warnings */
+struct ether_addr;
+struct sockaddr;
+struct sockaddr_dl;
+struct sockaddr_in;
+#endif])
+
+])