changeset
propagate from branch 'im.pidgin.pidgin' (head a9e2f64c52875847fd69ccddc11b1f77f03f7ae5)
Thu, 04 Sep 2008 22:18:58 +0000
- author
- Sadrul Habib Chowdhury <sadrul@pidgin.im>
- date
- Thu, 04 Sep 2008 22:18:58 +0000
- branch
- xmpp.custom_smiley
- changeset 24253
- 86bdb60dd46a
- parent 24251
- c463b357854c (current diff)
- parent 24252
- a9e2f64c5287 (diff)
- child 24254
- 2d990726bf92
propagate from branch 'im.pidgin.pidgin' (head a9e2f64c52875847fd69ccddc11b1f77f03f7ae5)
to branch 'im.pidgin.xmpp.custom_smiley' (head c463b357854c89132675f2794dce37701f46ccc2)
--- a/configure.ac Thu Sep 04 21:27:33 2008 +0000 +++ b/configure.ac Thu Sep 04 22:18:58 2008 +0000 @@ -1240,6 +1240,7 @@ AC_SUBST(DBUS_LIBS) enable_dbus=yes ], [ + enable_dbus=no if test "x$force_deps" = "xyes" ; then AC_MSG_ERROR([ D-Bus development headers not found. @@ -1256,6 +1257,7 @@ AC_SUBST(NETWORKMANAGER_LIBS) AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.]) ], [ + enable_nm=no if test "x$force_deps" = "xyes" ; then AC_MSG_ERROR([ NetworkManager development headers not found. @@ -1263,6 +1265,8 @@ ]) fi]) fi +else + enable_nm=no fi dnl #######################################################################
