Add configure code for setting LDAP_SYSLOG but actually use hardcoded

LDAP_SYSLOG in slap.h/slurp.h.

acconfig.h

@@ -124,6 +124,9 @@
 /* define this for LDAP User Interface support */
 #undef LDAP_LIBUI
 
+/* define this to add syslog code */
+#undef LDAP_SYSLOG
+
 /* define this to use DB2 in native mode */
 #undef LDBM_USE_DB2
 

configure.in

@@ -39,6 +39,7 @@ AC_ARG_WITH(subdir, [  --with-subdir=DIR change default subdirectory used for in
 AC_SUBST(ldap_subdir)dnl
 
 OL_ARG_ENABLE(debug,[  --enable-debug 	enable debugging], yes)dnl
+ol_enable_syslog=no
 dnl OL_ARG_ENABLE(syslog,[  --enable-syslog	enable syslog support], auto)dnl
 OL_ARG_ENABLE(proctitle,[  --enable-proctitle	enable proctitle support], yes)dnl
 OL_ARG_ENABLE(libui,[  --enable-libui	enable library user interface], yes)dnl
@@ -970,7 +971,7 @@ if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then
 	ol_enable_ldbm=no
 fi
 
-if test $ol_enable_wrappers = yes ; then
+if test $ol_enable_wrappers != no ; then
 	AC_CHECK_LIB(wrap, main,
 		[have_wrappers=yes], [have_wrappers=no])
 
@@ -989,6 +990,14 @@ if test $ol_enable_wrappers = yes ; then
 
 fi
 
+if test $ol_enable_syslog != no ; then
+	AC_CHECK_FUNC(openlog)
+	if test $ac_cv_func_openlog = no -a $ol_enable_syslog = yes; then
+		AC_MSG_ERROR(could not find syslog, select appropriate options or disable)
+	fi
+	ol_enable_syslog=$ac_cv_func_openlog
+fi
+
 if test $ol_enable_dmalloc != no ; then
 	AC_CHECK_HEADERS(dmalloc.h)
 	AC_CHECK_LIB(dmalloc, dmalloc_shutdown)
@@ -1209,9 +1218,9 @@ dnl Sort out defines
 if test $ol_enable_debug != no ; then
 	AC_DEFINE(LDAP_DEBUG,1)
 fi
-dnl	if test $ol_enable_syslog != no ; then
-dnl		AC_DEFINE(LDAP_SYSLOG,1)
-dnl	fi
+if test $ol_enable_syslog = yes ; then
+	AC_DEFINE(LDAP_SYSLOG,1)
+fi
 if test $ol_enable_libui = yes ; then
 	AC_DEFINE(LDAP_LIBUI,1)
 fi

include/portable.h.in

@@ -225,6 +225,9 @@ is provided ``as is'' without express or implied warranty.
 /* define this for LDAP User Interface support */
 #undef LDAP_LIBUI
 
+/* define this to add syslog code */
+#undef LDAP_SYSLOG
+
 /* define this to use DBBTREE w/ LDBM backend */
 #undef LDBM_USE_DBBTREE
 

servers/slapd/slap.h

@@ -5,6 +5,10 @@
 
 #include <stdlib.h>
 
+#ifndef LDAP_SYSLOG
+#define LDAP_SYSLOG 1
+#endif
+
 #include <sys/types.h>
 #include <ac/syslog.h>
 #include <ac/regex.h>

servers/slurpd/slurp.h

@@ -15,7 +15,9 @@
 #ifndef _SLURPD_H_
 #define _SLURPD_H_
 
-#define LDAP_SYSLOG
+#ifndef LDAP_SYSLOG
+#define LDAP_SYSLOG 1
+#endif
 
 #include <ac/syslog.h>
 #include <ac/errno.h>