Mercurial > pidgin.yaz
diff configure.ac @ 19337:6d94101c7d22
propagate from branch 'im.pidgin.pidgin' (head 671cfe949215447db0da7081a7e1501693ab4f98)
to branch 'im.pidgin.soc.2007.msimprpl' (head 3d41b5ffa5690ba5da2becdd342bcb118df639b6)
| author | Jeffrey Connelly <jaconnel@calpoly.edu> |
|---|---|
| date | Mon, 20 Aug 2007 02:59:38 +0000 |
| parents | 829b00936eef 36316f1db621 |
| children | 0762e505818c |
line wrap: on
line diff
--- a/configure.ac Mon Aug 20 02:59:29 2007 +0000 +++ b/configure.ac Mon Aug 20 02:59:38 2007 +0000 @@ -1093,7 +1093,7 @@ dnl ####################################################################### AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--enable-dbus], [enable D-Bus support])], , enable_dbus=yes) -AC_ARG_ENABLE(nm, [AC_HELP_STRING([--enable-nm], [enable NetworkManager support (buggy) (requires D-Bus)])], enable_libnm=yes, enable_libnm=no) +AC_ARG_ENABLE(nm, [AC_HELP_STRING([--enable-nm], [enable NetworkManager support (buggy) (requires D-Bus)])], enable_libnm=$enableval, enable_libnm=no) if test "x$enable_dbus" = "xyes" ; then AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no) @@ -2117,8 +2117,8 @@ pidgin/pixmaps/emblems/16/scalable/Makefile pidgin/pixmaps/emotes/Makefile pidgin/pixmaps/emotes/default/Makefile - pidgin/pixmaps/emotes/default/22/Makefile - pidgin/pixmaps/emotes/default/22/scalable/Makefile + pidgin/pixmaps/emotes/default/24/Makefile + pidgin/pixmaps/emotes/default/24/scalable/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/icons/Makefile pidgin/pixmaps/icons/16/Makefile @@ -2139,6 +2139,8 @@ pidgin/pixmaps/protocols/48/Makefile pidgin/pixmaps/protocols/48/scalable/Makefile pidgin/pixmaps/status/Makefile + pidgin/pixmaps/status/11/Makefile + pidgin/pixmaps/status/11/scalable/Makefile pidgin/pixmaps/status/16/Makefile pidgin/pixmaps/status/16/rtl/Makefile pidgin/pixmaps/status/16/scalable/Makefile