copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adding some enable options. 

using $(srcdir) for files refered by wildcars
This commit is contained in:
Dimitur Kirov 2006-10-05 15:08:07 +00:00
parent 1a68b63302
commit f56897745d
21 changed files with 973 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -1,4 +1,7 @@
SUBDIRS = data src po SUBDIRS = data src po
ACLOCAL_AMFLAGS = -I m4
bin_SCRIPTS = scripts/gajim bin_SCRIPTS = scripts/gajim
commonfilesdir = $(pkgdatadir) commonfilesdir = $(pkgdatadir)
@ -8,7 +11,7 @@ commonfiles_DATA = COPYING \
THANKS \ THANKS \
AUTHORS AUTHORS
EXTRA_DIST = \ EXTRA_DIST = config.rpath \
$(commonfiles_DATA) \ $(commonfiles_DATA) \
autogen.sh \ autogen.sh \
intltool-extract.in \ intltool-extract.in \

27
Makefile.in
View File

@ -39,13 +39,15 @@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure $(top_srcdir)/scripts/gajim.in AUTHORS \ $(top_srcdir)/configure $(top_srcdir)/scripts/gajim.in \
COPYING ChangeLog INSTALL NEWS THANKS compile config.guess \ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS THANKS \
config.sub depcomp install-sh ltmain.sh missing mkinstalldirs compile config.guess config.rpath config.sub depcomp \
install-sh ltmain.sh missing mkinstalldirs
subdir = . subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \ am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \
$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/python.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@ -98,6 +100,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@
BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@
BUILD_IDLE_FALSE = @BUILD_IDLE_FALSE@
BUILD_IDLE_TRUE = @BUILD_IDLE_TRUE@
BUILD_REMOTE_CONTROL_FALSE = @BUILD_REMOTE_CONTROL_FALSE@
BUILD_REMOTE_CONTROL_TRUE = @BUILD_REMOTE_CONTROL_TRUE@
BUILD_TRAYICON_FALSE = @BUILD_TRAYICON_FALSE@
BUILD_TRAYICON_TRUE = @BUILD_TRAYICON_TRUE@
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@ CATOBJEXT = @CATOBJEXT@
CC = @CC@ CC = @CC@
@ -257,6 +265,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
SUBDIRS = data src po SUBDIRS = data src po
ACLOCAL_AMFLAGS = -I m4
bin_SCRIPTS = scripts/gajim bin_SCRIPTS = scripts/gajim
commonfilesdir = $(pkgdatadir) commonfilesdir = $(pkgdatadir)
commonfiles_DATA = COPYING \ commonfiles_DATA = COPYING \
@ -265,7 +274,7 @@ commonfiles_DATA = COPYING \
THANKS \ THANKS \
AUTHORS AUTHORS
EXTRA_DIST = \ EXTRA_DIST = config.rpath \
$(commonfiles_DATA) \ $(commonfiles_DATA) \
autogen.sh \ autogen.sh \
intltool-extract.in \ intltool-extract.in \
@ -289,15 +298,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \ @for dep in $?; do \
case '$(am__configure_deps)' in \ case '$(am__configure_deps)' in \
*$$dep*) \ *$$dep*) \
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
cd $(srcdir) && $(AUTOMAKE) --gnu \ cd $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \ && exit 0; \
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile $(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \

1
aclocal.m4 vendored
View File

@ -7856,4 +7856,5 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR ]) # _AM_PROG_TAR
m4_include([m4/glib-gettext.m4]) m4_include([m4/glib-gettext.m4])
m4_include([m4/nls.m4])
m4_include([m4/python.m4]) m4_include([m4/python.m4])

10
autogen.sh
View File

@ -1,6 +1,8 @@
#!/bin/sh #!/bin/sh
aclocal -I ./m4 --force aclocal -I ./m4 \
autoconf && libtoolize --force --copy \
autoheader && autoheader \
automake --add-missing && automake --add-missing --foreign --copy \
&& autoconf \
&& ./configure $@

6
config.h.in
View File

@ -24,6 +24,9 @@
/* Define if your <locale.h> file defines LC_MESSAGES. */ /* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES #undef HAVE_LC_MESSAGES
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
/* Define to 1 if you have the `X11' library (-lX11). */ /* Define to 1 if you have the `X11' library (-lX11). */
#undef HAVE_LIBX11 #undef HAVE_LIBX11
@ -83,3 +86,6 @@
/* Version number of package */ /* Version number of package */
#undef VERSION #undef VERSION
/* Define to empty if `const' does not conform to ANSI C. */
#undef const

786
configure vendored
View File

File diff suppressed because it is too large Load Diff

102
configure.ac
View File

