blob: 87404113cbaf700f2ed466fbd7090e1bc232cbbb (
plain)
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
|
$FreeBSD$
--- configure.orig Tue Jan 29 18:34:49 2002
+++ configure Tue Feb 12 10:13:56 2002
@@ -16378,8 +16378,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.
@@ -16457,13 +16457,13 @@
fi
;;
*)
- for thread_lib in "" pthread pthread32 pthreads c_r thread dce; do
+ for thread_lib in "$PTHREAD_LIBS" "" pthread pthread32 pthreads c_r thread dce; do
if test x"$thread_lib" = x; then
add_thread_lib=""
IN=""
else
- add_thread_lib="-l$thread_lib"
- IN=" in -l$thread_lib"
+ add_thread_lib="$thread_lib"
+ IN=" in $thread_lib"
fi
if test x"$have_threads" = xposix; then
defattr=0
@@ -17660,13 +17660,13 @@
#
# Check for libiconv
#
- echo "$as_me:17663: checking for libiconv_open in -liconv" >&5
-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
+ echo "$as_me:17663: 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 17671 "configure"
#include "confdefs.h"
@@ -17728,7 +17728,7 @@
fi
if test "x$with_libiconv" = "xyes" ; then
- ICONV_LIBS="-liconv"
+ ICONV_LIBS="-lgiconv"
cat >>confdefs.h <<\_ACEOF
#define USE_LIBICONV 1
_ACEOF
|
