From 9f7e58c4fd9deb009bcead0fdce2da2e161d2979 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 6 Apr 2024 21:49:10 +0800 Subject: [PATCH] build: Use XDT_VERSION_INIT and get rid of configure.ac.in --- .gitignore | 1 - configure.ac.in => configure.ac | 15 +++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) rename configure.ac.in => configure.ac (88%) diff --git a/.gitignore b/.gitignore index 89a08fb..a33fc1c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ stamp* *,orig configure config.* -configure.ac mkinstalldirs missing compile diff --git a/configure.ac.in b/configure.ac similarity index 88% rename from configure.ac.in rename to configure.ac index 7af514c..a338377 100644 --- a/configure.ac.in +++ b/configure.ac @@ -12,24 +12,19 @@ dnl 2005-2008 Johannes Zellner dnl *************************** dnl *** Version information *** dnl *************************** -m4_define([taskmanager_version_major], [1]) -m4_define([taskmanager_version_minor], [5]) -m4_define([taskmanager_version_micro], [7]) -m4_define([taskmanager_version_build], [@REVISION@]) -m4_define([taskmanager_version_tag], [git]) -m4_define([taskmanager_version], [taskmanager_version_major().taskmanager_version_minor().taskmanager_version_micro()ifelse(taskmanager_version_tag(), [git], [taskmanager_version_tag()-taskmanager_version_build()], [taskmanager_version_tag()])]) +XDT_VERSION_INIT([1.5.7], [git]) dnl *************************** dnl *** Initialize autoconf *** dnl *************************** AC_COPYRIGHT([Copyright (c) 2005-2024 The Xfce development team. All rights reserved.]) -AC_INIT([Xfce4 Taskmanager], [taskmanager_version], [https://gitlab.xfce.org/apps/xfce4-taskmanager/], [xfce4-taskmanager], +AC_INIT([Xfce4 Taskmanager], [xdt_version], [https://gitlab.xfce.org/apps/xfce4-taskmanager/], [xfce4-taskmanager], [https://docs.xfce.org/apps/xfce4-taskmanager/start]) -AC_PREREQ([2.60]) +AC_PREREQ([2.69]) AC_CONFIG_MACRO_DIRS([m4]) AC_CANONICAL_TARGET() -AC_REVISION([taskmanager_version_build]) +AC_REVISION([xdt_version_build]) dnl *************************** dnl *** Initialize automake *** @@ -141,7 +136,7 @@ AM_CONDITIONAL([OS_SKEL], [test x"$ac_os_implementation" = x"skel"]) dnl *********************************** dnl *** Check for debugging support *** dnl *********************************** -XDT_FEATURE_DEBUG() +XDT_FEATURE_DEBUG([xdt_debug_default]) dnl *************** dnl *** Outputs ***