[Xfce4-commits] <terminal:master> Update to git build and enable silent build rules if available.

[Nick Schermer]

Updating branch refs/heads/master
         to 81a54d0d16995f0ee78438eaf7d4bf97f3ace109 (commit)
       from c6c405ac3b0e409df97109363e1a448596b781a8 (commit)

commit 81a54d0d16995f0ee78438eaf7d4bf97f3ace109
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Aug 19 21:34:45 2009 +0200

    Update to git build and enable silent build rules if available.

 autogen.sh      |   43 +++++++++++--------------------------------
 configure.in.in |    9 +++++----
 po/LINGUAS      |    2 --
 3 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 9769a5c..d3b7588 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,46 +1,25 @@
 #!/bin/sh
 #
-# $Id$
+# Copyright (c) 2002-2009
+#         The Xfce development team. All rights reserved.
 #
-# Copyright (c) 2002-2006
-#         The Thunar development team. All rights reserved.
-#
-# Written for Thunar by Benedikt Meurer <benny at xfce.org>.
+# Written for Xfce by Benedikt Meurer <benny at xfce.org>
+#                 and Brian Tarricone <brian at tarricone.org>.
 #
 
+export XDT_AUTOGEN_REQUIRED_VERSION="4.7.0"
+
 (type xdt-autogen) >/dev/null 2>&1 || {
   cat >&2 <<EOF
-autogen.sh: You don't seem to have the Xfce development tools installed on
-            your system, which are required to build this software.
-            Please install the xfce4-dev-tools package first, it is available
+autogen.sh: You don't seem to have the Xfce development tools (at least
+            version $XDT_REQURED_VERSION) installed on your system, which
+            are required to build this software.
+            Please install the xfce4-dev-tools package first; it is available
             from http://www.xfce.org/.
 EOF
   exit 1
 }
 
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
-  cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
-            or try to checkout again.
-EOF
-  exit 1
-}
-
-# substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-if test -d .git/svn; then
-  revision=`git svn find-rev trunk 2>/dev/null ||
-            git svn find-rev origin/trunk 2>/dev/null ||
-            git svn find-rev HEAD 2>/dev/null ||
-            git svn find-rev master 2>/dev/null`
-else
-  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
-fi
-sed -e "s/@LINGUAS@/${linguas}/g" \
-    -e "s/@REVISION@/${revision}/g" \
-    < "configure.in.in" > "configure.in"
-
-exec xdt-autogen $@
+exec xdt-autogen "$@"
 
 # vi:set ts=2 sw=2 et ai:
diff --git a/configure.in.in b/configure.in.in
index b6347d7..7dc5fc5 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -14,14 +14,14 @@ m4_define([terminal_version_minor], [4])
 m4_define([terminal_version_micro], [0])
 m4_define([terminal_version_nano], [])
 m4_define([terminal_version_build], [@REVISION@])
-m4_define([terminal_version_tag], [svn])
+m4_define([terminal_version_tag], [git])
 m4_define([terminal_version_dbus], [3])
-m4_define([terminal_version], [terminal_version_major().terminal_version_minor().terminal_version_micro()ifelse(terminal_version_nano(), [], [], [.terminal_version_nano()])ifelse(terminal_version_tag(), [svn], [terminal_version_tag()-terminal_version_build()], [terminal_version_tag()])])
+m4_define([terminal_version], [terminal_version_major().terminal_version_minor().terminal_version_micro()ifelse(terminal_version_nano(), [], [], [.terminal_version_nano()])ifelse(terminal_version_tag(), [git], [terminal_version_tag()-terminal_version_build()], [terminal_version_tag()])])
 
 dnl *******************************************
-dnl *** Debugging support for SVN snapshots ***
+dnl *** Debugging support for GIT snapshots ***
 dnl *******************************************
-m4_define([terminal_debug_default], [ifelse(terminal_version_tag(), [svn], [yes], [minimum])])
+m4_define([terminal_debug_default], [ifelse(terminal_version_tag(), [git], [yes], [minimum])])
 
 dnl ***************************
 dnl *** Initialize autoconf ***
@@ -40,6 +40,7 @@ dnl ***************************
 AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl ***********************************
 dnl *** Subst D-BUS service version ***
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index 635e756..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ar ast be ca cs da de dz el en_GB eo es et eu fi fr gl he hu id it ja kk ko ku lt lv nb nl pa pl pt pt_BR ro ru sk sq sv tr uk ur ur_PK vi zh_CN zh_TW