[gnome-builder/wip/chergert/libidemm-merge: 18/27] libidemm: fix autotools files

[Christian Hergert <chergert src gnome org>]

commit ad786f9686e5b8632b3674cb57aec93547c1e3dd
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Thu Apr 7 19:50:07 2016 +0200

    libidemm: fix autotools files

 libidemm/Makefile.am           |    4 ++++
 libidemm/configure.ac          |    4 +---
 libidemm/idemm/Makefile.am     |    4 ++++
 libidemm/src/Makefile.am       |    4 ++++
 libidemm/tools/Makefile.am     |    4 ++++
 plugins/hello-cpp/Makefile.am  |    4 ++--
 plugins/hello-cpp/configure.ac |   16 ++++++----------
 7 files changed, 25 insertions(+), 15 deletions(-)
---
diff --git a/libidemm/Makefile.am b/libidemm/Makefile.am
index 80ddc95..b9b3db0 100644
--- a/libidemm/Makefile.am
+++ b/libidemm/Makefile.am
@@ -13,6 +13,8 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+if ENABLE_IDEMM
+
 srcmm_subdirs = idemm
 idemm_include_HEADERS = idemm.h
 
@@ -37,3 +39,5 @@ nodist_idemm_libinclude_HEADERS = idemmconfig.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_files)
+
+endif
diff --git a/libidemm/configure.ac b/libidemm/configure.ac
index dd36e16..aee3725 100644
--- a/libidemm/configure.ac
+++ b/libidemm/configure.ac
@@ -1,4 +1,3 @@
-m4_define([glibmm_required_version], [2.47.3])
 m4_define([gtkmm_required_version], [3.19.12])
 
 AC_SUBST([IDEMM_SO_VERSION], [0:0:0])
@@ -13,8 +12,7 @@ MM_ARG_ENABLE_DOCUMENTATION
 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])
 
-PKG_CHECK_MODULES(IDEMM,    [glibmm-2.4 >= glibmm_required_version
-                             gtkmm-3.0 >= gtkmm_required_version])
+PKG_CHECK_MODULES(IDEMM,    [gtkmm-3.0 >= gtkmm_required_version])
 
 
 AC_ARG_ENABLE([idemm],
diff --git a/libidemm/idemm/Makefile.am b/libidemm/idemm/Makefile.am
index 56a8c02..fb2adf0 100644
--- a/libidemm/idemm/Makefile.am
+++ b/libidemm/idemm/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_IDEMM
+
 lib_LTLIBRARIES = libidemm-1.0.la
 include $(srcdir)/../src/filelist.am
 include $(srcdir)/filelist.am
@@ -18,3 +20,5 @@ libidemm_1_0_la_LDFLAGS =
        $(NULL)
 
 libidemm_1_0_la_LIBADD  = $(IDEMM_LIBS)
+
+endif
diff --git a/libidemm/src/Makefile.am b/libidemm/src/Makefile.am
index b054dc3..4c5e67b 100644
--- a/libidemm/src/Makefile.am
+++ b/libidemm/src/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_IDEMM
+
 binding_name    = idemm
 wrap_init_flags = --namespace=Ide --parent_dir=idemm
 codegen_srcdir  = $(top_srcdir)/libidemm/tools
@@ -10,3 +12,5 @@ files_ccg  = $(idemm_files_ccg)
 files_hg   = $(idemm_files_hg)
 
 include $(top_srcdir)/libidemm/generate-binding.am
+
+endif
diff --git a/libidemm/tools/Makefile.am b/libidemm/tools/Makefile.am
index 1b19311..2c43a6d 100644
--- a/libidemm/tools/Makefile.am
+++ b/libidemm/tools/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_IDEMM
+
 AUTOMAKE_OPTIONS = subdir-objects
 
 include $(srcdir)/m4/filelist.am
@@ -9,3 +11,5 @@ extra_defs_gen_generate_defs_libide_LDADD = \
        $(IDEMM_LIBS) -lglibmm_generate_extra_defs-2.4 -L../../libide -lide-1.0
 
 AM_CPPFLAGS = -I$(top_builddir) $(LIBIDE_CFLAGS) $(IDEMM_CFLAGS) -I../../libide -I../../contrib/pnl
+
+endif
diff --git a/plugins/hello-cpp/Makefile.am b/plugins/hello-cpp/Makefile.am
index 44eb253..a95df61 100644
--- a/plugins/hello-cpp/Makefile.am
+++ b/plugins/hello-cpp/Makefile.am
@@ -13,8 +13,8 @@ libhello_cpp_plugin_la_SOURCES = \
        registermmtype.h \
        $(NULL)
 
-libhello_cpp_plugin_la_CPPFLAGS = $(GTKMM_CFLAGS) $(PLUGIN_CFLAGS) -I$(top_srcdir)/libidemm
-libhello_cpp_plugin_la_LDFLAGS = $(GTKMM_LIBS) $(PLUGIN_LDFLAGS) -L$(top_srcdir)/libidemm/idemm/.libs 
-lidemm-1.0
+libhello_cpp_plugin_la_CPPFLAGS = $(IDEMM_CFLAGS) $(PLUGIN_CFLAGS) -I$(top_srcdir)/libidemm
+libhello_cpp_plugin_la_LDFLAGS = $(IDEMM_LIBS) $(PLUGIN_LDFLAGS) -L$(top_srcdir)/libidemm/idemm/.libs 
-lidemm-1.0
 
 include $(top_srcdir)/plugins/Makefile.plugin
 
diff --git a/plugins/hello-cpp/configure.ac b/plugins/hello-cpp/configure.ac
index 13adff2..39217bb 100644
--- a/plugins/hello-cpp/configure.ac
+++ b/plugins/hello-cpp/configure.ac
@@ -1,23 +1,19 @@
-m4_define([gtkmm_required_version], [3.18.0])
-
 # --enable-hello-cpp-plugin=yes/no
+
 AC_ARG_ENABLE([hello-cpp-plugin],
               [AS_HELP_STRING([--enable-hello-cpp-plugin=@<:@yes/no@:>@],
                               [Build example C++ plugin with gtkmm.])],
               [enable_hello_cpp_plugin=$enableval],
               [enable_hello_cpp_plugin=auto])
 
-AS_IF([test x$enable_hello_cpp_plugin != x$no],[
-       PKG_CHECK_MODULES(GTKMM,
-                         [gtkmm-3.0 >= gtkmm_required_version],
-                         [have_gtkmm=yes],
-                         [have_gtkmm=no])
+AS_IF([test x$enable_hello_cpp_plugin != xno],[
+       AM_COND_IF([ENABLE_IDEMM], [have_idemm=yes], [have_idemm=no])
 
-       AS_IF([test x$enable_hello_cpp_plugin = xyes && x$have_gtkmm = xno],[
-              AC_MSG_ERROR([--enable-hello-cpp-plugin requires gtkmm-3.0 >= gtkmm_required_version])
+       AS_IF([test x$enable_hello_cpp_plugin = xyes && x$have_idemm = xno],[
+              AC_MSG_ERROR([--enable-hello-cpp-plugin requires --enable-idemm=yes])
        ])
 
-       enable_hello_cpp_plugin=$have_gtkmm
+       enable_hello_cpp_plugin=$have_idemm             
 ])
 
 AM_CONDITIONAL(ENABLE_HELLO_CPP_PLUGIN, test x$enable_hello_cpp_plugin = xyes)