[balsa/gtk3] Silence some autoconf and automake complaints

[Peter Bloomfield <peterb src gnome org>]

commit dc565e254c1d20a4e4bc70ad90c64dfefc2cf976
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed May 20 20:30:07 2015 -0400

    Silence some autoconf and automake complaints
    
        * configure.ac: silence autoconf.
        * libbalsa/imap/Makefile.am: silence automake.
        * libinit_balsa/Makefile.am: ditto.

 ChangeLog                 |    8 ++++++++
 configure.ac              |   14 ++++++--------
 libbalsa/imap/Makefile.am |    2 +-
 libinit_balsa/Makefile.am |    2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 03b145b..d1b245b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-05-20  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       Silence some autoconf and automake complaints.
+
+       * configure.ac: silence autoconf.
+       * libbalsa/imap/Makefile.am: silence automake.
+       * libinit_balsa/Makefile.am: ditto.
+
 2015-04-10  Peter Bloomfield  <pbloomfield bellsouth net>
 
        * src/sendmsg-window.c (delete_handler),
diff --git a/configure.ac b/configure.ac
index ec84ab4..9a538b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_DEFINE_UNQUOTED(BALSA_VERSION, "AC_PACKAGE_VERSION",[Defines the Balsa version])
 
+AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 
 dnl #####################################################################
@@ -213,9 +214,8 @@ dnl #####################################################################
 dnl 3. Programs: compilers and their options.
 dnl #####################################################################
 AC_PROG_CC
-m4_ifdef([AM_PROG_LIBTOOL],[AM_PROG_LIBTOOL],[AC_PROG_RANLIB])
+m4_ifdef([LT_INIT],[LT_INIT],[AC_PROG_LIBTOOL])
 AC_PROG_LN_S
-AC_USE_SYSTEM_EXTENSIONS
 AC_CHECK_MEMBERS([struct utsname.domainname],[],[],[[#include<sys/utsname.h>]])
 
 # pkg-config
@@ -356,17 +356,15 @@ PKG_CHECK_MODULES(BALSA_AB, [
 ])
 
 AC_MSG_CHECKING(whether res_init is available)
-AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <resolv.h>
-                               ],
-                               [res_init();]),
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <resolv.h>;]],
+                               [[res_init();]])],
                have_res_init=yes,
                have_res_init=no)
 if test $have_res_init = no ; then
     save_LIBS=$LIBS
     LIBS="$LIBS -lresolv"
-    AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <resolv.h>
-                                   ],
-                                   [res_init();]),
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <resolv.h>;]],
+                                   [[res_init();]])],
                    have_res_init=yes)
 fi
 AC_MSG_RESULT([$have_res_init])
diff --git a/libbalsa/imap/Makefile.am b/libbalsa/imap/Makefile.am
index cb7f780..abf56bf 100644
--- a/libbalsa/imap/Makefile.am
+++ b/libbalsa/imap/Makefile.am
@@ -44,7 +44,7 @@ libimap_a_SOURCES = \
 EXTRA_DIST = \
        libimap-marshal.list
 
-INCLUDES= -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libbalsa \
+AM_CPPFLAGS = -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libbalsa \
        -I${top_srcdir}/libbalsa/imap \
        $(BALSA_CFLAGS)
 
diff --git a/libinit_balsa/Makefile.am b/libinit_balsa/Makefile.am
index 8271e7a..aa5a1ce 100644
--- a/libinit_balsa/Makefile.am
+++ b/libinit_balsa/Makefile.am
@@ -16,7 +16,7 @@ libinit_balsa_a_SOURCES =             \
        assistant_helper.c              \
        assistant_helper.h
 
-INCLUDES=-I$(top_builddir) -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
        -I$(top_srcdir)/libbalsa \
        -I$(top_srcdir)/src \
         $(BALSA_CFLAGS)