merge autoconf additions to trunk

INSTALL

+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).  Here is a another example:
+
+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+

Makefile

-VERSION		?= 0.10
-
-GAJIM_AP	= 0 # do we build Autopackage?
-
-MODULES		= src src/common po
-PREFIX		= /usr/local
-PYTHON		= python
-DESTDIR		= 
-OPTFLAGS	= 
-export OPTFLAGS
-LIBDIR		= /lib
-export LIBDIR
-MANDIR		= $(DESTDIR)$(PREFIX)/share/man
-
-FIND		= find . \( -name '*.glade' -o -name '*.py' -o -name '*.xpm' -o -name '*.gif' -o -name '*.png' -o -name '*.wav' -o -name '*.xml' \)
-
-FILES		= `$(FIND)`
-DIRS		= `$(FIND) -exec dirname {} \; | sort -u`
-FIND_PO		= find ./po \( -name '*.mo' \)
-FILES_PO	= `$(FIND_PO) | sed -e 's/^\.\/po/\./g'`
-DIRS_PO		= `$(FIND_PO) -exec dirname {} \; | sort -u | sed -e 's/^\.\/po/\./g'`
-FIND_LIB	= find . -name '*.so'
-FILES_LIB	= `$(FIND_LIB)`
-
-SCRIPTS = \
-	scripts/gajim \
-	scripts/gajim-remote \
-
-all: translation trayicon gtkspell idle gajim.desktop
-
-translation:
-	${MAKE} -C po all
-
-trayicon:
-	${MAKE} -C src trayicon.so;
-
-gtkspell:
-	${MAKE} -C src gtkspell.so;
-
-idle:
-	${MAKE} -C src/common all;
-
-distclean: clean
-	-rm ./tags
-
-clean:
-	find . -name '*.pyc' -exec rm {} \;
-	find . -name '*.pyo' -exec rm {} \;
-	${MAKE} -C po clean
-	rm -f gajim.desktop
-	$(foreach sdir, $(MODULES), ${MAKE} -C $(sdir) clean;)
-dist:
-	rm -rf gajim-$(VERSION)
-	mkdir gajim-$(VERSION)
-	cp -r data src po gajim-$(VERSION)/
-	cp AUTHORS gajim.1 gajim-remote.1 gajim.desktop.in COPYING THANKS Makefile Changelog README launch.sh gajim-$(VERSION)
-	mkdir gajim-$(VERSION)/scripts
-	for s in $(SCRIPTS) ; do \
-		cp $$s gajim-$(VERSION)/scripts/; \
-	done
-	find gajim-$(VERSION) -name '.svn' -type d | xargs rm -rf
-	find gajim-$(VERSION) -name '*.pyc' -exec rm {} \;
-	find gajim-$(VERSION) -name '*.pyo' -exec rm {} \;
-	find gajim-$(VERSION) -name '.*' -exec rm {} \;
-	@echo tarring gajim-$(VERSION) ...
-	@tar czf gajim-$(VERSION).tar.gz gajim-$(VERSION)/
-	@tar cjf gajim-$(VERSION).tar.bz2 gajim-$(VERSION)/
-	rm -rf gajim-$(VERSION)
-
-install:
-	# Remove the old po folder if it exists
-	if [ -d $(DESTDIR)$(PREFIX)/share/gajim/po ] ; then \
-		rm -rf $(DESTDIR)$(PREFIX)/share/gajim/po; \
-	fi
-	for d in $(DIRS) ; do \
-		if [ ! -d $(DESTDIR)$(PREFIX)/share/gajim/$$d ] ; then \
-			mkdir -p "$(DESTDIR)$(PREFIX)/share/gajim/$$d"; \
-		fi; \
-	done
-	for f in $(FILES) ; do \
-		DST=`dirname "$$f"`; \
-		cp "$$f" "$(DESTDIR)$(PREFIX)/share/gajim/$$DST/"; \
-	done
-
-	for d in $(DIRS_PO) ; do \
-		if [ ! -d $(DESTDIR)$(PREFIX)/share/locale/$$d ] ; then \
-			mkdir -p "$(DESTDIR)$(PREFIX)/share/locale/$$d"; \
-		fi; \
-	done
-	if [[  -n $$(find po -name *.mo) ]]; then \
-		${MAKE} -C po install PREFIX=$(PREFIX) ; \
-	fi
-	cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/";
-	cp THANKS "$(DESTDIR)$(PREFIX)/share/gajim/";
-	cp AUTHORS "$(DESTDIR)$(PREFIX)/share/gajim/";
-	mkdir -p "$(DESTDIR)$(PREFIX)/share/pixmaps";
-	cp data/pixmaps/gajim.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
-	cp data/pixmaps/gajim_about.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
-	mkdir -p "$(DESTDIR)$(PREFIX)/share/applications";
-	if [ -f gajim.desktop ]; then \
-		cp gajim.desktop "$(DESTDIR)$(PREFIX)/share/applications/"; \
-	fi;
-	mkdir -p "$(MANDIR)/man1";
-	cp gajim.1 "$(MANDIR)/man1";
-	cp gajim-remote.1 "$(MANDIR)/man1";
-	mkdir -p "$(DESTDIR)$(PREFIX)$(LIBDIR)/gajim";
-	for f in $(FILES_LIB) ; do \
-		cp "$$f" "$(DESTDIR)$(PREFIX)$(LIBDIR)/gajim/"; \
-	done
-	mkdir -p "$(DESTDIR)$(PREFIX)/bin";
-	for s in $(SCRIPTS) ; do \
-		BASE=`basename "$$s"`; \
-		if [ $(GAJIM_AP) -ne 0 ] ; then \
-			F=`cat "$$s" | sed -e 's!LIB!$(LIBDIR)!g' -e 's!PYTHON_EXEC!$(PYTHON)!g'`; \
-		else \
-			F=`cat "$$s" | sed -e 's!PREFIX!$(PREFIX)!g' -e 's!LIB!$(LIBDIR)!g' -e 's!PYTHON_EXEC!$(PYTHON)!g'`; \
-		fi; \
-		echo "$$F" > "$(DESTDIR)$(PREFIX)/bin/$$BASE"; \
-		chmod +x "$(DESTDIR)$(PREFIX)/bin/$$BASE"; \
-	done
-
-gajim.desktop: gajim.desktop.in
-	intltool-merge -d po gajim.desktop.in gajim.desktop
-
-#
-# show make params we accept
-#
-help:
-	@echo Usage:
-	@echo make			- builds all modules
-	@echo make clean		- delete built modules and object files
-	@echo make distclean		- clean plus deletion of all other non-repository files
-	@echo make install		- install binaries into the official directories
-	@echo make uninstall		- uninstall binaries from the official directories
-	@echo make help			- prints this help
-	@echo
-	@echo make trayicon		- makes only trayicon module
-	@echo make idle			- makes only idle detection module
-	@echo make translation 		- makes only translation \(mo files\)
-	@echo make gtkspell		- makes only gtkspell detection module
-	@echo make tags			- makes 'tags' file for use with ctags
-	@echo
-
-#
-# uninstall application from official directories
-#
-uninstall:
-	rm -rf	"$(DESTDIR)$(PREFIX)/share/gajim" # the main files are here
-	rm -rf	"$(DESTDIR)$(PREFIX)/lib/gajim" # the .so files are here
-	rm -f	"$(DESTDIR)$(PREFIX)/bin/gajim" # the bash script
-	rm -f	"$(DESTDIR)$(PREFIX)/bin/gajim-remote" # remote-control script
-	rm -f	"$(MANDIR)/man1/gajim.1" # the man page
-	rm -f	"$(MANDIR)/man1/gajim-remote.1" # the man page
-	rm -f	"$(DESTDIR)$(PREFIX)/share/pixmaps/gajim.png" # the icon
-	rm -f	"$(DESTDIR)$(PREFIX)/share/pixmaps/gajim_about.png" # the icon
-	rm -f	"$(DESTDIR)$(PREFIX)/share/applications/gajim.desktop" #the desktop
-	find "$(DESTDIR)$(PREFIX)/share/locale" -name 'gajim.mo' -exec rm {} \; #the .mo files
-	@echo done uninstalling
-
-tags:
-	-rm tags
-	exuberant-ctags -R
-
-.PHONY: all translation trayicon gtkspell idle clean dist distclean install help\
-	uninstall tags

