-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi guys... I tried to compile NM with the latest CVS (20061128 - 09:58 UTC+2) and it fails to build if DBUS 1.0 is installed. This is because it tries to insert this flag: DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT I saw the code, and it seems that the flags should be replaced by DBUS_NAME_FLAG_DO_NOT_QUEUE; basing on this #if condition: #if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) This is true for every DBUS < 1.0 but it fails with DBUS >= 1.0 so it still insert DBUS...PROIHIBIT... which is undefined... So i patched the #if as follows (see it in the attached patch too): +#if (DBUS_VERSION_MAJOR > 0) || ((DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)) Now it works... Hope this helps... Shogun PS: I don't know it the following is only related to my custom ebuild in Gentoo, but make doesn't execute the nm-marshal.h rules, so it fails... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFFa/vc5ZhuYzhlmjoRAlbpAJ0SPVw1/Bo6+tAq6+cQ+eVx8tfhSwCgpRg2 zwbDcMvm/r+cyWcXJueUzCE= =fFZq -----END PGP SIGNATURE-----
--- nm-dbus-manager.old 2006-11-28 09:47:24.188437922 +0100 +++ nm-dbus-manager.c 2006-11-28 09:48:29.501474009 +0100 @@ -872,7 +872,7 @@ } dbus_error_init (&error); -#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) +#if (DBUS_VERSION_MAJOR > 0) || ((DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)) flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; #else flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;
Attachment:
network-manager-dbus-1.0-flag.patch.sig
Description: Binary data