[gnome-builder/wip/chergert/libidemm-merge] libidemm: fix make distcheck

[Marcin Kolny <mkolny src gnome org>]

commit ef4ca4ee5c5be8e015de63fb29907f207aeda729
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Mon Apr 25 21:44:12 2016 +0200

    libidemm: fix make distcheck

 Makefile.am                                    |    1 +
 autogen.sh                                     |    3 +
 build/autotools/mm-ax_cxx_compile_stdcxx.m4    |  561 ------------------------
 build/autotools/mm-ax_cxx_compile_stdcxx_11.m4 |  171 -------
 build/autotools/mm-common.m4                   |   47 --
 build/autotools/mm-common.m4.in                |   47 --
 build/autotools/mm-dietlib.m4                  |  118 -----
 build/autotools/mm-doc.m4                      |  252 -----------
 build/autotools/mm-module.m4                   |   87 ----
 build/autotools/mm-pkg.m4                      |  123 ------
 build/autotools/mm-warnings.m4                 |  123 ------
 libidemm/configure.ac                          |   17 +-
 libidemm/idemm/Makefile.am                     |    7 +-
 libidemm/tools/Makefile.am                     |    2 +
 14 files changed, 21 insertions(+), 1538 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c21aa98..66a03ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --disable-gtk-doc \
        --disable-tracing \
        --enable-appstream-util \
+       --disable-maintainer-mode \
        $(NULL)
 
 GITIGNOREFILES = \
diff --git a/autogen.sh b/autogen.sh
index a8d6c32..8f0d698 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,6 +21,9 @@ gtkdocize || exit 1
 
 if command -v mm-common-prepare 2>/dev/null; then
     mm-common-prepare --copy --force $srcdir/libidemm
+else
+    touch $srcdir/libidemm/generate-binding.am
+    touch $srcdir/libidemm/compile-binding.am
 fi
 
 autoreconf --force --install -Wno-portability || exit 1
diff --git a/libidemm/configure.ac b/libidemm/configure.ac
index c6b506f..efc9391 100644
--- a/libidemm/configure.ac
+++ b/libidemm/configure.ac
@@ -3,15 +3,15 @@ m4_define([glibmm_required_version], [2.48.0])
 
 AC_SUBST([IDEMM_SO_VERSION], [0:0:0])
 
-MM_PREREQ([0.9.8])
-MM_INIT_MODULE([idemm-1.0])
+m4_ifdef([MM_PREREQ], [MM_PREREQ([0.9.8])])
+m4_ifdef([MM_INIT_MODULE], [MM_INIT_MODULE([idemm-1.0])])
 
-MM_CONFIG_DOCTOOL_DIR([docs])
+m4_ifdef([MM_ARG_ENABLE_DOCUMENTATION], [MM_ARG_ENABLE_DOCUMENTATION])
 
-MM_ARG_ENABLE_DOCUMENTATION
+m4_ifdef([MM_CONFIG_DOCTOOL_DIR], [MM_CONFIG_DOCTOOL_DIR([docs])])
 
-MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
-MM_PKG_CONFIG_SUBST([GMMPROC_EXTRA_M4_DIR], [--variable=gmmprocm4dir cairomm-1.0 pangomm-1.4 atkmm-1.6 
gtkmm-3.0])
+m4_ifdef([MM_PKG_CONFIG_SUBST], [MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])])
+m4_ifdef([MM_PKG_CONFIG_SUBST], [MM_PKG_CONFIG_SUBST([GMMPROC_EXTRA_M4_DIR], [--variable=gmmprocm4dir 
cairomm-1.0 pangomm-1.4 atkmm-1.6 gtkmm-3.0])])
 
 AC_ARG_ENABLE([idemm],
               [AS_HELP_STRING([--enable-idemm=@<:@yes/no@:>@],
@@ -26,8 +26,8 @@ AS_IF([test x$enable_idemm != xno],[
                          [have_gtkmm=yes],
                          [have_gtkmm=no])
 
-         AS_IF([test x$enable_idemm = xyes && x$have_idemm = xno],[
-               AC_MSG_ERROR([--enable-idemm requires gtkmm >= gtkmm_required_version])
+        AS_IF([test x$enable_idemm = xyes && x$have_idemm = xno],[
+               AC_MSG_ERROR([--enable-idemm requires gtkmm >= gtkmm_required_version])
        ])
 
        enable_idemm=$have_gtkmm
@@ -41,3 +41,4 @@ AC_CONFIG_FILES([libidemm/Makefile])
 AC_CONFIG_FILES([libidemm/idemm/Makefile])
 AC_CONFIG_FILES([libidemm/src/Makefile])
 AC_CONFIG_FILES([libidemm/tools/Makefile])
+
diff --git a/libidemm/idemm/Makefile.am b/libidemm/idemm/Makefile.am
index 3c4b528..1f8b89a 100644
--- a/libidemm/idemm/Makefile.am
+++ b/libidemm/idemm/Makefile.am
@@ -9,7 +9,12 @@ include $(srcdir)/filelist.am
 include $(top_srcdir)/libidemm/compile-binding.am
 
 local_cppflags = $(binding_includes) $(binding_cppflags) -DLIBIDEMM_BUILD=1
-libide_cflags = $(LIBIDE_CFLAGS) -I$(top_srcdir)/libide -I$(top_srcdir)/contrib/pnl
+libide_cflags = \
+       -I$(top_builddir) \
+       $(LIBIDE_CFLAGS) \
+       -I$(top_srcdir)/libide \
+       -I$(top_srcdir)/contrib/pnl \
+       -I$(top_builddir)/libide
 
 AM_CPPFLAGS = $(local_cppflags) $(IDEMM_CFLAGS) $(libide_cflags)
 
diff --git a/libidemm/tools/Makefile.am b/libidemm/tools/Makefile.am
index 3ceae82..ee4ce18 100644
--- a/libidemm/tools/Makefile.am
+++ b/libidemm/tools/Makefile.am
@@ -2,6 +2,8 @@ if ENABLE_IDEMM
 
 include $(srcdir)/m4/filelist.am
 
+dist_noinst_DATA = $(addprefix m4/,$(files_codegen_m4))
+
 noinst_PROGRAMS = extra_defs_gen/generate_defs_libide
 
 extra_defs_gen_generate_defs_libide_SOURCES = extra_defs_gen/generate_defs_libide.cc