Revert "merge git work"

This reverts commit 0cfd80847f0d66967f56c7d6b3eb46793f725859.

svn path=/trunk/; revision=519

1 files changed, 72 insertions, 74 deletions

diff --git a/configure.ac b/configure.ac
index 663306638..76a34cd83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,17 +5,6 @@ AC_COPYRIGHT([
   Copyright (C) 2007 Collabora Ltd.
 ])
 
-AC_CONFIG_AUX_DIR(.)
-
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define)
-
-AM_MAINTAINER_MODE
-
-AC_ISC_POSIX
-AC_PROG_CC
-AC_HEADER_STDC
-
 # LT Version numbers, remember to change them just *before* a release.
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
 #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
@@ -35,18 +24,7 @@ AC_SUBST(LIBEMPATHY_GTK_CURRENT)
 AC_SUBST(LIBEMPATHY_GTK_AGE)
 AC_SUBST(LIBEMPATHY_GTK_REVISION)
 
-AM_PROG_LIBTOOL
-AM_PATH_GLIB_2_0
-AC_PATH_XTRA
-
-AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-AM_GCONF_SOURCE_2
-
-IT_PROG_INTLTOOL([0.35.0])
-
-GTK_DOC_CHECK([1.3])
-
+# Minimal version required
 GLIB_REQUIRED=2.14.0
 GTK_REQUIRED=2.12.0
 GCONF_REQUIRED=1.2.0
@@ -56,37 +34,34 @@ TELEPATHY_REQUIRED=0.3.1
 TELEPATHY_GLIB_REQUIRED=0.7.0
 MISSION_CONTROL_REQUIRED=4.37
 
-IDT_COMPILE_WARNINGS
-
-dnl Uncomment that to build without deprecated symbols
-dnl AC_DEFINE(GTK_DISABLE_DEPRECATED, 1, [Disable deprecated GTK symbols])
-dnl AC_DEFINE(G_DISABLE_DEPRECATED, 1, [Disable deprecated GLib symbols])
-dnl AC_DEFINE(LIBTELEPATHY_DISABLE_DEPRECATED, 1, [Disable deprecated libtelepathy symbols])
+# Uncomment that to build without deprecated symbols
+# AC_DEFINE(GTK_DISABLE_DEPRECATED, 1, [Disable deprecated GTK symbols])
+# AC_DEFINE(G_DISABLE_DEPRECATED, 1, [Disable deprecated GLib symbols])
+# AC_DEFINE(LIBTELEPATHY_DISABLE_DEPRECATED, 1, [Disable deprecated libtelepathy symbols])
 
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR(.)
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define)
+AM_MAINTAINER_MODE
+AC_ISC_POSIX
+AC_PROG_CC
+AC_HEADER_STDC
+AM_PROG_LIBTOOL
+AM_PATH_GLIB_2_0
+AC_PATH_XTRA
+IT_PROG_INTLTOOL([0.35.0])
+GTK_DOC_CHECK([1.3])
+IDT_COMPILE_WARNINGS
+AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
+AC_PATH_PROG(GCONFTOOL, gconftool-2)
+AM_GCONF_SOURCE_2
 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
 AC_SUBST(GLIB_GENMARSHAL)
 
