blob: 23e679ddc0319a939e5f3b652b002704bb01e5cb (
plain) (
blame)
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
|
--- apr-0.9.4/build/apr_threads.m4.orig Sun Nov 16 02:42:33 2003
+++ apr-0.9.4/build/apr_threads.m4 Wed Jan 28 17:52:33 2004
@@ -110,6 +110,7 @@
AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
[apr_ptc_cflags=$CFLAGS
+ if test "x$ac_cv_pthreads_cflags" = "x"; then
for flag in none -kthread -pthread -pthreads -mthreads -Kthread -threads; do
CFLAGS=$apr_ptc_cflags
test "x$flag" != "xnone" && CFLAGS="$CFLAGS $flag"
@@ -118,6 +119,11 @@
break
])
done
+ else
+ if test "$ac_cv_pthreads_cflags" != "none"; then
+ apr_cv_pthreads_cflags="$ac_cv_pthreads_cflags"
+ fi
+ fi
CFLAGS=$apr_ptc_cflags
])
@@ -136,6 +142,7 @@
AC_CACHE_CHECK([for LIBS needed for pthreads], [apr_cv_pthreads_lib], [
apr_ptc_libs=$LIBS
+ if test "x$ac_cv_pthreads_lib" = "x"; then
for lib in -lpthread -lpthreads -lc_r; do
LIBS="$apr_ptc_libs $lib"
APR_PTHREADS_TRY_RUN([
@@ -143,6 +150,13 @@
break
])
done
+ else
+ case x$ac_cv_pthreads_lib in
+ x-*) apr_cv_pthreads_lib="$ac_cv_pthreads_lib" ;;
+ xnone|x) : ;;
+ *) apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
+ esac
+ fi
LIBS=$apr_ptc_libs
])
|
