1*f3525e2fSDon Lewisdiff -ur misc/libxml2-2.9.10/include/libxml/xmlversion.h misc/build/libxml2-2.9.10/include/libxml/xmlversion.h
2*f3525e2fSDon Lewis--- misc/libxml2-2.9.10/include/libxml/xmlversion.h	2018-03-05 07:54:29.000000000 -0800
3*f3525e2fSDon Lewis+++ misc/build/libxml2-2.9.10/include/libxml/xmlversion.h	2018-08-22 22:53:15.488158000 -0700
4*f3525e2fSDon Lewis@@ -270,7 +270,7 @@
5cdf0e10cSrcweir  *
6cdf0e10cSrcweir  * Whether iconv support is available
7cdf0e10cSrcweir  */
8cdf0e10cSrcweir-#if 1
9cdf0e10cSrcweir+#if 0
10cdf0e10cSrcweir #define LIBXML_ICONV_ENABLED
11cdf0e10cSrcweir #endif
12cdf0e10cSrcweir
13*f3525e2fSDon Lewis@@ -297,7 +297,7 @@
14cdf0e10cSrcweir  *
15cdf0e10cSrcweir  * Whether Debugging module is configured in
16cdf0e10cSrcweir  */
17cdf0e10cSrcweir-#if 1
18cdf0e10cSrcweir+#if 0
19cdf0e10cSrcweir #define LIBXML_DEBUG_ENABLED
20cdf0e10cSrcweir #endif
21cdf0e10cSrcweir
22*f3525e2fSDon Lewisdiff -ur misc/libxml2-2.9.10/xml2-config.in misc/build/libxml2-2.9.10/xml2-config.in
23*f3525e2fSDon Lewis--- misc/libxml2-2.9.10/xml2-config.in	2016-06-07 03:04:14.000000000 -0700
24*f3525e2fSDon Lewis+++ misc/build/libxml2-2.9.10/xml2-config.in	2019-11-07 22:50:00.185459398 -0800
25cdf0e10cSrcweir@@ -1,9 +1,14 @@
26cdf0e10cSrcweir #! /bin/sh
27cdf0e10cSrcweir
28cdf0e10cSrcweir-prefix=@prefix@
29cdf0e10cSrcweir-exec_prefix=@exec_prefix@
30cdf0e10cSrcweir-includedir=@includedir@
31cdf0e10cSrcweir-libdir=@libdir@
32cdf0e10cSrcweir+#prefix=@prefix@
33cdf0e10cSrcweir+#exec_prefix=@exec_prefix@
34cdf0e10cSrcweir+#includedir=@includedir@
35cdf0e10cSrcweir+#libdir=@libdir@
36cdf0e10cSrcweir+
37cdf0e10cSrcweir+prefix=${SOLARVERSION}/${INPATH}
38cdf0e10cSrcweir+exec_prefix=${SOLARVERSION}/${INPATH}
39cdf0e10cSrcweir+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
40cdf0e10cSrcweir+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
41cdf0e10cSrcweir
42cdf0e10cSrcweir usage()
43cdf0e10cSrcweir {
44*f3525e2fSDon Lewis@@ -65,7 +70,8 @@
45cdf0e10cSrcweir 	;;
46cdf0e10cSrcweir
47cdf0e10cSrcweir     --cflags)
48*f3525e2fSDon Lewis-        cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@"
49*f3525e2fSDon Lewis+        cflags="-I${includedir}"
50*f3525e2fSDon Lewis+#        cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@"
51cdf0e10cSrcweir        	;;
52cdf0e10cSrcweir
53cdf0e10cSrcweir     --libtool-libs)
54*f3525e2fSDon Lewis@@ -80,18 +86,19 @@
55cdf0e10cSrcweir        	;;
56cdf0e10cSrcweir
57cdf0e10cSrcweir     --libs)
58*f3525e2fSDon Lewis-        if [ "$2" = "--dynamic" ]; then
59*f3525e2fSDon Lewis-            shift
60*f3525e2fSDon Lewis-            libs="@XML_LIBS@"
61*f3525e2fSDon Lewis-        else
62*f3525e2fSDon Lewis-            libs="@XML_LIBS@ @XML_PRIVATE_LIBS@ @MODULE_PLATFORM_LIBS@"
63*f3525e2fSDon Lewis-        fi
64*f3525e2fSDon Lewis-
65*f3525e2fSDon Lewis-        if [ "@XML_LIBDIR@" != "-L/usr/lib" -a "@XML_LIBDIR@" != "-L/usr/lib64" ]; then
66*f3525e2fSDon Lewis-            libs="@XML_LIBDIR@ $libs"
67*f3525e2fSDon Lewis-        fi
68*f3525e2fSDon Lewis-
69*f3525e2fSDon Lewis-        libs="$libs @WIN32_EXTRA_LIBADD@"
70*f3525e2fSDon Lewis+        libs="-L${libdir} ${LIBXML2LIB} -lm"
71*f3525e2fSDon Lewis+        if [ "$2" = "--dynamic" ]; then
72*f3525e2fSDon Lewis+            shift
73*f3525e2fSDon Lewis+#            libs="@XML_LIBS@"
74*f3525e2fSDon Lewis+#        else
75*f3525e2fSDon Lewis+#            libs="@XML_LIBS@ @XML_PRIVATE_LIBS@ @MODULE_PLATFORM_LIBS@"
76*f3525e2fSDon Lewis+        fi
77*f3525e2fSDon Lewis+#
78*f3525e2fSDon Lewis+#        if [ "@XML_LIBDIR@" != "-L/usr/lib" -a "@XML_LIBDIR@" != "-L/usr/lib64" ]; then
79*f3525e2fSDon Lewis+#            libs="@XML_LIBDIR@ $libs"
80*f3525e2fSDon Lewis+#        fi
81*f3525e2fSDon Lewis+#
82*f3525e2fSDon Lewis+#        libs="$libs @WIN32_EXTRA_LIBADD@"
83*f3525e2fSDon Lewis         ;;
84cdf0e10cSrcweir
85cdf0e10cSrcweir     *)
86