summaryrefslogtreecommitdiff
path: root/editors/AbiWord/files/patch-..::wv::configure
blob: 158295cfc02c2e29540af78d3ec97218948a88e1 (plain) (blame)
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
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
$FreeBSD$

--- ../wv/configure.orig	Tue Jul 24 00:47:56 2001
+++ ../wv/configure	Wed Aug  8 14:47:05 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
@@ -2867,14 +2867,14 @@
 have_iconv=no
 
 if test "$check_for_libiconv" = "yes"; then
-    echo $ac_n "checking for iconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:2872: checking for iconv_open in -liconv" >&5
+    echo $ac_n "checking for iconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:2872: 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 2880 "configure"
 #include "confdefs.h"
@@ -2905,9 +2905,9 @@
   
         if test "x$LIBICONV_DIR" != "x"; then
             ICONV_CFLAGS="-I$LIBICONV_DIR/include"
-            ICONV_LIBS="-L$LIBICONV_DIR/lib -liconv"
+            ICONV_LIBS="-L$LIBICONV_DIR/lib -lgiconv"
         else
-            ICONV_LIBS="-liconv"
+            ICONV_LIBS="-lgiconv"
         fi
         cat >> confdefs.h <<\EOF
 #define USE_ICONV 1
@@ -2919,14 +2919,14 @@
 fi
 
         if test "$have_iconv" = "no"; then
-        echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:2924: checking for libiconv_open in -liconv" >&5
+        echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:2924: 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 2932 "configure"
 #include "confdefs.h"
@@ -2957,9 +2957,9 @@
   
             if test "x$LIBICONV_DIR" != "x"; then
                 ICONV_CFLAGS="-I$LIBICONV_DIR/include"
-                ICONV_LIBS="-L$LIBICONV_DIR/lib -liconv"
+                ICONV_LIBS="-L$LIBICONV_DIR/lib -lgiconv"
             else
-                ICONV_LIBS="-liconv"
+                ICONV_LIBS="-lgiconv"
             fi
             cat >> confdefs.h <<\EOF
 #define USE_ICONV 1
@@ -3073,7 +3073,7 @@
 #line 3074 "configure"
 #include "confdefs.h"
 
-	#include <iconv.h>
+	#include <giconv.h>
 	#include <stdio.h>
 	#include <errno.h>
 	#include <string.h>
@@ -3152,7 +3152,7 @@
 #line 3153 "configure"
 #include "confdefs.h"
 
-	#include <iconv.h>
+	#include <giconv.h>
 	#include <stdio.h>
 	#include <errno.h>
 	#include <string.h>
@@ -3231,7 +3231,7 @@
 #line 3232 "configure"
 #include "confdefs.h"
 
-	#include <iconv.h>
+	#include <giconv.h>
 	#include <stdio.h>
 	#include <errno.h>
 	#include <string.h>
@@ -3310,7 +3310,7 @@
 #line 3311 "configure"
 #include "confdefs.h"
 
-	#include <iconv.h>
+	#include <giconv.h>
 	#include <stdio.h>
 	#include <errno.h>
 	#include <string.h>
@@ -3389,7 +3389,7 @@
 #line 3390 "configure"
 #include "confdefs.h"
 
-	#include <iconv.h>
+	#include <giconv.h>
 	#include <stdio.h>
 	#include <errno.h>
 	#include <string.h>
@@ -3468,7 +3468,7 @@
 #line 3469 "configure"
 #include "confdefs.h"
 
-	#include <iconv.h>
+	#include <giconv.h>
 	#include <stdio.h>
 	#include <errno.h>
 	#include <string.h>
@@ -3547,7 +3547,7 @@
 #line 3548 "configure"
 #include "confdefs.h"
 
-	#include <iconv.h>
+	#include <giconv.h>
 	#include <stdio.h>
 	#include <errno.h>
 	#include <string.h>
@@ -3626,7 +3626,7 @@
 #line 3627 "configure"
 #include "confdefs.h"
 
-	#include <iconv.h>
+	#include <giconv.h>
 	#include <stdio.h>
 	#include <errno.h>
 	#include <string.h>
@@ -3705,7 +3705,7 @@
 #line 3706 "configure"
 #include "confdefs.h"
 
-	#include <iconv.h>
+	#include <giconv.h>
 	#include <stdio.h>
 	#include <errno.h>
 	#include <string.h>
@@ -3785,7 +3785,7 @@
 #line 3786 "configure"
 #include "confdefs.h"
 
-	#include <iconv.h>
+	#include <giconv.h>
 	#include <stdio.h>
 	#include <errno.h>
 	#include <string.h>
@@ -3864,7 +3864,7 @@
 #line 3865 "configure"
 #include "confdefs.h"
 
-	#include <iconv.h>
+	#include <giconv.h>
 	#include <stdio.h>
 	#include <errno.h>
 	#include <string.h>
@@ -3943,7 +3943,7 @@
 #line 3944 "configure"
 #include "confdefs.h"
 
-	#include <iconv.h>
+	#include <giconv.h>
 	#include <stdio.h>
 	#include <errno.h>
 	#include <string.h>
@@ -4022,7 +4022,7 @@
 #line 4023 "configure"
 #include "confdefs.h"
 
-	#include <iconv.h>
+	#include <giconv.h>
 	#include <stdio.h>
 	#include <errno.h>
 	#include <string.h>
@@ -4101,7 +4101,7 @@
 #line 4102 "configure"
 #include "confdefs.h"
 
-	#include <iconv.h>
+	#include <giconv.h>
 	#include <stdio.h>
 	#include <errno.h>
 	#include <string.h>