diff options
| author | richard <richard@b067294f-1dea-0310-9683-c47a78595994> | 2007-11-14 14:11:02 +0000 |
|---|---|---|
| committer | richard <richard@b067294f-1dea-0310-9683-c47a78595994> | 2007-11-14 14:11:02 +0000 |
| commit | e20effa9ae97742e6633c0c0c771fa70b5794772 (patch) | |
| tree | f4e89a72b6978264361254d231c0beb64a68cc19 | |
| parent | 0dca6183402acf326aaefd948b25453159101fd3 (diff) | |
matchbox: Fix configure.ac for packages that require expat
git-svn-id: http://svn.o-hand.com/repos/matchbox/trunk/Xoo@1820 b067294f-1dea-0310-9683-c47a78595994
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 19 |
2 files changed, 4 insertions, 19 deletions
@@ -1,10 +1,8 @@ 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. + $expat variable isn't used. 2007-08-06 Ross Burton <ross@openedhand.com> diff --git a/configure.ac b/configure.ac index 4ab1100..1f5011d 100644 --- a/configure.ac +++ b/configure.ac @@ -8,10 +8,6 @@ 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) @@ -78,20 +74,11 @@ esac case "$expat_lib" in yes) - - case "$expat" in - yes|"") - EXPAT_LIBS="-lexpat" - ;; - *) - EXPAT_LIBS="-L$expat/lib -lexpat" - ;; - esac - + EXPAT_LIBS="-lexpat" ;; -no) + no) ;; -*) + *) EXPAT_LIBS="-L$expat_lib -lexpat" ;; esac |