Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C9A586038 for ; Wed, 1 Jun 2011 05:14:26 +0000 (UTC) Received: (qmail 9983 invoked by uid 500); 1 Jun 2011 05:14:25 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 9866 invoked by uid 500); 1 Jun 2011 05:14:19 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 9850 invoked by uid 99); 1 Jun 2011 05:14:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2011 05:14:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2011 05:14:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 64E782388906; Wed, 1 Jun 2011 05:13:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1130002 - in /apr/apr/trunk: NWGNUmakefile build/NWGNUenvironment.inc build/NWGNUmakefile ldap/NWGNUmakefile Date: Wed, 01 Jun 2011 05:13:56 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110601051356.64E782388906@eris.apache.org> Author: wrowe Date: Wed Jun 1 05:13:55 2011 New Revision: 1130002 URL: http://svn.apache.org/viewvc?rev=1130002&view=rev Log: Some quick fixes to get us back compiling on Netware Submitted by: NormW Removed: apr/apr/trunk/ldap/NWGNUmakefile Modified: apr/apr/trunk/NWGNUmakefile apr/apr/trunk/build/NWGNUenvironment.inc apr/apr/trunk/build/NWGNUmakefile Modified: apr/apr/trunk/NWGNUmakefile URL: http://svn.apache.org/viewvc/apr/apr/trunk/NWGNUmakefile?rev=1130002&r1=1130001&r2=1130002&view=diff ============================================================================== --- apr/apr/trunk/NWGNUmakefile (original) +++ apr/apr/trunk/NWGNUmakefile Wed Jun 1 05:13:55 2011 @@ -4,7 +4,6 @@ SUBDIRS = \ build \ - ldap \ xml \ $(EOLIST) @@ -47,7 +46,6 @@ XINCDIRS += \ $(APR)/include/arch/unix \ $(APR)/dbm/sdbm \ $(APR)/random/unix \ - $(LDAPSDK)/inc \ $(EOLIST) # @@ -203,7 +201,6 @@ FILES_nlm_objs = \ FILES_nlm_libs = \ $(PRELUDE) \ $(APRLIB) \ - $(APRLDAPLIB) \ $(APRXMLLIB) \ $(EOLIST) @@ -229,14 +226,6 @@ FILES_nlm_modules += ws2_32 \ $(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 +266,6 @@ FILES_nlm_Ximports += \ $(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 += \ Modified: apr/apr/trunk/build/NWGNUenvironment.inc URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=1130002&r1=1130001&r2=1130002&view=diff ============================================================================== --- apr/apr/trunk/build/NWGNUenvironment.inc (original) +++ apr/apr/trunk/build/NWGNUenvironment.inc Wed Jun 1 05:13:55 2011 @@ -42,13 +42,6 @@ ifneq "$(wildcard $(NOVELLLIBC)/include/ $(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 @@ INSTDIRS += \ APR = $(subst \,/,$(APR_WORK)) APRBUILD = $(APR)/build -APRLDAP = $(APR)/ldap APRXML = $(APR)/xml APRTEST = $(APR)/test @@ -362,7 +354,6 @@ APRTEST = $(APR)/test # APRLIB = $(APR)/$(OBJDIR)/aprlib.lib -APRLDAPLIB = $(APRLDAP)/$(OBJDIR)/ldap.lib APRXMLLIB = $(APRXML)/$(OBJDIR)/xml.lib # Modified: apr/apr/trunk/build/NWGNUmakefile URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUmakefile?rev=1130002&r1=1130001&r2=1130002&view=diff ============================================================================== --- apr/apr/trunk/build/NWGNUmakefile (original) +++ apr/apr/trunk/build/NWGNUmakefile Wed Jun 1 05:13:55 2011 @@ -29,13 +29,11 @@ XINCDIRS += \ $(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)