You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/08/11 15:08:26 UTC
svn commit: r984397 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Wed Aug 11 13:08:26 2010
New Revision: 984397
URL: http://svn.apache.org/viewvc?rev=984397&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Build GSSAPI support into neon on OpenBSD.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=984397&r1=984396&r2=984397&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Wed Aug 11 13:08:26 2010
@@ -10,6 +10,7 @@ ENABLE_JAVA_BINDINGS ?= no # they don't
USE_APR_ICONV ?= no # set to yes to use APR iconv instead of GNU iconv
PWD = $(shell pwd)
+UNAME = $(shell uname)
TAG ?= none
ifeq ($(TAG),none)
@@ -528,11 +529,22 @@ $(NEON_OBJDIR)/.retrieved: $(DISTDIR)/$(
tar -C $(SRCDIR) -zxf $(DISTDIR)/$(NEON_DIST)
touch $@
+# OpenBSD does not have krb5-config in PATH, but the neon port has
+# a suitable replacement.
+ifeq ($(UNAME),OpenBSD)
+KRB5_CONFIG_PATH=/usr/ports/net/neon/files
+endif
+
# configure neon
$(NEON_OBJDIR)/.configured: $(NEON_OBJDIR)/.retrieved
cd $(NEON_SRCDIR) && ./autogen.sh
+ if [ -n "$(KRB5_CONFIG_PATH)" -a -d "$(KRB5_CONFIG_PATH)" ]; then \
+ cp $(KRB5_CONFIG_PATH)/krb5-config $(NEON_OBJDIR); \
+ chmod +x $(NEON_OBJDIR)/krb5-config; \
+ fi
cd $(NEON_OBJDIR) \
&& env CFLAGS="-g" $(NEON_SRCDIR)/configure \
+ PATH=$(NEON_OBJDIR):$$PATH \
--prefix=$(PREFIX)/neon \
--with-ssl \
--enable-shared