From b0548425d7920e1c3d9cd65754b663380e9051cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Fri, 23 Apr 2010 15:25:32 +0200 Subject: [PATCH] logging: log NetworkManager version; use distribution version when configured --- configure.ac | 8 ++++++++ src/main.c | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index aedc8ec903..adfe67fe9b 100644 --- a/configure.ac +++ b/configure.ac @@ -164,6 +164,14 @@ if test x"$with_distro" = xpardus; then AC_DEFINE(TARGET_PARDUS, 1, [Define if you have Pardus]) fi +dnl +dnl Distribution version string +dnl +AC_ARG_WITH(dist-version, AS_HELP_STRING([--with-dist-version=], [Define the NM's distribution version string]), ac_distver=$withval, ac_distver="") +if ! test x"$ac_distver" = x""; then + AC_DEFINE_UNQUOTED(NM_DIST_VERSION, "$ac_distver", [Define the distribution version string]) +fi + AC_MSG_CHECKING([Linux Wireless Extensions >= 18]) AC_TRY_COMPILE([#ifndef __user #define __user diff --git a/src/main.c b/src/main.c index cce2939e39..6bb1121716 100644 --- a/src/main.c +++ b/src/main.c @@ -616,7 +616,10 @@ main (int argc, char *argv[]) nm_logging_start (become_daemon); - nm_log_info (LOGD_CORE, "starting..."); +#if !defined(NM_DIST_VERSION) +# define NM_DIST_VERSION VERSION +#endif + nm_log_info (LOGD_CORE, "NetworkManager-" NM_DIST_VERSION " is starting..."); success = FALSE; main_loop = g_main_loop_new (NULL, FALSE);