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