| @@ -1,248 +1,271 @@ | | | @@ -1,248 +1,271 @@ |
1 | $NetBSD: patch-aa,v 1.45 2008/12/08 16:10:19 tnn Exp $ | | 1 | $NetBSD: patch-aa,v 1.46 2009/09/22 15:50:46 joerg Exp $ |
2 | | | 2 | |
3 | --- configure.orig 2008-11-24 06:50:01.000000000 +0100 | | 3 | --- configure.orig 2009-08-29 01:17:41.000000000 +0200 |
4 | +++ configure | | 4 | +++ configure |
5 | @@ -835,6 +835,7 @@ GIO | | 5 | @@ -837,6 +837,7 @@ GIO |
6 | GSPAWN | | 6 | GSPAWN |
7 | GLIB_DEBUG_FLAGS | | 7 | GLIB_DEBUG_FLAGS |
8 | G_MODULE_NEED_USCORE | | 8 | G_MODULE_NEED_USCORE |
9 | +G_MODULE_BROKEN_DLOPEN_NULL | | 9 | +G_MODULE_BROKEN_DLOPEN_NULL |
10 | G_MODULE_BROKEN_RTLD_GLOBAL | | 10 | G_MODULE_BROKEN_RTLD_GLOBAL |
11 | G_MODULE_HAVE_DLERROR | | 11 | G_MODULE_HAVE_DLERROR |
12 | G_MODULE_LDFLAGS | | 12 | G_MODULE_LDFLAGS |
13 | @@ -34079,6 +34080,7 @@ else | | 13 | @@ -34078,10 +34079,11 @@ if test x"$glib_native_win32" = xyes; th |
| | | 14 | G_MODULE_LDFLAGS= |
| | | 15 | else |
| | | 16 | export SED |
| | | 17 | - G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` |
| | | 18 | + G_MODULE_LDFLAGS=`(libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` |
14 | fi | | 19 | fi |
15 | G_MODULE_NEED_USCORE=0 | | 20 | G_MODULE_NEED_USCORE=0 |
16 | G_MODULE_BROKEN_RTLD_GLOBAL=0 | | 21 | G_MODULE_BROKEN_RTLD_GLOBAL=0 |
17 | +G_MODULE_BROKEN_DLOPEN_NULL=0 | | 22 | +G_MODULE_BROKEN_DLOPEN_NULL=0 |
18 | G_MODULE_HAVE_DLERROR=0 | | 23 | G_MODULE_HAVE_DLERROR=0 |
19 | if test -z "$G_MODULE_IMPL"; then | | 24 | if test -z "$G_MODULE_IMPL"; then |
20 | case "$host" in | | 25 | case "$host" in |
21 | @@ -34914,6 +34916,87 @@ fi | | 26 | @@ -34656,7 +34658,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP |
| | | 27 | LIBS="$G_MODULE_LIBS $LIBS" |
| | | 28 | LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" |
| | | 29 | echo "void glib_plugin_test(void) { }" > plugin.c |
| | | 30 | - ${SHELL} ./libtool --mode=compile ${CC} -shared \ |
| | | 31 | + ${SHELL} libtool --mode=compile ${CC} -shared \ |
| | | 32 | -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null |
| | | 33 | { $as_echo "$as_me:$LINENO: checking for RTLD_GLOBAL brokenness" >&5 |
| | | 34 | $as_echo_n "checking for RTLD_GLOBAL brokenness... " >&6; } |
| | | 35 | @@ -34917,6 +34919,87 @@ fi |
22 | | | 36 | |
23 | LIBS="$LIBS_orig" | | 37 | LIBS="$LIBS_orig" |
24 | fi | | 38 | fi |
25 | + { $as_echo "$as_me:$LINENO: checking for dlopen(NULL, 0) brokenness" >&5 | | 39 | + { $as_echo "$as_me:$LINENO: checking for dlopen(NULL, 0) brokenness" >&5 |
26 | +$as_echo_n "checking for dlopen(NULL, 0) brokenness... " >&6; } | | 40 | +$as_echo_n "checking for dlopen(NULL, 0) brokenness... " >&6; } |
27 | +if test "${glib_cv_dlopennull_broken+set}" = set; then | | 41 | +if test "${glib_cv_dlopennull_broken+set}" = set; then |
28 | + $as_echo_n "(cached) " >&6 | | 42 | + $as_echo_n "(cached) " >&6 |
29 | +else | | 43 | +else |
30 | + | | 44 | + |
31 | + if test "$cross_compiling" = yes; then | | 45 | + if test "$cross_compiling" = yes; then |
32 | + glib_cv_dlopennull_broken=no | | 46 | + glib_cv_dlopennull_broken=no |
33 | +else | | 47 | +else |
34 | + cat >conftest.$ac_ext <<_ACEOF | | 48 | + cat >conftest.$ac_ext <<_ACEOF |
35 | +/* confdefs.h. */ | | 49 | +/* confdefs.h. */ |
36 | +_ACEOF | | 50 | +_ACEOF |
37 | +cat confdefs.h >>conftest.$ac_ext | | 51 | +cat confdefs.h >>conftest.$ac_ext |
38 | +cat >>conftest.$ac_ext <<_ACEOF | | 52 | +cat >>conftest.$ac_ext <<_ACEOF |
39 | +/* end confdefs.h. */ | | 53 | +/* end confdefs.h. */ |
40 | + | | 54 | + |
41 | +#include <stdio.h> | | 55 | +#include <stdio.h> |
42 | +#include <dlfcn.h> | | 56 | +#include <dlfcn.h> |
43 | +#ifndef RTLD_GLOBAL | | 57 | +#ifndef RTLD_GLOBAL |
44 | +# define RTLD_GLOBAL 0 | | 58 | +# define RTLD_GLOBAL 0 |
45 | +#endif | | 59 | +#endif |
46 | +#ifndef RTLD_LAZY | | 60 | +#ifndef RTLD_LAZY |
47 | +# define RTLD_LAZY 0 | | 61 | +# define RTLD_LAZY 0 |
48 | +#endif | | 62 | +#endif |
49 | +int gettext; | | 63 | +int gettext; |
50 | +int main () { | | 64 | +int main () { |
51 | + void *handle; | | 65 | + void *handle; |
52 | + handle = dlopen ("libm.so", RTLD_GLOBAL | RTLD_LAZY); | | 66 | + handle = dlopen ("libm.so", RTLD_GLOBAL | RTLD_LAZY); |
53 | + if (!handle) return 0; | | 67 | + if (!handle) return 0; |
54 | + handle = dlopen (NULL, 0); | | 68 | + handle = dlopen (NULL, 0); |
55 | + if (!handle) return 0; | | 69 | + if (!handle) return 0; |
56 | + handle = dlsym (handle, "sin"); | | 70 | + handle = dlsym (handle, "sin"); |
57 | + return handle == NULL; | | 71 | + return handle == NULL; |
58 | +} | | 72 | +} |
59 | + | | 73 | + |
60 | +_ACEOF | | 74 | +_ACEOF |
61 | +rm -f conftest$ac_exeext | | 75 | +rm -f conftest$ac_exeext |
62 | +if { (ac_try="$ac_link" | | 76 | +if { (ac_try="$ac_link" |
63 | +case "(($ac_try" in | | 77 | +case "(($ac_try" in |
64 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | | 78 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
65 | + *) ac_try_echo=$ac_try;; | | 79 | + *) ac_try_echo=$ac_try;; |
66 | +esac | | 80 | +esac |
67 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | | 81 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
68 | +$as_echo "$ac_try_echo") >&5 | | 82 | +$as_echo "$ac_try_echo") >&5 |
69 | + (eval "$ac_link") 2>&5 | | 83 | + (eval "$ac_link") 2>&5 |
70 | + ac_status=$? | | 84 | + ac_status=$? |
71 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | | 85 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
72 | + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | | 86 | + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
73 | + { (case "(($ac_try" in | | 87 | + { (case "(($ac_try" in |
74 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | | 88 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
75 | + *) ac_try_echo=$ac_try;; | | 89 | + *) ac_try_echo=$ac_try;; |
76 | +esac | | 90 | +esac |
77 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | | 91 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
78 | +$as_echo "$ac_try_echo") >&5 | | 92 | +$as_echo "$ac_try_echo") >&5 |
79 | + (eval "$ac_try") 2>&5 | | 93 | + (eval "$ac_try") 2>&5 |
80 | + ac_status=$? | | 94 | + ac_status=$? |
81 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | | 95 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
82 | + (exit $ac_status); }; }; then | | 96 | + (exit $ac_status); }; }; then |
83 | + glib_cv_dlopennull_broken=no | | 97 | + glib_cv_dlopennull_broken=no |
84 | +else | | 98 | +else |
85 | + $as_echo "$as_me: program exited with status $ac_status" >&5 | | 99 | + $as_echo "$as_me: program exited with status $ac_status" >&5 |
86 | +$as_echo "$as_me: failed program was:" >&5 | | 100 | +$as_echo "$as_me: failed program was:" >&5 |
87 | +sed 's/^/| /' conftest.$ac_ext >&5 | | 101 | +sed 's/^/| /' conftest.$ac_ext >&5 |
88 | + | | 102 | + |
89 | +( exit $ac_status ) | | 103 | +( exit $ac_status ) |
90 | +glib_cv_dlopennull_broken=yes | | 104 | +glib_cv_dlopennull_broken=yes |
91 | +fi | | 105 | +fi |
92 | +rm -rf conftest.dSYM | | 106 | +rm -rf conftest.dSYM |
93 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | | 107 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
94 | +fi | | 108 | +fi |
95 | + | | 109 | + |
96 | + | | 110 | + |
97 | + | | 111 | + |
98 | +fi | | 112 | +fi |
99 | +{ $as_echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5 | | 113 | +{ $as_echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5 |
100 | +$as_echo "$glib_cv_dlopennull_broken" >&6; } | | 114 | +$as_echo "$glib_cv_dlopennull_broken" >&6; } |
101 | + if test "x$glib_cv_dlopennull_broken" = "xyes"; then | | 115 | + if test "x$glib_cv_dlopennull_broken" = "xyes"; then |
102 | + G_MODULE_BROKEN_DLOPEN_NULL=1 | | 116 | + G_MODULE_BROKEN_DLOPEN_NULL=1 |
103 | + else | | 117 | + else |
104 | + G_MODULE_BROKEN_DLOPEN_NULL=0 | | 118 | + G_MODULE_BROKEN_DLOPEN_NULL=0 |
105 | + fi | | 119 | + fi |
106 | if test -z "$G_MODULE_IMPL"; then | | 120 | if test -z "$G_MODULE_IMPL"; then |
107 | G_MODULE_IMPL=0 | | 121 | G_MODULE_IMPL=0 |
108 | G_MODULE_SUPPORTED=false | | 122 | G_MODULE_SUPPORTED=false |
109 | @@ -34950,6 +35033,8 @@ fi | | 123 | @@ -34927,7 +35010,7 @@ fi |
| | | 124 | { $as_echo "$as_me:$LINENO: checking for the suffix of module shared libraries" >&5 |
| | | 125 | $as_echo_n "checking for the suffix of module shared libraries... " >&6; } |
| | | 126 | export SED |
| | | 127 | -shrext_cmds=`./libtool --config | grep '^shrext_cmds='` |
| | | 128 | +shrext_cmds=`libtool --config | grep '^shrext_cmds='` |
| | | 129 | eval $shrext_cmds |
| | | 130 | module=yes eval std_shrext=$shrext_cmds |
| | | 131 | # chop the initial dot |
| | | 132 | @@ -34953,6 +35036,8 @@ fi |
110 | | | 133 | |
111 | | | 134 | |
112 | | | 135 | |
113 | + | | 136 | + |
114 | + | | 137 | + |
115 | { $as_echo "$as_me:$LINENO: checking for gspawn implementation" >&5 | | 138 | { $as_echo "$as_me:$LINENO: checking for gspawn implementation" >&5 |
116 | $as_echo_n "checking for gspawn implementation... " >&6; } | | 139 | $as_echo_n "checking for gspawn implementation... " >&6; } |
117 | case "$host" in | | 140 | case "$host" in |
118 | @@ -36696,117 +36781,8 @@ if test x"$have_threads" != xno; then | | 141 | @@ -36800,117 +36885,8 @@ if test x"$have_threads" != xno; then |
119 | G_THREAD_LIBS="-lpthread -lthread" | | 142 | G_THREAD_LIBS="-lpthread -lthread" |
120 | ;; | | 143 | ;; |
121 | *) | | 144 | *) |
122 | - for flag in pthread pthreads mt; do | | 145 | - for flag in pthread pthreads mt; do |
123 | - glib_save_CFLAGS="$CFLAGS" | | 146 | - glib_save_CFLAGS="$CFLAGS" |
124 | - CFLAGS="$CFLAGS -$flag" | | 147 | - CFLAGS="$CFLAGS -$flag" |
125 | - if test "$cross_compiling" = yes; then | | 148 | - if test "$cross_compiling" = yes; then |
126 | - cat >conftest.$ac_ext <<_ACEOF | | 149 | - cat >conftest.$ac_ext <<_ACEOF |
127 | - | | 150 | - |
128 | -#include <pthread.h> | | 151 | -#include <pthread.h> |
129 | -int check_me = 0; | | 152 | -int check_me = 0; |
130 | -void* func(void* data) {check_me = 42; return &check_me;} | | 153 | -void* func(void* data) {check_me = 42; return &check_me;} |
131 | -int main() | | 154 | -int main() |
132 | - { pthread_t t; | | 155 | - { pthread_t t; |
133 | - void *ret; | | 156 | - void *ret; |
134 | - pthread_create (&t, 0, func, 0); | | 157 | - pthread_create (&t, 0, func, 0); |
135 | - pthread_join (t, &ret); | | 158 | - pthread_join (t, &ret); |
136 | - return (check_me != 42 || ret != &check_me); | | 159 | - return (check_me != 42 || ret != &check_me); |
137 | -} | | 160 | -} |
138 | -_ACEOF | | 161 | -_ACEOF |
139 | -rm -f conftest.$ac_objext conftest$ac_exeext | | 162 | -rm -f conftest.$ac_objext conftest$ac_exeext |
140 | -if { (ac_try="$ac_link" | | 163 | -if { (ac_try="$ac_link" |
141 | -case "(($ac_try" in | | 164 | -case "(($ac_try" in |
142 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | | 165 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
143 | - *) ac_try_echo=$ac_try;; | | 166 | - *) ac_try_echo=$ac_try;; |
144 | -esac | | 167 | -esac |
145 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | | 168 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
146 | -$as_echo "$ac_try_echo") >&5 | | 169 | -$as_echo "$ac_try_echo") >&5 |
147 | - (eval "$ac_link") 2>conftest.er1 | | 170 | - (eval "$ac_link") 2>conftest.er1 |
148 | - ac_status=$? | | 171 | - ac_status=$? |
149 | - grep -v '^ *+' conftest.er1 >conftest.err | | 172 | - grep -v '^ *+' conftest.er1 >conftest.err |
150 | - rm -f conftest.er1 | | 173 | - rm -f conftest.er1 |
151 | - cat conftest.err >&5 | | 174 | - cat conftest.err >&5 |
152 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | | 175 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
153 | - (exit $ac_status); } && { | | 176 | - (exit $ac_status); } && { |
154 | - test -z "$ac_c_werror_flag" || | | 177 | - test -z "$ac_c_werror_flag" || |
155 | - test ! -s conftest.err | | 178 | - test ! -s conftest.err |
156 | - } && test -s conftest$ac_exeext && { | | 179 | - } && test -s conftest$ac_exeext && { |
157 | - test "$cross_compiling" = yes || | | 180 | - test "$cross_compiling" = yes || |
158 | - $as_test_x conftest$ac_exeext | | 181 | - $as_test_x conftest$ac_exeext |
159 | - }; then | | 182 | - }; then |
160 | - glib_flag_works=yes | | 183 | - glib_flag_works=yes |
161 | -else | | 184 | -else |
162 | - $as_echo "$as_me: failed program was:" >&5 | | 185 | - $as_echo "$as_me: failed program was:" >&5 |
163 | -sed 's/^/| /' conftest.$ac_ext >&5 | | 186 | -sed 's/^/| /' conftest.$ac_ext >&5 |
164 | - | | 187 | - |
165 | - glib_flag_works=no | | 188 | - glib_flag_works=no |
166 | -fi | | 189 | -fi |
167 | - | | 190 | - |
168 | -rm -rf conftest.dSYM | | 191 | -rm -rf conftest.dSYM |
169 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | | 192 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
170 | - conftest$ac_exeext conftest.$ac_ext | | 193 | - conftest$ac_exeext conftest.$ac_ext |
171 | -else | | 194 | -else |
172 | - cat >conftest.$ac_ext <<_ACEOF | | 195 | - cat >conftest.$ac_ext <<_ACEOF |
173 | -/* confdefs.h. */ | | 196 | -/* confdefs.h. */ |
174 | -_ACEOF | | 197 | -_ACEOF |
175 | -cat confdefs.h >>conftest.$ac_ext | | 198 | -cat confdefs.h >>conftest.$ac_ext |
176 | -cat >>conftest.$ac_ext <<_ACEOF | | 199 | -cat >>conftest.$ac_ext <<_ACEOF |
177 | -/* end confdefs.h. */ | | 200 | -/* end confdefs.h. */ |
178 | - | | 201 | - |
179 | -#include <pthread.h> | | 202 | -#include <pthread.h> |
180 | -int check_me = 0; | | 203 | -int check_me = 0; |
181 | -void* func(void* data) {check_me = 42; return &check_me;} | | 204 | -void* func(void* data) {check_me = 42; return &check_me;} |
182 | -int main() | | 205 | -int main() |
183 | - { pthread_t t; | | 206 | - { pthread_t t; |
184 | - void *ret; | | 207 | - void *ret; |
185 | - pthread_create (&t, 0, func, 0); | | 208 | - pthread_create (&t, 0, func, 0); |
186 | - pthread_join (t, &ret); | | 209 | - pthread_join (t, &ret); |
187 | - return (check_me != 42 || ret != &check_me); | | 210 | - return (check_me != 42 || ret != &check_me); |
188 | -} | | 211 | -} |
189 | -_ACEOF | | 212 | -_ACEOF |
190 | -rm -f conftest$ac_exeext | | 213 | -rm -f conftest$ac_exeext |
191 | -if { (ac_try="$ac_link" | | 214 | -if { (ac_try="$ac_link" |
192 | -case "(($ac_try" in | | 215 | -case "(($ac_try" in |
193 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | | 216 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
194 | - *) ac_try_echo=$ac_try;; | | 217 | - *) ac_try_echo=$ac_try;; |
195 | -esac | | 218 | -esac |
196 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | | 219 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
197 | -$as_echo "$ac_try_echo") >&5 | | 220 | -$as_echo "$ac_try_echo") >&5 |
198 | - (eval "$ac_link") 2>&5 | | 221 | - (eval "$ac_link") 2>&5 |
199 | - ac_status=$? | | 222 | - ac_status=$? |
200 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | | 223 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
201 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | | 224 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
202 | - { (case "(($ac_try" in | | 225 | - { (case "(($ac_try" in |
203 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | | 226 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
204 | - *) ac_try_echo=$ac_try;; | | 227 | - *) ac_try_echo=$ac_try;; |
205 | -esac | | 228 | -esac |
206 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | | 229 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
207 | -$as_echo "$ac_try_echo") >&5 | | 230 | -$as_echo "$ac_try_echo") >&5 |
208 | - (eval "$ac_try") 2>&5 | | 231 | - (eval "$ac_try") 2>&5 |
209 | - ac_status=$? | | 232 | - ac_status=$? |
210 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | | 233 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
211 | - (exit $ac_status); }; }; then | | 234 | - (exit $ac_status); }; }; then |
212 | - glib_flag_works=yes | | 235 | - glib_flag_works=yes |
213 | -else | | 236 | -else |
214 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | | 237 | - $as_echo "$as_me: program exited with status $ac_status" >&5 |
215 | -$as_echo "$as_me: failed program was:" >&5 | | 238 | -$as_echo "$as_me: failed program was:" >&5 |
216 | -sed 's/^/| /' conftest.$ac_ext >&5 | | 239 | -sed 's/^/| /' conftest.$ac_ext >&5 |
217 | - | | 240 | - |
218 | -( exit $ac_status ) | | 241 | -( exit $ac_status ) |
219 | -glib_flag_works=no | | 242 | -glib_flag_works=no |
220 | -fi | | 243 | -fi |
221 | -rm -rf conftest.dSYM | | 244 | -rm -rf conftest.dSYM |
222 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | | 245 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
223 | -fi | | 246 | -fi |
224 | - | | 247 | - |
225 | - | | 248 | - |
226 | - CFLAGS="$glib_save_CFLAGS" | | 249 | - CFLAGS="$glib_save_CFLAGS" |
227 | - if test $glib_flag_works = yes ; then | | 250 | - if test $glib_flag_works = yes ; then |
228 | - G_THREAD_CFLAGS=-$flag | | 251 | - G_THREAD_CFLAGS=-$flag |
229 | - G_THREAD_LIBS=-$flag | | 252 | - G_THREAD_LIBS=-$flag |
230 | - break; | | 253 | - break; |
231 | - fi | | 254 | - fi |
232 | - done | | 255 | - done |
233 | + G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" | | 256 | + G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" |
234 | + G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" | | 257 | + G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" |
235 | ;; | | 258 | ;; |
236 | esac | | 259 | esac |
237 | fi | | 260 | fi |
238 | @@ -39000,6 +38976,10 @@ case $host in | | 261 | @@ -39104,6 +39080,10 @@ case $host in |
239 | *) | | 262 | *) |
240 | G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" | | 263 | G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" |
241 | ;; | | 264 | ;; |
242 | + *-*-netbsd*) | | 265 | + *-*-netbsd*) |
243 | + # On NetBSD, pkgsrc's libtool does the right thing. | | 266 | + # On NetBSD, pkgsrc's libtool does the right thing. |
244 | + G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" | | 267 | + G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" |
245 | + ;; | | 268 | + ;; |
246 | esac | | 269 | esac |
247 | | | 270 | |
248 | | | 271 | |