pidgin: c47f25da: Don't check for NetworkManager support w...
qulogic at pidgin.im
qulogic at pidgin.im
Tue Sep 2 00:45:50 EDT 2008
-----------------------------------------------------------------
Revision: c47f25daa781df4d189a0c93f999d0ecde75fd6a
Ancestor: a6a63428db8d1d52bd1b3accc5c859f03df1578e
Author: qulogic at pidgin.im
Date: 2008-09-02T04:37:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c47f25daa781df4d189a0c93f999d0ecde75fd6a
Modified files:
configure.ac
ChangeLog:
Don't check for NetworkManager support when we find out we're not
building with D-Bus support (ie D-Bus not found, but with
--disable-missing-dependencies specified).
References #6903.
-------------- next part --------------
============================================================
--- configure.ac 3402cf3b8d3f0471108a594dffc8693e29875aa3
+++ configure.ac c235a68f29c4e16c44df1a583681b5c181f8bd23
@@ -1246,8 +1246,10 @@ Use --disable-dbus if you do not need D-
Use --disable-dbus if you do not need D-Bus support.
])
fi])
+fi
dnl Check for NetworkManager.h; if we don't have it, oh well
+if test "x$enable_dbus" = "xyes" ; then
if test "x$enable_nm" = "xyes" ; then
PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager], [
AC_SUBST(NETWORKMANAGER_CFLAGS)
@@ -1261,8 +1263,6 @@ Use --disable-nm if you do not need Netw
])
fi])
fi
-else
- enable_nm=no
fi
dnl #######################################################################
More information about the Commits
mailing list