[dasher] If expat is in the system library path, check the X distribution before
- From: Patrick Welche <pwelche src gnome org>
- To: svn-commits-list gnome org
- Subject: [dasher] If expat is in the system library path, check the X distribution before
- Date: Tue, 26 May 2009 12:12:52 -0400 (EDT)
commit beb26c149908585f1d9bd8cdfbe880ec9aa4260b
Author: Patrick Welche <prlw1 cam ac uk>
Date: Fri May 22 20:32:08 2009 +0100
If expat is in the system library path, check the X distribution before
giving up.
---
ChangeLog | 4 ++++
configure.ac | 15 ++++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b04b49f..9e5020c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-21 Patrick Welche <prlw1 cam ac uk>
+
+ * configure.ac: Look for expat in the X distribution.
+
2009-05-19 Alan Lawrence <acl33 inf phy cam ac uk>
* DasherModel.h: Removed unused 'iStyle' member of SGotoItem
diff --git a/configure.ac b/configure.ac
index 5d9fed7..01d79c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,6 @@ WITHGTK2=true;
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6)
-AC_CHECK_LIB(expat, XML_Parse,, AC_MSG_ERROR([Expat library not found.]))
AC_LANG_PUSH(C++)
AC_CHECK_FUNCS(lldiv)
AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
@@ -234,8 +233,19 @@ if test x"$WITHA11Y" = xtrue; then
AC_DEFINE([GNOME_A11Y], 1, [gnome_a11y libraries are present])
fi
+AC_PATH_XTRA
+AC_CHECK_LIB(expat, XML_Parse,,[
+ if test x$no_x = xyes ; then
+ AC_MSG_ERROR([Expat library not found.])
+ else
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ LDFLAGS="$LDFLAGS $X_LIBS"
+ dnl Check for different function to avoid cached "no" result.
+ AC_CHECK_LIB(expat, XML_SetElementHandler,,
+ [AC_MSG_ERROR([Expat library not found.])])
+ fi
+])
if test x"$WITHQTE" != xtrue -a x"$WITHA11Y" != xtrue; then
- AC_PATH_XTRA
if test x$no_x = xyes ; then
AC_MSG_ERROR([X development libraries not found])
else
@@ -252,7 +262,6 @@ if test x"$WITHQTE" != xtrue -a x"$WITHA11Y" != xtrue; then
AC_SUBST(X_LIBS)
fi
-
if test x"$WITHJAPANESE" = xtrue; then
AC_DEFINE([JAPANESE], 1, [Japanese support enabled])
JAPANESE_SOURCES='CannaConversionHelper.$(OBJEXT)'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]