Attachment #213531 for bug #251689




DLINCLDIR=	@DLINCLDIR@
DYNLOADFILE=	@DYNLOADFILE@
MACHDEP_OBJS=	@MACHDEP_OBJS@
LIBOBJDIR=	Python.dir/
LIBOBJS=	@LIBOBJS@
UNICODE_OBJS=   @UNICODE_OBJS@


##########################################################################
# Grammar
GRAMMAR_H=	$(srcdir)/Include/graminit.h
GRAMMAR_C=	$(srcdir)/Python.dir/graminit.c
GRAMMAR_INPUT=	$(srcdir)/Grammar/Grammar




PGOBJS=		\
		Objects/obmalloc.o \
		Python.dir/mysnprintf.o \
		Parser/tokenizer_pgen.o \
		Parser/printgrammar.o \
		Parser/pgenmain.o

# AST
AST_H_DIR=	$(srcdir)/Include
AST_H=		$(AST_H_DIR)/Python-ast.h
AST_C_DIR=	$(srcdir)/Python.dir
AST_C=		$(AST_C_DIR)/Python-ast.c
AST_ASDL=	$(srcdir)/Parser/Python.asdl


##########################################################################
# Python
PYTHON_OBJS=	\
		Python.dir/_warnings.o \
		Python.dir/Python-ast.o \
		Python.dir/asdl.o \
		Python.dir/ast.o \
		Python.dir/bltinmodule.o \
		Python.dir/ceval.o \
		Python.dir/compile.o \
		Python.dir/codecs.o \
		Python.dir/errors.o \
		Python.dir/frozen.o \
		Python.dir/frozenmain.o \
		Python.dir/future.o \
		Python.dir/getargs.o \
		Python.dir/getcompiler.o \
		Python.dir/getcopyright.o \
		Python.dir/getmtime.o \
		Python.dir/getplatform.o \
		Python.dir/getversion.o \
		Python.dir/graminit.o \
		Python.dir/import.o \
		Python.dir/importdl.o \
		Python.dir/marshal.o \
		Python.dir/modsupport.o \
		Python.dir/mystrtoul.o \
		Python.dir/mysnprintf.o \
		Python.dir/peephole.o \
		Python.dir/pyarena.o \
		Python.dir/pyfpe.o \
		Python.dir/pymath.o \
		Python.dir/pystate.o \
		Python.dir/pythonrun.o \
		Python.dir/structmember.o \
		Python.dir/symtable.o \
		Python.dir/sysmodule.o \
		Python.dir/traceback.o \
		Python.dir/getopt.o \
		Python.dir/pystrcmp.o \
		Python.dir/pystrtod.o \
		Python.dir/formatter_unicode.o \
		Python.dir/formatter_string.o \
		Python.dir/$(DYNLOADFILE) \
		$(LIBOBJS) \
		$(MACHDEP_OBJS) \
		$(THREADOBJ)

