[Goodies-commits] r4655 - xfce4-dict/trunk

[Enrico Troeger]

Author: enrico
Date: 2008-04-22 19:11:08 +0000 (Tue, 22 Apr 2008)
New Revision: 4655

Modified:
   xfce4-dict/trunk/autogen.sh
   xfce4-dict/trunk/configure.in.in
Log:
Use newer autogen.sh (from mailwatch plugin).


Modified: xfce4-dict/trunk/autogen.sh
===================================================================
--- xfce4-dict/trunk/autogen.sh	2008-04-22 19:11:05 UTC (rev 4654)
+++ xfce4-dict/trunk/autogen.sh	2008-04-22 19:11:08 UTC (rev 4655)
@@ -1,7 +1,12 @@
 #!/bin/sh
 #
-# $Id: autogen.sh 1972 2006-09-06 08:21:54Z nick $
+# $Id: autogen.sh 13265 2005-03-12 04:15:08Z brian $
 #
+# Copyright (c) 2002-2005
+#         The Xfce development team. All rights reserved.
+#
+# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
+#
 
 (type xdt-autogen) >/dev/null 2>&1 || {
   cat >&2 <<EOF
@@ -13,20 +18,31 @@
   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.
+            or try to check out 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}'`
+echo 'dnl *** This file is autogenerated.  Do not edit. ***' >configure.in
+echo >>configure.in
+
+linguas=$(sed -e '/^#/d' po/LINGUAS)
+
+if [ -d .git/svn ]; then
+    revision=$(git-svn find-rev trunk)
+elif [ -d .svn ]; then
+    revision=$(LC_ALL=C svn info $0 | awk '/^Revision: /{ printf "%05d", $2 }')
+else
+    revision=UNKNOWN
+fi
+
 sed -e "s/@LINGUAS@/${linguas}/g" \
     -e "s/@REVISION@/${revision}/g" \
-    < "configure.in.in" > "configure.in"
+    < "configure.in.in" >> "configure.in"
 
 exec xdt-autogen $@
+
+# vi:set ts=2 sw=2 et ai:

Modified: xfce4-dict/trunk/configure.in.in
===================================================================
--- xfce4-dict/trunk/configure.in.in	2008-04-22 19:11:05 UTC (rev 4654)
+++ xfce4-dict/trunk/configure.in.in	2008-04-22 19:11:08 UTC (rev 4655)
@@ -21,7 +21,7 @@
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
-AC_PROG_INTLTOOL()
+AC_PROG_INTLTOOL
 
 dnl check for standard header files
 AC_HEADER_STDC