@ -1,4 +1,5 @@
AC_INIT([Gajim],[0.11.0],[http://trac.gajim.org/newticket],[gajim]) AC_INIT([Gajim - A Jabber Instant Messager],
[0.11.0],[http://trac.gajim.org/],[gajim])
AM_INIT_AUTOMAKE([1.9]) AM_INIT_AUTOMAKE([1.9])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
@ -6,7 +7,6 @@ AM_MAINTAINER_MODE
IT_PROG_INTLTOOL([0.35.0]) IT_PROG_INTLTOOL([0.35.0])
AM_DISABLE_STATIC AM_DISABLE_STATIC
AC_ENABLE_SHARED(yes) AC_ENABLE_SHARED(yes)
AC_ENABLE_STATIC(no) AC_ENABLE_STATIC(no)
@ -16,27 +16,55 @@ AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_C_CONST
AC_CHECK_HEADERS([libintl.h])
AC_PATH_X AC_PATH_X
GETTEXT_PACKAGE=gajim GETTEXT_PACKAGE=gajim
AC_SUBST([GETTEXT_PACKAGE]) AC_SUBST([GETTEXT_PACKAGE])
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"], [Gettext package]) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"], [Gettext package])
ALL_LINGUAS="fr pt el pl es ru bg de nb cs nl pt_BR sv it eu sk no zh_CN br eo" ALL_LINGUAS="fr pt el pl es ru bg de nb cs nl pt_BR sv it eu sk no zh_CN br eo"
AM_GLIB_GNU_GETTEXT AM_GLIB_GNU_GETTEXT
AM_NLS
PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.61 dbus-glib-1 >= 0.61])
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
dnl ****
dnl pygtk and gtk+
dnl ****
PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.6.0 pygtk-2.0 >= 2.6.0]) PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.6.0 pygtk-2.0 >= 2.6.0])
AC_SUBST(PYGTK_CFLAGS) AC_SUBST(PYGTK_CFLAGS)
AC_SUBST(PYGTK_LIBS) AC_SUBST(PYGTK_LIBS)
PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
AC_SUBST(PYGTK_DEFS) AC_SUBST(PYGTK_DEFS)
dnl *****
dnl dbus
dnl *****
AC_ARG_ENABLE([remote],
[ --disable-remote enable 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.61 dbus-glib-1 >= 0.61])
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
have_remote=true
else
have_remote=false
fi
AM_CONDITIONAL(BUILD_REMOTE_CONTROL, $have_remote)
dnl ****
dnl gtkspell
dnl ****
AC_ARG_ENABLE(gtkspell, AC_ARG_ENABLE(gtkspell,
[ --enable-gtkspell build spell checking support [default auto]],, [ --disable-gtkspell build spell checking support [default auto]],
enable_gtkspell=auto) enable_gtkspell=$enableval, enable_gtkspell=auto)
if test "x$enable_gtkspell" = "xauto";then if test "x$enable_gtkspell" = "xauto";then
PKG_CHECK_EXISTS([gtkspell-2.0], [enable_gtkspell=yes], [enable_gtkspell=no]) PKG_CHECK_EXISTS([gtkspell-2.0], [enable_gtkspell=yes], [enable_gtkspell=no])
@ -51,30 +79,57 @@ else
fi fi
AM_CONDITIONAL(BUILD_GTKSPELL, $have_gtkspell) AM_CONDITIONAL(BUILD_GTKSPELL, $have_gtkspell)
PKG_CHECK_EXISTS([xscrnsaver], [have_xscrnsaver=yes], [have_xscrnsaver=no])
if test "x$have_xscrnsaver" = "xyes";then dnl ****
PKG_CHECK_MODULES([XSCRNSAVER], xscrnsaver) dnl xscreensaver
AC_SUBST(XSCRNSAVER_LIBS) dnl ****
AC_ARG_ENABLE([idle],
[ --disable-idle build idle module [default auto]],
enable_idle=$enableval, enable_idle=yes)
if test "x$enable_idle" = "xyes";then
PKG_CHECK_EXISTS([xscrnsaver], [have_xscrnsaver=yes], [have_xscrnsaver=no])
if test "x$have_xscrnsaver" = "xyes";then
PKG_CHECK_MODULES([XSCRNSAVER], xscrnsaver)
AC_SUBST(XSCRNSAVER_LIBS)
have_idle=true
else
# Checks for libraries.
AC_CHECK_LIB([X11], [XOpenDisplay])
AC_CHECK_LIB([Xext], [XMissingExtension])
AC_CHECK_LIB([Xss], [XScreenSaverAllocInfo])
XSCRNSAVER_LIBS="$LIBS"
AC_SUBST([XSCRNSAVER_LIBS])
if test "x$XSCRNSAVER_LIBS" = "x";then
have_idle=false
else
have_idle=true
fi
fi
else else
# Checks for libraries. have_idle=false
AC_CHECK_LIB([X11], [XOpenDisplay])
AC_CHECK_LIB([Xext], [XMissingExtension])
AC_CHECK_LIB([Xss], [XScreenSaverAllocInfo])
XSCRNSAVER_LIBS=" -lX11 -lXss -lXext"
AC_SUBST([XSCRNSAVER_LIBS])
fi fi
AM_CONDITIONAL(BUILD_IDLE, $have_idle)
AM_PATH_PYTHON([2.4]) AM_PATH_PYTHON([2.4])
if test "x$PYTHON" = "x:"; then if test "x$PYTHON" = "x:"; then
AC_MSG_ERROR([Python not found]) AC_MSG_ERROR([Python not found])
fi fi
dnl ****
dnl tray icon
dnl ****
AC_ARG_ENABLE(trayicon,
[ --disable-trayicon build trayicon module [default yes]],
enable_trayicon=$enableval, enable_trayicon=yes)
test "x$enable_trayicon" = "xyes" && have_trayicon=true || have_trayicon=false
AM_CONDITIONAL(BUILD_TRAYICON, $have_trayicon)
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
AC_SUBST([PYTHON_INCLUDES]) AC_SUBST([PYTHON_INCLUDES])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
data/Makefile data/Makefile
data/glade/Makefile data/glade/Makefile
@ -88,4 +143,11 @@ AC_CONFIG_FILES([
po/Makefile.in po/Makefile.in
]) ])
AC_OUTPUT AC_OUTPUT
echo "
*****************************
Build features:
spell check ...... ${have_gtkspell}
idle module ...... ${have_idle}
remote control ... ${have_remote}
trayicon ......... ${have_trayicon}
*****************************"

2
data/Makefile.am
View File

