[gtk+] gtk: Include gail by default, don't build it as a module

[Matthias Clasen <matthiasc src gnome org>]

commit 773df067e8bb6f1932f6b3ad4e9c91d52187ccd6
Author: Benjamin Otte <otte redhat com>
Date:   Wed Jun 15 12:46:50 2011 +0200

    gtk: Include gail by default, don't build it as a module
    
    It is now no longer possible to disable it.
    This doesn't matter though because GTK will not instantiate a11y
    objects until you actually use it. So nothing changes in practice.

 gtk/Makefile.am      |    3 ++-
 gtk/a11y/Makefile.am |   10 +---------
 gtk/gtkmain.c        |    5 +++++
 3 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e1eeca3..7c80c2f 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -16,7 +16,7 @@ else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
-SUBDIRS = . a11y tests
+SUBDIRS = a11y . tests
 
 if HAVE_PAPI_CUPS
 GTK_PRINT_BACKENDS=file,papi,cups
@@ -109,6 +109,7 @@ endif
 libgtkincludedir = $(includedir)/gtk-3.0/gtk
 libadd = \
 	$(top_builddir)/gdk/libgdk-3.la	\
+	$(top_builddir)/gtk/a11y/libgail.la \
 	$(GTK_DEP_LIBS)
 deps =
 
diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am
index 0e1474e..82d2daf 100644
--- a/gtk/a11y/Makefile.am
+++ b/gtk/a11y/Makefile.am
@@ -1,11 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
-moduledir = $(libdir)/gtk-3.0/modules
-module_LTLIBRARIES = libgail.la
+noinst_LTLIBRARIES = libgail.la
 
 gail_c_sources =			\
 	gail-private-macros.h		\
@@ -144,13 +139,10 @@ libgail_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libgail_la_LIBADD =  \
-	$(top_builddir)/gtk/libgtk-3.la				\
 	$(GTK_DEP_LIBS)						\
 	$(INTLLIBS)
 
 libgail_la_LDFLAGS =    \
-	-rpath $(moduledir) -module -avoid-version \
-	$(no_undefined) \
         $(LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index d941bb8..55d806b 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -811,6 +811,9 @@ gettext_initialization (void)
 #endif  
 }
 
+/* XXX: Remove me after getting rid of gail */
+extern void gnome_accessibility_module_init     (void);
+
 static void
 do_post_parse_initialization (int    *argc,
                               char ***argv)
@@ -868,6 +871,8 @@ do_post_parse_initialization (int    *argc,
     {
       _gtk_modules_init (argc, argv, NULL);
     }
+
+  gnome_accessibility_module_init ();
 }