]>
Commit | Line | Data |
---|---|---|
36fcf714 JB |
1 | --- Python-2.2.1/configure.in.orig Fri Apr 19 20:16:38 2002 |
2 | +++ Python-2.2.1/configure.in Fri Apr 19 20:28:11 2002 | |
3 | @@ -1017,13 +1017,13 @@ | |
4 | # Defining _REENTRANT on system with POSIX threads should not hurt. | |
5 | AC_DEFINE(_REENTRANT) | |
6 | posix_threads=yes | |
7 | - LIBOBJS="$LIBOBJS thread.o" | |
8 | + AC_LIBOBJ([thread]) | |
9 | elif test "$ac_cv_kpthread" = "yes" | |
10 | then | |
11 | CC="$CC -Kpthread" | |
12 | AC_DEFINE(WITH_THREAD) | |
13 | posix_threads=yes | |
14 | - LIBOBJS="$LIBOBJS thread.o" | |
15 | + AC_LIBOBJ([thread]) | |
16 | else | |
17 | if test ! -z "$with_threads" -a -d "$with_threads" | |
18 | then LDFLAGS="$LDFLAGS -L$with_threads" | |
19 | @@ -1048,11 +1048,11 @@ | |
20 | AC_DEFINE(C_THREADS) | |
21 | AC_DEFINE(HURD_C_THREADS) | |
22 | LIBS="$LIBS -lthreads" | |
23 | - LIBOBJS="$LIBOBJS thread.o"],[ | |
24 | + AC_LIBOBJ([thread.o])],[ | |
25 | AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD) | |
26 | AC_DEFINE(C_THREADS) | |
27 | AC_DEFINE(MACH_C_THREADS) | |
28 | - LIBOBJS="$LIBOBJS thread.o"],[ | |
29 | + AC_LIBOBJ([thread])],[ | |
30 | AC_MSG_CHECKING(for --with-pth) | |
31 | AC_ARG_WITH(pth, | |
32 | [ --with-pth use GNU pth threading libraries], [ | |
33 | @@ -1060,7 +1060,7 @@ | |
34 | AC_DEFINE(WITH_THREAD) | |
35 | AC_DEFINE(HAVE_PTH) | |
36 | LIBS="-lpth $LIBS" | |
37 | - LIBOBJS="$LIBOBJS thread.o"],[ | |
38 | + AC_LIBOBJ([thread])],[ | |
39 | AC_MSG_RESULT(no) | |
8f7d05d0 | 40 | |
36fcf714 JB |
41 | # Just looking for pthread_create in libpthread is not enough: |
42 | @@ -1076,34 +1076,34 @@ | |
43 | AC_MSG_RESULT(yes) | |
44 | AC_DEFINE(WITH_THREAD) | |
45 | posix_threads=yes | |
46 | - LIBOBJS="$LIBOBJS thread.o"],[ | |
47 | + AC_LIBOBJ([thread])],[ | |
48 | LIBS=$_libs | |
49 | AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD) | |
50 | posix_threads=yes | |
51 | - LIBOBJS="$LIBOBJS thread.o"],[ | |
52 | + AC_LIBOBJ([thread])],[ | |
53 | AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD) | |
54 | AC_DEFINE(BEOS_THREADS) | |
55 | - LIBOBJS="$LIBOBJS thread.o"],[ | |
56 | + AC_LIBOBJ([thread])],[ | |
57 | AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD) | |
58 | posix_threads=yes | |
59 | LIBS="$LIBS -lpthreads" | |
60 | - LIBOBJS="$LIBOBJS thread.o"], [ | |
61 | + AC_LIBOBJ([thread])], [ | |
62 | AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD) | |
63 | posix_threads=yes | |
64 | LIBS="$LIBS -lc_r" | |
65 | - LIBOBJS="$LIBOBJS thread.o"], [ | |
66 | + AC_LIBOBJ([thread])], [ | |
67 | AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD) | |
68 | posix_threads=yes | |
69 | LIBS="$LIBS -lthread" | |
70 | - LIBOBJS="$LIBOBJS thread.o"], [ | |
71 | + AC_LIBOBJ([thread])], [ | |
72 | AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD) | |
73 | posix_threads=yes | |
74 | LIBS="$LIBS -lpthread" | |
75 | - LIBOBJS="$LIBOBJS thread.o"], [ | |
76 | + AC_LIBOBJ([thread])], [ | |
77 | AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD) | |
78 | posix_threads=yes | |
79 | LIBS="$LIBS -lcma" | |
80 | - LIBOBJS="$LIBOBJS thread.o"],[ | |
81 | + AC_LIBOBJ([thread])],[ | |
82 | USE_THREAD_MODULE="#"]) | |
83 | ])])])])])])])])])]) | |
84 | ||
85 | @@ -1139,11 +1139,11 @@ | |
86 | ||
87 | AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD) | |
88 | LIBS="$LIBS -lmpc" | |
89 | - LIBOBJS="$LIBOBJS thread.o" | |
90 | + AC_LIBOBJ([thread]) | |
91 | USE_THREAD_MODULE=""]) | |
92 | AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD) | |
93 | LIBS="$LIBS -lthread" | |
94 | - LIBOBJS="$LIBOBJS thread.o" | |
95 | + AC_LIBOBJ([thread]) | |
96 | USE_THREAD_MODULE=""]) | |
97 | ||
98 | if test "$USE_THREAD_MODULE" != "#" | |
99 | @@ -2037,11 +2037,11 @@ | |
100 | EOF | |
101 | AC_CHECK_TYPE(socklen_t, int) | |
102 | ||
103 | -# Add Python/ prefix to LIBOBJS | |
104 | -libobjs=$LIBOBJS | |
105 | -LIBOBJS= | |
106 | +# Add Python/ prefix to LIB@&t@OBJS | |
107 | +libobjs=$LIB@&t@OBJS | |
108 | +LIB@&t@OBJS= | |
109 | for obj in $libobjs; do | |
110 | - LIBOBJS="$LIBOBJS Python/$obj" | |
111 | + LIB@&t@OBJS="$LIB@&t@OBJS Python/$obj" | |
112 | done | |
113 | ||
114 | #AC_MSG_CHECKING(for Modules/Setup) |