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
|
--- configure.orig Fri Nov 17 22:45:11 2000
+++ configure Mon Nov 20 18:27:43 2000
@@ -4230,6 +4230,12 @@
linux*)
G_MODULE_LDFLAGS='-rdynamic'
;;
+ freebsd*)
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ if test $objformat = "elf"; then
+ G_MODULE_LDFLAGS='-Wl,-E'
+ fi
+ ;;
esac
LIBS_orig="$LIBS"
LDFLAGS_orig="$LDFLAGS"
@@ -4523,7 +4529,7 @@
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
fi
;;
- *-freebsd2.2*)
+ *-freebsd*)
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
@@ -4610,8 +4616,8 @@
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
@@ -4912,7 +4918,7 @@
sizeof (buffer));
; return 0; }
EOF
-if { (eval echo configure:4916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
rm -rf conftest*
ac_cv_func_nonposix_getpwuid_r=yes
else
@@ -5413,6 +5419,7 @@
if eval "test \"`echo '$''{'ac_cv_func_iconv_open'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
+# LIBS="-liconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 5418 "configure"
#include "confdefs.h"
@@ -5462,14 +5469,14 @@
#
# Check for libiconv
#
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
echo "configure:5467: checking for libiconv_open in -liconv" >&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 5475 "configure"
#include "confdefs.h"
@@ -5509,7 +5516,7 @@
fi
if test "x$with_libiconv" = "xyes" ; then
- ICONV_LIBS="-liconv"
+ ICONV_LIBS="-lgiconv"
cat >> confdefs.h <<\EOF
#define USE_LIBICONV 1
EOF
|