Makefile.am

+SUBDIRS = data src po
+
+ACLOCAL_AMFLAGS = -I m4
+
+bin_SCRIPTS = scripts/gajim
+
+commonfilesdir = $(pkgdatadir)
+commonfiles_DATA = COPYING	\
+				   README 	\
+				   ChangeLog \
+				   THANKS	\
+				   AUTHORS
+
+EXTRA_DIST = \
+	$(commonfiles_DATA) \
+	autogen.sh			\
+	intltool-extract.in \
+	intltool-merge.in 	\
+	intltool-update.in	\
+	scripts/gajim.in
+	
+DISTCLEANFILES = 		\
+	intltool-extract 	\
+	intltool-merge 		\
+	intltool-update		\
+	scripts/gajim

autogen.sh

+#!/bin/sh
+  intltoolize --force --automake \
+  && aclocal -I ./m4 \
+  && libtoolize --copy --force --automake \
+  && autoheader \
+  && automake --add-missing --gnu --copy \
+  && autoconf \
+  && ./configure $@

compile

+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# 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; either version 2, or (at your option)
+# any later version.
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no `-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # `.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:

config.h.in

+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* always defined to indicate that i18n is enabled */
+#undef ENABLE_NLS
+
+/* Gettext package */
+#undef GETTEXT_PACKAGE
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#undef HAVE_BIND_TEXTDOMAIN_CODESET
+
+/* Define to 1 if you have the `dcgettext' function. */
+#undef HAVE_DCGETTEXT
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if your <locale.h> file defines 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). */
+#undef HAVE_LIBX11
+
+/* Define to 1 if you have the `Xext' library (-lXext). */
+#undef HAVE_LIBXEXT
+
+/* Define to 1 if you have the `Xss' library (-lXss). */
+#undef HAVE_LIBXSS
+
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const

