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
|
$FreeBSD$
--- configure.orig Fri Mar 8 17:54:21 2002
+++ configure Mon Mar 11 10:21:32 2002
@@ -16768,8 +16768,8 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
;;
- *-freebsd2.2*)
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
+ *-freebsd*)
+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS $PTHREAD_CFLAGS"
# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
# -mthreads flag.
@@ -16849,7 +16849,7 @@
*-*-openbsd* | *-*-freebsd*)
# FreeBSD and OpenBSD want us to use the -pthread flag
# instead of linking to -lc_r and libtool enforces that.
- G_THREAD_LIBS="-pthread"
+ G_THREAD_LIBS="$PTHREAD_LIBS"
;;
*)
for thread_lib in "" pthread pthread32 pthreads thread dce; do
@@ -18048,13 +18048,13 @@
# Check if we have GNU libiconv
if test $found_iconv = "no"; then
- echo "$as_me:18051: checking for libiconv_open in -liconv" >&5
-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
+ echo "$as_me:18051: checking for libiconv_open in -lgiconv" >&5
+echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6
if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 18059 "configure"
#include "confdefs.h"
@@ -18108,15 +18108,15 @@
fi
fi
- # Check if we have a iconv in -liconv, possibly from vendor
+ # Check if we have a iconv in -lgiconv, possibly from vendor
if test $found_iconv = "no"; then
- echo "$as_me:18113: checking for iconv_open in -liconv" >&5
-echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
+ echo "$as_me:18113: checking for iconv_open in -lgiconv" >&5
+echo $ECHO_N "checking for iconv_open in -lgiconv... $ECHO_C" >&6
if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 18121 "configure"
#include "confdefs.h"
@@ -18242,13 +18242,13 @@
;;
gnu|yes)
- echo "$as_me:18245: checking for libiconv_open in -liconv" >&5
-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
+ echo "$as_me:18245: checking for libiconv_open in -lgiconv" >&5
+echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6
if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 18253 "configure"
#include "confdefs.h"
@@ -18303,13 +18303,13 @@
;;
native)
- echo "$as_me:18306: checking for iconv_open in -liconv" >&5
-echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
+ echo "$as_me:18306: checking for iconv_open in -lgiconv" >&5
+echo $ECHO_N "checking for iconv_open in -lgiconv... $ECHO_C" >&6
if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 18314 "configure"
#include "confdefs.h"
@@ -18373,14 +18373,14 @@
case $with_libiconv in
gnu)
- ICONV_LIBS="-liconv"
+ ICONV_LIBS="-lgiconv"
cat >>confdefs.h <<\_ACEOF
#define USE_LIBICONV_GNU Using GNU libiconv
_ACEOF
;;
native)
- ICONV_LIBS="-liconv"
+ ICONV_LIBS="-lgiconv"
cat >>confdefs.h <<\_ACEOF
#define USE_LIBICONV_NATIVE Using a native implementation of iconv in a separate library
_ACEOF
|
