|
Matthias Clasen |
2a4120 |
diff -up at-spi-1.25.2/atk-bridge/Makefile.am.unneeded-deps at-spi-1.25.2/atk-bridge/Makefile.am
|
|
Matthias Clasen |
2a4120 |
--- at-spi-1.25.2/atk-bridge/Makefile.am.unneeded-deps 2007-12-03 01:16:10.000000000 -0500
|
|
Matthias Clasen |
2a4120 |
+++ at-spi-1.25.2/atk-bridge/Makefile.am 2008-12-10 11:44:34.000000000 -0500
|
|
Matthias Clasen |
2a4120 |
@@ -33,4 +33,4 @@ libatk_bridge_la_LDFLAGS = \
|
|
Matthias Clasen |
2a4120 |
|
|
Matthias Clasen |
2a4120 |
libatk_bridge_la_LIBADD = \
|
|
Matthias Clasen |
2a4120 |
$(top_builddir)/libspi/libspi.la \
|
|
Matthias Clasen |
2a4120 |
- $(ATK_BRIDGE_LIBS)
|
|
Matthias Clasen |
2a4120 |
+ $(ATK_BRIDGE_LIBS) $(X_LIBS)
|
|
Matthias Clasen |
2a4120 |
diff -up at-spi-1.25.2/configure.in.unneeded-deps at-spi-1.25.2/configure.in
|
|
Matthias Clasen |
2a4120 |
--- at-spi-1.25.2/configure.in.unneeded-deps 2008-12-01 01:52:24.000000000 -0500
|
|
Matthias Clasen |
2a4120 |
+++ at-spi-1.25.2/configure.in 2008-12-10 11:48:47.000000000 -0500
|
|
Matthias Clasen |
2a4120 |
@@ -77,7 +77,7 @@ AC_PATH_XTRA
|
|
Matthias Clasen |
2a4120 |
if test x$no_x = xyes ; then
|
|
Matthias Clasen |
2a4120 |
AC_MSG_ERROR([X development libraries not found])
|
|
Matthias Clasen |
2a4120 |
else
|
|
Matthias Clasen |
2a4120 |
- X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
|
|
Matthias Clasen |
2a4120 |
+ X_LIBS="$X_LIBS -lX11"
|
|
Matthias Clasen |
2a4120 |
fi
|
|
Matthias Clasen |
2a4120 |
|
|
Matthias Clasen |
2a4120 |
AC_SUBST(X_LIBS)
|
|
Matthias Clasen |
0f9b3a |
@@ -144,7 +144,6 @@ LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variab
|
|
Matthias Clasen |
0f9b3a |
AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
|
|
Matthias Clasen |
0f9b3a |
AC_SUBST(LIBBONOBO_IDL_DIR)
|
|
Matthias Clasen |
0f9b3a |
|
|
Matthias Clasen |
0f9b3a |
-LIBS="$LIBS $X_LIBS"
|
|
Matthias Clasen |
0f9b3a |
dnl path to Xtst
|
|
Matthias Clasen |
0f9b3a |
AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[
|
|
Matthias Clasen |
0f9b3a |
AC_MSG_ERROR([Couldn't find the Xtst library. Check config.log])],
|
|
Matthias Clasen |
2a4120 |
diff -up at-spi-1.25.2/cspi/Makefile.am.unneeded-deps at-spi-1.25.2/cspi/Makefile.am
|
|
Matthias Clasen |
2a4120 |
--- at-spi-1.25.2/cspi/Makefile.am.unneeded-deps 2007-06-05 03:16:57.000000000 -0400
|
|
Matthias Clasen |
2a4120 |
+++ at-spi-1.25.2/cspi/Makefile.am 2008-12-10 11:44:34.000000000 -0500
|
|
Matthias Clasen |
0f9b3a |
@@ -14,7 +14,7 @@ libcspi_la_LDFLAGS = @LDFLAGS@ @LT_VERSI
|
|
Matthias Clasen |
0f9b3a |
|
|
Matthias Clasen |
0f9b3a |
LDADD = \
|
|
Matthias Clasen |
0f9b3a |
$(top_builddir)/libspi/libspi.la \
|
|
Matthias Clasen |
0f9b3a |
- $(LIBCSPI_LIBS) $(X_LIBS)
|
|
Matthias Clasen |
0f9b3a |
+ $(LIBCSPI_LIBS)
|
|
Matthias Clasen |
0f9b3a |
|
|
Matthias Clasen |
0f9b3a |
libcspidir = $(includedir)/at-spi-1.0/cspi
|
|
Matthias Clasen |
0f9b3a |
libcspi_HEADERS = \
|
|
Matthias Clasen |
2a4120 |
diff -up at-spi-1.25.2/libspi/Makefile.am.unneeded-deps at-spi-1.25.2/libspi/Makefile.am
|
|
Matthias Clasen |
2a4120 |
--- at-spi-1.25.2/libspi/Makefile.am.unneeded-deps 2007-11-28 01:43:23.000000000 -0500
|
|
Matthias Clasen |
2a4120 |
+++ at-spi-1.25.2/libspi/Makefile.am 2008-12-10 11:44:34.000000000 -0500
|
|
Matthias Clasen |
0f9b3a |
@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir) \
|
|
Matthias Clasen |
0f9b3a |
$(X_CFLAGS)
|
|
Matthias Clasen |
0f9b3a |
|
|
Matthias Clasen |
0f9b3a |
libspi_la_LDFLAGS = @LT_VERSION_INFO@ -no-undefined
|
|
Matthias Clasen |
0f9b3a |
-libspi_la_LIBADD = $(LIBSPI_LIBS) $(XTST_LIBS)
|
|
Matthias Clasen |
0f9b3a |
+libspi_la_LIBADD = $(LIBSPI_LIBS)
|
|
Matthias Clasen |
0f9b3a |
|
|
Matthias Clasen |
0f9b3a |
libspiincludedir = $(includedir)/at-spi-1.0/libspi
|
|
Matthias Clasen |
0f9b3a |
|