[Xfce4-commits] <xfce4-embed-plugin:master> Modernize configure.in.in and add git support.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 8ce5f37eed0c7d4eddd3abb16a0ccbac0f526cf6 (commit)
       from e23328127dee2321942fc40a7852ccce8783ffd2 (commit)

commit 8ce5f37eed0c7d4eddd3abb16a0ccbac0f526cf6
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Apr 23 09:11:15 2011 +0200

    Modernize configure.in.in and add git support.

 configure.in.in |   40 +++++++++++++++++++++++-----------------
 1 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 3e4ac3c..795fb3d 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -11,9 +11,10 @@ dnl ***************************
 m4_define([sample_version_major], [0])
 m4_define([sample_version_minor], [0])
 m4_define([sample_version_micro], [2])
-m4_define([sample_version_build], [r at REVISION@])
-m4_define([sample_version_tag], [svn])
-m4_define([sample_version], [sample_version_major().sample_version_minor().sample_version_micro()ifelse(sample_version_tag(), [svn], [sample_version_tag()-sample_version_build()], [sample_version_tag()])])
+m4_define([sample_version_nano],  []) dnl leave this empty to have no nano version
+m4_define([sample_version_build], [@REVISION@])
+m4_define([sample_version_tag], [git])
+m4_define([sample_version], [sample_version_major().sample_version_minor().sample_version_micro()ifelse(sample_version_nano(), [], [], [.sample_version_nano()])ifelse(sample_version_tag(), [git], [sample_version_tag()-sample_version_build()], [sample_version_tag()])])
 
 dnl ***************************
 dnl *** Initialize autoconf ***
@@ -22,35 +23,40 @@ AC_COPYRIGHT([Copyright (c) 2011
         The Xfce development team. All rights reserved.])
 AC_INIT([xfce4-sample-plugin], [sample_version], [http://bugzilla.xfce.org/], [xfce4-sample-plugin])
 AC_PREREQ([2.50])
-AC_CANONICAL_TARGET()
-AC_REVISION([$Id])
+AC_REVISION([xfce4_panel_version_build])
 
 dnl ***************************
 dnl *** Initialize automake ***
 dnl ***************************
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
+AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+dnl *******************************
+dnl *** Check for UNIX variants ***
+dnl *******************************
+AC_AIX()
+AC_ISC_POSIX()
 
 dnl ********************************
 dnl *** Check for basic programs ***
 dnl ********************************
 AC_PROG_CC()
+AM_PROG_CC_C_O()
 AC_PROG_LD()
 AC_PROG_INSTALL()
-AC_PROG_LIBTOOL()
 AC_PROG_INTLTOOL()
+AC_PROG_LIBTOOL()
 
 dnl **********************************
 dnl *** Check for standard headers ***
 dnl **********************************
-AC_CHECK_HEADERS([math.h memory.h stdlib.h string.h sys/stat.h \
-                  sys/time.h time.h])
-
-dnl ************************************
-dnl *** Check for standard functions ***
-dnl ************************************
-AC_CHECK_FUNCS([])
+AC_HEADER_STDC()
+AC_CHECK_HEADERS([stdlib.h unistd.h locale.h stdio.h errno.h time.h string.h \
+                  math.h sys/types.h sys/wait.h memory.h signal.h sys/prctl.h \
+                  libintl.h])
+AC_CHECK_FUNCS([bind_textdomain_codeset])
 
 dnl ******************************
 dnl *** Check for i18n support ***
@@ -65,10 +71,10 @@ XDT_CHECK_LIBX11_REQUIRE()
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
 XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.2])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
 
 dnl ***********************************
 dnl *** Check for debugging support ***