[Xfce4-commits] <xfce4-power-manager:master> Support for silent build+get rid of the LINGUAS file

[Ali Abdallah]

Updating branch refs/heads/master
         to 66b2ea467383ca4b85ac675f4d4c9f1e8fa97637 (commit)
       from 1802ee7aa0b0112dc89ae767f7efe8254fb5c344 (commit)

commit 66b2ea467383ca4b85ac675f4d4c9f1e8fa97637
Author: Ali Abdallah <ali at ali-xfce.org>
Date:   Wed Oct 21 11:53:09 2009 +0200

    Support for silent build+get rid of the LINGUAS file

 autogen.sh      |   51 +++++++++------------------------------------------
 configure.ac.in |    1 +
 po/LINGUAS      |    2 --
 3 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 8133da6..6bc0c8a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,53 +1,20 @@
 #!/bin/sh
 #
-# vi:set et ai sw=2 sts=2 ts=2: */
-# 
-# Copyright (c) 2007-2009 Jannis Pohlmann <jannis at xfce.org>
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-# GNU Library General Public License for more details.
-# 
-# You should have received a copy of the GNU Library General 
-# Public License along with this library; if not, write to the 
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# Copyright (c) 2002-2009
+#         The Xfce development team. All rights reserved.
+#
+# Written for Xfce by Benedikt Meurer <benny at xfce.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
-            from http://www.xfce.org/.
+            Please install the xfce4-dev-tools package first, available from
+            http://xfce.org/~benny/projects/xfce4-dev-tools/.
 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; then
-  revision=$(git rev-parse --short HEAD 2>/dev/null)
-else
-  revision="Unknown"
-fi
-sed -e "s/@LINGUAS@/${linguas}/g" \
-    -e "s/@REVISION@/${revision}/g" \
-    < "configure.ac.in" > "configure.ac"
-
-exec xdt-autogen $@
-
+xdt-autogen $@
diff --git a/configure.ac.in b/configure.ac.in
index 6a0fc0c..92bbd38 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -12,6 +12,7 @@ AC_PREREQ(2.50)
 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])])
 
 # ===================================================== #
 #               Check for UNIX variants                 #
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index 2263615..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ast ca cs da de el es et eu fi fr gl id it ja nb nl pt_BR pt ru sv tr uk ur ur_PK zh_CN