[nemiver] Misc fixes for autoconf 2.69 and automake 1.13.1

[Dodji Seketeli <dodji src gnome org>]

commit f8ed481300cd55343960e189925dd24dcf8ae0d9
Author: Dodji Seketeli <dodji seketeli org>
Date:   Mon May 20 20:57:30 2013 +0200

    Misc fixes for autoconf 2.69 and automake 1.13.1
    
        * configure.ac: Replace AM_GNU_GETTEXT with AM_GLIB_GNU_GETTEXT.
        * src/Makefile.am: Replace INCLUDES with AM_CPPFLAGS.
        * src/common/Makefile.am: Likewise.
        * src/confmgr/Makefile.am: Likewise.
        * src/dbdimpl/sqlite/Makefile.am: Likewise.
        * src/dbgengine/Makefile.am: Likewise.
        * src/langs/Makefile.am: Likewise.
        * src/persp/dbgperspective/Makefile.am: Likewise.
        * src/uicommon/Makefile.am: Likewise.
        * src/workbench/Makefile.am: Likewise.

 configure.ac                         |    5 ++---
 src/Makefile.am                      |    2 +-
 src/common/Makefile.am               |    2 +-
 src/confmgr/Makefile.am              |    6 +++---
 src/dbdimpl/sqlite/Makefile.am       |    2 +-
 src/dbgengine/Makefile.am            |    2 +-
 src/langs/Makefile.am                |    2 +-
 src/persp/dbgperspective/Makefile.am |    2 +-
 src/uicommon/Makefile.am             |    2 +-
 src/workbench/Makefile.am            |    2 +-
 10 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8cbaef5..d5d6ad5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,14 +108,13 @@ dnl *************************************
 dnl To add a new language, add language code xx to po/LINGUAS
 IT_PROG_INTLTOOL([0.40.0])
 
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
-
 GETTEXT_PACKAGE=nemiver
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
                    [The domain to use with gettext])
 
+AM_GLIB_GNU_GETTEXT
+
 nemiverlocaledir=[${datadir}/locale]
 AC_SUBST(nemiverlocaledir)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 8fa2432..fdabfb2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ $(abs_top_builddir)/src/uicommon/libnemiveruicommon.la
 
 endif
 
-INCLUDES=\
+AM_CPPFLAGS=\
 -DNEMIVERLOCALEDIR=\"$(nemiverlocaledir)\" \
 -DPREFIX=\""$(prefix)"\" \
 -DSYSCONFDIR=\""$(sysconfdir)"\" \
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 5b61d90..074c5bd 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -85,7 +85,7 @@ libnemivercommon_la_LDFLAGS= NEMIVERCOMMON_LIBS@ -lutil \
 #pkgconfig_DATA = libnemivercommon.pc
 #EXTRA_DIST = $(pkgconfig_DATA)
 
-INCLUDES= NEMIVERCOMMON_CFLAGS@ \
+AM_CPPFLAGS= NEMIVERCOMMON_CFLAGS@ \
 -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
 -DSYSTEM_LIBDIR=\"/usr/lib\" \
 -DNEMIVER_INSTALL_PREFIX=\"@NEMIVER_INSTALL_PREFIX \" \
diff --git a/src/confmgr/Makefile.am b/src/confmgr/Makefile.am
index 0b9dbc7..90d1637 100644
--- a/src/confmgr/Makefile.am
+++ b/src/confmgr/Makefile.am
@@ -9,7 +9,7 @@ publicheadersdir=$(NEMIVER_INCLUDE_DIR)/dynmods
 
 configdir= NEMIVER_SYSTEM_CONFIG_DIR@
 
-INCLUDES= NEMIVERCOMMON_CFLAGS@ -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
+AM_CPPFLAGS= NEMIVERCOMMON_CFLAGS@ -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
 -I$(abs_top_srcdir)/src
 
 if BUILD_GSETTINGS
@@ -23,7 +23,7 @@ if BUILD_GSETTINGS
     gsettingsmgrmoddir= NEMIVER_MODULES_DIR@
 
     config_DATA=gsettingsmgr.conf
-    INCLUDES+= @NEMIVERGSETTINGS_CFLAGS@
+    AM_CPPFLAGS+= @NEMIVERGSETTINGS_CFLAGS@
 else
     libgconfmgrmod_la_SOURCES=$(headers) $(h)/nmv-gconf-mgr.cc\
             $(h)/nmv-gconf-keys-defs.cc
@@ -35,7 +35,7 @@ else
     gconfmgrmoddir= NEMIVER_MODULES_DIR@
 
     config_DATA=gconfmgr.conf
-    INCLUDES+= @GCONF_CFLAGS@
+    AM_CPPFLAGS+= @GCONF_CFLAGS@
 endif
 
 EXTRA_DIST=gconfmgr.conf.in gsettingsmgr.conf.in
