diff options
| author | richard <richard@b067294f-1dea-0310-9683-c47a78595994> | 2007-11-14 13:58:05 +0000 |
|---|---|---|
| committer | richard <richard@b067294f-1dea-0310-9683-c47a78595994> | 2007-11-14 13:58:05 +0000 |
| commit | 0dca6183402acf326aaefd948b25453159101fd3 (patch) | |
| tree | 571ba8001253aef743b88f6ed84a40a37eda1a69 | |
| parent | ffe5d7c191d47a992cb843b7c0642c1e94bdd6d7 (diff) | |
matchbox: Update various configure.ac files, adding --enable-expat and --disable-expat options where needed and ensuring -L/lib doesn't end up in EXPAT_LIBS.
git-svn-id: http://svn.o-hand.com/repos/matchbox/trunk/Xoo@1819 b067294f-1dea-0310-9683-c47a78595994
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2007-11-14 Richard Purdie <rpurdie@opened.com> + + * configure.ac: + Add --enable-expat and --disable-expat options. + Stop -L/lib being added to compiler commandline and breaking builds + when --enable-expat and --disable-expat options aren't used and + $expat is empty. + 2007-08-06 Ross Burton <ross@openedhand.com> * data/Makefile.am: diff --git a/configure.ac b/configure.ac index 859d17d..4ab1100 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,10 @@ AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE() AM_CONFIG_HEADER(config.h) +AC_ARG_ENABLE(expat, + [ --enable-expat Enable expat XML parser support], + enable_expat=$enableval, enable_expat=no ) + AC_ARG_WITH(expat-includes, [ --with-expat-includes=DIR Use Expat includes in DIR], expat_includes=$withval, expat_includes=yes) @@ -76,7 +80,7 @@ case "$expat_lib" in yes) case "$expat" in - yes) + yes|"") EXPAT_LIBS="-lexpat" ;; *) |