[Xfce4-commits] <xfwm4:xfce-4.6> Use Jannis' autogen.sh script from Thunar

[Olivier Fourdan]

Updating branch refs/heads/xfce-4.6
         to 03d5815fa2647b12dec0c1d25acc66dfe677916b (commit)
       from 4acb393ff5884167f3ce70ad641f209d7b2de783 (commit)

commit 03d5815fa2647b12dec0c1d25acc66dfe677916b
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Fri Sep 4 16:02:36 2009 +0200

    Use Jannis' autogen.sh script from Thunar

 autogen.sh |   52 ++++++++++++++++------------------------------------
 1 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index a6f77eb..295c4e9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,17 +1,23 @@
 #!/bin/sh
 #
-# $Id$
+# vi:set et ai sw=2 sts=2 ts=2: */
+#-
+# Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
 #
-# Copyright (c) 2002-2005
-#         The Xfce development team. All rights reserved.
+# This program is free software; you can redistribute it and/or 
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of 
+# the License, or (at your option) any later version.
 #
-# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
+# This program 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 General Public License for more details.
 #
-
-# Set locale to C to avoid troubles with "svn info" output parsing
-LC_ALL=C
-LANG=C
-export LC_ALL LANG
+# You should have received a copy of the GNU General Public 
+# License along with this program; if not, write to the Free 
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 (type xdt-autogen) >/dev/null 2>&1 || {
   cat >&2 <<EOF
@@ -23,31 +29,5 @@ 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
-}
-
-echo "Creating configure.ac"
-
-# 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.ac.in" > "configure.ac"
-
-exec xdt-autogen $@
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.0" exec xdt-autogen $@
 
-# vi:set ts=2 sw=2 et ai: