build: print version on startup and add dist-version

Distributions should set dist-version at build time with the
package version and revision, so for RPM-based distros you'd

--with-dist-version=%{version}-%{release}

which will be printed out on MM startup to help debugging.
This commit is contained in:
Dan Williams
2010-05-21 09:43:47 -07:00
parent c311c3419c
commit afebde4868
2 changed files with 15 additions and 2 deletions

View File

@@ -126,6 +126,14 @@ else
fi
AM_CONDITIONAL(WITH_LOCATION_API, test "x$with_location_api" = "xyes")
dnl
dnl Distribution version string
dnl
AC_ARG_WITH(dist-version, AS_HELP_STRING([--with-dist-version=<mm-dist-version>], [Define the custom version (like distribution package name and revision)]), ac_distver=$withval, ac_distver="")
if ! test x"$ac_distver" = x""; then
AC_DEFINE_UNQUOTED(MM_DIST_VERSION, "$ac_distver", [Define the distribution version string])
fi
AC_CONFIG_FILES([
Makefile
marshallers/Makefile

View File

@@ -11,9 +11,10 @@
* GNU General Public License for more details:
*
* Copyright (C) 2008 - 2009 Novell, Inc.
* Copyright (C) 2009 Red Hat, Inc.
* Copyright (C) 2009 - 2010 Red Hat, Inc.
*/
#include <config.h>
#include <signal.h>
#include <syslog.h>
#include <string.h>
@@ -23,7 +24,9 @@
#include "mm-manager.h"
#include "mm-options.h"
#define HAL_DBUS_SERVICE "org.freedesktop.Hal"
#if !defined(MM_DIST_VERSION)
# define MM_DIST_VERSION VERSION
#endif
static GMainLoop *loop = NULL;
@@ -182,6 +185,8 @@ main (int argc, char *argv[])
if (!mm_options_debug ())
logging_setup ();
g_message ("ModemManager (version " MM_DIST_VERSION ") starting...");
bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &err);
if (!bus) {
g_warning ("Could not get the system bus. Make sure "