-dnl -----------------------------------------------------------
-dnl SVN for ChangeLog generation
-dnl -----------------------------------------------------------
-
-AC_SUBST([SVN_ROOT],[http://svn.gnome.org/svn])
-AC_SUBST([SVN_MODULE],[empathy])
-AC_SUBST([SVN_BRANCH],["trunk"])
-
-dnl -----------------------------------------------------------
-dnl Language Support
-dnl -----------------------------------------------------------
-
-GETTEXT_PACKAGE=empathy
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
-
-AM_GLIB_GNU_GETTEXT
-
-dnl -----------------------------------------------------------
-dnl Pkg-Config dependency checks
-dnl -----------------------------------------------------------
+# -----------------------------------------------------------
+# Pkg-Config dependency checks
+# -----------------------------------------------------------
 
 PKG_CHECK_MODULES(LIBEMPATHY,
 [
@@ -115,9 +90,19 @@ PKG_CHECK_MODULES(EMPATHY,
    libebook-1.2
 ])
 
-dnl -----------------------------------------------------------
-dnl ISO codes, used for aspell support
-dnl -----------------------------------------------------------
+# -----------------------------------------------------------
+# Language Support
+# -----------------------------------------------------------
+
+GETTEXT_PACKAGE=empathy
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
+
+AM_GLIB_GNU_GETTEXT
+
+# -----------------------------------------------------------
+# ISO codes, used for aspell support
+# -----------------------------------------------------------
 AC_MSG_CHECKING([whether iso-codes exists and has iso-639 domain])
 if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 ; then
    AC_MSG_RESULT([yes])
@@ -133,9 +118,9 @@ fi
 
 AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["$iso_codes_prefix"],[ISO codes prefix])
 
-dnl -----------------------------------------------------------
-dnl ASpell
-dnl -----------------------------------------------------------
+# -----------------------------------------------------------
+# ASpell
+# -----------------------------------------------------------
 AC_ARG_ENABLE(aspell,
               AS_HELP_STRING([--enable-aspell=@<:@no/yes/auto@:>@],
                              [compile with aspell support]), ,
@@ -163,9 +148,9 @@ if test "x$enable_aspell" = "xyes" -a "x$have_aspell" != "xyes"; then
 fi
 
 
-dnl -----------------------------------------------------------
-dnl Megaphone
-dnl -----------------------------------------------------------
+# -----------------------------------------------------------
+# Megaphone
+# -----------------------------------------------------------
 AC_ARG_ENABLE(megaphone,
               AS_HELP_STRING([--enable-megaphone=@<:@no/yes/auto@:>@],
                              [build megaphone applet]), ,
@@ -193,9 +178,9 @@ fi
 
 AM_CONDITIONAL(HAVE_MEGAPHONE, test "x$have_megaphone" = "xyes")
 
-dnl -----------------------------------------------------------
-dnl Nothere
-dnl -----------------------------------------------------------
+# -----------------------------------------------------------
+# Nothere
+# -----------------------------------------------------------
 AC_ARG_ENABLE(nothere,
               AS_HELP_STRING([--enable-nothere=@<:@no/yes/auto@:>@],
                              [build nothere applet]), ,
@@ -222,19 +207,32 @@ fi
 
 AM_CONDITIONAL(HAVE_NOTHERE, test "x$have_nothere" = "xyes")
 
-dnl -----------------------------------------------------------
-dnl Tests
-dnl -----------------------------------------------------------
+# -----------------------------------------------------------
+# Tests
+# -----------------------------------------------------------
 AC_ARG_ENABLE(tests,
-              AS_HELP_STRING([--enable-tests=@<:@no/yes@:>@],
+              AS_HELP_STRING([--enable-tests=@<:@no/yes/auto@:>@],
                              [build tests]), ,
                              enable_tests=no)
 
-AM_CONDITIONAL(HAVE_TESTS, test "x$enable_tests" = "xyes")
+if test "x$enable_tests" != "xno"; then
+   PKG_CHECK_MODULES(CHECK,
+   [
+      check >= 0.9.4
+   ], have_check="yes", have_check="no")
+else
+   have_check=no
+fi
+
+if test "x$enable_tests" = "xyes" -a "x$have_check" != "xyes"; then
+   AC_MSG_ERROR([Couldn't find check dependencies.])
+fi
+
+AM_CONDITIONAL(HAVE_TESTS, test "x$have_check" = "xyes")
 
-dnl -----------------------------------------------------------
-dnl Python Bindings
-dnl -----------------------------------------------------------
+# -----------------------------------------------------------
+# Python Bindings
+# -----------------------------------------------------------
 AC_ARG_ENABLE(python,
               AS_HELP_STRING([--enable-python=@<:@no/yes/auto@:>@],
                              [build python bindings to libempathy and libempathy-gtk]), ,
@@ -269,9 +267,9 @@ fi
 
 AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes")
 
-dnl -----------------------------------------------------------
-dnl VoIP support
-dnl -----------------------------------------------------------
+# -----------------------------------------------------------
+# VoIP support
+# -----------------------------------------------------------
 AC_ARG_ENABLE(voip,
               AS_HELP_STRING([--enable-voip=@<:@no/yes@:>@],
                              [Add support for Voice and Video call]), ,
@@ -283,7 +281,7 @@ fi
 
 AM_CONDITIONAL(HAVE_VOIP, test "x$enable_voip" = "xyes")
 
-dnl -----------------------------------------------------------
+# -----------------------------------------------------------
 
 AC_OUTPUT([
    Makefile