[g-a-devel] building at-spi2

[Patrick Welche <prlw1 cam ac uk>]

Is this a sensible list for at-spi2-core/at-spi2-atk bits and pieces?

I found the following patches useful when trying to build the above:

In core.diff for at-spi2-core, the reason for uncommenting the LIBS
line is that PATH_XTRA has set X_LIBS, but then all the subsequent
AC_CHECK_LIB calls won't benefit from the paths that it found.
EXTRA_DIST is simply redefined instead of being appended to.

In atk.diff for at-spi2-atk, atk-adaptor/bridge.c=>libspiatk and
common/keymasks.h=>libcspi #include X11 headers, so really need
X_CFLAGS. INCLUDES is the old name for AM_CPPFLAGS.

Cheers,

Patrick

diff --git a/configure.ac b/configure.ac
index 4e9d0a7..1eff7e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,7 @@ else
 fi
 AC_SUBST(X_LIBS)
 
-#LIBS="$LIBS $X_LIBS"
+LIBS="$LIBS $X_LIBS"
 AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[
 	AC_MSG_ERROR([Couldn't find the Xtst library. Check config.log])],
 	-lX11 -lXext)
diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index 9206a3c..389eb81 100644
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -58,4 +58,4 @@ $(service_DATA): $(service_in_files) Makefile
 	@sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
 
 DISTCLEANFILES = org.freedesktop.atspi.Registry.service
-EXTRA_DIST = org.freedesktop.atspi.Registry.service.in
+EXTRA_DIST += org.freedesktop.atspi.Registry.service.in

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 23438b3..68c810f 100644
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -5,10 +5,12 @@ libspiatk_la_CFLAGS = $(DBUS_GLIB_CFLAGS)                 \
 		      $(ATK_CFLAGS)                       \
 		      $(DBIND_CFLAGS)			  \
 		      $(DROUTE_CFLAGS)			  \
+		      $(X_CFLAGS)			  \
 		      -I$(top_srcdir)                     \
 		      -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
 
-libspiatk_la_LDFLAGS = -no-undefined       \
+libspiatk_la_LDFLAGS = $(X_LIBS)           \
+		       -no-undefined       \
 		       -module             \
 		       -avoid-version      \
 		       -rpath $(gtkmoduledir)
diff --git a/cspi/Makefile.am b/cspi/Makefile.am
index 2ce79ef..d6fd432 100644
--- a/cspi/Makefile.am
+++ b/cspi/Makefile.am
@@ -6,6 +6,7 @@ libcspi_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
                     $(ATK_CFLAGS)       \
 		    $(DBIND_CFLAGS)     \
 		    $(DROUTE_CFLAGS)    \
+		    $(X_CFLAGS)         \
                     -I$(top_srcdir)
 
 
diff --git a/tests/cspi/Makefile.am b/tests/cspi/Makefile.am
index 316cbe4..d991bae 100644
--- a/tests/cspi/Makefile.am
+++ b/tests/cspi/Makefile.am
@@ -5,7 +5,7 @@ keysynth_test_SOURCES = keysynth-test.c
 simple_at_SOURCES = simple-at.c 
 test_simple_SOURCES = test-simple.c 
 
-INCLUDES = -I$(top_srcdir)           \
+AM_CPPFLAGS = -I$(top_srcdir)        \
            -I$(top_builddir)         \
 	   $(DBUS_CFLAGS)	     \
 	   $(GLIB_CFLAGS)	     \