From owner-svn-src-user@FreeBSD.ORG  Thu Oct 15 10:48:45 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 811CF106566B;
	Thu, 15 Oct 2009 10:48:45 +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 70F4F8FC0C;
	Thu, 15 Oct 2009 10:48:45 +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 n9FAmjqM071147;
	Thu, 15 Oct 2009 10:48:45 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9FAmjdw071142;
	Thu, 15 Oct 2009 10:48:45 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200910151048.n9FAmjdw071142@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Thu, 15 Oct 2009 10:48:45 +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: r198122 - in user/des/svnsup: . src src/apply
	src/distill
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: Thu, 15 Oct 2009 10:48:45 -0000

Author: des
Date: Thu Oct 15 10:48:45 2009
New Revision: 198122
URL: http://svn.freebsd.org/changeset/base/198122

Log:
  Connect libsvnsup to the build.

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

Modified: user/des/svnsup/configure.ac
==============================================================================
--- user/des/svnsup/configure.ac	Thu Oct 15 10:48:19 2009	(r198121)
+++ user/des/svnsup/configure.ac	Thu Oct 15 10:48:45 2009	(r198122)
@@ -15,6 +15,7 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
+AC_PROG_RANLIB
 
 AC_ARG_ENABLE(distill,
 	AS_HELP_STRING([--enable-distill],
@@ -124,6 +125,7 @@ AS_IF([test x"$enable_distill" = x"yes"]
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
+	src/libsvnsup/Makefile
 	src/distill/Makefile
 	src/apply/Makefile
 ])

Modified: user/des/svnsup/src/Makefile.am
==============================================================================
--- user/des/svnsup/src/Makefile.am	Thu Oct 15 10:48:19 2009	(r198121)
+++ user/des/svnsup/src/Makefile.am	Thu Oct 15 10:48:45 2009	(r198122)
@@ -8,4 +8,4 @@ if ENABLE_APPLY
 APPLY_SUBDIR = apply
 endif
 
-SUBDIRS = ${DISTILL_SUBDIR} ${APPLY_SUBDIR}
+SUBDIRS = libsvnsup ${DISTILL_SUBDIR} ${APPLY_SUBDIR}

Modified: user/des/svnsup/src/apply/Makefile.am
==============================================================================
--- user/des/svnsup/src/apply/Makefile.am	Thu Oct 15 10:48:19 2009	(r198121)
+++ user/des/svnsup/src/apply/Makefile.am	Thu Oct 15 10:48:45 2009	(r198122)
@@ -5,4 +5,8 @@ bin_PROGRAMS = svnsup-apply
 svnsup_apply_SOURCES = \
 	main.c
 
-svnsup_apply_LDADD =
+svnsup_apply_CPPFLAGS = \
+	-I$(top_builddir)/src/libsvnsup
+
+svnsup_apply_LDADD = \
+        $(top_builddir)/src/libsvnsup/libsvnsup.a

Modified: user/des/svnsup/src/distill/Makefile.am
==============================================================================
--- user/des/svnsup/src/distill/Makefile.am	Thu Oct 15 10:48:19 2009	(r198121)
+++ user/des/svnsup/src/distill/Makefile.am	Thu Oct 15 10:48:45 2009	(r198122)
@@ -15,9 +15,11 @@ svnsup_distill_SOURCES = \
 	txdelta.c
 
 svnsup_distill_CPPFLAGS = \
+	-I$(top_builddir)/src/libsvnsup \
 	${APR_1_CFLAGS}
 
 svnsup_distill_LDADD = \
+	$(top_builddir)/src/libsvnsup/libsvnsup.a \
 	${APR_1_LDADD} \
 	${SVN_DELTA_1_LIBS} \
 	${SVN_CLIENT_1_LIBS} \