1--- misc/libxml2-2.7.8/ltmain.sh	2009-10-06 17:39:54.000000000 +0100
2+++ misc/build/libxml2-2.7.8/ltmain.sh	2009-12-17 11:43:56.000000000 +0000
3@@ -6599,8 +6599,8 @@
4 	  ;;
5
6 	freebsd-elf)
7-	  major=".$current"
8-	  versuffix=".$current"
9+	  major=.`expr $current - $age`
10+	  versuffix=".$major.$age.$revision";
11 	  ;;
12
13 	irix | nonstopux)
14--- misc/libxml2-2.7.8/include/libxml/xmlversion.h	2009-12-17 11:45:19.000000000 +0000
15+++ misc/build/libxml2-2.7.8/include/libxml/xmlversion.h	2009-12-17 11:45:36.000000000 +0000
16@@ -264,7 +264,7 @@
17  *
18  * Whether iconv support is available
19  */
20-#if 1
21+#if 0
22 #define LIBXML_ICONV_ENABLED
23 #endif
24
25@@ -291,7 +291,7 @@
26  *
27  * Whether Debugging module is configured in
28  */
29-#if 1
30+#if 0
31 #define LIBXML_DEBUG_ENABLED
32 #endif
33
34@@ -300,7 +300,7 @@
35  *
36  * Whether the memory debugging is configured in
37  */
38-#if 1
39+#if 0
40 #define DEBUG_MEMORY_LOCATION
41 #endif
42
43@@ -309,7 +309,7 @@
44  *
45  * Whether the runtime debugging is configured in
46  */
47-#if 1
48+#if 0
49 #define LIBXML_DEBUG_RUNTIME
50 #endif
51
52--- misc/libxml2-2.7.8/xml2-config.in	2009-12-17 11:45:20.000000000 +0000
53+++ misc/build/libxml2-2.7.8/xml2-config.in	2009-12-17 11:45:36.000000000 +0000
54@@ -1,9 +1,14 @@
55 #! /bin/sh
56
57-prefix=@prefix@
58-exec_prefix=@exec_prefix@
59-includedir=@includedir@
60-libdir=@libdir@
61+#prefix=@prefix@
62+#exec_prefix=@exec_prefix@
63+#includedir=@includedir@
64+#libdir=@libdir@
65+
66+prefix=${SOLARVERSION}/${INPATH}
67+exec_prefix=${SOLARVERSION}/${INPATH}
68+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
69+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
70
71 usage()
72 {
73@@ -67,7 +72,8 @@
74 	;;
75
76     --cflags)
77-       	echo @XML_INCLUDEDIR@ @XML_CFLAGS@
78+        echo -I${includedir}
79+#       	echo @XML_INCLUDEDIR@ @XML_CFLAGS@
80        	;;
81
82     --libtool-libs)
83@@ -82,19 +88,24 @@
84        	;;
85
86     --libs)
87-        if [ "`uname`" = "Linux" ]
88-	then
89-	    if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
90-	    then
91-		echo @XML_LIBS@
92-	    else
93-		echo @XML_LIBDIR@ @XML_LIBS@
94-	    fi
95-	else
96-	    echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
97-	fi
98+        echo -L${libdir} ${LIBXML2LIB} -lm
99+#        if [ "`uname`" = "Linux" ]
100+#	then
101+#	    if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
102+#	    then
103+#		echo @XML_LIBS@
104+#	    else
105+#		echo @XML_LIBDIR@ @XML_LIBS@
106+#	    fi
107+#	else
108+#	    echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
109+#	fi
110        	;;
111
112+    print) # ugly configure hack
113+        exit 0
114+        ;;
115+
116     *)
117 	usage
118 	exit 1
119