diff options
Diffstat (limited to 'textproc/libxml2/files/patch-ab')
| -rw-r--r-- | textproc/libxml2/files/patch-ab | 107 |
1 files changed, 88 insertions, 19 deletions
diff --git a/textproc/libxml2/files/patch-ab b/textproc/libxml2/files/patch-ab index 95463f93ba31..5f2557587a38 100644 --- a/textproc/libxml2/files/patch-ab +++ b/textproc/libxml2/files/patch-ab @@ -1,26 +1,95 @@ ---- configure.orig Fri Jun 1 03:33:59 2001 -+++ configure Mon Jun 18 13:39:58 2001 -@@ -3545,3 +3545,3 @@ + +$FreeBSD$ + +--- configure.orig Tue Jul 10 18:51:46 2001 ++++ configure Wed Jul 11 10:25:59 2001 +@@ -3569,7 +3569,7 @@ + + XML_LIBDIR='-L${libdir}' -XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}' +XML_INCLUDEDIR='-I${includedir}/libxml2 -I${includedir}/libxml2/libxml' -@@ -4028,3 +4028,3 @@ - builtin and then its argument prototype would still apply. */ --char iconv(); -+char libiconv(); - -@@ -4038,3 +4038,3 @@ - #else --iconv(); -+libiconv(); - #endif -@@ -4074,6 +4074,6 @@ - builtin and then its argument prototype would still apply. */ --char iconv(); -+char libiconv(); + XML_CFLAGS="" + RDL_LIBS="" +@@ -4020,16 +4020,16 @@ + ICONV_LIBS="-L$with_iconv/lib" + fi + +- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 +-echo "configure:4026: checking for iconv.h" >&5 ++ ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 ++echo "configure:4026: checking for giconv.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF + #line 4031 "configure" + #include "confdefs.h" +-#include <iconv.h> ++#include <giconv.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" + { (eval echo configure:4036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +@@ -4048,17 +4048,17 @@ + fi + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- echo $ac_n "checking for iconv""... $ac_c" 1>&6 +-echo "configure:4053: checking for iconv" >&5 ++ echo $ac_n "checking for libiconv""... $ac_c" 1>&6 ++echo "configure:4053: checking for libiconv" >&5 + cat > conftest.$ac_ext <<EOF + #line 4055 "configure" + #include "confdefs.h" + #include <stdlib.h> +-#include <iconv.h> ++#include <giconv.h> + int main() { + + iconv_t cd = iconv_open ("",""); +-iconv (cd, NULL, NULL, NULL, NULL); ++libiconv (cd, NULL, NULL, NULL, NULL); + ; return 0; } + EOF + if { (eval echo configure:4065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +@@ -4072,23 +4072,23 @@ + rm -rf conftest* + + echo "$ac_t""no" 1>&6 +- echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 +-echo "configure:4077: checking for iconv in -liconv" >&5 ++ echo $ac_n "checking for libiconv in -lgiconv""... $ac_c" 1>&6 ++echo "configure:4077: checking for libiconv in -lgiconv" >&5 + + _ldflags="${LDFLAGS}" + _libs="${LIBS}" + LDFLAGS="${LDFLAGS} ${ICONV_LIBS}" +- LIBS="${LIBS} -liconv" ++ LIBS="${LIBS} -lgiconv" + cat > conftest.$ac_ext <<EOF + #line 4085 "configure" + #include "confdefs.h" + #include <stdlib.h> +-#include <iconv.h> ++#include <giconv.h> int main() { --iconv() -+libiconv() + + iconv_t cd = iconv_open ("",""); +-iconv (cd, NULL, NULL, NULL, NULL); ++libiconv (cd, NULL, NULL, NULL, NULL); ; return 0; } + EOF + if { (eval echo configure:4095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +@@ -4096,7 +4096,7 @@ + + echo "$ac_t""yes" 1>&6 + WITH_ICONV=1 +- ICONV_LIBS="${ICONV_LIBS} -liconv" ++ ICONV_LIBS="${ICONV_LIBS} -lgiconv" + LIBS="${_libs}" + LDFLAGS="${_ldflags}" + else |