$(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
	$(ASDLGEN) -c $(AST_C_DIR) $(AST_ASDL)

Python.dir/compile.o Python.dir/symtable.o: $(GRAMMAR_H) $(AST_H)

Python.dir/getplatform.o: $(srcdir)/Python.dir/getplatform.c
		$(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python.dir/getplatform.c

Python.dir/importdl.o: $(srcdir)/Python.dir/importdl.c
		$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python.dir/importdl.c

Objects/unicodectype.o:	$(srcdir)/Objects/unicodectype.c \
				$(srcdir)/Objects/unicodetype_db.h

Objects/stringobject.o: $(srcdir)/Objects/stringobject.c \
				$(STRINGLIB_HEADERS)

Python.dir/formatter_unicode.o: $(srcdir)/Python.dir/formatter_unicode.c \
				$(STRINGLIB_HEADERS)

Python.dir/formatter_string.o: $(srcdir)/Python.dir/formatter_string.c \
				$(STRINGLIB_HEADERS)

############################################################################


# Dependencies

Python.dir/thread.o: @THREADHEADERS@

# Declare targets that aren't real files
.PHONY: all build_all sharedmods oldsharedmods test quicktest memtest




fi
case "$enable_toolbox_glue" in
yes)
	extra_machdep_objs="Python.dir/mactoolboxglue.o"
	extra_undefs="-u _PyMac_Error"
	AC_DEFINE(USE_TOOLBOX_OBJECT_GLUE, 1,
         [Define if you want to use MacPython modules on MacOSX in unix-Python.])

	SIGNAL_OBJS=""
else
	USE_SIGNAL_MODULE="#"
	SIGNAL_OBJS="Parser/intrcheck.o Python.dir/sigcheck.o"
fi

# This is used to generate Setup.config

    # Defining _REENTRANT on system with POSIX threads should not hurt.
    AC_DEFINE(_REENTRANT)
    posix_threads=yes
    THREADOBJ="Python.dir/thread.o"    
elif test "$ac_cv_kpthread" = "yes"
then
    CC="$CC -Kpthread"

    fi
    AC_DEFINE(WITH_THREAD)
    posix_threads=yes
    THREADOBJ="Python.dir/thread.o"
elif test "$ac_cv_kthread" = "yes"
then
    CC="$CC -Kthread"

    fi
    AC_DEFINE(WITH_THREAD)
    posix_threads=yes
    THREADOBJ="Python.dir/thread.o"
elif test "$ac_cv_pthread" = "yes"
then
    CC="$CC -pthread"

    fi
    AC_DEFINE(WITH_THREAD)
    posix_threads=yes
    THREADOBJ="Python.dir/thread.o"
else
    if test ! -z "$with_threads" -a -d "$with_threads"
    then LDFLAGS="$LDFLAGS -L$with_threads"

    AC_DEFINE(HURD_C_THREADS, 1,
    [Define if you are using Mach cthreads directly under /include])
    LIBS="$LIBS -lthreads"
    THREADOBJ="Python.dir/thread.o"],[
    AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
    AC_DEFINE(C_THREADS)
    AC_DEFINE(MACH_C_THREADS, 1,
    [Define if you are using Mach cthreads under mach /])
    THREADOBJ="Python.dir/thread.o"],[
    AC_MSG_CHECKING(for --with-pth)
    AC_ARG_WITH([pth],
                AC_HELP_STRING(--with-pth, use GNU pth threading libraries),

                  AC_DEFINE([HAVE_PTH], 1,
                            [Define if you have GNU PTH threads.])
                  LIBS="-lpth $LIBS"
                  THREADOBJ="Python.dir/thread.o"],
	        [AC_MSG_RESULT(no)

    # Just looking for pthread_create in libpthread is not enough:

    AC_MSG_RESULT(yes)
    AC_DEFINE(WITH_THREAD)
    posix_threads=yes
    THREADOBJ="Python.dir/thread.o"],[
    LIBS=$_libs
    AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
    posix_threads=yes
    THREADOBJ="Python.dir/thread.o"],[
    AC_CHECK_HEADER(atheos/threads.h, [AC_DEFINE(WITH_THREAD)
    AC_DEFINE(ATHEOS_THREADS, 1,
    [Define this if you have AtheOS threads.])
    THREADOBJ="Python.dir/thread.o"],[
    AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
    AC_DEFINE(BEOS_THREADS, 1,
    [Define this if you have BeOS threads.])
    THREADOBJ="Python.dir/thread.o"],[
    AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
    posix_threads=yes
    LIBS="$LIBS -lpthreads"
    THREADOBJ="Python.dir/thread.o"], [
    AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
    posix_threads=yes
    LIBS="$LIBS -lc_r"
    THREADOBJ="Python.dir/thread.o"], [
    AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
    posix_threads=yes
    LIBS="$LIBS -lpthread"
    THREADOBJ="Python.dir/thread.o"], [
    AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
    posix_threads=yes
    LIBS="$LIBS -lcma"
    THREADOBJ="Python.dir/thread.o"],[
    USE_THREAD_MODULE="#"])
    ])])])])])])])])])])

    AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
    LIBS="$LIBS -lmpc"
    THREADOBJ="Python.dir/thread.o"
    USE_THREAD_MODULE=""])

    if test "$posix_threads" != "yes"; then     
      AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
      LIBS="$LIBS -lthread"
      THREADOBJ="Python.dir/thread.o"
      USE_THREAD_MODULE=""])
    fi



