Commit | Line | Data |
---|---|---|
67cf4ba7 JB |
1 | diff -purN libxslt-1.1.26.orig/configure libxslt-1.1.26/configure |
2 | --- libxslt-1.1.26.orig/configure 2009-12-16 16:50:48.000000000 +0100 | |
3 | +++ libxslt-1.1.26/configure 2009-12-16 17:07:50.000000000 +0100 | |
4 | @@ -15860,32 +15860,9 @@ $as_echo "$as_me: error: libxml source d | |
5 | fi | |
6 | fi | |
7 | ||
8 | - | |
9 | -if ${XML_CONFIG} --libs print > /dev/null 2>&1 | |
10 | -then | |
11 | - XMLVERS=`$XML_CONFIG --version` | |
12 | - if test `echo $XMLVERS | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -ge `echo $LIBXML_REQUIRED_VERSION | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` | |
13 | - then | |
14 | - LIBXML_LIBS="$LIBXML_LIBS `$XML_CONFIG --libs`" | |
15 | - LIBXML_CFLAGS="$LIBXML_CFLAGS `$XML_CONFIG --cflags`" | |
16 | - { $as_echo "$as_me:$LINENO: result: $XMLVERS found" >&5 | |
17 | -$as_echo "$XMLVERS found" >&6; } | |
18 | - else | |
19 | - { { $as_echo "$as_me:$LINENO: error: Version $XMLVERS found. You need at least libxml2 $LIBXML_REQUIRED_VERSION for this version of libxslt" >&5 | |
20 | -$as_echo "$as_me: error: Version $XMLVERS found. You need at least libxml2 $LIBXML_REQUIRED_VERSION for this version of libxslt" >&2;} | |
21 | - { (exit 1); exit 1; }; } | |
22 | - fi | |
23 | -else | |
24 | - { { $as_echo "$as_me:$LINENO: error: Could not find libxml2 anywhere, check ftp://xmlsoft.org/." >&5 | |
25 | -$as_echo "$as_me: error: Could not find libxml2 anywhere, check ftp://xmlsoft.org/." >&2;} | |
26 | - { (exit 1); exit 1; }; } | |
27 | -fi | |
28 | - | |
29 | - | |
30 | - | |
31 | - | |
32 | - | |
33 | - | |
34 | +XMLVERS=`$XML_CONFIG --version` | |
35 | +LIBXML_LIBS="-L${SRC_DIR} -lxml2 -lz -lm" | |
36 | +LIBXML_CFLAGS="-I${SRC_DIR}/include -I${SRC_DIR}/include/libxml2" | |
37 | ||
38 | # Check whether --with-plugins was given. | |
39 | if test "${with_plugins+set}" = set; then |