|
Line
Link Here
|
| 0 |
-- configure.in |
0 |
++ configure.in |
|
Lines 97-103
Link Here
|
| 97 |
dnl zlib option might change flags, so we save them initially |
97 |
dnl zlib option might change flags, so we save them initially |
| 98 |
dnl |
98 |
dnl |
| 99 |
_cppflags="${CPPFLAGS}" |
99 |
_cppflags="${CPPFLAGS}" |
| 100 |
_ldflags="${LDFLAGS}" |
100 |
_libs="${LIBS}" |
| 101 |
|
101 |
|
| 102 |
AC_ARG_WITH(c14n, |
102 |
AC_ARG_WITH(c14n, |
| 103 |
[ --with-c14n add the Canonicalization support (on)]) |
103 |
[ --with-c14n add the Canonicalization support (on)]) |
|
Lines 154-160
Link Here
|
| 154 |
if test "$withval" != "no" -a "$withval" != "yes"; then |
154 |
if test "$withval" != "no" -a "$withval" != "yes"; then |
| 155 |
RDL_DIR=$withval |
155 |
RDL_DIR=$withval |
| 156 |
CPPFLAGS="${CPPFLAGS} -I$withval/include" |
156 |
CPPFLAGS="${CPPFLAGS} -I$withval/include" |
| 157 |
LDFLAGS="${LDFLAGS} -L$withval/lib" |
157 |
LIBS="${LIBS} -L$withval/lib" |
| 158 |
fi |
158 |
fi |
| 159 |
]) |
159 |
]) |
| 160 |
AC_ARG_WITH(regexps, |
160 |
AC_ARG_WITH(regexps, |
|
Lines 190-196
Link Here
|
| 190 |
if test "$withval" != "no" -a "$withval" != "yes"; then |
190 |
if test "$withval" != "no" -a "$withval" != "yes"; then |
| 191 |
Z_DIR=$withval |
191 |
Z_DIR=$withval |
| 192 |
CPPFLAGS="${CPPFLAGS} -I$withval/include" |
192 |
CPPFLAGS="${CPPFLAGS} -I$withval/include" |
| 193 |
LDFLAGS="${LDFLAGS} -L$withval/lib" |
193 |
LIBS="${LIBS} -L$withval/lib" |
| 194 |
fi |
194 |
fi |
| 195 |
]) |
195 |
]) |
| 196 |
AC_ARG_WITH(lzma, |
196 |
AC_ARG_WITH(lzma, |
|
Lines 198-204
Link Here
|
| 198 |
if test "$withval" != "no" -a "$withval" != "yes"; then |
198 |
if test "$withval" != "no" -a "$withval" != "yes"; then |
| 199 |
LZMA_DIR=$withval |
199 |
LZMA_DIR=$withval |
| 200 |
CPPFLAGS="${CPPFLAGS} -I$withval/include" |
200 |
CPPFLAGS="${CPPFLAGS} -I$withval/include" |
| 201 |
LDFLAGS="${LDFLAGS} -L$withval/lib" |
201 |
LIBS="${LIBS} -L$withval/lib" |
| 202 |
fi |
202 |
fi |
| 203 |
]) |
203 |
]) |
| 204 |
AC_ARG_WITH(coverage, |
204 |
AC_ARG_WITH(coverage, |
|
Lines 428-434
Link Here
|
| 428 |
AC_SUBST(WITH_LZMA) |
428 |
AC_SUBST(WITH_LZMA) |
| 429 |
|
429 |
|
| 430 |
CPPFLAGS=${_cppflags} |
430 |
CPPFLAGS=${_cppflags} |
| 431 |
LDFLAGS=${_ldflags} |
431 |
LIBS=${_libs} |
| 432 |
|
432 |
|
| 433 |
echo Checking headers |
433 |
echo Checking headers |
| 434 |
|
434 |
|
|
Lines 1365-1378
Link Here
|
| 1365 |
AC_SUBST(WITH_ICONV) |
1365 |
AC_SUBST(WITH_ICONV) |
| 1366 |
|
1366 |
|
| 1367 |
WITH_ICU=0 |
1367 |
WITH_ICU=0 |
|
|
1368 |
ICU_LIBS="" |
| 1368 |
if test "$with_icu" != "yes" ; then |
1369 |
if test "$with_icu" != "yes" ; then |
| 1369 |
echo Disabling ICU support |
1370 |
echo Disabling ICU support |
| 1370 |
else |
1371 |
else |
| 1371 |
ICU_CONFIG=icu-config |
1372 |
ICU_CONFIG=icu-config |
| 1372 |
if ${ICU_CONFIG} --cflags >/dev/null 2>&1 |
1373 |
if ${ICU_CONFIG} --cflags >/dev/null 2>&1 |
| 1373 |
then |
1374 |
then |
| 1374 |
ICU_LIBS=`icu-config --ldflags` |
1375 |
ICU_LIBS=`${ICU_CONFIG} --ldflags` |
| 1375 |
LDFLAGS="$LDFLAGS $ICU_LIBS" |
|
|
| 1376 |
WITH_ICU=1 |
1376 |
WITH_ICU=1 |
| 1377 |
echo Enabling ICU support |
1377 |
echo Enabling ICU support |
| 1378 |
else |
1378 |
else |
|
Lines 1380-1385
Link Here
|
| 1380 |
fi |
1380 |
fi |
| 1381 |
fi |
1381 |
fi |
| 1382 |
AC_SUBST(WITH_ICU) |
1382 |
AC_SUBST(WITH_ICU) |
|
|
1383 |
AC_SUBST(ICU_LIBS) |
| 1383 |
|
1384 |
|
| 1384 |
WITH_ISO8859X=1 |
1385 |
WITH_ISO8859X=1 |
| 1385 |
if test "$WITH_ICONV" != "1" ; then |
1386 |
if test "$WITH_ICONV" != "1" ; then |
| 1386 |
-- libxml-2.0.pc.in |
1387 |
++ libxml-2.0.pc.in |
|
Lines 9-13
Link Here
|
| 9 |
Description: libXML library version2. |
9 |
Description: libXML library version2. |
| 10 |
Requires: |
10 |
Requires: |
| 11 |
Libs: -L${libdir} -lxml2 |
11 |
Libs: -L${libdir} -lxml2 |
| 12 |
Libs.private: @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ |
12 |
Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ |
| 13 |
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ |
13 |
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ |
| 14 |
-- libxml-2.0-uninstalled.pc.in |
14 |
++ libxml-2.0-uninstalled.pc.in |
|
Lines 8-12
Link Here
|
| 8 |
Version: @VERSION@ |
8 |
Version: @VERSION@ |
| 9 |
Description: libXML library version2. |
9 |
Description: libXML library version2. |
| 10 |
Requires: |
10 |
Requires: |
| 11 |
Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ |
11 |
Libs: -L${libdir} -lxml2 @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ |
| 12 |
Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@ |
12 |
Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@ |
| 13 |
-- Makefile.am |
13 |
++ Makefile.am |
|
Lines 18-24
Link Here
|
| 18 |
bin_SCRIPTS=xml2-config |
18 |
bin_SCRIPTS=xml2-config |
| 19 |
|
19 |
|
| 20 |
lib_LTLIBRARIES = libxml2.la |
20 |
lib_LTLIBRARIES = libxml2.la |
| 21 |
libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@ |
21 |
libxml2_la_LIBADD = @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@ |
| 22 |
|
22 |
|
| 23 |
if USE_VERSION_SCRIPT |
23 |
if USE_VERSION_SCRIPT |
| 24 |
LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms |
24 |
LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms |
