[Xfce4-commits] <xfce4-clipman-plugin:master> Update autotools build

[Mike Massonnet]

Updating branch refs/heads/master
         to ab936561bdfad1188d07771a163318e4d126595c (commit)
       from 2b69ec4fad1e5018cb822c33a22829e8f64c95d1 (commit)

commit ab936561bdfad1188d07771a163318e4d126595c
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Tue Aug 18 10:19:51 2009 +0200

    Update autotools build
    
    Drop the po/LINGUAS files and substitute them directly inside the
    configure script instead.
    Update the version tag svn=>git and pass the project URL.

 autogen.sh      |   13 ++-----------
 configure.ac.in |    9 +++++----
 po/LINGUAS      |    2 --
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 8a45054..d8c3065 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,22 +18,13 @@ 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 'dnl *** This file is automatically generated from configure.ac.in ***' \
     >configure.ac
 echo 'dnl *** DO NOT EDIT! ***' >>configure.ac
 echo >>configure.ac
 
 # substitute revision and linguas
-linguas=$(sed -e '/^#/d' po/LINGUAS)
+linguas=$(ls po/*.po 2>/dev/null | awk 'BEGIN {FS="[./]"; ORS=" "} {print $2}')
 if [ -d .git ]; then
     revision=$(git log --pretty=format:%h -n 1)
 else
@@ -41,7 +32,7 @@ else
 fi
 sed -e "s/@LINGUAS@/${linguas}/g" \
     -e "s/@REVISION@/${revision}/g" \
-    < "configure.ac.in" >> "configure.ac"
+    < configure.ac.in >> configure.ac
 
 xdt-autogen $@
 
diff --git a/configure.ac.in b/configure.ac.in
index f9bbae6..7d02abc 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -12,16 +12,17 @@ dnl ***************************
 m4_define([project_version_major], [1])
 m4_define([project_version_minor], [1])
 m4_define([project_version_micro], [0])
-m4_define([project_version_build], [r at REVISION@])
-m4_define([project_version_tag], [svn]) # leave empty for release
-m4_define([project_version], [project_version_major().project_version_minor().project_version_micro()ifelse(project_version_tag(), [svn], [project_version_tag()-project_version_build()], [project_version_tag()])])
+m4_define([project_version_build], [@REVISION@])
+m4_define([project_version_tag], [git]) # leave empty for release
+m4_define([project_version], [project_version_major().project_version_minor().project_version_micro()ifelse(project_version_tag(), [git], [project_version_tag()-project_version_build()], [project_version_tag()])])
 
 dnl ***************************
 dnl *** Initialize autoconf ***
 dnl ***************************
 AC_COPYRIGHT([Copyright (c) 2005-2009
         The Xfce development team. All rights reserved.])
-AC_INIT([Clipman], [project_version], [http://bugzilla.xfce.org/], [xfce4-clipman-plugin])
+AC_INIT([Clipman], [project_version], [http://bugzilla.xfce.org/], [xfce4-clipman-plugin],
+       	[http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin])
 AC_PREREQ([2.50])
 AC_CANONICAL_TARGET()
 AC_REVISION([project_version_build])
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index f5a2ec3..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ar ast ca cs da de el en_GB es eu fi fr gl hu id it ja lv nb nl pl pt pt_BR ru sq sv tr uk ur ur_PK vi zh_CN zh_TW