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