diff --git a/src/dbdimpl/sqlite/Makefile.am b/src/dbdimpl/sqlite/Makefile.am
index bdfdbc4..e458e14 100644
--- a/src/dbdimpl/sqlite/Makefile.am
+++ b/src/dbdimpl/sqlite/Makefile.am
@@ -16,7 +16,7 @@ libnemiverdbdsqlite_la_LIBADD= \
 @SQLITE3_LIBS@ @NEMIVERCOMMON_LIBS@ \
 $(abs_top_builddir)/src/common/libnemivercommon.la
 
-INCLUDES= SQLITE3_CFLAGS@ @NEMIVERCOMMON_CFLAGS@ -I$(abs_top_srcdir)/src \
+AM_CPPFLAGS= SQLITE3_CFLAGS@ @NEMIVERCOMMON_CFLAGS@ -I$(abs_top_srcdir)/src \
 -DIN_LIBSQLITE_DSO
 
 config_DATA=org.nemiver.db.sqlitedriver.conf
diff --git a/src/dbgengine/Makefile.am b/src/dbgengine/Makefile.am
index d1cd044..a4bafe9 100644
--- a/src/dbgengine/Makefile.am
+++ b/src/dbgengine/Makefile.am
@@ -127,6 +127,6 @@ $(abs_top_builddir)/src/common/libnemivercommon.la libdbgcommon.la
 config_DATA=gdbengine.conf varlist.conf varwalker.conf varobjwalker.conf varlistwalker.conf cpptrait.conf
 configdir= NEMIVER_SYSTEM_CONFIG_DIR@
 
-INCLUDES= NEMIVERCOMMON_CFLAGS@ -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
+AM_CPPFLAGS= NEMIVERCOMMON_CFLAGS@ -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
 -I$(top_srcdir)/src -I$(top_srcdir)/src/confmgr
 
diff --git a/src/langs/Makefile.am b/src/langs/Makefile.am
index 68324df..3b50d88 100644
--- a/src/langs/Makefile.am
+++ b/src/langs/Makefile.am
@@ -17,7 +17,7 @@ $(h)/nmv-cpp-parser.cc
 libnemivercparser_la_LIBADD=$(abs_top_builddir)/src/common/libnemivercommon.la
 libnemivercparser_la_CFLAGS= -fPIC -DPIC
 
-INCLUDES= \
+AM_CPPFLAGS = \
 -I$(abs_top_srcdir) \
 -I$(abs_top_srcdir)/src \
 @NEMIVERCOMMON_CFLAGS@
diff --git a/src/persp/dbgperspective/Makefile.am b/src/persp/dbgperspective/Makefile.am
index 6f2268f..d6913d4 100644
--- a/src/persp/dbgperspective/Makefile.am
+++ b/src/persp/dbgperspective/Makefile.am
@@ -102,7 +102,7 @@ $(abs_top_builddir)/src/common/libnemivercommon.la \
 $(abs_top_builddir)/src/uicommon/libnemiveruicommon.la \
 $(abs_top_builddir)/src/dbgengine/libdebuggerutils.la
 
-INCLUDES= NEMIVERDBGPERSP_CFLAGS@ -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
+AM_CPPFLAGS= NEMIVERDBGPERSP_CFLAGS@ -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
 -I$(abs_top_srcdir)/src \
 -I$(abs_top_srcdir)/src/confmgr \
 -I$(abs_top_srcdir)/src/dbgengine \
diff --git a/src/uicommon/Makefile.am b/src/uicommon/Makefile.am
index b321a09..cd72021 100644
--- a/src/uicommon/Makefile.am
+++ b/src/uicommon/Makefile.am
@@ -38,7 +38,7 @@ libnemiveruicommon_la_SOURCES= $(sources) $(memoryview_sources)
 libnemiveruicommon_la_LIBADD= @NEMIVERUICOMMON_LIBS@ -lutil
 libnemiveruicommon_la_CFLAGS= -fPIC -DPIC
 
-INCLUDES= NEMIVERUICOMMON_CFLAGS@ \
+AM_CPPFLAGS= NEMIVERUICOMMON_CFLAGS@ \
 -I$(abs_top_srcdir) \
 -I$(abs_top_srcdir)/src \
 -I$(abs_top_srcdir)/src/confmgr \
diff --git a/src/workbench/Makefile.am b/src/workbench/Makefile.am
index a2b308a..ecb6ddc 100644
--- a/src/workbench/Makefile.am
+++ b/src/workbench/Makefile.am
@@ -23,7 +23,7 @@ libworkbenchmod_la_LIBADD= NEMIVERWORKBENCH_LIBS@ \
 config_DATA=workbench.conf
 configdir= NEMIVER_SYSTEM_CONFIG_DIR@
 
-INCLUDES= NEMIVERWORKBENCH_CFLAGS@ -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
+AM_CPPFLAGS= NEMIVERWORKBENCH_CFLAGS@ -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
 -I$(abs_top_srcdir)/src \
 -I$(abs_top_srcdir)/src/confmgr \
 -I$(abs_top_srcdir)/src/dbgengine \