From f41e5c719f41d4bc243f3a8b295042d214625cac Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Fri, 16 Mar 2007 00:03:55 +0000
Subject: regen

---
 app/xkbutils/aclocal.m4  | 20 +++++++++++++++++++-
 app/xkbutils/config.h.in |  9 +++++++++
 app/xkbutils/configure   | 23 +++++++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)

(limited to 'app/xkbutils')

diff --git a/app/xkbutils/aclocal.m4 b/app/xkbutils/aclocal.m4
index e447613ca..215937597 100644
--- a/app/xkbutils/aclocal.m4
+++ b/app/xkbutils/aclocal.m4
@@ -1116,7 +1116,8 @@ dnl
 # --------------------
 # Adds --with/without-release-string and changes the PACKAGE and
 # PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION".  If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.  Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
  
 AC_DEFUN([XORG_RELEASE_VERSION],[
 	AC_ARG_WITH(release-version,
@@ -1129,5 +1130,22 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 		PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
 		AC_MSG_NOTICE([Building with package name set to $PACKAGE])
 	fi
+	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+		[`echo $PACKAGE_VERSION | cut -d . -f 1`],
+		[Major version of this package])
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	if test "x$PVM" = "x"; then
+		PVM="0"
+	fi
+	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+		[$PVM],
+		[Minor version of this package])
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	if test "x$PVP" = "x"; then
+		PVP="0"
+	fi
+	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+		[$PVP],
+		[Patch version of this package])
 ])
 
diff --git a/app/xkbutils/config.h.in b/app/xkbutils/config.h.in
index c364eda45..1ca40928b 100644
--- a/app/xkbutils/config.h.in
+++ b/app/xkbutils/config.h.in
@@ -18,5 +18,14 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
 /* Version number of package */
 #undef VERSION
diff --git a/app/xkbutils/configure b/app/xkbutils/configure
index 0b91db57f..0edad4bbf 100644
--- a/app/xkbutils/configure
+++ b/app/xkbutils/configure
@@ -3462,6 +3462,29 @@ fi;
 echo "$as_me: Building with package name set to $PACKAGE" >&6;}
 	fi
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+_ACEOF
+
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	if test "x$PVM" = "x"; then
+		PVM="0"
+	fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
+
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	if test "x$PVP" = "x"; then
+		PVP="0"
+	fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
+
+
 
           ac_config_files="$ac_config_files Makefile"
 cat >confcache <<\_ACEOF
-- 
cgit v1.2.3