summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2005-01-16 01:41:24 +0000
committerKeith Packard <keithp@keithp.com>2005-01-16 01:41:24 +0000
commit59e149e757795a7c0ec66c35b551a66e0da42098 (patch)
tree4503498940fe8329b4310d8fb2651b0c6e56f57f
parentd8ae9c92197f1f2782b9decb276f6da756ce882d (diff)
downloadfontconfig-59e149e757795a7c0ec66c35b551a66e0da42098.tar.gz
Have --with-expat set EXPAT_CFLAGS (bug 2278)
reviewed by: Keith Packard <keithp@keithp.com>
-rw-r--r--ChangeLog7
-rw-r--r--configure.in11
2 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 07621e8..1204864 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-15 Alan Coopersmith <alan.coopersmith@sun.com>
+
+ reviewed by: Keith Packard <keithp@keithp.com>
+
+ * configure.in:
+ Have --with-expat set EXPAT_CFLAGS (bug 2278)
+
2005-01-13 Keith Packard <keithp@keithp.com>
* doc/fontconfig-user.sgml:
diff --git a/configure.in b/configure.in
index 7f333aa..c18a9f3 100644
--- a/configure.in
+++ b/configure.in
@@ -202,7 +202,16 @@ no)
;;
*)
case "$expat_includes" in
- yes|no)
+ yes)
+ case "$expat" in
+ yes)
+ ;;
+ *)
+ EXPAT_CFLAGS="-I$expat/include"
+ ;;
+ esac
+ ;;
+ no)
EXPAT_CFLAGS=""
;;
*)