1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
$FreeBSD$
--- ../wv/configure.orig Fri Aug 10 16:54:41 2001
+++ ../wv/configure Thu Aug 16 10:49:37 2001
@@ -2351,7 +2351,7 @@
# LIBXML2_LIBS="-lxml" ]))
# Extract the first word of "glib-config", so it can be a program name with args.
-set dummy glib-config; ac_word=$2
+set dummy glib12-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2357: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
@@ -2930,15 +2930,15 @@
echo "$ac_t""yes" 1>&6
ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:2935: checking for iconv.h" >&5
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:2935: 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 2940 "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:2945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -2981,11 +2981,11 @@
ICONV_LIBS="-L$LIBICONV_DIR/lib/.libs -liconv"
else
ICONV_CFLAGS="-I$LIBICONV_DIR/include"
- ICONV_LIBS="-L$LIBICONV_DIR/lib -liconv"
+ ICONV_LIBS="-L$LIBICONV_DIR/lib -lgiconv"
fi
else
ICONV_CFLAGS=""
- ICONV_LIBS="-liconv"
+ ICONV_LIBS="-lgiconv"
fi
CPPFLAGS="${CPPFLAGS} $ICONV_CFLAGS"
@@ -2993,15 +2993,15 @@
if test "$use_peer_libiconv" = "abi" ; then
ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:2998: checking for iconv.h" >&5
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:2998: 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 3003 "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:3008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -3027,15 +3027,15 @@
else
ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:3032: checking for iconv.h" >&5
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:3032: 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 3037 "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:3042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -3055,14 +3055,14 @@
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- echo $ac_n "checking for iconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:3060: checking for iconv_open in -liconv" >&5
+ echo $ac_n "checking for iconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:3060: checking for iconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'iconv_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3068 "configure"
#include "confdefs.h"
@@ -3095,14 +3095,14 @@
else
echo "$ac_t""no" 1>&6
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:3100: checking for libiconv_open in -liconv" >&5
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:3100: checking for libiconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3108 "configure"
#include "confdefs.h"
@@ -3168,7 +3168,7 @@
#line 3169 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
int main() {
|