AC_SUBST(THREADHEADERS)

for h in `(cd $srcdir;echo Python.dir/thread_*.h)`
do
  THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"
done

Lines 3892-3898 Link Here

(-)configure.in.orig (-1 / +1 lines)
3892	done	3892	done
3893		3893
3894	AC_SUBST(SRCDIRS)	3894	AC_SUBST(SRCDIRS)
3895	SRCDIRS="Parser Grammar Objects Python Modules Mac"	3895	SRCDIRS="Parser Grammar Objects Python.dir Modules Mac"
3896	AC_MSG_CHECKING(for build directories)	3896	AC_MSG_CHECKING(for build directories)
3897	for dir in $SRCDIRS; do	3897	for dir in $SRCDIRS; do
3898	if test ! -d $dir; then	3898	if test ! -d $dir; then

Return to bug 251689

Lines 170-176 Link Here

(-)Makefile.pre.in.orig (-53 / +53 lines)
170	DLINCLDIR= @DLINCLDIR@	170	DLINCLDIR= @DLINCLDIR@
171	DYNLOADFILE= @DYNLOADFILE@	171	DYNLOADFILE= @DYNLOADFILE@
172	MACHDEP_OBJS= @MACHDEP_OBJS@	172	MACHDEP_OBJS= @MACHDEP_OBJS@
173	LIBOBJDIR= Python/	173	LIBOBJDIR= Python.dir/
174	LIBOBJS= @LIBOBJS@	174	LIBOBJS= @LIBOBJS@
175	UNICODE_OBJS= @UNICODE_OBJS@	175	UNICODE_OBJS= @UNICODE_OBJS@
176		176
Lines 199-205 Link Here
199	##########################################################################	199	##########################################################################
200	# Grammar	200	# Grammar
201	GRAMMAR_H= $(srcdir)/Include/graminit.h	201	GRAMMAR_H= $(srcdir)/Include/graminit.h
202	GRAMMAR_C= $(srcdir)/Python/graminit.c	202	GRAMMAR_C= $(srcdir)/Python.dir/graminit.c
203	GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar	203	GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
204		204
205		205
Lines 226-232 Link Here
226		226
227	PGOBJS= \	227	PGOBJS= \
228	Objects/obmalloc.o \	228	Objects/obmalloc.o \
229	Python/mysnprintf.o \	229	Python.dir/mysnprintf.o \
230	Parser/tokenizer_pgen.o \	230	Parser/tokenizer_pgen.o \
231	Parser/printgrammar.o \	231	Parser/printgrammar.o \
232	Parser/pgenmain.o	232	Parser/pgenmain.o
Lines 241-247 Link Here
241	# AST	241	# AST
242	AST_H_DIR= $(srcdir)/Include	242	AST_H_DIR= $(srcdir)/Include
243	AST_H= $(AST_H_DIR)/Python-ast.h	243	AST_H= $(AST_H_DIR)/Python-ast.h
244	AST_C_DIR= $(srcdir)/Python	244	AST_C_DIR= $(srcdir)/Python.dir
245	AST_C= $(AST_C_DIR)/Python-ast.c	245	AST_C= $(AST_C_DIR)/Python-ast.c
246	AST_ASDL= $(srcdir)/Parser/Python.asdl	246	AST_ASDL= $(srcdir)/Parser/Python.asdl
247		247
Lines 252-298 Link Here
252	##########################################################################	252	##########################################################################
253	# Python	253	# Python
254	PYTHON_OBJS= \	254	PYTHON_OBJS= \
255	Python/_warnings.o \	255	Python.dir/_warnings.o \
256	Python/Python-ast.o \	256	Python.dir/Python-ast.o \
257	Python/asdl.o \	257	Python.dir/asdl.o \
258	Python/ast.o \	258	Python.dir/ast.o \
259	Python/bltinmodule.o \	259	Python.dir/bltinmodule.o \
260	Python/ceval.o \	260	Python.dir/ceval.o \
261	Python/compile.o \	261	Python.dir/compile.o \
262	Python/codecs.o \	262	Python.dir/codecs.o \
263	Python/errors.o \	263	Python.dir/errors.o \
264	Python/frozen.o \	264	Python.dir/frozen.o \
265	Python/frozenmain.o \	265	Python.dir/frozenmain.o \
266	Python/future.o \	266	Python.dir/future.o \
267	Python/getargs.o \	267	Python.dir/getargs.o \
268	Python/getcompiler.o \	268	Python.dir/getcompiler.o \
269	Python/getcopyright.o \	269	Python.dir/getcopyright.o \
270	Python/getmtime.o \	270	Python.dir/getmtime.o \
271	Python/getplatform.o \	271	Python.dir/getplatform.o \
272	Python/getversion.o \	272	Python.dir/getversion.o \
273	Python/graminit.o \	273	Python.dir/graminit.o \
274	Python/import.o \	274	Python.dir/import.o \
275	Python/importdl.o \	275	Python.dir/importdl.o \
276	Python/marshal.o \	276	Python.dir/marshal.o \
277	Python/modsupport.o \	277	Python.dir/modsupport.o \
278	Python/mystrtoul.o \	278	Python.dir/mystrtoul.o \
279	Python/mysnprintf.o \	279	Python.dir/mysnprintf.o \
280	Python/peephole.o \	280	Python.dir/peephole.o \
281	Python/pyarena.o \	281	Python.dir/pyarena.o \
282	Python/pyfpe.o \	282	Python.dir/pyfpe.o \
283	Python/pymath.o \	283	Python.dir/pymath.o \
284	Python/pystate.o \	284	Python.dir/pystate.o \
285	Python/pythonrun.o \	285	Python.dir/pythonrun.o \
286	Python/structmember.o \	286	Python.dir/structmember.o \
287	Python/symtable.o \	287	Python.dir/symtable.o \
288	Python/sysmodule.o \	288	Python.dir/sysmodule.o \
289	Python/traceback.o \	289	Python.dir/traceback.o \
290	Python/getopt.o \	290	Python.dir/getopt.o \
291	Python/pystrcmp.o \	291	Python.dir/pystrcmp.o \
292	Python/pystrtod.o \	292	Python.dir/pystrtod.o \
293	Python/formatter_unicode.o \	293	Python.dir/formatter_unicode.o \
294	Python/formatter_string.o \	294	Python.dir/formatter_string.o \
295	Python/$(DYNLOADFILE) \	295	Python.dir/$(DYNLOADFILE) \
296	$(LIBOBJS) \	296	$(LIBOBJS) \
297	$(MACHDEP_OBJS) \	297	$(MACHDEP_OBJS) \
298	$(THREADOBJ)	298	$(THREADOBJ)
Lines 548-560 Link Here
548	$(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)	548	$(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
549	$(ASDLGEN) -c $(AST_C_DIR) $(AST_ASDL)	549	$(ASDLGEN) -c $(AST_C_DIR) $(AST_ASDL)
550		550
551	Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H)	551	Python.dir/compile.o Python.dir/symtable.o: $(GRAMMAR_H) $(AST_H)
552		552
553	Python/getplatform.o: $(srcdir)/Python/getplatform.c	553	Python.dir/getplatform.o: $(srcdir)/Python.dir/getplatform.c
554	$(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c	554	$(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python.dir/getplatform.c
555		555
556	Python/importdl.o: $(srcdir)/Python/importdl.c	556	Python.dir/importdl.o: $(srcdir)/Python.dir/importdl.c
557	$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c	557	$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python.dir/importdl.c
558		558
559	Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \	559	Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \
560	$(srcdir)/Objects/unicodetype_db.h	560	$(srcdir)/Objects/unicodetype_db.h
Lines 582-591 Link Here
582	Objects/stringobject.o: $(srcdir)/Objects/stringobject.c \	582	Objects/stringobject.o: $(srcdir)/Objects/stringobject.c \
583	$(STRINGLIB_HEADERS)	583	$(STRINGLIB_HEADERS)
584		584
585	Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \	585	Python.dir/formatter_unicode.o: $(srcdir)/Python.dir/formatter_unicode.c \
586	$(STRINGLIB_HEADERS)	586	$(STRINGLIB_HEADERS)
587		587
588	Python/formatter_string.o: $(srcdir)/Python/formatter_string.c \	588	Python.dir/formatter_string.o: $(srcdir)/Python.dir/formatter_string.c \
589	$(STRINGLIB_HEADERS)	589	$(STRINGLIB_HEADERS)
590		590
591	############################################################################	591	############################################################################
Lines 1216-1222 Link Here
1216		1216
1217	# Dependencies	1217	# Dependencies
1218		1218
1219	Python/thread.o: @THREADHEADERS@	1219	Python.dir/thread.o: @THREADHEADERS@
1220		1220
1221	# Declare targets that aren't real files	1221	# Declare targets that aren't real files
1222	.PHONY: all build_all sharedmods oldsharedmods test quicktest memtest	1222	.PHONY: all build_all sharedmods oldsharedmods test quicktest memtest

Lines 1566-1572 Link Here

(-)configure.in.orig (-20 / +20 lines)
1566	fi	1566	fi
1567	case "$enable_toolbox_glue" in	1567	case "$enable_toolbox_glue" in
1568	yes)	1568	yes)
1569	extra_machdep_objs="Python/mactoolboxglue.o"	1569	extra_machdep_objs="Python.dir/mactoolboxglue.o"
1570	extra_undefs="-u _PyMac_Error"	1570	extra_undefs="-u _PyMac_Error"
1571	AC_DEFINE(USE_TOOLBOX_OBJECT_GLUE, 1,	1571	AC_DEFINE(USE_TOOLBOX_OBJECT_GLUE, 1,
1572	[Define if you want to use MacPython modules on MacOSX in unix-Python.])	1572	[Define if you want to use MacPython modules on MacOSX in unix-Python.])
Lines 2061-2067 Link Here
2061	SIGNAL_OBJS=""	2061	SIGNAL_OBJS=""
2062	else	2062	else
2063	USE_SIGNAL_MODULE="#"	2063	USE_SIGNAL_MODULE="#"
2064	SIGNAL_OBJS="Parser/intrcheck.o Python/sigcheck.o"	2064	SIGNAL_OBJS="Parser/intrcheck.o Python.dir/sigcheck.o"
2065	fi	2065	fi
2066		2066
2067	# This is used to generate Setup.config	2067	# This is used to generate Setup.config
Lines 2114-2120 Link Here
2114	# Defining _REENTRANT on system with POSIX threads should not hurt.	2114	# Defining _REENTRANT on system with POSIX threads should not hurt.
2115	AC_DEFINE(_REENTRANT)	2115	AC_DEFINE(_REENTRANT)
2116	posix_threads=yes	2116	posix_threads=yes
2117	THREADOBJ="Python/thread.o"	2117	THREADOBJ="Python.dir/thread.o"
2118	elif test "$ac_cv_kpthread" = "yes"	2118	elif test "$ac_cv_kpthread" = "yes"
2119	then	2119	then
2120	CC="$CC -Kpthread"	2120	CC="$CC -Kpthread"
Lines 2123-2129 Link Here
2123	fi	2123	fi
2124	AC_DEFINE(WITH_THREAD)	2124	AC_DEFINE(WITH_THREAD)
2125	posix_threads=yes	2125	posix_threads=yes
2126	THREADOBJ="Python/thread.o"	2126	THREADOBJ="Python.dir/thread.o"
2127	elif test "$ac_cv_kthread" = "yes"	2127	elif test "$ac_cv_kthread" = "yes"
2128	then	2128	then
2129	CC="$CC -Kthread"	2129	CC="$CC -Kthread"
Lines 2132-2138 Link Here
2132	fi	2132	fi
2133	AC_DEFINE(WITH_THREAD)	2133	AC_DEFINE(WITH_THREAD)
2134	posix_threads=yes	2134	posix_threads=yes
2135	THREADOBJ="Python/thread.o"	2135	THREADOBJ="Python.dir/thread.o"
2136	elif test "$ac_cv_pthread" = "yes"	2136	elif test "$ac_cv_pthread" = "yes"
2137	then	2137	then
2138	CC="$CC -pthread"	2138	CC="$CC -pthread"
Lines 2141-2147 Link Here
2141	fi	2141	fi
2142	AC_DEFINE(WITH_THREAD)	2142	AC_DEFINE(WITH_THREAD)
2143	posix_threads=yes	2143	posix_threads=yes
2144	THREADOBJ="Python/thread.o"	2144	THREADOBJ="Python.dir/thread.o"
2145	else	2145	else
2146	if test ! -z "$with_threads" -a -d "$with_threads"	2146	if test ! -z "$with_threads" -a -d "$with_threads"
2147	then LDFLAGS="$LDFLAGS -L$with_threads"	2147	then LDFLAGS="$LDFLAGS -L$with_threads"
Lines 2169-2180 Link Here
2169	AC_DEFINE(HURD_C_THREADS, 1,	2169	AC_DEFINE(HURD_C_THREADS, 1,
2170	[Define if you are using Mach cthreads directly under /include])	2170	[Define if you are using Mach cthreads directly under /include])
2171	LIBS="$LIBS -lthreads"	2171	LIBS="$LIBS -lthreads"
2172	THREADOBJ="Python/thread.o"],[	2172	THREADOBJ="Python.dir/thread.o"],[
2173	AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)	2173	AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
2174	AC_DEFINE(C_THREADS)	2174	AC_DEFINE(C_THREADS)
2175	AC_DEFINE(MACH_C_THREADS, 1,	2175	AC_DEFINE(MACH_C_THREADS, 1,
2176	[Define if you are using Mach cthreads under mach /])	2176	[Define if you are using Mach cthreads under mach /])
2177	THREADOBJ="Python/thread.o"],[	2177	THREADOBJ="Python.dir/thread.o"],[
2178	AC_MSG_CHECKING(for --with-pth)	2178	AC_MSG_CHECKING(for --with-pth)
2179	AC_ARG_WITH([pth],	2179	AC_ARG_WITH([pth],
2180	AC_HELP_STRING(--with-pth, use GNU pth threading libraries),	2180	AC_HELP_STRING(--with-pth, use GNU pth threading libraries),
Lines 2183-2189 Link Here
2183	AC_DEFINE([HAVE_PTH], 1,	2183	AC_DEFINE([HAVE_PTH], 1,
2184	[Define if you have GNU PTH threads.])	2184	[Define if you have GNU PTH threads.])
2185	LIBS="-lpth $LIBS"	2185	LIBS="-lpth $LIBS"
2186	THREADOBJ="Python/thread.o"],	2186	THREADOBJ="Python.dir/thread.o"],
2187	[AC_MSG_RESULT(no)	2187	[AC_MSG_RESULT(no)
2188		2188
2189	# Just looking for pthread_create in libpthread is not enough:	2189	# Just looking for pthread_create in libpthread is not enough:
Lines 2199-2245 Link Here
2199	AC_MSG_RESULT(yes)	2199	AC_MSG_RESULT(yes)
2200	AC_DEFINE(WITH_THREAD)	2200	AC_DEFINE(WITH_THREAD)
2201	posix_threads=yes	2201	posix_threads=yes
2202	THREADOBJ="Python/thread.o"],[	2202	THREADOBJ="Python.dir/thread.o"],[
2203	LIBS=$_libs	2203	LIBS=$_libs
2204	AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)	2204	AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
2205	posix_threads=yes	2205	posix_threads=yes
2206	THREADOBJ="Python/thread.o"],[	2206	THREADOBJ="Python.dir/thread.o"],[
2207	AC_CHECK_HEADER(atheos/threads.h, [AC_DEFINE(WITH_THREAD)	2207	AC_CHECK_HEADER(atheos/threads.h, [AC_DEFINE(WITH_THREAD)
2208	AC_DEFINE(ATHEOS_THREADS, 1,	2208	AC_DEFINE(ATHEOS_THREADS, 1,
2209	[Define this if you have AtheOS threads.])	2209	[Define this if you have AtheOS threads.])
2210	THREADOBJ="Python/thread.o"],[	2210	THREADOBJ="Python.dir/thread.o"],[
2211	AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)	2211	AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
2212	AC_DEFINE(BEOS_THREADS, 1,	2212	AC_DEFINE(BEOS_THREADS, 1,
2213	[Define this if you have BeOS threads.])	2213	[Define this if you have BeOS threads.])
2214	THREADOBJ="Python/thread.o"],[	2214	THREADOBJ="Python.dir/thread.o"],[
2215	AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)	2215	AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
2216	posix_threads=yes	2216	posix_threads=yes
2217	LIBS="$LIBS -lpthreads"	2217	LIBS="$LIBS -lpthreads"
2218	THREADOBJ="Python/thread.o"], [	2218	THREADOBJ="Python.dir/thread.o"], [
2219	AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)	2219	AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
2220	posix_threads=yes	2220	posix_threads=yes
2221	LIBS="$LIBS -lc_r"	2221	LIBS="$LIBS -lc_r"
2222	THREADOBJ="Python/thread.o"], [	2222	THREADOBJ="Python.dir/thread.o"], [
2223	AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)	2223	AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
2224	posix_threads=yes	2224	posix_threads=yes
2225	LIBS="$LIBS -lpthread"	2225	LIBS="$LIBS -lpthread"
2226	THREADOBJ="Python/thread.o"], [	2226	THREADOBJ="Python.dir/thread.o"], [
2227	AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)	2227	AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
2228	posix_threads=yes	2228	posix_threads=yes
2229	LIBS="$LIBS -lcma"	2229	LIBS="$LIBS -lcma"
2230	THREADOBJ="Python/thread.o"],[	2230	THREADOBJ="Python.dir/thread.o"],[
2231	USE_THREAD_MODULE="#"])	2231	USE_THREAD_MODULE="#"])
2232	])])])])])])])])])])	2232	])])])])])])])])])])
2233		2233
2234	AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)	2234	AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
2235	LIBS="$LIBS -lmpc"	2235	LIBS="$LIBS -lmpc"
2236	THREADOBJ="Python/thread.o"	2236	THREADOBJ="Python.dir/thread.o"
2237	USE_THREAD_MODULE=""])	2237	USE_THREAD_MODULE=""])
2238		2238
2239	if test "$posix_threads" != "yes"; then	2239	if test "$posix_threads" != "yes"; then
2240	AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)	2240	AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
2241	LIBS="$LIBS -lthread"	2241	LIBS="$LIBS -lthread"
2242	THREADOBJ="Python/thread.o"	2242	THREADOBJ="Python.dir/thread.o"
2243	USE_THREAD_MODULE=""])	2243	USE_THREAD_MODULE=""])
2244	fi	2244	fi
2245		2245
Lines 3886-3892 Link Here
3886		3886
3887	AC_SUBST(THREADHEADERS)	3887	AC_SUBST(THREADHEADERS)
3888		3888
3889	for h in `(cd $srcdir;echo Python/thread_*.h)`	3889	for h in `(cd $srcdir;echo Python.dir/thread_*.h)`
3890	do	3890	do
3891	THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"	3891	THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"
3892	done	3892	done