configure.ac

+AC_INIT([Gajim - A Jabber Instant Messager],
+		[0.11.0],[http://trac.gajim.org/],[gajim])
+AM_INIT_AUTOMAKE([1.9])
+AC_CONFIG_HEADER(config.h)
+
+AM_MAINTAINER_MODE
+
+IT_PROG_INTLTOOL([0.35.0])
+
+AM_DISABLE_STATIC
+AC_ENABLE_SHARED(yes)
+AC_ENABLE_STATIC(no)
+
+AC_ISC_POSIX
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_PROG_LIBTOOL
+AC_C_CONST
+AC_CHECK_HEADERS([libintl.h])
+AC_PATH_X
+
+
+GETTEXT_PACKAGE=gajim
+AC_SUBST([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"
+AM_GLIB_GNU_GETTEXT
+AM_NLS
+
+
+dnl ****
+dnl pygtk and gtk+
+dnl ****
+PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.6.0 pygtk-2.0 >= 2.6.0])
+AC_SUBST(PYGTK_CFLAGS)
+AC_SUBST(PYGTK_LIBS)
+PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
+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, 
+  [  --disable-gtkspell      build spell checking support [default auto]],
+  enable_gtkspell=$enableval, enable_gtkspell=auto)
+
+if test "x$enable_gtkspell" = "xauto";then
+	PKG_CHECK_EXISTS([gtkspell-2.0], [enable_gtkspell=yes], [enable_gtkspell=no])
+fi
+if test "x$enable_gtkspell" = "xyes";then
+	PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0])
+	AC_SUBST(GTKSPELL_CFLAGS)
+	AC_SUBST(GTKSPELL_LIBS)
+	have_gtkspell=true
+else
+	have_gtkspell=false
+fi
+AM_CONDITIONAL(BUILD_GTKSPELL, $have_gtkspell)
+
+
+dnl ****
+dnl xscreensaver
+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
+	have_idle=false
+fi
+AM_CONDITIONAL(BUILD_IDLE, $have_idle)
+
+AM_PATH_PYTHON([2.4])
+if test "x$PYTHON" = "x:"; then
+	AC_MSG_ERROR([Python not found])
+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)])
+AC_SUBST([PYTHON_INCLUDES])
+
+AC_CONFIG_FILES([ 
+	Makefile
+	data/Makefile
+	data/glade/Makefile
+	data/emoticons/Makefile
+	data/pixmaps/Makefile
+	data/iconsets/Makefile
+	data/gajim.desktop.in
+	src/Makefile
+	src/common/Makefile
+	scripts/gajim
+	po/Makefile.in
+])
+AC_OUTPUT
+echo " 
+***************************** 
+  Build features:
+    spell check ...... ${have_gtkspell}
+    idle module ...... ${have_idle}
+    remote control ... ${have_remote}
+    trayicon ......... ${have_trayicon}
+*****************************"

