diff options
| author | Emil Velikov <[email protected]> | 2013-10-30 00:03:43 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2013-10-30 22:05:42 +0000 |
| commit | 9eb3de1ce7acb59a8b38ddcef20366620ff02b60 (patch) | |
| tree | 63f851456e626686b778c83e9e8f1bdf7eaa3425 | |
| parent | 5cb80f03142ddcc949f4d208594004cc2bcc4140 (diff) | |
automake: handle expat version pre 2.1
Commit aec20d66d9d13e0acd6a7199b63e1383e1e9900a
(automake: properly handle non-default expat installation),
assumed that up-to date distributions use a recent version
of expat that handles security vunerabilities CVE-2012-1147
and CVE-2012-1148. Seems like this is not always the case
and they prefer to backport only the fix, rather than use
the updated library.
This commit adds a default case -lexpat whenever expat is
not found, while properly handling expat.pc if present.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71022
Reported-By: Bryce Harrington <[email protected]>
Reported-By: Vinson Lee <[email protected]>
Tested-by: Bryce Harrington <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 8ba4feef3a1..f94c9b9791c 100644 --- a/configure.ac +++ b/configure.ac @@ -1005,9 +1005,14 @@ if test "x$enable_dri" = xyes; then DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/ */ /g'` # Check for expat - PKG_CHECK_MODULES([EXPAT], [expat], [], - AC_MSG_ERROR([Expat required for DRI.])) - + PKG_CHECK_EXISTS([EXPAT], [have_expat=yes], [have_expat=no]) + if test "x$have_expat" = "xyes"; then + PKG_CHECK_MODULES([EXPAT], [expat], [], + AC_MSG_ERROR([Expat required for DRI.])) + else + # expat version 2.0 and earlier do not provide expat.pc + EXPAT_LIBS=-lexpat + fi # If we are building any DRI driver other than swrast. if test -n "$DRI_DIRS"; then |