Index: trunk/psLib/m4/ipp_stdopts.m4
===================================================================
--- trunk/psLib/m4/ipp_stdopts.m4	(revision 23787)
+++ trunk/psLib/m4/ipp_stdopts.m4	(revision 23793)
@@ -50,20 +50,10 @@
 	)
 	
-	[$1]_VERSION="UNKNOWN"
-	[$1]_BRANCH="UNKNOWN"
-	[$1]_SOURCE="UNKNOWN"
 	AS_IF([test "x$enable_version" = xtrue],
 		[AC_PATH_PROG([SVNVERSION], [svnversion])
-		AC_PATH_PROG([SVN], [svn])
-		AC_PROG_SED
-		AS_IF([test "x$SVNVERSION" != x], [$1]_VERSION=`$SVNVERSION`)
-		AS_IF([test "x$SVN" != x],
-			[[$1]_BRANCH=`$SVN info | $SED -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
-			[$1]_SOURCE=`$SVN info | $SED -n -e 's/Repository UUID: // p'`])
-		]
+		AC_PATH_PROG([SVN], [svn])]
 	)
-	
-dnl	AC_SUBST([$1]_VERSION,[[$1]_VERSION])
-dnl	AC_SUBST([$1]_BRANCH,[[$1]_BRANCH])
-dnl	AC_SUBST([$1]_SOURCE,[[$1]_SOURCE])
+	AC_PROG_SED
+	AM_CONDITIONAL([HAVE_SVNVERSION], [test "x$SVNVERSION" != x])
+	AM_CONDITIONAL([HAVE_SVN], [test "x$SVN" != x])
 ])