Misc. fixes which hopefully help on BSD.

autogen.sh

@@ -294,11 +294,10 @@ ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
 if $want_libtool; then
     	version_check libtool LIBTOOLIZE 'libtoolize libtoolize15 glibtoolize' $REQUIRED_LIBTOOL_VERSION \
         "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz" || DIE=1
-		if [ `uname` = "FreeBSD" ]; then
-   			require_m4macro libtool15.m4
-		else
-   			require_m4macro libtool.m4
-		fi
+#		if [ `uname` = "FreeBSD" ]; then
+#  			require_m4macro libtool15.m4
+#		fi
+		require_m4macro libtool.m4
 fi
 
 if $want_gettext; then

configure.ac

@@ -418,14 +418,14 @@ AC_ARG_WITH([slapd],
 	AC_HELP_STRING([--with-slapd=FILE],
 		[Path to slapd binary]),
 	[DEFAULT_SLAPD_PATH="$with_slapd"],
-	[AC_PATH_PROG(DEFAULT_SLAPD_PATH,[slapd],[/usr/libexec/slapd],[$PATH:/sbin:/usr/sbin:/usr/libexec:/usr/lib/openldap])])
+	[AC_PATH_PROG(DEFAULT_SLAPD_PATH,[slapd],[/usr/libexec/slapd],[$PATH:/sbin:/usr/sbin:/usr/libexec:/usr/lib/openldap:/usr/local/libexec])])
 
 # Check for openldap's schema files
 AC_ARG_WITH([slapd-schema],
 	AC_HELP_STRING([--with-slapd-schema=DIR],
 		[Path to slapd schema directory]),
 	[DEFAULT_SLAPD_SCHEMA_DIR=$withval],
-	[AC_PATH_PROG(DEFAULT_SLAPD_SCHEMA_DIR, core.schema, [/etc/openldap/schema], [/etc/openldap/schema:/etc/ldap/schema])])
+	[AC_PATH_PROG(DEFAULT_SLAPD_SCHEMA_DIR, core.schema, [/etc/openldap/schema], [/etc/openldap/schema:/etc/ldap/schema:/usr/local/etc/openldap/schema])])
 if echo $DEFAULT_SLAPD_SCHEMA_DIR |grep "/core.schema$" >/dev/null 2>&1; then
 	DEFAULT_SLAPD_SCHEMA_DIR=`dirname $DEFAULT_SLAPD_SCHEMA_DIR`
 fi

src/apps/manager/manager.c

@@ -3,6 +3,7 @@
 #include <bongoutil.h>
 #include <msgapi.h>
 #include <sys/wait.h>
+#include <sys/resource.h>
 #include <time.h>
 #include <unistd.h>
 #include <getopt.h>