From 8cb72631720a62f4a65488f8f050cc7d753c7a9e Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Thu, 27 Nov 2008 10:45:08 -0800 Subject: [PATCH] Make *_[major|minor|micro]_version handling universal. --- configure.ac | 70 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 36 deletions(-) rewrite configure.ac (65%) diff --git a/configure.ac b/configure.ac dissimilarity index 65% index a87bac5..f2b70e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,36 +1,34 @@ -m4_define([plugin_major_version], [0]) -m4_define([plugin_minor_version], [15]) -m4_define([plugin_micro_version], [5]) -m4_define([plugin_nano_version], [0]) -m4_define([plugin_version],[plugin_major_version.plugin_minor_version.plugin_micro_version.plugin_nano_version]) - -AC_INIT(src) -AM_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE([gmpc-qosd], [plugin_version],qball@qballcow.nl) - -AC_DEFINE(PLUGIN_MAJOR_VERSION, plugin_major_version, ["Major version of plugin"]) -AC_DEFINE(PLUGIN_MINOR_VERSION, plugin_minor_version, ["Minor version of plugin"]) -AC_DEFINE(PLUGIN_MICRO_VERSION, plugin_micro_version, ["Micro version of plugin"]) -AC_DEFINE(PLUGIN_NANO_VERSION, plugin_nano_version, ["Nano version of plugin"]) - -AC_PROG_CC -AM_DISABLE_STATIC -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL - -PKG_CHECK_MODULES([gmpcqosd], -[ - glib-2.0 >= 2.10 - gobject-2.0 >= 2.4 - gtk+-2.0 >= 2.8 - gmodule-2.0 - cairo - libxml-2.0 - libmpd >= 0.14.99 - gmpc >= 0.15.4.102 -]) -AC_SUBST(gmpcqosd_LIBS) -AC_SUBST(gmpcqosd_CFLAGS) - - -AC_OUTPUT([Makefile src/Makefile]) +m4_define([package_major_version], [0]) +m4_define([package_minor_version], [15]) +m4_define([package_micro_version], [5]) +m4_define([package_version],[package_major_version.package_minor_version.package_micro_version]) + +AC_INIT(src) +AM_CONFIG_HEADER([config.h]) +AM_INIT_AUTOMAKE([gmpc-qosd], [package_version],qball@qballcow.nl) + +AC_DEFINE(PLUGIN_MAJOR_VERSION, package_major_version, ["Major version of plugin"]) +AC_DEFINE(PLUGIN_MINOR_VERSION, package_minor_version, ["Minor version of plugin"]) +AC_DEFINE(PLUGIN_MICRO_VERSION, package_micro_version, ["Micro version of plugin"]) + +AC_PROG_CC +AM_DISABLE_STATIC +AC_LIBTOOL_DLOPEN +AC_PROG_LIBTOOL + +PKG_CHECK_MODULES([gmpcqosd], +[ + glib-2.0 >= 2.10 + gobject-2.0 >= 2.4 + gtk+-2.0 >= 2.8 + gmodule-2.0 + cairo + libxml-2.0 + libmpd >= 0.14.99 + gmpc >= 0.15.4.102 +]) +AC_SUBST(gmpcqosd_LIBS) +AC_SUBST(gmpcqosd_CFLAGS) + + +AC_OUTPUT([Makefile src/Makefile]) -- 2.11.4.GIT