Don't use 'shtool mkln' as ln(1) replacement.

Allow both <sasl/sasl.h> and <sasl.h>

build/top.mk

@@ -116,8 +116,8 @@ CAT = cat
 CHMOD = chmod
 DATE = date
 HOSTNAME = $(SHTOOL) echo -e "%h%d"
-LN = $(SHTOOL) mkln
-LN_H = $(SHTOOL) mkln -f
+LN = ln
+LN_H = @LN_H@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDIR = $(SHTOOL) mkdir -p

configure.in

@@ -619,6 +619,8 @@ AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 
 AC_PROG_AWK
+OL_PROG_LN_H
+AC_PROG_LN_S
 
 AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail,
 	$PATH:/usr/libexec:/usr/lib:/usr/sbin:/usr/etc:/etc)
@@ -2114,9 +2116,9 @@ dnl
 ol_link_sasl=no
 ol_link_spasswd=no
 if test $ol_with_cyrus_sasl != no ; then
-	AC_CHECK_HEADERS(sasl.h)
+	AC_CHECK_HEADERS(sasl/sasl.h sasl.h)
 
-	if test $ac_cv_header_sasl_h ; then
+	if test $ac_cv_header_sasl_sasl_h = yes -o $ac_cv_header_sasl_h = yes; then
 		AC_CHECK_LIB(sasl2, sasl_client_init,
 			[ol_link_sasl="-lsasl2"],
 			[AC_CHECK_LIB(sasl, sasl_client_init,

include/portable.h.in

@@ -464,6 +464,9 @@
 /* Define if you have the <sasl.h> header file.  */
 #undef HAVE_SASL_H
 
+/* Define if you have the <sasl/sasl.h> header file.  */
+#undef HAVE_SASL_SASL_H
+
 /* Define if you have the <sched.h> header file.  */
 #undef HAVE_SCHED_H
 

libraries/libldap/cyrus.c

@@ -23,7 +23,11 @@
 ldap_pvt_thread_mutex_t ldap_int_sasl_mutex;
 #endif
 
+#ifdef HAVE_HEADER_SASL_SASL_H
+#include <sasl/sasl.h>
+#else
 #include <sasl.h>
+#endif
 
 #if SASL_VERSION_MAJOR >= 2
 #define SASL_CONST const

libraries/libldap/ldap-int.h

@@ -24,7 +24,11 @@
 
 #ifdef HAVE_CYRUS_SASL
 	/* the need for this should be removed */
+#ifdef HAVE_HEADER_SASL_SASL_H
+#include <sasl/sasl.h>
+#else
 #include <sasl.h>
+#endif
 
 #define SASL_MAX_BUFF_SIZE	65536
 #define SASL_MIN_BUFF_SIZE	4096

servers/slapd/sasl.c

@@ -18,7 +18,11 @@
 #ifdef HAVE_CYRUS_SASL
 #include <limits.h>
 
+#ifdef HAVE_SASL_SASL_H
+#include <sasl/sasl.h>
+#else
 #include <sasl.h>
+#endif
 
 #if SASL_VERSION_MAJOR >= 2
 #include <lutil.h>

servers/slapd/saslauthz.c

@@ -21,7 +21,13 @@
 
 #ifdef HAVE_CYRUS_SASL
 #include <limits.h>
+
+#ifdef HAVE_SASL_SASL_H
+#include <sasl/sasl.h>
+#else
 #include <sasl.h>
+#endif
+
 #include <ldap_pvt.h>
 #endif