changeset 97d46f489a69 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=97d46f489a69
description: don't require libdbus-1-dev to have gajim-remote. All distribution
have libdbus > 0.60 now. Fizes #2992
diffstat:
Makefile.am | 9 +--------
README.html | 3 +--
configure.ac | 22 ----------------------
3 files changed, 2 insertions(+), 32 deletions(-)
diffs (78 lines):
diff -r 7bfcc5454643 -r 97d46f489a69 Makefile.am
--- a/Makefile.am Sat Jun 06 19:05:49 2009 +0200
+++ b/Makefile.am Sun Jun 07 20:46:39 2009 +0200
@@ -2,14 +2,7 @@
ACLOCAL_AMFLAGS = -I m4
-if BUILD_REMOTE_CONTROL
-OPTIONAL_BIN = scripts/gajim-remote
-else
-OPTIONAL_BIN =
-endif
-
-bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager $(OPTIONAL_BIN)
-
+bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote
docfilesdir = $(docdir)
docfiles_DATA = README \
diff -r 7bfcc5454643 -r 97d46f489a69 README.html
--- a/README.html Sat Jun 06 19:05:49 2009 +0200
+++ b/README.html Sun Jun 07 20:46:39 2009 +0200
@@ -37,7 +37,7 @@
<li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can
avoid compiling trayicon and gtkspell</li>
<li>gnome-python-desktop (for GnomeKeyring support)</li>
<li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
-<li>D-Bus running to have gajim-remote working. Some distributions split
dbus-x11, which is needed for dbus to work with Gajim.</li>
+<li>D-Bus running to have gajim-remote working. Some distributions split
dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.60 is
required.</li>
<li>python-dbus bindings</li>
<li>python-sexy to have clickable URLs in chat windows</li>
<li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher
is required</li>
@@ -55,7 +55,6 @@
<li>python-gtk2-dev</li>
<li>libgtk2.0-dev aka. gtk2-devel</li>
<li>libgtkspell-dev (for the gtkspell module)</li>
-<li>libdbus-1-dev (for the remote control module)</li>
<li>intltool (>= 0.40.1)</li>
</ul>
diff -r 7bfcc5454643 -r 97d46f489a69 configure.ac
--- a/configure.ac Sat Jun 06 19:05:49 2009 +0200
+++ b/configure.ac Sun Jun 07 20:46:39 2009 +0200
@@ -45,27 +45,6 @@
PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
AC_SUBST(PYGTK_DEFS)
-dnl *****
-dnl dbus
-dnl *****
-AC_ARG_ENABLE([remote],
- [ --disable-remote disable remote control via DBus [default auto]],
- enable_remote=$enableval, enable_remote=auto)
-
-if test "x$enable_remote" = "xauto"; then
- PKG_CHECK_EXISTS([dbus-1],enable_remote=yes,enable_remote=no)
-fi
-
-if test "x$enable_remote" = "xyes";then
- PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60])
- AC_SUBST(DBUS_CFLAGS)
- AC_SUBST(DBUS_LIBS)
- have_remote=true
-else
- have_remote=false
-fi
-AM_CONDITIONAL(BUILD_REMOTE_CONTROL, $have_remote)
-
AM_PATH_PYTHON([2.5])
if test "x$PYTHON" = "x:"; then
AC_MSG_ERROR([Python not found])
@@ -184,7 +163,6 @@
echo "
*****************************
Build features:
- remote control ... ${have_remote}
trayicon ......... ${have_trayicon}
idle module OSX .. ${have_idle_osx}
cocoa (OSX)....... ${have_cocoa}
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
