[Goodies-commits] r4043 - xfce4-mailwatch-plugin/trunk

[Brian Tarricone]

Author: kelnos
Date: 2008-03-14 07:31:10 +0000 (Fri, 14 Mar 2008)
New Revision: 4043

Modified:
   xfce4-mailwatch-plugin/trunk/autogen.sh
   xfce4-mailwatch-plugin/trunk/configure.ac.in
Log:
clean up autogen and configure.ac, track svn revision in version tag


Modified: xfce4-mailwatch-plugin/trunk/autogen.sh
===================================================================
--- xfce4-mailwatch-plugin/trunk/autogen.sh	2008-03-14 06:01:51 UTC (rev 4042)
+++ xfce4-mailwatch-plugin/trunk/autogen.sh	2008-03-14 07:31:10 UTC (rev 4043)
@@ -29,11 +29,20 @@
 echo 'dnl *** This file is autogenerated.  Do not edit. ***' >configure.ac
 echo >>configure.ac
 
-linguas=`sed -e '/^#/d' po/LINGUAS`
+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.ac.in" >> "configure.ac"
 
-
 exec xdt-autogen $@
 
 # vi:set ts=2 sw=2 et ai:

Modified: xfce4-mailwatch-plugin/trunk/configure.ac.in
===================================================================
--- xfce4-mailwatch-plugin/trunk/configure.ac.in	2008-03-14 06:01:51 UTC (rev 4042)
+++ xfce4-mailwatch-plugin/trunk/configure.ac.in	2008-03-14 07:31:10 UTC (rev 4043)
@@ -1,17 +1,22 @@
-dnl configure.ac
+dnl configure.ac.in
 dnl
 dnl xfce4-mailwatch-plugin - a mail notification plugin for the xfce4 panel
 dnl
 
 dnl version info
-m4_define([mailwatch_version], [1.0.2svn])
+m4_define([mailwatch_version_major], [1])
+m4_define([mailwatch_version_minor], [0])
+m4_define([mailwatch_version_micro], [2])
+m4_define([mailwatch_version_build], [r at REVISION@])
+m4_define([mailwatch_version_tag], [svn])
+m4_define([mailwatch_version], [mailwatch_version_major().mailwatch_version_minor().mailwatch_version_micro()ifelse(mailwatch_version_tag(), [svn], [mailwatch_version_tag()-mailwatch_version_build()], [mailwatch_version_tag()])])
 
 dnl init autoconf
-AC_INIT([xfce4-mailwatch-plugin], [mailwatch_version], [bjt23 at cornell.edu])
+AC_INIT([xfce4-mailwatch-plugin], [mailwatch_version],
+        [http://bugzilla.xfce.org/])
 AC_PREREQ([2.50])
 
 dnl init automake
-MAILWATCH_VERSION=mailwatch_version
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE
@@ -31,8 +36,11 @@
 
 dnl check for standard header files
 AC_HEADER_STDC
-AC_CHECK_HEADERS(errno.h fcntl.h math.h netdb.h netinet/in.h signal.h stddef.h string.h sys/select.h sys/socket.h sys/stat.h sys/types.h sys/wait.h time.h unistd.h)
-AC_CHECK_FUNCS(mmap sigaction srandom)
+AC_CHECK_HEADERS([errno.h fcntl.h math.h netdb.h netinet/in.h \
+                  signal.h stddef.h string.h sys/select.h \
+                  sys/socket.h sys/stat.h sys/types.h sys/wait.h \
+                  time.h unistd.h])
+AC_CHECK_FUNCS([mmap sigaction srandom])
 
 dnl Check for i18n support
 XDT_I18N([@LINGUAS@])
@@ -62,7 +70,7 @@
 XDT_CHECK_OPTIONAL_PACKAGE([GNUTLS], [gnutls], [1.2.0], [ssl],
 	[gnutls support for secure IMAP/POP3 connections], [yes])
 if test "x$GNUTLS_FOUND" = "xyes"; then
-	AC_DEFINE_UNQUOTED([HAVE_SSL_SUPPORT], [1], [Define if SSL support is enabled])
+	AC_DEFINE([HAVE_SSL_SUPPORT], [1], [Define if SSL support is enabled])
 fi
 AM_CONDITIONAL([HAVE_SSL_SUPPORT], [test "x$GNUTLS_FOUND" = "xyes"])