Mercurial > pidgin.yaz
comparison configure.ac @ 23976:f5faf254159b
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.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Tue, 02 Sep 2008 04:37:33 +0000 |
parents | c6670bbc2191 |
children | 3273b22b6a7b |
comparison
equal
deleted
inserted
replaced
23975:e2a610871476 | 23976:f5faf254159b |
---|---|
1244 AC_MSG_ERROR([ | 1244 AC_MSG_ERROR([ |
1245 D-Bus development headers not found. | 1245 D-Bus development headers not found. |
1246 Use --disable-dbus if you do not need D-Bus support. | 1246 Use --disable-dbus if you do not need D-Bus support. |
1247 ]) | 1247 ]) |
1248 fi]) | 1248 fi]) |
1249 fi | |
1249 | 1250 |
1250 dnl Check for NetworkManager.h; if we don't have it, oh well | 1251 dnl Check for NetworkManager.h; if we don't have it, oh well |
1252 if test "x$enable_dbus" = "xyes" ; then | |
1251 if test "x$enable_nm" = "xyes" ; then | 1253 if test "x$enable_nm" = "xyes" ; then |
1252 PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager], [ | 1254 PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager], [ |
1253 AC_SUBST(NETWORKMANAGER_CFLAGS) | 1255 AC_SUBST(NETWORKMANAGER_CFLAGS) |
1254 AC_SUBST(NETWORKMANAGER_LIBS) | 1256 AC_SUBST(NETWORKMANAGER_LIBS) |
1255 AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.]) | 1257 AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.]) |
1259 NetworkManager development headers not found. | 1261 NetworkManager development headers not found. |
1260 Use --disable-nm if you do not need NetworkManager support. | 1262 Use --disable-nm if you do not need NetworkManager support. |
1261 ]) | 1263 ]) |
1262 fi]) | 1264 fi]) |
1263 fi | 1265 fi |
1264 else | |
1265 enable_nm=no | |
1266 fi | 1266 fi |
1267 | 1267 |
1268 dnl ####################################################################### | 1268 dnl ####################################################################### |
1269 dnl # Check for Python | 1269 dnl # Check for Python |
1270 dnl ####################################################################### | 1270 dnl ####################################################################### |