Author: asterix Date: 2006-11-29 09:07:41 +0100 (Wed, 29 Nov 2006) New Revision: 7563
Added: trunk/scripts/gajim-remote.in Removed: trunk/scripts/gajim-remote Modified: trunk/Makefile.am trunk/configure.ac Log: [Fab] install gajim-remote only if dbus is present. see #2723
Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2006-11-29 02:34:07 UTC (rev 7562) +++ trunk/Makefile.am 2006-11-29 08:07:41 UTC (rev 7563) @@ -2,9 +2,15 @@
ACLOCAL_AMFLAGS = -I m4
-bin_SCRIPTS = scripts/gajim +if BUILD_REMOTE_CONTROL +OPTIONAL_BIN = scripts/gajim-remote +else +OPTIONAL_BIN = +endif
+bin_SCRIPTS = scripts/gajim $(OPTIONAL_BIN)
+ docfilesdir = $(docdir) docfiles_DATA = README \ README.html \ @@ -19,13 +25,15 @@ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ - scripts/gajim.in + scripts/gajim.in \ + scripts/gajim-remote.in DISTCLEANFILES = \ intltool-extract \ intltool-merge \ intltool-update \ - scripts/gajim + scripts/gajim \ + scripts/gajim-remote
MAINTAINERCLEANFILES = \ configure \
Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-11-29 02:34:07 UTC (rev 7562) +++ trunk/configure.ac 2006-11-29 08:07:41 UTC (rev 7563) @@ -160,6 +160,7 @@ src/Makefile src/common/Makefile scripts/gajim + scripts/gajim-remote po/Makefile.in ]) AC_OUTPUT
Deleted: trunk/scripts/gajim-remote =================================================================== --- trunk/scripts/gajim-remote 2006-11-29 02:34:07 UTC (rev 7562) +++ trunk/scripts/gajim-remote 2006-11-29 08:07:41 UTC (rev 7563) @@ -1,33 +0,0 @@ -#!/bin/sh -## gajim -## -## Contributors for this file: -## - Yann Le Boulanger asterix@lagaule.org -## - Nikos Kouremenos kourem@gmail.com -## - Dimitur Kirov dkirov@gmail.com -## -## Copyright (C) 2003-2004 Yann Le Boulanger asterix@lagaule.org -## Vincent Hanquez tab@snarc.org -## Copyright (C) 2005 Yann Le Boulanger asterix@lagaule.org -## Vincent Hanquez tab@snarc.org -## Nikos Kouremenos nkour@jabber.org -## Dimitur Kirov dkirov@gmail.com -## Travis Shirk travis@pobox.com -## Norman Rasmussen norman@rasmussen.co.za -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. - -if [ `id -u` -eq 0 ]; then - echo "You must not launch gajim-remote as root, it is INSECURE" -fi - -cd PREFIX/share/gajim/src -export PYTHONPATH="$PYTHONPATH:PREFIXLIB/gajim" -exec PYTHON_EXEC -OO gajim-remote.py "$@"
Added: trunk/scripts/gajim-remote.in =================================================================== --- trunk/scripts/gajim-remote.in (rev 0) +++ trunk/scripts/gajim-remote.in 2006-11-29 08:07:41 UTC (rev 7563) @@ -0,0 +1,36 @@ +#!/bin/sh +## gajim +## +## Contributors for this file: +## - Yann Le Boulanger asterix@lagaule.org +## - Nikos Kouremenos kourem@gmail.com +## - Dimitur Kirov dkirov@gmail.com +## +## Copyright (C) 2003-2004 Yann Le Boulanger asterix@lagaule.org +## Vincent Hanquez tab@snarc.org +## Copyright (C) 2005 Yann Le Boulanger asterix@lagaule.org +## Vincent Hanquez tab@snarc.org +## Nikos Kouremenos nkour@jabber.org +## Dimitur Kirov dkirov@gmail.com +## Travis Shirk travis@pobox.com +## Norman Rasmussen norman@rasmussen.co.za +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 2 only. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +if [ `id -u` -eq 0 ]; then + echo "You must not launch gajim-remote as root, it is INSECURE" +fi + +datadir=@DATADIR@ +PYTHON_EXEC=@PYTHON@ + +cd ${datadir}/gajim/src +export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim" +exec ${PYTHON_EXEC} -OO gajim-remote.py "$@"