[gnome-calculator] Misc build system cleanups

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 81027d5721af7347c9e14417de26067c8676761b
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Jun 28 11:12:46 2015 -0500

    Misc build system cleanups

 Makefile.am  |    4 ++--
 configure.ac |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a52cc38..babbeb6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,5 @@
 SUBDIRS = data lib src search-provider tests help po
 
-ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS}
-
 DISTCHECK_CONFIGURE_FLAGS = --enable-installed-tests
 
 MAINTAINERCLEANFILES = \
@@ -9,6 +7,8 @@ MAINTAINERCLEANFILES = \
        $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
        $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)
 
+GITIGNOREFILES = m4
+
 @BEHAVE_INSTALLED_TESTS_RULE@
 INSTALLED_TESTS=basic_mode advanced_mode financial_mode programming_mode
 INSTALLED_TESTS_TYPE=session-exclusive
diff --git a/configure.ac b/configure.ac
index add7736..82d7ee5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,10 +4,9 @@ AC_INIT([gnome-calculator], [3.17.3])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
 
 AM_PROG_VALAC([0.24])
-AM_PROG_CC_C_O
 
 LT_PREREQ([2.2])
 LT_INIT