| @@ -1,30 +1,38 @@ | | | @@ -1,30 +1,38 @@ |
1 | $NetBSD: patch-ak,v 1.14 2010/07/12 17:52:29 drochner Exp $ | | 1 | $NetBSD: patch-ak,v 1.15 2010/11/17 15:59:38 drochner Exp $ |
2 | | | 2 | |
3 | --- configure.orig 2010-04-26 03:11:28.000000000 +0000 | | 3 | --- configure.orig 2010-08-11 20:55:10.000000000 +0000 |
4 | +++ configure | | 4 | +++ configure |
5 | @@ -17395,13 +17395,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk | | 5 | @@ -4397,7 +4397,6 @@ fi |
| | | 6 | |
| | | 7 | list="-DG_DISABLE_DEPRECATED |
| | | 8 | -DPANGO_DISABLE_DEPRECATED |
| | | 9 | - -DGDK_DISABLE_DEPRECATED |
| | | 10 | -DGDK_PIXBUF_DISABLE_DEPRECATED |
| | | 11 | -DG_DISABLE_SINGLE_INCLUDES |
| | | 12 | -DGTK_DISABLE_SINGLE_INCLUDES |
| | | 13 | @@ -17395,13 +17394,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk |
6 | | | 14 | |
7 | | | 15 | |
8 | PTHREAD_LIB="" | | 16 | PTHREAD_LIB="" |
9 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 | | 17 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 |
10 | -$as_echo_n "checking for pthread_create in -lpthread... " >&6; } | | 18 | -$as_echo_n "checking for pthread_create in -lpthread... " >&6; } |
11 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in ${PTHREAD_LIB}" >&5 | | 19 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in ${PTHREAD_LIB}" >&5 |
12 | +$as_echo_n "checking for pthread_create in ${PTHREAD_LIB}... " >&6; } | | 20 | +$as_echo_n "checking for pthread_create in ${PTHREAD_LIB}... " >&6; } |
13 | if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then : | | 21 | if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then : |
14 | $as_echo_n "(cached) " >&6 | | 22 | $as_echo_n "(cached) " >&6 |
15 | else | | 23 | else |
16 | ac_check_lib_save_LIBS=$LIBS | | 24 | ac_check_lib_save_LIBS=$LIBS |
17 | -LIBS="-lpthread $LIBS" | | 25 | -LIBS="-lpthread $LIBS" |
18 | +LIBS="${PTHREAD_LIB} $LIBS" | | 26 | +LIBS="${PTHREAD_LIB} $LIBS" |
19 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | | 27 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
20 | /* end confdefs.h. */ | | 28 | /* end confdefs.h. */ |
21 | | | 29 | |
22 | @@ -17432,7 +17432,7 @@ fi | | 30 | @@ -17432,7 +17431,7 @@ fi |
23 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 | | 31 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 |
24 | $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } | | 32 | $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } |
25 | if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : | | 33 | if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : |
26 | - PTHREAD_LIB="-lpthread" | | 34 | - PTHREAD_LIB="-lpthread" |
27 | + PTHREAD_LIB="${PTHREAD_LIB}" | | 35 | + PTHREAD_LIB="${PTHREAD_LIB}" |
28 | else | | 36 | else |
29 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5 | | 37 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5 |
30 | $as_echo_n "checking for pthread_create in -lpthreads... " >&6; } | | 38 | $as_echo_n "checking for pthread_create in -lpthreads... " >&6; } |