data/Makefile.am

+SUBDIRS = glade emoticons pixmaps iconsets 
+
+desktopdir = $(datadir)/applications
+desktop_in_files = gajim.desktop.in.in 
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+
+soundsdir = $(pkgdatadir)/data/sounds
+sounds_DATA = $(srcdir)/sounds/*.wav
+
+otherdir = $(pkgdatadir)/data/others
+other_DATA = other/servers.xml
+
+man_MANS = gajim.1 gajim-remote.1
+
+@INTLTOOL_DESKTOP_RULE@
+
+EXTRA_DIST = $(desktop_in_files) \
+			 $(sounds_DATA) \
+			 $(other_DATA) \
+			 $(man_MANS)
+
+DISTCLEANFILES = $(desktop_DATA)
+

data/emoticons/Makefile.am

+emoticonsdir = $(pkgdatadir)/data/emoticons
+
+emoticons_DATA = 
+
+EMOTICONS_DIRS = **
+
+EMOTICONS_FILES = **/{*.png,*.gif,emoticons.py}
+
+
+install-data-local:
+	@for d in $(EMOTICONS_DIRS);do \
+		if test -d $$d;then \
+			echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d"; \
+			$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d || exit 1; \
+		fi; \
+	done; \
+	for f in $(EMOTICONS_FILES);do \
+		if test -f $$f; then \
+			echo " $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f"; \
+			$(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f || exit 1; \
+		fi; \
+	done; 
+
+dist-hook:
+	@for d in $(EMOTICONS_DIRS);do \
+		if test -d $$d;then \
+			echo " $(mkdir_p) $(distdir)/$$d"; \
+			$(mkdir_p) $(distdir)/$$d || exit 1; \
+		fi; \
+	done; \
+	for f in $(EMOTICONS_FILES);do \
+		if test -f $$f; then \
+			echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
+			cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
+		fi; \
+	done; 

gajim.desktop.in → data/gajim.desktop.in.in

@@ -3,7 +3,7 @@ Categories=Network;InstantMessaging;Application;GTK;GNOME;
 _Name=Gajim Instant Messenger
 _GenericName=Jabber IM Client
 _Comment=A GTK+ Jabber client
-Version=0.9.4
+Version=@VERSION@
 Encoding=UTF-8
 Exec=gajim
 Icon=gajim.png