Commit89441c9

committed

Merge branch 'master' into anyelement

2 parentsf01011c +d8179b0 commit89441c9Copy full SHA for 89441c9

File tree

+319

-4532

lines changed

+319

-4532

lines changed

Lines changed: 0 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,18 +97,4 @@ AC_SUBST(python_libdir)[]dnl`
`97`	`97`	`AC_SUBST(python_libspec)[]dnl`
`98`	`98`	`AC_SUBST(python_additional_libs)[]dnl`
`99`	`99`
`100`		`-# threaded python is not supported on OpenBSD`
`101`		`-AC_MSG_CHECKING(whetherPythoniscompiledwiththreadsupport)`
`102`		-pythreads=`${PYTHON} -c "import sys; print(int('thread' in sys.builtin_module_names))"`
`103`		`-if test "$pythreads" = "1"; then`
`104`		`-AC_MSG_RESULT(yes)`
`105`		`- case $host_os in`
`106`		`- openbsd*)`
`107`		`-AC_MSG_ERROR([threaded Python not supported on this platform])`
`108`		`- ;;`
`109`		`- esac`
`110`		`-else`
`111`		`-AC_MSG_RESULT(no)`
`112`		`-fi`
`113`		`-`
`114`	`100`	`])# PGAC_CHECK_PYTHON_EMBED_SETUP`

Lines changed: 0 additions & 17 deletions

Original file line number	Diff line number	Diff line change
@@ -7526,23 +7526,6 @@ python_additional_libs=`${PYTHON} -c "import distutils.sysconfig; print(' '.join
`7526`	`7526`	`$as_echo"${python_libspec}${python_additional_libs}">&6; }`
`7527`	`7527`
`7528`	`7528`
`7529`		`-# threaded python is not supported on OpenBSD`
`7530`		`-{$as_echo"$as_me:${as_lineno-$LINENO}: checking whether Python is compiled with thread support">&5`
`7531`		`-$as_echo_n"checking whether Python is compiled with thread support...">&6; }`
`7532`		-pythreads=`${PYTHON} -c"import sys; print(int('thread' in sys.builtin_module_names))"`
`7533`		`-iftest"$pythreads" ="1";then`
`7534`		`- {$as_echo"$as_me:${as_lineno-$LINENO}: result: yes">&5`
`7535`		`-$as_echo"yes">&6; }`
`7536`		`-case$host_osin`
`7537`		`- openbsd*)`
`7538`		`- as_fn_error$?"threaded Python not supported on this platform""$LINENO" 5`
`7539`		`- ;;`
`7540`		`-esac`
`7541`		`-else`
`7542`		`- {$as_echo"$as_me:${as_lineno-$LINENO}: result: no">&5`
`7543`		`-$as_echo"no">&6; }`
`7544`		`-fi`
`7545`		`-`
`7546`	`7529`
`7547`	`7530`
`7548`	`7531`	`# We need libpython as a shared library. With Python >=2.5, we`

Lines changed: 0 additions & 1 deletion

Lines changed: 0 additions & 5 deletions

This file was deleted.

Lines changed: 0 additions & 21 deletions

This file was deleted.

Comments

(0)