forked from Lainports/freebsd-ports
85 lines
2.4 KiB
Text
85 lines
2.4 KiB
Text
|
|
$FreeBSD$
|
|
|
|
--- configure.orig Mon Jul 23 22:40:34 2001
|
|
+++ configure Mon Jul 30 15:39:38 2001
|
|
@@ -3571,7 +3572,7 @@
|
|
|
|
|
|
XML_LIBDIR='-L${libdir}'
|
|
-XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
|
|
+XML_INCLUDEDIR='-I${includedir}/libxml2 -I${includedir}/libxml2/libxml'
|
|
|
|
XML_CFLAGS=""
|
|
RDL_LIBS=""
|
|
@@ -4034,15 +4035,15 @@
|
|
fi
|
|
|
|
ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
|
|
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
|
|
-echo "configure:4039: checking for iconv.h" >&5
|
|
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
|
|
+echo "configure:4039: 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 4044 "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:4049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
@@ -4067,11 +4068,11 @@
|
|
#line 4068 "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:4078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
@@ -4085,23 +4086,23 @@
|
|
rm -rf conftest*
|
|
|
|
echo "$ac_t""no" 1>&6
|
|
- echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
|
|
-echo "configure:4090: checking for iconv in -liconv" >&5
|
|
+ echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
|
|
+echo "configure:4090: checking for iconv in -lgiconv" >&5
|
|
|
|
_ldflags="${LDFLAGS}"
|
|
_libs="${LIBS}"
|
|
LDFLAGS="${LDFLAGS} ${ICONV_LIBS}"
|
|
- LIBS="${LIBS} -liconv"
|
|
+ LIBS="${LIBS} -lgiconv"
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 4098 "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:4108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
@@ -4109,7 +4110,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
|