Author: kelnos
Date: 2006-11-27 22:48:03 +0000 (Mon, 27 Nov 2006)
New Revision: 24000
Modified:
xfmedia/trunk/configure.ac.in
xfmedia/trunk/src/mainwin-callbacks.c
Log:
make the svn revision check happen in autogen.sh, with an update in configure.
'cached' value from autogen check is used if the configure check fails
Modified: xfmedia/trunk/configure.ac.in
===================================================================
--- xfmedia/trunk/configure.ac.in 2006-11-27 21:58:13 UTC (rev 23999)
+++ xfmedia/trunk/configure.ac.in 2006-11-27 22:48:03 UTC (rev 24000)
@@ -36,16 +36,15 @@
dnl get svn revision
SVN=`which svn`
-case "x$SVN" in
- x|xno)
- REVISION="unknown rev"
- ;;
- *)
- REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4`
- ;;
-esac
-AC_DEFINE_UNQUOTED([REVISION], "$REVISION", [subversion revision number])
-AC_SUBST([REVISION])
+if test "$SVN" -a -x "$SVN"; then
+ dir="`dirname $0`"
+ SVN_REVISION=`LC_ALL=C svn info "$dir" | awk '/^Revision: / {printf
"%05d\n", $2}'`
+fi
+if test -z "$SVN_REVISION"; then
+ SVN_REVISION="@REVISION@"
+fi
+AC_DEFINE_UNQUOTED([SVN_REVISION], "$REVISION", [subversion revision number])
+AC_SUBST([SVN_REVISION])
dnl check GNU getopt() - thanks libcmml!
HAVE_GETOPT_LONG="no"
Modified: xfmedia/trunk/src/mainwin-callbacks.c
===================================================================
--- xfmedia/trunk/src/mainwin-callbacks.c 2006-11-27 21:58:13 UTC (rev
23999)
+++ xfmedia/trunk/src/mainwin-callbacks.c 2006-11-27 22:48:03 UTC (rev
24000)
@@ -1963,7 +1963,7 @@
if(!toplevel)
toplevel = mwin->window;
- ainfo = xfce_about_info_new("Xfmedia", VERSION " (" REVISION ")",
+ ainfo = xfce_about_info_new("Xfmedia", VERSION " (r" SVN_REVISION ")",
_("Xfmedia is a lightweight media player,\nbased on the xine
engine"),
XFCE_COPYRIGHT_TEXT("2004-2005", "Brian Tarricone"),
XFCE_LICENSE_GPL);
xfce_about_info_set_homepage(ainfo, WEBSITE);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
