colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logging: log NetworkManager version; use distribution version when configured

Browse Source
This commit is contained in:
Jiří Klimeš
2010-04-23 15:25:32 +02:00
parent 8315a03632
commit b0548425d7
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@@ -164,6 +164,14 @@ if test x"$with_distro" = xpardus; then
AC_DEFINE(TARGET_PARDUS, 1, [Define if you have Pardus]) AC_DEFINE(TARGET_PARDUS, 1, [Define if you have Pardus])
fi fi
dnl
dnl Distribution version string
dnl
AC_ARG_WITH(dist-version, AS_HELP_STRING([--with-dist-version=<NM-distribution-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_MSG_CHECKING([Linux Wireless Extensions >= 18])
AC_TRY_COMPILE([#ifndef __user AC_TRY_COMPILE([#ifndef __user
#define __user #define __user

5
src/main.c
View File

@@ -616,7 +616,10 @@ main (int argc, char *argv[])
nm_logging_start (become_daemon); 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; success = FALSE;
main_loop = g_main_loop_new (NULL, FALSE); main_loop = g_main_loop_new (NULL, FALSE);