[almanah] Some autotools modifications fixing some warnings

[Álvaro Peña <alvaropg src gnome org>]

commit b5a6b7c4bf422e06d7a208e38f286e99ff602cfe
Author: Álvaro Peña <alvaropg gmail com>
Date:   Fri Nov 21 20:53:26 2014 +0100

    Some autotools modifications fixing some warnings

 Makefile.am  |    2 ++
 configure.ac |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f6765f9..7a36912 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = src po data
 
 EXTRA_DIST =                   \
diff --git a/configure.ac b/configure.ac
index d354d41..cf156e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,10 @@
 AC_PREREQ(2.63)
 
AC_INIT([almanah],[0.12.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=almanah],[almanah],[http://wiki.gnome.org/Apps/Almanah_Diary])
 
-AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_SRCDIR([src])
 AC_USE_SYSTEM_EXTENSIONS
 
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip check-news subdir-objects])
@@ -10,7 +12,7 @@ AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip check-news subdir-objects])
 # Enable silent build when available (Automake 1.11)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-GETTEXT_PACKAGE=almanah
+GETTEXT_PACKAGE=AC_PACKAGE_TARNAME
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name])
 AC_SUBST(GETTEXT_PACKAGE)
 IT_PROG_INTLTOOL([0.35.0])