| @@ -1,268 +1,268 @@ | | | @@ -1,268 +1,268 @@ |
| 1 | $NetBSD: patch-aa,v 1.43 2008/09/06 11:07:20 obache Exp $ | | 1 | $NetBSD: patch-aa,v 1.44 2008/10/24 15:59:52 wiz Exp $ |
| 2 | | | 2 | |
| 3 | --- configure.orig 2008-09-02 19:29:47.000000000 +0000 | | 3 | --- configure.orig 2008-10-16 14:41:13.000000000 +0000 |
| 4 | +++ configure | | 4 | +++ configure |
| 5 | @@ -986,6 +986,7 @@ G_MODULE_PLUGIN_LIBS | | 5 | @@ -986,6 +986,7 @@ MKDIR_P |
| 6 | G_MODULE_LDFLAGS | | 6 | INSTALL_STRIP_PROGRAM |
| 7 | G_MODULE_HAVE_DLERROR | | 7 | STRIP |
| 8 | G_MODULE_BROKEN_RTLD_GLOBAL | | 8 | install_sh |
| 9 | +G_MODULE_BROKEN_DLOPEN_NULL | | 9 | +G_MODULE_BROKEN_DLOPEN_NULL |
| 10 | G_MODULE_NEED_USCORE | | 10 | MAKEINFO |
| 11 | GLIB_DEBUG_FLAGS | | 11 | AUTOHEADER |
| 12 | GSPAWN | | 12 | AUTOMAKE |
| 13 | @@ -37197,6 +37198,7 @@ else | | 13 | @@ -37256,6 +37257,7 @@ else |
| 14 | fi | | 14 | fi |
| 15 | G_MODULE_NEED_USCORE=0 | | 15 | G_MODULE_NEED_USCORE=0 |
| 16 | G_MODULE_BROKEN_RTLD_GLOBAL=0 | | 16 | G_MODULE_BROKEN_RTLD_GLOBAL=0 |
| 17 | +G_MODULE_BROKEN_DLOPEN_NULL=0 | | 17 | +G_MODULE_BROKEN_DLOPEN_NULL=0 |
| 18 | G_MODULE_HAVE_DLERROR=0 | | 18 | G_MODULE_HAVE_DLERROR=0 |
| 19 | if test -z "$G_MODULE_IMPL"; then | | 19 | if test -z "$G_MODULE_IMPL"; then |
| 20 | case "$host" in | | 20 | case "$host" in |
| 21 | @@ -38030,6 +38032,87 @@ fi | | 21 | @@ -38091,6 +38093,87 @@ fi |
| 22 | | | 22 | |
| 23 | LIBS="$LIBS_orig" | | 23 | LIBS="$LIBS_orig" |
| 24 | fi | | 24 | fi |
| 25 | + { $as_echo "$as_me:$LINENO: checking for dlopen(NULL, 0) brokenness" >&5 | | 25 | + { $as_echo "$as_me:$LINENO: checking for dlopen(NULL, 0) brokenness" >&5 |
| 26 | +$as_echo_n "checking for dlopen(NULL, 0) brokenness... " >&6; } | | 26 | +$as_echo_n "checking for dlopen(NULL, 0) brokenness... " >&6; } |
| 27 | +if test "${glib_cv_dlopennull_broken+set}" = set; then | | 27 | +if test "${glib_cv_dlopennull_broken+set}" = set; then |
| 28 | + $as_echo_n "(cached) " >&6 | | 28 | + $as_echo_n "(cached) " >&6 |
| 29 | +else | | 29 | +else |
| 30 | + | | 30 | + |
| 31 | + if test "$cross_compiling" = yes; then | | 31 | + if test "$cross_compiling" = yes; then |
| 32 | + glib_cv_dlopennull_broken=no | | 32 | + glib_cv_dlopennull_broken=no |
| 33 | +else | | 33 | +else |
| 34 | + cat >conftest.$ac_ext <<_ACEOF | | 34 | + cat >conftest.$ac_ext <<_ACEOF |
| 35 | +/* confdefs.h. */ | | 35 | +/* confdefs.h. */ |
| 36 | +_ACEOF | | 36 | +_ACEOF |
| 37 | +cat confdefs.h >>conftest.$ac_ext | | 37 | +cat confdefs.h >>conftest.$ac_ext |
| 38 | +cat >>conftest.$ac_ext <<_ACEOF | | 38 | +cat >>conftest.$ac_ext <<_ACEOF |
| 39 | +/* end confdefs.h. */ | | 39 | +/* end confdefs.h. */ |
| 40 | + | | 40 | + |
| 41 | +#include <stdio.h> | | 41 | +#include <stdio.h> |
| 42 | +#include <dlfcn.h> | | 42 | +#include <dlfcn.h> |
| 43 | +#ifndef RTLD_GLOBAL | | 43 | +#ifndef RTLD_GLOBAL |
| 44 | +# define RTLD_GLOBAL 0 | | 44 | +# define RTLD_GLOBAL 0 |
| 45 | +#endif | | 45 | +#endif |
| 46 | +#ifndef RTLD_LAZY | | 46 | +#ifndef RTLD_LAZY |
| 47 | +# define RTLD_LAZY 0 | | 47 | +# define RTLD_LAZY 0 |
| 48 | +#endif | | 48 | +#endif |
| 49 | +int gettext; | | 49 | +int gettext; |
| 50 | +int main () { | | 50 | +int main () { |
| 51 | + void *handle; | | 51 | + void *handle; |
| 52 | + handle = dlopen ("libm.so", RTLD_GLOBAL | RTLD_LAZY); | | 52 | + handle = dlopen ("libm.so", RTLD_GLOBAL | RTLD_LAZY); |
| 53 | + if (!handle) return 0; | | 53 | + if (!handle) return 0; |
| 54 | + handle = dlopen (NULL, 0); | | 54 | + handle = dlopen (NULL, 0); |
| 55 | + if (!handle) return 0; | | 55 | + if (!handle) return 0; |
| 56 | + handle = dlsym (handle, "sin"); | | 56 | + handle = dlsym (handle, "sin"); |
| 57 | + return handle == NULL; | | 57 | + return handle == NULL; |
| 58 | +} | | 58 | +} |
| 59 | + | | 59 | + |
| 60 | +_ACEOF | | 60 | +_ACEOF |
| 61 | +rm -f conftest$ac_exeext | | 61 | +rm -f conftest$ac_exeext |
| 62 | +if { (ac_try="$ac_link" | | 62 | +if { (ac_try="$ac_link" |
| 63 | +case "(($ac_try" in | | 63 | +case "(($ac_try" in |
| 64 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | | 64 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 65 | + *) ac_try_echo=$ac_try;; | | 65 | + *) ac_try_echo=$ac_try;; |
| 66 | +esac | | 66 | +esac |
| 67 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | | 67 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 68 | +$as_echo "$ac_try_echo") >&5 | | 68 | +$as_echo "$ac_try_echo") >&5 |
| 69 | + (eval "$ac_link") 2>&5 | | 69 | + (eval "$ac_link") 2>&5 |
| 70 | + ac_status=$? | | 70 | + ac_status=$? |
| 71 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | | 71 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 72 | + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | | 72 | + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
| 73 | + { (case "(($ac_try" in | | 73 | + { (case "(($ac_try" in |
| 74 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | | 74 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 75 | + *) ac_try_echo=$ac_try;; | | 75 | + *) ac_try_echo=$ac_try;; |
| 76 | +esac | | 76 | +esac |
| 77 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | | 77 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 78 | +$as_echo "$ac_try_echo") >&5 | | 78 | +$as_echo "$ac_try_echo") >&5 |
| 79 | + (eval "$ac_try") 2>&5 | | 79 | + (eval "$ac_try") 2>&5 |
| 80 | + ac_status=$? | | 80 | + ac_status=$? |
| 81 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | | 81 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 82 | + (exit $ac_status); }; }; then | | 82 | + (exit $ac_status); }; }; then |
| 83 | + glib_cv_dlopennull_broken=no | | 83 | + glib_cv_dlopennull_broken=no |
| 84 | +else | | 84 | +else |
| 85 | + $as_echo "$as_me: program exited with status $ac_status" >&5 | | 85 | + $as_echo "$as_me: program exited with status $ac_status" >&5 |
| 86 | +$as_echo "$as_me: failed program was:" >&5 | | 86 | +$as_echo "$as_me: failed program was:" >&5 |
| 87 | +sed 's/^/| /' conftest.$ac_ext >&5 | | 87 | +sed 's/^/| /' conftest.$ac_ext >&5 |
| 88 | + | | 88 | + |
| 89 | +( exit $ac_status ) | | 89 | +( exit $ac_status ) |
| 90 | +glib_cv_dlopennull_broken=yes | | 90 | +glib_cv_dlopennull_broken=yes |
| 91 | +fi | | 91 | +fi |
| 92 | +rm -rf conftest.dSYM | | 92 | +rm -rf conftest.dSYM |
| 93 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | | 93 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
| 94 | +fi | | 94 | +fi |
| 95 | + | | 95 | + |
| 96 | + | | 96 | + |
| 97 | + | | 97 | + |
| 98 | +fi | | 98 | +fi |
| 99 | +{ $as_echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5 | | 99 | +{ $as_echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5 |
| 100 | +$as_echo "$glib_cv_dlopennull_broken" >&6; } | | 100 | +$as_echo "$glib_cv_dlopennull_broken" >&6; } |
| 101 | + if test "x$glib_cv_dlopennull_broken" = "xyes"; then | | 101 | + if test "x$glib_cv_dlopennull_broken" = "xyes"; then |
| 102 | + G_MODULE_BROKEN_DLOPEN_NULL=1 | | 102 | + G_MODULE_BROKEN_DLOPEN_NULL=1 |
| 103 | + else | | 103 | + else |
| 104 | + G_MODULE_BROKEN_DLOPEN_NULL=0 | | 104 | + G_MODULE_BROKEN_DLOPEN_NULL=0 |
| 105 | + fi | | 105 | + fi |
| 106 | if test -z "$G_MODULE_IMPL"; then | | 106 | if test -z "$G_MODULE_IMPL"; then |
| 107 | G_MODULE_IMPL=0 | | 107 | G_MODULE_IMPL=0 |
| 108 | G_MODULE_SUPPORTED=false | | 108 | G_MODULE_SUPPORTED=false |
| 109 | @@ -38066,6 +38149,8 @@ fi | | 109 | @@ -38127,6 +38210,8 @@ fi |
| 110 | | | 110 | |
| 111 | | | 111 | |
| 112 | | | 112 | |
| 113 | + | | 113 | + |
| 114 | + | | 114 | + |
| 115 | { $as_echo "$as_me:$LINENO: checking for gspawn implementation" >&5 | | 115 | { $as_echo "$as_me:$LINENO: checking for gspawn implementation" >&5 |
| 116 | $as_echo_n "checking for gspawn implementation... " >&6; } | | 116 | $as_echo_n "checking for gspawn implementation... " >&6; } |
| 117 | case "$host" in | | 117 | case "$host" in |
| 118 | @@ -39807,117 +39892,8 @@ if test x"$have_threads" != xno; then | | 118 | @@ -39873,117 +39958,8 @@ if test x"$have_threads" != xno; then |
| 119 | G_THREAD_LIBS="-lpthread -lthread" | | 119 | G_THREAD_LIBS="-lpthread -lthread" |
| 120 | ;; | | 120 | ;; |
| 121 | *) | | 121 | *) |
| 122 | - for flag in pthread pthreads mt; do | | 122 | - for flag in pthread pthreads mt; do |
| 123 | - glib_save_CFLAGS="$CFLAGS" | | 123 | - glib_save_CFLAGS="$CFLAGS" |
| 124 | - CFLAGS="$CFLAGS -$flag" | | 124 | - CFLAGS="$CFLAGS -$flag" |
| 125 | - if test "$cross_compiling" = yes; then | | 125 | - if test "$cross_compiling" = yes; then |
| 126 | - cat >conftest.$ac_ext <<_ACEOF | | 126 | - cat >conftest.$ac_ext <<_ACEOF |
| 127 | - | | 127 | - |
| 128 | -#include <pthread.h> | | 128 | -#include <pthread.h> |
| 129 | -int check_me = 0; | | 129 | -int check_me = 0; |
| 130 | -void* func(void* data) {check_me = 42; return &check_me;} | | 130 | -void* func(void* data) {check_me = 42; return &check_me;} |
| 131 | -int main() | | 131 | -int main() |
| 132 | - { pthread_t t; | | 132 | - { pthread_t t; |
| 133 | - void *ret; | | 133 | - void *ret; |
| 134 | - pthread_create (&t, 0, func, 0); | | 134 | - pthread_create (&t, 0, func, 0); |
| 135 | - pthread_join (t, &ret); | | 135 | - pthread_join (t, &ret); |
| 136 | - return (check_me != 42 || ret != &check_me); | | 136 | - return (check_me != 42 || ret != &check_me); |
| 137 | -} | | 137 | -} |
| 138 | -_ACEOF | | 138 | -_ACEOF |
| 139 | -rm -f conftest.$ac_objext conftest$ac_exeext | | 139 | -rm -f conftest.$ac_objext conftest$ac_exeext |
| 140 | -if { (ac_try="$ac_link" | | 140 | -if { (ac_try="$ac_link" |
| 141 | -case "(($ac_try" in | | 141 | -case "(($ac_try" in |
| 142 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | | 142 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 143 | - *) ac_try_echo=$ac_try;; | | 143 | - *) ac_try_echo=$ac_try;; |
| 144 | -esac | | 144 | -esac |
| 145 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | | 145 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 146 | -$as_echo "$ac_try_echo") >&5 | | 146 | -$as_echo "$ac_try_echo") >&5 |
| 147 | - (eval "$ac_link") 2>conftest.er1 | | 147 | - (eval "$ac_link") 2>conftest.er1 |
| 148 | - ac_status=$? | | 148 | - ac_status=$? |
| 149 | - grep -v '^ *+' conftest.er1 >conftest.err | | 149 | - grep -v '^ *+' conftest.er1 >conftest.err |
| 150 | - rm -f conftest.er1 | | 150 | - rm -f conftest.er1 |
| 151 | - cat conftest.err >&5 | | 151 | - cat conftest.err >&5 |
| 152 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | | 152 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 153 | - (exit $ac_status); } && { | | 153 | - (exit $ac_status); } && { |
| 154 | - test -z "$ac_c_werror_flag" || | | 154 | - test -z "$ac_c_werror_flag" || |
| 155 | - test ! -s conftest.err | | 155 | - test ! -s conftest.err |
| 156 | - } && test -s conftest$ac_exeext && { | | 156 | - } && test -s conftest$ac_exeext && { |
| 157 | - test "$cross_compiling" = yes || | | 157 | - test "$cross_compiling" = yes || |
| 158 | - $as_test_x conftest$ac_exeext | | 158 | - $as_test_x conftest$ac_exeext |
| 159 | - }; then | | 159 | - }; then |
| 160 | - glib_flag_works=yes | | 160 | - glib_flag_works=yes |
| 161 | -else | | 161 | -else |
| 162 | - $as_echo "$as_me: failed program was:" >&5 | | 162 | - $as_echo "$as_me: failed program was:" >&5 |
| 163 | -sed 's/^/| /' conftest.$ac_ext >&5 | | 163 | -sed 's/^/| /' conftest.$ac_ext >&5 |
| 164 | - | | 164 | - |
| 165 | - glib_flag_works=no | | 165 | - glib_flag_works=no |
| 166 | -fi | | 166 | -fi |
| 167 | - | | 167 | - |
| 168 | -rm -rf conftest.dSYM | | 168 | -rm -rf conftest.dSYM |
| 169 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | | 169 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 170 | - conftest$ac_exeext conftest.$ac_ext | | 170 | - conftest$ac_exeext conftest.$ac_ext |
| 171 | -else | | 171 | -else |
| 172 | - cat >conftest.$ac_ext <<_ACEOF | | 172 | - cat >conftest.$ac_ext <<_ACEOF |
| 173 | -/* confdefs.h. */ | | 173 | -/* confdefs.h. */ |
| 174 | -_ACEOF | | 174 | -_ACEOF |
| 175 | -cat confdefs.h >>conftest.$ac_ext | | 175 | -cat confdefs.h >>conftest.$ac_ext |
| 176 | -cat >>conftest.$ac_ext <<_ACEOF | | 176 | -cat >>conftest.$ac_ext <<_ACEOF |
| 177 | -/* end confdefs.h. */ | | 177 | -/* end confdefs.h. */ |
| 178 | - | | 178 | - |
| 179 | -#include <pthread.h> | | 179 | -#include <pthread.h> |
| 180 | -int check_me = 0; | | 180 | -int check_me = 0; |
| 181 | -void* func(void* data) {check_me = 42; return &check_me;} | | 181 | -void* func(void* data) {check_me = 42; return &check_me;} |
| 182 | -int main() | | 182 | -int main() |
| 183 | - { pthread_t t; | | 183 | - { pthread_t t; |
| 184 | - void *ret; | | 184 | - void *ret; |
| 185 | - pthread_create (&t, 0, func, 0); | | 185 | - pthread_create (&t, 0, func, 0); |
| 186 | - pthread_join (t, &ret); | | 186 | - pthread_join (t, &ret); |
| 187 | - return (check_me != 42 || ret != &check_me); | | 187 | - return (check_me != 42 || ret != &check_me); |
| 188 | -} | | 188 | -} |
| 189 | -_ACEOF | | 189 | -_ACEOF |
| 190 | -rm -f conftest$ac_exeext | | 190 | -rm -f conftest$ac_exeext |
| 191 | -if { (ac_try="$ac_link" | | 191 | -if { (ac_try="$ac_link" |
| 192 | -case "(($ac_try" in | | 192 | -case "(($ac_try" in |
| 193 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | | 193 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 194 | - *) ac_try_echo=$ac_try;; | | 194 | - *) ac_try_echo=$ac_try;; |
| 195 | -esac | | 195 | -esac |
| 196 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | | 196 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 197 | -$as_echo "$ac_try_echo") >&5 | | 197 | -$as_echo "$ac_try_echo") >&5 |
| 198 | - (eval "$ac_link") 2>&5 | | 198 | - (eval "$ac_link") 2>&5 |
| 199 | - ac_status=$? | | 199 | - ac_status=$? |
| 200 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | | 200 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 201 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | | 201 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
| 202 | - { (case "(($ac_try" in | | 202 | - { (case "(($ac_try" in |
| 203 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | | 203 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 204 | - *) ac_try_echo=$ac_try;; | | 204 | - *) ac_try_echo=$ac_try;; |
| 205 | -esac | | 205 | -esac |
| 206 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | | 206 | -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 207 | -$as_echo "$ac_try_echo") >&5 | | 207 | -$as_echo "$ac_try_echo") >&5 |
| 208 | - (eval "$ac_try") 2>&5 | | 208 | - (eval "$ac_try") 2>&5 |
| 209 | - ac_status=$? | | 209 | - ac_status=$? |
| 210 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | | 210 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 211 | - (exit $ac_status); }; }; then | | 211 | - (exit $ac_status); }; }; then |
| 212 | - glib_flag_works=yes | | 212 | - glib_flag_works=yes |
| 213 | -else | | 213 | -else |
| 214 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | | 214 | - $as_echo "$as_me: program exited with status $ac_status" >&5 |
| 215 | -$as_echo "$as_me: failed program was:" >&5 | | 215 | -$as_echo "$as_me: failed program was:" >&5 |
| 216 | -sed 's/^/| /' conftest.$ac_ext >&5 | | 216 | -sed 's/^/| /' conftest.$ac_ext >&5 |
| 217 | - | | 217 | - |
| 218 | -( exit $ac_status ) | | 218 | -( exit $ac_status ) |
| 219 | -glib_flag_works=no | | 219 | -glib_flag_works=no |
| 220 | -fi | | 220 | -fi |
| 221 | -rm -rf conftest.dSYM | | 221 | -rm -rf conftest.dSYM |
| 222 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | | 222 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
| 223 | -fi | | 223 | -fi |
| 224 | - | | 224 | - |
| 225 | - | | 225 | - |
| 226 | - CFLAGS="$glib_save_CFLAGS" | | 226 | - CFLAGS="$glib_save_CFLAGS" |
| 227 | - if test $glib_flag_works = yes ; then | | 227 | - if test $glib_flag_works = yes ; then |
| 228 | - G_THREAD_CFLAGS=-$flag | | 228 | - G_THREAD_CFLAGS=-$flag |
| 229 | - G_THREAD_LIBS=-$flag | | 229 | - G_THREAD_LIBS=-$flag |
| 230 | - break; | | 230 | - break; |
| 231 | - fi | | 231 | - fi |
| 232 | - done | | 232 | - done |
| 233 | + G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" | | 233 | + G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" |
| 234 | + G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" | | 234 | + G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" |
| 235 | ;; | | 235 | ;; |
| 236 | esac | | 236 | esac |
| 237 | fi | | 237 | fi |
| 238 | @@ -42106,6 +42082,10 @@ case $host in | | 238 | @@ -42177,6 +42153,10 @@ case $host in |
| 239 | *) | | 239 | *) |
| 240 | G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" | | 240 | G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" |
| 241 | ;; | | 241 | ;; |
| 242 | + *-*-netbsd*) | | 242 | + *-*-netbsd*) |
| 243 | + # On NetBSD, pkgsrc's libtool does the right thing. | | 243 | + # On NetBSD, pkgsrc's libtool does the right thing. |
| 244 | + G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" | | 244 | + G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" |
| 245 | + ;; | | 245 | + ;; |
| 246 | esac | | 246 | esac |
| 247 | | | 247 | |
| 248 | | | 248 | |
| 249 | @@ -47398,9 +47378,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ | | 249 | @@ -47480,9 +47460,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ |
| 250 | } | | 250 | } |
| 251 | split(mac1, mac2, "(") #) | | 251 | split(mac1, mac2, "(") #) |
| 252 | macro = mac2[1] | | 252 | macro = mac2[1] |
| 253 | - prefix = substr(line, 1, index(line, defundef) - 1) | | 253 | - prefix = substr(line, 1, index(line, defundef) - 1) |
| 254 | if (D_is_set[macro]) { | | 254 | if (D_is_set[macro]) { |
| 255 | # Preserve the white space surrounding the "#". | | 255 | # Preserve the white space surrounding the "#". |
| 256 | + prefix = substr(line, 1, index(line, defundef) - 1) | | 256 | + prefix = substr(line, 1, index(line, defundef) - 1) |
| 257 | print prefix "define", macro P[macro] D[macro] | | 257 | print prefix "define", macro P[macro] D[macro] |
| 258 | next | | 258 | next |
| 259 | } else { | | 259 | } else { |
| 260 | @@ -47408,7 +47388,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ | | 260 | @@ -47490,7 +47470,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ |
| 261 | # in the case of _POSIX_SOURCE, which is predefined and required | | 261 | # in the case of _POSIX_SOURCE, which is predefined and required |
| 262 | # on some systems where configure will not decide to define it. | | 262 | # on some systems where configure will not decide to define it. |
| 263 | if (defundef == "undef") { | | 263 | if (defundef == "undef") { |
| 264 | - print "/*", prefix defundef, macro, "*/" | | 264 | - print "/*", prefix defundef, macro, "*/" |
| 265 | + print "/*", line, "*/" | | 265 | + print "/*", line, "*/" |
| 266 | next | | 266 | next |
| 267 | } | | 267 | } |
| 268 | } | | 268 | } |