2005-08-31 Benedikt Meurer <benny@xfce.org>

	* configure.in.in, autogen.sh: Merge build framework changes from
	  libexo.




(Old svn revision: 17214)

3 files changed, 39 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a6020c..9e2fb57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-31      Benedikt Meurer <benny@xfce.org>
+
+	* configure.in.in, autogen.sh: Merge build framework changes from
+	  libexo.
+
 2005-07-09      Benedikt Meurer <benny@xfce.org>
 
 	* configure.ac, NEWS: Bump version after release (4.3.1svn).
diff --git a/autogen.sh b/autogen.sh
index 0909c7e..02455ed 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,19 +8,21 @@
 # Written for Xfce by Benedikt Meurer <benny@xfce.org>.
 #
 
-if (type xdt-autogen) >/dev/null 2>&1; then
-  exec xdt-autogen $@
-else
-  (aclocal &&
-   automake --add-missing --copy --gnu &&
-   autoconf) || exit 1
+(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
+            from http://www.xfce.org/.
+EOF
+  exit 1
+}
 
-  if test x"${NOCONFIGURE}" = x""; then
-    (./configure --enable-maintainer-mode $@ &&
-     echo "Now type \"make\" to build.") || exit 1
-  else
-    echo "Skipping configure process."
-  fi
-fi
+# substitute revision and date
+revision=`svn info $0 | awk '/^Revision: / {printf "%04d\n", $2}'`
+sed -e "s/@DATE@/`date +%Y%m%d`/g" -e "s/@REVISION@/${revision}/g" \
+  < "configure.in.in" > "configure.in"
+
+exec xdt-autogen $@
 
 # vi:set ts=2 sw=2 et ai:
diff --git a/configure.ac b/configure.in.in
index 44e5603..93c5f3f 100644
--- a/configure.ac
+++ b/configure.in.in
@@ -6,19 +6,24 @@ dnl
 dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
 dnl
 
-dnl Version information
+dnl ***************************
+dnl *** Version information ***
+dnl ***************************
 m4_define([xdt_version_major], [4])
 m4_define([xdt_version_minor], [3])
-m4_define([xdt_version_micro], [1])
+m4_define([xdt_version_micro], [3])
+m4_define([xdt_version_build], [r@REVISION@])
 m4_define([xdt_version_tag], [svn])
-m4_define([xdt_version], [xdt_version_major().xdt_version_minor().xdt_version_micro()xdt_version_tag()])
+m4_define([xdt_version], [xdt_version_major().xdt_version_minor().xdt_version_micro()ifelse(xdt_version_tag(), [], [], [xdt_version_tag()-xdt_version_build()])])
 
 
 dnl # DO NOT MODIFY ANYTHING BELOW THIS LINE, UNLESS YOU KNOW WHAT
 dnl # YOU ARE DOING.
 
 
-dnl Initialize autoconf
+dnl ***************************
+dnl *** Initialize autoconf ***
+dnl ***************************
 AC_INIT([xfce4-dev-tools], [xdt_version()], [xfce4-dev@xfce.org])
 AC_COPYRIGHT([Copyright (c) 2002-2005
         The Xfce development team. All rights reserved.
@@ -26,14 +31,20 @@ AC_COPYRIGHT([Copyright (c) 2002-2005
 Written for Xfce by Benedikt Meurer <benny@xfce.org>.])
 AC_REVISION([$Id$])
 
-dnl Initialize the other autotools
+dnl ***************************
+dnl *** Initialize automake ***
+dnl ***************************
 AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
 AM_MAINTAINER_MODE()
 
-dnl Check for basic programs
-AC_PROG_INSTALL
+dnl ********************************
+dnl *** Check for basic programs ***
+dnl ********************************
+AC_PROG_INSTALL()
 
-dnl Generate files
+dnl **********************
+dnl *** Generate files ***
+dnl **********************
 AC_OUTPUT([
 Makefile
 xfce4-dev-tools.spec