From 873740dee5845de4ee84357888fa3f94f0ae9c38 Mon Sep 17 00:00:00 2001 From: billh Date: Mon, 11 Mar 2002 15:30:27 +0000 Subject: [PATCH] Fix for broken configure (was not explicitly including X libs). git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@246 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- ChangeLog | 7 +++++++ configure.in | 10 ++++++++++ test/Makefile.am | 4 ++-- util/Makefile.am | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fc90ab..028e6ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-03-11 Bill Haneman + + * configure.in: + Added X_LIBS to AC_SUBST, for applications + that call Xlib API directly. + + 2002-03-07 Bill Haneman * configure.in: diff --git a/configure.in b/configure.in index 87eebac..0911f23 100644 --- a/configure.in +++ b/configure.in @@ -82,6 +82,16 @@ dnl NOTE: We need to use a separate automake conditional for this dnl to make this work with the tarballs. AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) +AC_PATH_XTRA + +if test x$no_x = xyes ; then + AC_MSG_ERROR([X development libraries not found]) +else + X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" +fi + +AC_SUBST(X_LIBS) + dnl Checks for libraries PKG_CHECK_MODULES(LIBSPI, \ libbonobo-2.0 >= 1.107.0 \ diff --git a/test/Makefile.am b/test/Makefile.am index c7385be..77ab4a7 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -26,6 +26,6 @@ DEBUG_CFLAGS=-DSPI_DEBUG CFLAGS += $(TESTS_CFLAGS) $(DEBUG_CFLAGS) -LDADD = ../util/libat-util.la ../libspi/libspi.la ../cspi/libcspi.la $(TESTS_LIBS) +LDADD = ../util/libat-util.la ../libspi/libspi.la ../cspi/libcspi.la $(TESTS_LIBS) $(X_LIBS) -TESTS = test-simple \ No newline at end of file +TESTS = test-simple diff --git a/util/Makefile.am b/util/Makefile.am index 910d145..97ba2de 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -53,7 +53,7 @@ IDLFLAGS = -I$(BONOBO_ACTIVATION_IDL_DIR) \ orbittypelibdir = $(libdir)/orbit -LDADD = $(UTILS_LIBS) +LDADD = $(UTILS_LIBS) $(X_LIBS) serverinfodir = $(libdir)/bonobo/servers serverinfo_DATA = Accessibility_Util.server -- 2.7.4