httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From NormW <no...@gknw.net>
Subject Re: svn commit: r1128885 - in /apr/apr/trunk: build/apu-conf.m4 build/apu-ldap.m4 configure.in
Date Wed, 01 Jun 2011 02:04:17 GMT
G/Morning
> I will have win32 repaired shortly.  Some effort will be needed to have netware
> working again, but I will be updating the necessary .hnw files from apr while
> I handle the .hw files.

if cleaning out apr-trunk ldap+NetWare, the following will help; getting 
httpd-trunk to build for NetWare again is another (not so easy) story.

Index: NWGNUmakefile
===================================================================
--- NWGNUmakefile	(revision 1129913)
+++ NWGNUmakefile	(working copy)
@@ -4,7 +4,6 @@

  SUBDIRS = \
  	build \
-	ldap \
  	xml \
  	$(EOLIST)

@@ -203,7 +202,6 @@
  FILES_nlm_libs = \
  	$(PRELUDE) \
  	$(APRLIB) \
-	$(APRLDAPLIB) \
  	$(APRXMLLIB) \
  	$(EOLIST)

@@ -229,14 +227,6 @@
  	$(EOLIST)
  endif

-#If the LDAP support is defined then add the auto-load modules
-ifneq "$(LDAPSDK)" ""
-FILES_nlm_modules += \
-	lldapsdk \
-	lldapssl \
-	$(EOLIST)
-endif
-
  ifdef EXPATSDK
  ifndef EXPAT_LINK_STATIC
  FILES_nlm_modules += \
@@ -277,14 +267,6 @@
  	$(EOLIST)
  endif

-#If the LDAP support is defined then add the imports
-ifneq "$(LDAPSDK)" ""
-FILES_nlm_Ximports += \
-	@lldapsdk.imp \
-	@lldapssl.imp \
-	$(EOLIST)
-endif
-
  ifdef EXPATSDK
  ifndef EXPAT_LINK_STATIC
  FILES_nlm_Ximports += \
Index: build/NWGNUenvironment.inc
===================================================================
--- build/NWGNUenvironment.inc	(revision 1129913)
+++ build/NWGNUenvironment.inc	(working copy)
@@ -42,13 +42,6 @@
  $(error NOVELLLIBC does not point to a valid Novell LIBC SDK)
  endif

-ifndef LDAPSDK
-LDAPSDK = C:/novell/ndk/cldapsdk/NetWare/libc
-endif
-ifneq "$(wildcard $(LDAPSDK)/inc/ldap.h)" "$(LDAPSDK)/inc/ldap.h"
-$(error LDAPSDK does not point to a valid Novell CLDAP SDK)
-endif
-
  ifdef EXPATSDK
  ifeq "$(wildcard $(EXPATSDK)/include/expat.h)" 
"$(EXPATSDK)/include/expat.h"
  EXPAT_IMP = $(EXPATSDK)/imports/expatlbc.imp
@@ -353,7 +346,6 @@

  APR		= $(subst \,/,$(APR_WORK))
  APRBUILD	= $(APR)/build
-APRLDAP		= $(APR)/ldap
  APRXML		= $(APR)/xml
  APRTEST		= $(APR)/test

@@ -362,7 +354,6 @@
  #

  APRLIB		= $(APR)/$(OBJDIR)/aprlib.lib
-APRLDAPLIB	= $(APRLDAP)/$(OBJDIR)/ldap.lib
  APRXMLLIB	= $(APRXML)/$(OBJDIR)/xml.lib

  #
Index: build/NWGNUmakefile
===================================================================
--- build/NWGNUmakefile	(revision 1129913)
+++ build/NWGNUmakefile	(working copy)
@@ -29,13 +29,11 @@
  	$(APR)/include/arch/netware \
  	$(APR)/include/arch/unix \
  	$(APRBUILD) \
-	$(LDAPSDK)/inc \
  	$(EOLIST)

  FILES_prebuild_headers = \
  	$(APR)/include/apr.h \
  	$(APR)/include/apu_want.h \
-	$(APR)/include/apr_ldap.h \
  	$(APR)/include/private/apu_select_dbm.h \
  	$(EOLIST)

The ldap\NWGNUmakefile could also be removed if desired.

HTH,
Norm
PS Sorry No longer in apr dev list.

Mime
View raw message