don't require the user to have svn installed when building from tarball

configure.ac

@@ -1,6 +1,8 @@
 AC_INIT([transmission],[0.90],[http://transmission.m0k.org/trac/newticket])
 PEERID_PREFIX="-TR0900-"
 USERAGENT_PREFIX="0.90"
+AC_SUBST(PEERID_PREFIX,[$PEERID_PREFIX])
+AC_SUBST(USERAGENT_PREFIX,[$USERAGENT_PREFIX])
 
 AC_PREREQ(2.54)
 dnl AM_CONFIG_HEADER(config.h)
@@ -177,21 +179,6 @@ AM_CONDITIONAL([HAVE_DARWIN],[test "x$darwin" = "xyes"])
 AM_CONDITIONAL([HAVE_WINDOWS],[test "x$msw" = "xyes"])
 
 
-dnl ----------------------------------------------------------------------------
-dnl
-dnl  Version files
-
-
-dnl constraint: strlen(MAJOR MINOR MAINT BETA) must be 4
-dnl convention: BETA: "Z" for a beta, "0" for a stable
-SVN_REVISION=`svn info . | sed -ne "s/^Revision: \(.*\:\)\{0,1\}\(.*\)$/\2/p"`
-AC_SUBST(PEERID_PREFIX,[$PEERID_PREFIX])
-AC_SUBST(USERAGENT_PREFIX,[$USERAGENT_PREFIX])
-AC_SUBST(SVN_REVISION,[$SVN_REVISION])
-AC_SUBST(BUNDLE_VERSION,[$SVN_REVISION])
-AC_SUBST(VERSION_PACKAGE,$USERAGENT_PREFIX-r$SVN_REVISION)
-
-
 dnl ----------------------------------------------------------------------------
 dnl
 dnl  Generate the output

libtransmission/Makefile.am

@@ -75,21 +75,12 @@ noinst_HEADERS = \
     utils.h \
     xml.h
 
-BUILT_SOURCES = version.h
+dist_libtransmission_a_SOURCES = \
+    version.h
 
-EXTRA_DIST = \
-	version.h \
-	version.h.in
-
-do_subst = sed \
-	-e 's,[@]PEERID_PREFIX[@],$(PEERID_PREFIX),g' \
-	-e 's,[@]USERAGENT_PREFIX[@],$(USERAGENT_PREFIX),g' \
-	-e 's,[@]SVN_REVISION[@],$(SVN_REVISION),g' \
-	-e 's,[@]SHORT_VERSION_STRING[@],$(SHORT_VERSION_STRING),g' \
-	-e 's,[@]LONG_VERSION_STRING[@],$(LONG_VERSION_STRING),g' 
-
-version.h: version.h.in
-	$(do_subst) < $(srcdir)/version.h.in > version.h
-
-CLEANFILES = \
-	version.h
+version.h:
+	echo '#define PEERID_PREFIX         "'@PEERID_PREFIX@'"' > version.h
+	echo '#define USERAGENT_PREFIX      "'@USERAGENT_PREFIX@'"' >> version.h
+	echo '#define SVN_REVISION          "'`svn info | grep "Revision" | awk -F': ' '{print $$2}'`'"' >> version.h
+	echo '#define SHORT_VERSION_STRING  "'@USERAGENT_PREFIX@'"' >> version.h
+	echo '#define LONG_VERSION_STRING   "'@USERAGENT_PREFIX@' ('`svn info | grep "Revision" | awk -F': ' '{print $$2}'`')"' >> version.h

libtransmission/version.h.in

@@ -1,5 +0,0 @@
-#define PEERID_PREFIX         "@PEERID_PREFIX@"
-#define USERAGENT_PREFIX      "@USERAGENT_PREFIX@"
-#define SVN_REVISION          "@SVN_REVISION@"
-#define SHORT_VERSION_STRING  "@USERAGENT_PREFIX@"
-#define LONG_VERSION_STRING   "@USERAGENT_PREFIX@ (r@SVN_REVISION@)"

macosx/Makefile.am

@@ -84,6 +84,9 @@ EXTRA_DIST = \
     TorrentTableView.h \
     TorrentTableView.m
 
+dist-hook:
+	rm -rf `find $(distdir)/macosx -name ".svn"`
+
 # Use Xcode do make the actual build
 all:
 	@(cd .. && xcodebuild -alltargets -activeconfiguration | grep -v "^$$")