@ -5,7 +5,7 @@ desktop_in_files = gajim.desktop.in.in
desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
soundsdir = $(pkgdatadir)/data/sounds soundsdir = $(pkgdatadir)/data/sounds
sounds_DATA = sounds/*.wav sounds_DATA = $(srcdir)/sounds/*.wav
otherdir = $(pkgdatadir)/data/others otherdir = $(pkgdatadir)/data/others
other_DATA = other/servers.xml other_DATA = other/servers.xml

17
data/Makefile.in
View File

@ -41,7 +41,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/gajim.desktop.in.in $(srcdir)/gajim.desktop.in.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \ am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \
$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/python.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@ -86,6 +87,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@
BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@
BUILD_IDLE_FALSE = @BUILD_IDLE_FALSE@
BUILD_IDLE_TRUE = @BUILD_IDLE_TRUE@
BUILD_REMOTE_CONTROL_FALSE = @BUILD_REMOTE_CONTROL_FALSE@
BUILD_REMOTE_CONTROL_TRUE = @BUILD_REMOTE_CONTROL_TRUE@
BUILD_TRAYICON_FALSE = @BUILD_TRAYICON_FALSE@
BUILD_TRAYICON_TRUE = @BUILD_TRAYICON_TRUE@
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@ CATOBJEXT = @CATOBJEXT@
CC = @CC@ CC = @CC@
@ -249,7 +256,7 @@ desktopdir = $(datadir)/applications
desktop_in_files = gajim.desktop.in.in desktop_in_files = gajim.desktop.in.in
desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
soundsdir = $(pkgdatadir)/data/sounds soundsdir = $(pkgdatadir)/data/sounds
sounds_DATA = sounds/*.wav sounds_DATA = $(srcdir)/sounds/*.wav
otherdir = $(pkgdatadir)/data/others otherdir = $(pkgdatadir)/data/others
other_DATA = other/servers.xml other_DATA = other/servers.xml
man_MANS = gajim.1 gajim-remote.1 man_MANS = gajim.1 gajim-remote.1
@ -271,9 +278,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu data/Makefile $(AUTOMAKE) --foreign data/Makefile
.PRECIOUS: Makefile .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \
@ -533,7 +540,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(mkdir_p) $(distdir)/other $(distdir)/sounds $(mkdir_p) $(distdir)/$(srcdir)/sounds $(distdir)/other
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \ list='$(DISTFILES)'; for file in $$list; do \

13
data/emoticons/Makefile.in
View File

@ -40,7 +40,8 @@ subdir = data/emoticons
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \ am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \
$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/python.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@ -70,6 +71,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@
BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@
BUILD_IDLE_FALSE = @BUILD_IDLE_FALSE@
BUILD_IDLE_TRUE = @BUILD_IDLE_TRUE@
BUILD_REMOTE_CONTROL_FALSE = @BUILD_REMOTE_CONTROL_FALSE@
BUILD_REMOTE_CONTROL_TRUE = @BUILD_REMOTE_CONTROL_TRUE@
BUILD_TRAYICON_FALSE = @BUILD_TRAYICON_FALSE@
BUILD_TRAYICON_TRUE = @BUILD_TRAYICON_TRUE@
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@ CATOBJEXT = @CATOBJEXT@
CC = @CC@ CC = @CC@
@ -244,9 +251,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/emoticons/Makefile'; \ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/emoticons/Makefile'; \
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu data/emoticons/Makefile $(AUTOMAKE) --foreign data/emoticons/Makefile
.PRECIOUS: Makefile .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \

3
data/glade/Makefile.am
View File

@ -1,5 +1,6 @@
gladedir = $(pkgdatadir)/data/glade gladedir = $(pkgdatadir)/data/glade
glade_DATA = *.glade glade_DATA = $(srcdir)/*.glade
EXTRA_DIST = $(glade_DATA) EXTRA_DIST = $(glade_DATA)
DISTCLEANFILES = *.h DISTCLEANFILES = *.h

16
data/glade/Makefile.in
View File

@ -40,7 +40,8 @@ subdir = data/glade
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \ am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \
$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/python.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@ -70,6 +71,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@
BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@
BUILD_IDLE_FALSE = @BUILD_IDLE_FALSE@
BUILD_IDLE_TRUE = @BUILD_IDLE_TRUE@
BUILD_REMOTE_CONTROL_FALSE = @BUILD_REMOTE_CONTROL_FALSE@
BUILD_REMOTE_CONTROL_TRUE = @BUILD_REMOTE_CONTROL_TRUE@
BUILD_TRAYICON_FALSE = @BUILD_TRAYICON_FALSE@
BUILD_TRAYICON_TRUE = @BUILD_TRAYICON_TRUE@
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@ CATOBJEXT = @CATOBJEXT@
CC = @CC@ CC = @CC@
@ -229,7 +236,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
gladedir = $(pkgdatadir)/data/glade gladedir = $(pkgdatadir)/data/glade
glade_DATA = *.glade glade_DATA = $(srcdir)/*.glade
EXTRA_DIST = $(glade_DATA) EXTRA_DIST = $(glade_DATA)
DISTCLEANFILES = *.h DISTCLEANFILES = *.h
all: all-am all: all-am
@ -244,9 +251,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/glade/Makefile'; \ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/glade/Makefile'; \
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu data/glade/Makefile $(AUTOMAKE) --foreign data/glade/Makefile
.PRECIOUS: Makefile .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \
@ -299,6 +306,7 @@ CTAGS:
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(mkdir_p) $(distdir)/$(srcdir)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \ list='$(DISTFILES)'; for file in $$list; do \

13
data/iconsets/Makefile.in
View File

@ -40,7 +40,8 @@ subdir = data/iconsets
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \ am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \
$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/python.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@ -70,6 +71,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@
BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@
BUILD_IDLE_FALSE = @BUILD_IDLE_FALSE@
BUILD_IDLE_TRUE = @BUILD_IDLE_TRUE@
BUILD_REMOTE_CONTROL_FALSE = @BUILD_REMOTE_CONTROL_FALSE@
BUILD_REMOTE_CONTROL_TRUE = @BUILD_REMOTE_CONTROL_TRUE@
BUILD_TRAYICON_FALSE = @BUILD_TRAYICON_FALSE@
BUILD_TRAYICON_TRUE = @BUILD_TRAYICON_TRUE@
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@ CATOBJEXT = @CATOBJEXT@
CC = @CC@ CC = @CC@
@ -248,9 +255,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/iconsets/Makefile'; \ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/iconsets/Makefile'; \
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu data/iconsets/Makefile $(AUTOMAKE) --foreign data/iconsets/Makefile
.PRECIOUS: Makefile .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \

6
data/pixmaps/Makefile.am
View File

@ -1,6 +1,6 @@
pixmapsdir = $(pkgdatadir)/data/pixmaps pixmapsdir = $(pkgdatadir)/data/pixmaps
pixmaps_DATA = *.png \ pixmaps_DATA = $(srcdir)/*.png \
gajim.ico \ gajim.ico \
events/*.png \ $(srcdir)/events/*.png \
agents/*.png $(srcdir)/agents/*.png
EXTRA_DIST = $(pixmaps_DATA) EXTRA_DIST = $(pixmaps_DATA)

21
data/pixmaps/Makefile.in
View File

@ -40,7 +40,8 @@ subdir = data/pixmaps
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \ am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \
$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/python.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@ -70,6 +71,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@
BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@
BUILD_IDLE_FALSE = @BUILD_IDLE_FALSE@
BUILD_IDLE_TRUE = @BUILD_IDLE_TRUE@
BUILD_REMOTE_CONTROL_FALSE = @BUILD_REMOTE_CONTROL_FALSE@
BUILD_REMOTE_CONTROL_TRUE = @BUILD_REMOTE_CONTROL_TRUE@
BUILD_TRAYICON_FALSE = @BUILD_TRAYICON_FALSE@
BUILD_TRAYICON_TRUE = @BUILD_TRAYICON_TRUE@
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@ CATOBJEXT = @CATOBJEXT@
CC = @CC@ CC = @CC@
@ -229,10 +236,10 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
pixmapsdir = $(pkgdatadir)/data/pixmaps pixmapsdir = $(pkgdatadir)/data/pixmaps
pixmaps_DATA = *.png \ pixmaps_DATA = $(srcdir)/*.png \
gajim.ico \ gajim.ico \
events/*.png \ $(srcdir)/events/*.png \
agents/*.png $(srcdir)/agents/*.png
EXTRA_DIST = $(pixmaps_DATA) EXTRA_DIST = $(pixmaps_DATA)
all: all-am all: all-am
@ -247,9 +254,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/pixmaps/Makefile'; \ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/pixmaps/Makefile'; \
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu data/pixmaps/Makefile $(AUTOMAKE) --foreign data/pixmaps/Makefile
.PRECIOUS: Makefile .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \
@ -302,7 +309,7 @@ CTAGS:
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(mkdir_p) $(distdir)/agents $(distdir)/events $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/$(srcdir)/agents $(distdir)/$(srcdir)/events
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \ list='$(DISTFILES)'; for file in $$list; do \

31
m4/nls.m4 Normal file
View File

@ -0,0 +1,31 @@
# nls.m4 serial 3 (gettext-0.15)
dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
dnl License but which still want to provide support for the GNU gettext
dnl functionality.
dnl Please note that the actual code of the GNU gettext library is covered
dnl by the GNU Library General Public License, and the rest of the GNU
dnl gettext package package is covered by the GNU General Public License.
dnl They are *not* in the public domain.
dnl Authors:
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
AC_PREREQ(2.50)
AC_DEFUN([AM_NLS],
[
AC_MSG_CHECKING([whether NLS is requested])
dnl Default is enabled NLS
AC_ARG_ENABLE(nls,
[ --disable-nls do not use Native Language Support],
USE_NLS=$enableval, USE_NLS=yes)
AC_MSG_RESULT($USE_NLS)
AC_SUBST(USE_NLS)
])

128
po/POTFILES.in
View File

@ -1,54 +1,59 @@
# ls gajim.desktop.in src/gtkgui.glade.h src/history_manager.glade.h # ls data/gajim.desktop.in.in data/glade/*.glade src/*py
# src/*py src/common/*py -1 -U in trunk # src/common/*py src/common/zeroconf/*.py -1 -U
# to produce this list # to produce this list
[encoding: UTF-8] [encoding: UTF-8]
gajim.desktop.in data/gajim.desktop.in.in
data/glade/account_context_menu.glade.h data/glade/account_context_menu.glade
data/glade/account_creation_wizard_window.glade.h data/glade/account_creation_wizard_window.glade
data/glade/account_modification_window.glade.h data/glade/account_modification_window.glade
data/glade/accounts_window.glade.h data/glade/accounts_window.glade
data/glade/add_new_contact_window.glade.h data/glade/add_new_contact_window.glade
data/glade/advanced_configuration_window.glade.h data/glade/advanced_configuration_window.glade
data/glade/advanced_menuitem_menu.glade.h data/glade/advanced_menuitem_menu.glade
data/glade/advanced_notifications_window.glade.h data/glade/advanced_notifications_window.glade
data/glade/change_password_dialog.glade.h data/glade/change_password_dialog.glade
data/glade/change_status_message_dialog.glade.h data/glade/change_status_message_dialog.glade
data/glade/chat_context_menu.glade.h data/glade/chat_context_menu.glade
data/glade/chat_control_popup_menu.glade.h data/glade/chat_control_popup_menu.glade
data/glade/choose_gpg_key_dialog.glade.h data/glade/choose_gpg_key_dialog.glade
data/glade/data_form_window.glade.h data/glade/data_form_window.glade
data/glade/edit_groups_dialog.glade.h data/glade/edit_groups_dialog.glade
data/glade/filetransfers.glade.h data/glade/filetransfers.glade
data/glade/gajim_themes_window.glade.h data/glade/gajim_themes_window.glade
data/glade/gc_control_popup_menu.glade.h data/glade/gc_control_popup_menu.glade
data/glade/gc_occupants_menu.glade.h data/glade/gc_occupants_menu.glade
data/glade/history_manager.glade.h data/glade/history_manager.glade
data/glade/history_window.glade.h data/glade/history_window.glade
data/glade/input_dialog.glade.h data/glade/input_dialog.glade
data/glade/invitation_received_dialog.glade.h data/glade/invitation_received_dialog.glade
data/glade/join_groupchat_window.glade.h data/glade/join_groupchat_window.glade
data/glade/manage_accounts_window.glade.h data/glade/manage_accounts_window.glade
data/glade/manage_bookmarks_window.glade.h data/glade/manage_bookmarks_window.glade
data/glade/manage_proxies_window.glade.h data/glade/manage_proxies_window.glade
data/glade/message_window.glade.h data/glade/message_window.glade
data/glade/passphrase_dialog.glade.h data/glade/passphrase_dialog.glade
data/glade/popup_notification_window.glade.h data/glade/popup_notification_window.glade
data/glade/preferences_window.glade.h data/glade/preferences_window.glade
data/glade/privacy_list_window.glade.h data/glade/privacy_lists_window.glade
data/glade/privacy_lists_window.glade.h data/glade/privacy_list_window.glade
data/glade/profile_window.glade.h data/glade/profile_window.glade
data/glade/progress_dialog.glade.h data/glade/progress_dialog.glade
data/glade/remove_account_window.glade.h data/glade/remove_account_window.glade
data/glade/roster_contact_context_menu.glade.h data/glade/roster_contact_context_menu.glade
data/glade/roster_window.glade.h data/glade/roster_window.glade
data/glade/service_discovery_window.glade.h data/glade/service_discovery_window.glade
data/glade/service_registration_window.glade.h data/glade/service_registration_window.glade
data/glade/single_message_window.glade.h data/glade/single_message_window.glade
data/glade/subscription_request_window.glade.h data/glade/subscription_request_popup_menu.glade
data/glade/systray_context_menu.glade.h data/glade/subscription_request_window.glade
data/glade/vcard_information_window.glade.h data/glade/systray_context_menu.glade
data/glade/xml_console_window.glade.h data/glade/vcard_information_window.glade
data/glade/xml_console_window.glade
data/glade/zeroconf_contact_context_menu.glade
data/glade/zeroconf_context_menu.glade
data/glade/zeroconf_information_window.glade
data/glade/zeroconf_properties_window.glade
src/advanced.py src/advanced.py
src/cell_renderer_image.py src/cell_renderer_image.py
src/chat_control.py src/chat_control.py
@ -58,35 +63,52 @@ src/dbus_support.py
src/dialogs.py src/dialogs.py
src/disco.py src/disco.py
src/filetransfers_window.py src/filetransfers_window.py
src/gajim-remote.py
src/gajim.py src/gajim.py
src/gajim-remote.py
src/gajim_themes_window.py src/gajim_themes_window.py
src/groupchat_control.py src/groupchat_control.py
src/gtkexcepthook.py src/gtkexcepthook.py
src/gtkgui_helpers.py src/gtkgui_helpers.py
src/history_manager.py src/history_manager.py
src/history_window.py src/history_window.py
src/htmltextview.py
src/message_control.py src/message_control.py
src/message_textview.py src/message_textview.py
src/message_window.py src/message_window.py
src/music_track_listener.py
src/notify.py src/notify.py
src/profile_window.py
src/remote_control.py src/remote_control.py
src/roster_window.py src/roster_window.py
src/rst_xhtml_generator.py
src/systray.py src/systray.py
src/systraywin32.py src/systraywin32.py
src/tooltips.py src/tooltips.py
src/vcard.py src/vcard.py
src/common/check_paths.py src/common/check_paths.py
src/common/exceptions.py
src/common/GnuPG.py
src/common/GnuPGInterface.py
src/common/config.py src/common/config.py
src/common/connection.py
src/common/connection_handlers.py src/common/connection_handlers.py
src/common/connection.py
src/common/contacts.py
src/common/dbus_support.py
src/common/events.py
src/common/exceptions.py
src/common/fuzzyclock.py
src/common/gajim.py src/common/gajim.py
src/common/GnuPGInterface.py
src/common/GnuPG.py
src/common/helpers.py src/common/helpers.py
src/common/i18n.py src/common/i18n.py
src/common/__init__.py
src/common/logger.py src/common/logger.py
src/common/nslookup.py
src/common/optparser.py src/common/optparser.py
src/common/proxy65_manager.py
src/common/sleepy.py src/common/sleepy.py
src/common/socks5.py src/common/socks5.py
src/common/xmpp_stringprep.py
src/common/zeroconf/client_zeroconf.py
src/common/zeroconf/connection_handlers_zeroconf.py
src/common/zeroconf/connection_zeroconf.py
src/common/zeroconf/__init__.py
src/common/zeroconf/roster_zeroconf.py

18
src/Makefile.am
View File

@ -20,7 +20,7 @@ gtkspell_la_LDFLAGS = \
gtkspell_la_CFLAGS = $(GTKSPELL_CFLAGS) $(PYGTK_CFLAGS) gtkspell_la_CFLAGS = $(GTKSPELL_CFLAGS) $(PYGTK_CFLAGS)
endif endif
if BUILD_TRAYICON
trayiconlib_LTLIBRARIES = trayicon.la trayiconlib_LTLIBRARIES = trayicon.la
trayiconlibdir = $(libdir)/gajim trayiconlibdir = $(libdir)/gajim
trayicon_la_LIBADD = $(PYGTK_LIBS) trayicon_la_LIBADD = $(PYGTK_LIBS)
@ -33,27 +33,27 @@ trayicon_la_LDFLAGS = \
-module -avoid-version -module -avoid-version
trayicon_la_CFLAGS = $(PYGTK_CFLAGS) trayicon_la_CFLAGS = $(PYGTK_CFLAGS)
trayicon.c: trayicon.defs trayicon.override trayicon.c:
pygtk-codegen-2.0 --prefix trayicon \ pygtk-codegen-2.0 --prefix trayicon \
--register $(PYGTK_DEFS)/gdk-types.defs \ --register $(PYGTK_DEFS)/gdk-types.defs \
--register $(PYGTK_DEFS)/gtk-types.defs \ --register $(PYGTK_DEFS)/gtk-types.defs \
--override trayicon.override \ --override $(srcdir)/trayicon.override \
trayicon.defs > $@ $(srcdir)/trayicon.defs > $@
endif
gajimsrcdir = $(pkgdatadir)/src gajimsrcdir = $(pkgdatadir)/src
gajimsrc_DATA = *.py gajimsrc_DATA = $(srcdir)/*.py
gajimsrc1dir = $(pkgdatadir)/src/common gajimsrc1dir = $(pkgdatadir)/src/common
gajimsrc1_DATA = \ gajimsrc1_DATA = \
common/*.py $(srcdir)/common/*.py
gajimsrc2dir = $(pkgdatadir)/src/common/xmpp gajimsrc2dir = $(pkgdatadir)/src/common/xmpp
gajimsrc2_DATA = \ gajimsrc2_DATA = \
common/xmpp/*.py $(srcdir)/common/xmpp/*.py
gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf
gajimsrc3_DATA = \ gajimsrc3_DATA = \
common/zeroconf/*.py $(srcdir)/common/zeroconf/*.py
EXTRA_DIST = $(gajimsrc_DATA) \ EXTRA_DIST = $(gajimsrc_DATA) \
$(gajimsrc1_DATA) \ $(gajimsrc1_DATA) \

74
src/Makefile.in
View File

@ -41,7 +41,8 @@ subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \ am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \
$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/python.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@ -68,12 +69,16 @@ am__gtkspell_la_SOURCES_DIST = gtkspellmodule.c
@BUILD_GTKSPELL_TRUE@ gtkspell_la-gtkspellmodule.lo @BUILD_GTKSPELL_TRUE@ gtkspell_la-gtkspellmodule.lo
gtkspell_la_OBJECTS = $(am_gtkspell_la_OBJECTS) gtkspell_la_OBJECTS = $(am_gtkspell_la_OBJECTS)
@BUILD_GTKSPELL_TRUE@am_gtkspell_la_rpath = -rpath $(gtkspelllibdir) @BUILD_GTKSPELL_TRUE@am_gtkspell_la_rpath = -rpath $(gtkspelllibdir)
trayicon_la_DEPENDENCIES = $(am__DEPENDENCIES_1) @BUILD_TRAYICON_TRUE@trayicon_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_trayicon_la_OBJECTS = trayicon_la-eggtrayicon.lo \ am__trayicon_la_SOURCES_DIST = eggtrayicon.c trayiconmodule.c
trayicon_la-trayiconmodule.lo @BUILD_TRAYICON_TRUE@am_trayicon_la_OBJECTS = \
nodist_trayicon_la_OBJECTS = trayicon_la-trayicon.lo @BUILD_TRAYICON_TRUE@ trayicon_la-eggtrayicon.lo \
@BUILD_TRAYICON_TRUE@ trayicon_la-trayiconmodule.lo
@BUILD_TRAYICON_TRUE@nodist_trayicon_la_OBJECTS = \
@BUILD_TRAYICON_TRUE@ trayicon_la-trayicon.lo
trayicon_la_OBJECTS = $(am_trayicon_la_OBJECTS) \ trayicon_la_OBJECTS = $(am_trayicon_la_OBJECTS) \
$(nodist_trayicon_la_OBJECTS) $(nodist_trayicon_la_OBJECTS)
@BUILD_TRAYICON_TRUE@am_trayicon_la_rpath = -rpath $(trayiconlibdir)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
@ -87,7 +92,8 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@ $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(gtkspell_la_SOURCES) $(trayicon_la_SOURCES) \ SOURCES = $(gtkspell_la_SOURCES) $(trayicon_la_SOURCES) \
$(nodist_trayicon_la_SOURCES) $(nodist_trayicon_la_SOURCES)
DIST_SOURCES = $(am__gtkspell_la_SOURCES_DIST) $(trayicon_la_SOURCES) DIST_SOURCES = $(am__gtkspell_la_SOURCES_DIST) \
$(am__trayicon_la_SOURCES_DIST)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \ html-recursive info-recursive install-data-recursive \
install-exec-recursive install-info-recursive \ install-exec-recursive install-info-recursive \
@ -116,6 +122,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@
BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@
BUILD_IDLE_FALSE = @BUILD_IDLE_FALSE@
BUILD_IDLE_TRUE = @BUILD_IDLE_TRUE@
BUILD_REMOTE_CONTROL_FALSE = @BUILD_REMOTE_CONTROL_FALSE@
BUILD_REMOTE_CONTROL_TRUE = @BUILD_REMOTE_CONTROL_TRUE@
BUILD_TRAYICON_FALSE = @BUILD_TRAYICON_FALSE@
BUILD_TRAYICON_TRUE = @BUILD_TRAYICON_TRUE@
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@ CATOBJEXT = @CATOBJEXT@
CC = @CC@ CC = @CC@
@ -293,33 +305,33 @@ INCLUDES = \
@BUILD_GTKSPELL_TRUE@ -module -avoid-version @BUILD_GTKSPELL_TRUE@ -module -avoid-version
@BUILD_GTKSPELL_TRUE@gtkspell_la_CFLAGS = $(GTKSPELL_CFLAGS) $(PYGTK_CFLAGS) @BUILD_GTKSPELL_TRUE@gtkspell_la_CFLAGS = $(GTKSPELL_CFLAGS) $(PYGTK_CFLAGS)
trayiconlib_LTLIBRARIES = trayicon.la @BUILD_TRAYICON_TRUE@trayiconlib_LTLIBRARIES = trayicon.la
trayiconlibdir = $(libdir)/gajim @BUILD_TRAYICON_TRUE@trayiconlibdir = $(libdir)/gajim
trayicon_la_LIBADD = $(PYGTK_LIBS) @BUILD_TRAYICON_TRUE@trayicon_la_LIBADD = $(PYGTK_LIBS)
trayicon_la_SOURCES = \ @BUILD_TRAYICON_TRUE@trayicon_la_SOURCES = \
eggtrayicon.c \ @BUILD_TRAYICON_TRUE@ eggtrayicon.c \
trayiconmodule.c @BUILD_TRAYICON_TRUE@ trayiconmodule.c
nodist_trayicon_la_SOURCES = \ @BUILD_TRAYICON_TRUE@nodist_trayicon_la_SOURCES = \
trayicon.c @BUILD_TRAYICON_TRUE@ trayicon.c
trayicon_la_LDFLAGS = \ @BUILD_TRAYICON_TRUE@trayicon_la_LDFLAGS = \
-module -avoid-version @BUILD_TRAYICON_TRUE@ -module -avoid-version
trayicon_la_CFLAGS = $(PYGTK_CFLAGS) @BUILD_TRAYICON_TRUE@trayicon_la_CFLAGS = $(PYGTK_CFLAGS)
gajimsrcdir = $(pkgdatadir)/src gajimsrcdir = $(pkgdatadir)/src
gajimsrc_DATA = *.py gajimsrc_DATA = $(srcdir)/*.py
gajimsrc1dir = $(pkgdatadir)/src/common gajimsrc1dir = $(pkgdatadir)/src/common
gajimsrc1_DATA = \ gajimsrc1_DATA = \
common/*.py $(srcdir)/common/*.py
gajimsrc2dir = $(pkgdatadir)/src/common/xmpp gajimsrc2dir = $(pkgdatadir)/src/common/xmpp
gajimsrc2_DATA = \ gajimsrc2_DATA = \
common/xmpp/*.py $(srcdir)/common/xmpp/*.py
gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf
gajimsrc3_DATA = \ gajimsrc3_DATA = \
common/zeroconf/*.py $(srcdir)/common/zeroconf/*.py
EXTRA_DIST = $(gajimsrc_DATA) \ EXTRA_DIST = $(gajimsrc_DATA) \
$(gajimsrc1_DATA) \ $(gajimsrc1_DATA) \
@ -345,9 +357,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile $(AUTOMAKE) --foreign src/Makefile
.PRECIOUS: Makefile .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \
@ -422,7 +434,7 @@ clean-trayiconlibLTLIBRARIES:
gtkspell.la: $(gtkspell_la_OBJECTS) $(gtkspell_la_DEPENDENCIES) gtkspell.la: $(gtkspell_la_OBJECTS) $(gtkspell_la_DEPENDENCIES)
$(LINK) $(am_gtkspell_la_rpath) $(gtkspell_la_LDFLAGS) $(gtkspell_la_OBJECTS) $(gtkspell_la_LIBADD) $(LIBS) $(LINK) $(am_gtkspell_la_rpath) $(gtkspell_la_LDFLAGS) $(gtkspell_la_OBJECTS) $(gtkspell_la_LIBADD) $(LIBS)
trayicon.la: $(trayicon_la_OBJECTS) $(trayicon_la_DEPENDENCIES) trayicon.la: $(trayicon_la_OBJECTS) $(trayicon_la_DEPENDENCIES)
$(LINK) -rpath $(trayiconlibdir) $(trayicon_la_LDFLAGS) $(trayicon_la_OBJECTS) $(trayicon_la_LIBADD) $(LIBS) $(LINK) $(am_trayicon_la_rpath) $(trayicon_la_LDFLAGS) $(trayicon_la_OBJECTS) $(trayicon_la_LIBADD) $(LIBS)
mostlyclean-compile: mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)
@ -695,7 +707,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(mkdir_p) $(distdir)/common $(distdir)/common/xmpp $(distdir)/common/zeroconf $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/$(srcdir)/common $(distdir)/$(srcdir)/common/xmpp $(distdir)/$(srcdir)/common/zeroconf
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \ list='$(DISTFILES)'; for file in $$list; do \
@ -850,12 +862,12 @@ uninstall-info: uninstall-info-recursive
uninstall-trayiconlibLTLIBRARIES uninstall-trayiconlibLTLIBRARIES
trayicon.c: trayicon.defs trayicon.override @BUILD_TRAYICON_TRUE@trayicon.c:
pygtk-codegen-2.0 --prefix trayicon \ @BUILD_TRAYICON_TRUE@ pygtk-codegen-2.0 --prefix trayicon \
--register $(PYGTK_DEFS)/gdk-types.defs \ @BUILD_TRAYICON_TRUE@ --register $(PYGTK_DEFS)/gdk-types.defs \
--register $(PYGTK_DEFS)/gtk-types.defs \ @BUILD_TRAYICON_TRUE@ --register $(PYGTK_DEFS)/gtk-types.defs \
--override trayicon.override \ @BUILD_TRAYICON_TRUE@ --override $(srcdir)/trayicon.override \
trayicon.defs > $@ @BUILD_TRAYICON_TRUE@ $(srcdir)/trayicon.defs > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

4
src/common/Makefile.am
View File

@ -1,7 +1,7 @@
INCLUDES = \ INCLUDES = \
$(PYTHON_INCLUDES) $(PYTHON_INCLUDES)
if BUILD_IDLE
idlelib_LTLIBRARIES = idle.la idlelib_LTLIBRARIES = idle.la
idlelibdir = $(libdir)/gajim idlelibdir = $(libdir)/gajim
@ -13,4 +13,4 @@ idle_la_LDFLAGS = \
-module -avoid-version -module -avoid-version
idle_la_CFLAGS = $(XSCREENSAVER_CFLAGS) $(PYTHON_INCLUDES) idle_la_CFLAGS = $(XSCREENSAVER_CFLAGS) $(PYTHON_INCLUDES)
endif

35
src/common/Makefile.in
View File

@ -40,7 +40,8 @@ subdir = src/common
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \ am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \
$(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/python.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@ -56,8 +57,10 @@ am__installdirs = "$(DESTDIR)$(idlelibdir)"
idlelibLTLIBRARIES_INSTALL = $(INSTALL) idlelibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(idlelib_LTLIBRARIES) LTLIBRARIES = $(idlelib_LTLIBRARIES)
idle_la_DEPENDENCIES = idle_la_DEPENDENCIES =
am_idle_la_OBJECTS = idle_la-idle.lo am__idle_la_SOURCES_DIST = idle.c
@BUILD_IDLE_TRUE@am_idle_la_OBJECTS = idle_la-idle.lo
idle_la_OBJECTS = $(am_idle_la_OBJECTS) idle_la_OBJECTS = $(am_idle_la_OBJECTS)
@BUILD_IDLE_TRUE@am_idle_la_rpath = -rpath $(idlelibdir)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
@ -70,7 +73,7 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@ $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(idle_la_SOURCES) SOURCES = $(idle_la_SOURCES)
DIST_SOURCES = $(idle_la_SOURCES) DIST_SOURCES = $(am__idle_la_SOURCES_DIST)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -86,6 +89,12 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@
BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@
BUILD_IDLE_FALSE = @BUILD_IDLE_FALSE@
BUILD_IDLE_TRUE = @BUILD_IDLE_TRUE@
BUILD_REMOTE_CONTROL_FALSE = @BUILD_REMOTE_CONTROL_FALSE@
BUILD_REMOTE_CONTROL_TRUE = @BUILD_REMOTE_CONTROL_TRUE@
BUILD_TRAYICON_FALSE = @BUILD_TRAYICON_FALSE@
BUILD_TRAYICON_TRUE = @BUILD_TRAYICON_TRUE@
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@ CATOBJEXT = @CATOBJEXT@
CC = @CC@ CC = @CC@
@ -247,14 +256,14 @@ target_alias = @target_alias@
INCLUDES = \ INCLUDES = \
$(PYTHON_INCLUDES) $(PYTHON_INCLUDES)
idlelib_LTLIBRARIES = idle.la @BUILD_IDLE_TRUE@idlelib_LTLIBRARIES = idle.la
idlelibdir = $(libdir)/gajim @BUILD_IDLE_TRUE@idlelibdir = $(libdir)/gajim
idle_la_LIBADD = $(XSCREENSAVER_LIBS) @BUILD_IDLE_TRUE@idle_la_LIBADD = $(XSCREENSAVER_LIBS)
idle_la_SOURCES = idle.c @BUILD_IDLE_TRUE@idle_la_SOURCES = idle.c
idle_la_LDFLAGS = \ @BUILD_IDLE_TRUE@idle_la_LDFLAGS = \
-module -avoid-version @BUILD_IDLE_TRUE@ -module -avoid-version
idle_la_CFLAGS = $(XSCREENSAVER_CFLAGS) $(PYTHON_INCLUDES) @BUILD_IDLE_TRUE@idle_la_CFLAGS = $(XSCREENSAVER_CFLAGS) $(PYTHON_INCLUDES)
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
@ -268,9 +277,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/common/Makefile'; \ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/common/Makefile'; \
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu src/common/Makefile $(AUTOMAKE) --foreign src/common/Makefile
.PRECIOUS: Makefile .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \
@ -316,7 +325,7 @@ clean-idlelibLTLIBRARIES:
rm -f "$${dir}/so_locations"; \ rm -f "$${dir}/so_locations"; \
done done
idle.la: $(idle_la_OBJECTS) $(idle_la_DEPENDENCIES) idle.la: $(idle_la_OBJECTS) $(idle_la_DEPENDENCIES)
$(LINK) -rpath $(idlelibdir) $(idle_la_LDFLAGS) $(idle_la_OBJECTS) $(idle_la_LIBADD) $(LIBS) $(LINK) $(am_idle_la_rpath) $(idle_la_LDFLAGS) $(idle_la_OBJECTS) $(idle_la_LIBADD) $(LIBS)
mostlyclean-compile: mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)