[gdlmm] Fix compilation with recent mm-common package

[Fabien Parent <fparent src gnome org>]

commit d14b1e0d911096d6514b4615a80152136a849f0f
Author: Fabien Parent <parent f gmail com>
Date:   Sun Jul 3 16:59:34 2011 +0200

    Fix compilation with recent mm-common package

 codegen/m4/convert.m4 |    4 +---
 configure.ac          |    1 +
 gdl/src/gdl_enum.defs |    2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/codegen/m4/convert.m4 b/codegen/m4/convert.m4
index 1e39a36..b5dcb23 100644
--- a/codegen/m4/convert.m4
+++ b/codegen/m4/convert.m4
@@ -1,5 +1,3 @@
 dnl Include gmmproc type conversion definitions:
-m4_include(`convert_base.m4')
-m4_include(`convert_glib.m4')
-m4_include(`convert_gtk.m4')
+m4_include(`convert_gtkmm.m4')
 m4_include(`convert_gdl.m4')
diff --git a/configure.ac b/configure.ac
index f5e1e11..0dacac3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,7 @@ PKG_CHECK_MODULES([GDLMM], [$GDLMM_MODULES])
 
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
+MM_PKG_CONFIG_SUBST([GMMPROC_EXTRA_M4_DIR], [--variable=gmmprocm4dir gtkmm-2.4 atkmm-1.6 pangomm-1.4])
 
 MM_ARG_ENABLE_DOCUMENTATION
 MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
diff --git a/gdl/src/gdl_enum.defs b/gdl/src/gdl_enum.defs
index 0c83519..95f0640 100644
--- a/gdl/src/gdl_enum.defs
+++ b/gdl/src/gdl_enum.defs
@@ -37,6 +37,7 @@
   (in-module "Gdl")
   (c-name "GdlDockItemFlags")
   (values
+    '("-drag" "GDL_DOCK_IN_DRAG" "1 << 8")
   )
 )
 
@@ -61,6 +62,7 @@
   (in-module "Gdl")
   (c-name "GdlDockParamFlags")
   (values
+    '("-drag" "GDL_DOCK_IN_DRAG" "1 << 8")
   )
 )