From owner-svn-src-user@FreeBSD.ORG  Tue Oct 13 16:00:19 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D86910657AA;
	Tue, 13 Oct 2009 16:00:19 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EECA88FC2F;
	Tue, 13 Oct 2009 16:00:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9DG0IKd009768;
	Tue, 13 Oct 2009 16:00:18 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9DG0ICF009765;
	Tue, 13 Oct 2009 16:00:18 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200910131600.n9DG0ICF009765@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Tue, 13 Oct 2009 16:00:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198034 - in user/des/svnsup: . src
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Oct 2009 16:00:19 -0000

Author: des
Date: Tue Oct 13 16:00:18 2009
New Revision: 198034
URL: http://svn.freebsd.org/changeset/base/198034

Log:
  Allow the user to choose which program(s) to build.

Modified:
  user/des/svnsup/configure.ac
  user/des/svnsup/src/Makefile.am

Modified: user/des/svnsup/configure.ac
==============================================================================
--- user/des/svnsup/configure.ac	Tue Oct 13 15:59:24 2009	(r198033)
+++ user/des/svnsup/configure.ac	Tue Oct 13 16:00:18 2009	(r198034)
@@ -18,6 +18,20 @@ AC_PROG_MAKE_SET
 
 PKG_PROG_PKG_CONFIG
 
+AC_ARG_ENABLE(distill,
+	AS_HELP_STRING([--enable-distill],
+		[build svnsup-distill (default is YES)]),
+	[], [enable_distill=yes]
+)
+AM_CONDITIONAL([ENABLE_DISTILL], [test x"$enable_distill" = xyes])
+
+AC_ARG_ENABLE(apply,
+	AS_HELP_STRING([--enable-apply],
+		[build svnsup-apply (default is YES)]),
+	[], [enable_apply=yes]
+)
+AM_CONDITIONAL([ENABLE_APPLY], [test x"$enable_apply" = xyes])
+
 AC_ARG_ENABLE(debugging,
 	AS_HELP_STRING([--enable-debugging],
 		[enable debugging (default is NO)]),

Modified: user/des/svnsup/src/Makefile.am
==============================================================================
--- user/des/svnsup/src/Makefile.am	Tue Oct 13 15:59:24 2009	(r198033)
+++ user/des/svnsup/src/Makefile.am	Tue Oct 13 16:00:18 2009	(r198034)
@@ -1,3 +1,11 @@
 # $Id$
 
-SUBDIRS = distill apply
+if ENABLE_DISTILL
+DISTILL_SUBDIR = distill
+endif
+
+if ENABLE_APPLY
+APPLY_SUBDIR = apply
+endif
+
+SUBDIRS = ${DISTILL_SUBDIR} ${APPLY_SUBDIR}