[emerillon] Update build system a bit

[Łukasz Jernaś <ljernas src gnome org>]

commit 3ba4febb72217bc594749257f2542f2a0c4fb968
Author: Å?ukasz JernaÅ? <deejay1 srem org>
Date:   Sat May 15 13:25:58 2010 +0200

    Update build system a bit

 autogen.sh            |    6 +++---
 configure.ac          |   34 ++++++++--------------------------
 emerillon/Makefile.am |    8 ++++----
 plugins/Makefile.am   |    1 +
 4 files changed, 16 insertions(+), 33 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 3cbb9b2..24e0de2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,7 @@ PKG_NAME="emerillon"
 }
 
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
+    echo "You need to install gnome-common from the GNOME GIT"
     exit 1
 }
 
@@ -22,8 +22,8 @@ which gtkdocize || {
     exit 1
 }
 
-REQUIRED_AUTOCONF_VERSION=2.59
-REQUIRED_AUTOMAKE_VERSION=1.7
+REQUIRED_AUTOCONF_VERSION=2.63
+REQUIRED_AUTOMAKE_VERSION=1.11
 REQUIRED_INTLTOOL_VERSION=0.40.0
 REQUIRED_PKG_CONFIG_VERSION=0.16.0
 REQUIRED_GTK_DOC_VERSION=1.14
diff --git a/configure.ac b/configure.ac
index f48955d..4f55962 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ(2.59)
+AC_PREREQ(2.63)
 
 m4_define(emerillon_major_version, 0)
 m4_define(emerillon_minor_version, 1)
@@ -7,7 +7,7 @@ m4_define(emerillon_version, emerillon_major_version.emerillon_minor_version.eme
 
 m4_define([emerillon_api_version],
           [emerillon_major_version.emerillon_minor_version])
-AC_INIT(emerillon, emerillon_version)
+AC_INIT([emerillon], [emerillon_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=emerillon], [emerillon])
 AC_CONFIG_SRCDIR(emerillon/main.c)
 
 AC_DEFINE(EMERILLON_MAJOR_VERSION, emerillon_major_version, [Emerillon major version])
@@ -20,15 +20,16 @@ AC_SUBST(EMERILLON_MICRO_VERSION, emerillon_micro_version)
 EMERILLON_API_VERSION=emerillon_api_version
 AC_SUBST(EMERILLON_API_VERSION)
 
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 no-dist-gzip -Wno-portability])
+AM_INIT_AUTOMAKE([1.11 dist-bzip2 no-dist-gzip -Wno-portability])
 
-AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_MACRO_DIR(m4)
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
+AM_SILENT_RULES([yes])
 
 GNOME_MAINTAINER_MODE_DEFINES
-GNOME_COMPILE_WARNINGS
+GNOME_COMPILE_WARNINGS([maximum])
 GNOME_DEBUG_CHECK
 
 AC_DISABLE_STATIC
@@ -39,7 +40,6 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
 
 ###############
@@ -130,24 +130,6 @@ EMERILLON_CFLAGS=`echo $EMERILLON_CFLAGS | sed s,/geoclue,,`
 AC_SUBST(EMERILLON_CFLAGS)
 AC_SUBST(EMERILLON_LIBS)
 
-###############
-# Depecations #
-###############
-AC_ARG_ENABLE(deprecations,
-              [AC_HELP_STRING([--enable-deprecations],
-                              [warn about deprecated usages [default=yes]])],,
-              [enable_deprecations=yes])
-
-if test "x$enable_deprecations" = "xyes"; then
-   DISABLE_DEPRECATED_CFLAGS="\
--DG_DISABLE_DEPRECATED \
--DGDK_DISABLE_DEPRECATED \
--DGTK_DISABLE_DEPRECATED \
--DGDK_PIXBUF_DISABLE_DEPRECATED \
--DGNOME_DISABLE_DEPRECATED"
-   AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-fi
-
 #################
 # Vala bindings #
 #################
diff --git a/emerillon/Makefile.am b/emerillon/Makefile.am
index a85f81c..e7bc5a5 100644
--- a/emerillon/Makefile.am
+++ b/emerillon/Makefile.am
@@ -2,11 +2,11 @@ SUBDIRS =
 
 INCLUDES =								\
 	-I$(top_srcdir)							\
-	-I$(srcdir)							\
+	-I$(srcdir)								\
 	$(EMERILLON_CFLAGS)						\
-	$(WARN_CFLAGS)							\
-	$(DISABLE_DEPRECATED_CFLAGS)					\
-	-DEMERILLON_COMPILATION						\
+	$(WARN_CFLAGS)						\
+	$(DISABLE_DEPRECATED)					\
+	-DEMERILLON_COMPILATION					\
 	-DEMERILLON_DATADIR=\""$(datadir)/emerillon"\"			\
 	-DEMERILLON_PLUGINDIR=\""$(libdir)/emerillon/plugins"\"		\
 	-DEMERILLON_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index f07b880..79dbabf 100755
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -7,6 +7,7 @@ INCLUDES = \
 	$(EMERILLON_CFLAGS) 				\
 	$(SEARCH_DEPS_CFLAGS) 				\
 	$(WARN_CFLAGS)					\
+	$(DISABLE_DEPRECATED)				\
 	-DEMERILLON_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DEMERILLON_UIDIR=\""$(datadir)/emerillon/ui/"\" \
 	-DEMERILLON_DATADIR=\""$(datadir)/emerillon"\"