HAVE_LWP_THR was renamed HAVE_THR.

diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in
index 002f02ecebb0b82201e356d5ce98074b90492176..d45e02e38c2c9808c20dfe96e804bdb19d917086 100644 (file)
--- a/servers/ldapd/Makefile.in
+++ b/servers/ldapd/Makefile.in
@@ -17,7 +17,7 @@ LDAP_LIBDIR= ../../libraries
 BUILD_OPT = "--enable-ldapd"
 BUILD_SRV = @BUILD_LDAPD@
 
-XLIBS= @LDAPD_LIBS@
+XLIBS= @LDAPD_LIBS@ @LUTIL_LIBS@
 
 all-local: $(PROGRAMS)
 

diff --git a/servers/slapd/detach.c b/servers/slapd/detach.c
index dd6db49d69a9ec9db074422dced7e974463cf45f..e20c83948d11b56143a404b75dd80958ec7f7ddd 100644 (file)
--- a/servers/slapd/detach.c
+++ b/servers/slapd/detach.c
@@ -47,7 +47,7 @@ detach()
        if ( ldap_debug == 0 ) {
 #endif
                for ( i = 0; i < 5; i++ ) {
-#if defined( HAVE_LWP_THR )
+#if defined( HAVE_THR )
                        switch ( fork1() ) {
 #else
                        switch ( fork() ) {

diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c
index 05940823ca2207987fc83339e045decc42c0a274..73a78c8f70c46054f2aef52f0afc58f43a9c81fa 100644 (file)
--- a/servers/slapd/monitor.c
+++ b/servers/slapd/monitor.c
@@ -195,7 +195,7 @@ monitor_info( Connection *conn, Operation *op )
        val.bv_len = strlen( buf );
        attr_merge( e, "nbackends", vals );
 
-#ifdef HAVE_LWP_THR
+#ifdef HAVE_THR
        sprintf( buf, "%d", thr_getconcurrency() );
        val.bv_val = buf;
        val.bv_len = strlen( buf );

diff --git a/servers/slurpd/globals.h b/servers/slurpd/globals.h
index 1582d1780daae21c8a4d6410420ca03b28758424..211c829ecd7da815ae0f13bd6d5c24851dd3807f 100644 (file)
--- a/servers/slurpd/globals.h
+++ b/servers/slurpd/globals.h
@@ -58,7 +58,7 @@ typedef struct globals {
     /* Default name of kerberos srvtab file */
     char *default_srvtab;
 #endif /* HAVE_KERBEROS */
-#if defined( HAVE_LWP )  && !defined( HAVE_LWP_THR )
+#if defined( HAVE_LWP )  && !defined( HAVE_THR )
     tl_t *tsl_list;
     mon_t tsl_mon;
 #endif /* THREAD_SUNOS4_LWP */