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 2012/09/17 16:32:01 UTC
svn commit: r1386632 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Mon Sep 17 14:32:00 2012
New Revision: 1386632
URL: http://svn.apache.org/viewvc?rev=1386632&view=rev
Log:
* tools/dist/unix-build/Makefile.svn: Compile with gnome-keyring support if
gnome-keyring libraries can be found.
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=1386632&r1=1386631&r2=1386632&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Sep 17 14:32:00 2012
@@ -1151,6 +1151,7 @@ MOD_DAV_SVN=modules/svn-$(WC)/mod_dav_sv
MOD_AUTHZ_SVN=modules/svn-$(WC)/mod_authz_svn.so
LIBMAGIC_FLAG=--with-libmagic=$(PREFIX)/libmagic
NEON_FLAG=--with-neon="$(PREFIX)/neon"
+GNOME_KEYRING_FLAG=--with-gnome-keyring=yes
JAVAHL_CHECK_TARGET=check-javahl
else ifeq ($(BRANCH_MAJOR),1.6)
BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER)
@@ -1159,6 +1160,7 @@ MOD_DAV_SVN=modules/svn-$(WC)/mod_dav_sv
MOD_AUTHZ_SVN=modules/svn-$(WC)/mod_authz_svn.so
W_NO_SYSTEM_HEADERS=-Wno-system-headers
NEON_FLAG=--with-neon="$(PREFIX)/neon"
+GNOME_KEYRING_FLAG=--with-gnome-keyring=yes
JAVAHL_CHECK_TARGET=check-javahl
else ifeq ($(BRANCH_MAJOR),1.5)
BDB_FLAG=$(PREFIX)/bdb
@@ -1168,6 +1170,7 @@ MOD_AUTHZ_SVN=modules/mod_authz_svn.so
DISABLE_NEON_VERSION_CHECK=--disable-neon-version-check
W_NO_SYSTEM_HEADERS=-Wno-system-headers
NEON_FLAG=--with-neon="$(PREFIX)/neon"
+GNOME_KEYRING_FLAG=
JAVAHL_CHECK_TARGET=check-javahl
else # 1.8
BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER)
@@ -1175,6 +1178,7 @@ SERF_FLAG=--with-serf="$(PREFIX)/serf"
MOD_DAV_SVN=modules/svn-$(WC)/mod_dav_svn.so
MOD_AUTHZ_SVN=modules/svn-$(WC)/mod_authz_svn.so
LIBMAGIC_FLAG=--with-libmagic=$(PREFIX)/libmagic
+GNOME_KEYRING_FLAG=--with-gnome-keyring=yes
JAVAHL_CHECK_TARGET=check-all-javahl
endif
@@ -1208,6 +1212,7 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)
--with-apr="$(PREFIX)/apr" \
--with-apr-util="$(PREFIX)/apr" \
$(NEON_FLAG) \
+ $(GNOME_KEYRING_FLAG) \
$(SVN_WITH_HTTPD) \
$(SVN_WITH_SASL) \
$(SERF_FLAG) \