Updating branch refs/heads/master to bd548c474d2ef87e479fab699374768b6e52e043 (commit) from 2eab8fee14251bdff4ba45d0f9cfe576ada33693 (commit)
commit bd548c474d2ef87e479fab699374768b6e52e043 Author: Diego Ongaro <ongar...@gmail.com> Date: Sat Oct 17 15:54:49 2009 -0700 Update to xfce4-dev-tools 4.7.0 These are the changes per Brian's email to the xfce4-dev list. Pulled down a new version of autogen.sh from xfdesktop. autogen.sh | 36 +++++++++++++----------------------- po/LINGUAS | 2 -- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/autogen.sh b/autogen.sh index 32e5775..ef98c52 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,37 +1,27 @@ #!/bin/sh # -# $Id: autogen.sh 1972 2006-09-06 08:21:54Z nick $ +# $Id$ # -# Copyright (c) 2002-2006 -# The Thunar development team. All rights reserved. +# Copyright (c) 2002-2009 +# The Xfce development team. All rights reserved. # -# Written for Thunar by Benedikt Meurer <be...@xfce.org>. +# Written for Xfce by Benedikt Meurer <be...@xfce.org> +# and Brian Tarricone <br...@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` -revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'` -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/po/LINGUAS b/po/LINGUAS deleted file mode 100644 index e3416cd..0000000 --- a/po/LINGUAS +++ /dev/null @@ -1,2 +0,0 @@ -# set of available languages (in alphabetic order) -ar ast ca da de el en_GB es eu fr gl hu it ja lv nl pl pt_BR pt ro ru sv tr uk ur ur_PK zh_CN _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits