Commit0d4aa03

committed

Fix agressive collection of thread flags.

1 parent26f6111 commit0d4aa03Copy full SHA for 0d4aa03

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,8 @@ esac`
`82`	`82`	`if test x"$acx_pthread_ok" = xno; then`
`83`	`83`	`for flag in $acx_pthread_flags; do`
`84`	`84`
	`85`	`+ tryPTHREAD_CFLAGS=""`
	`86`	`+ tryPTHREAD_LIBS=""`
`85`	`87`	`case $flag in`
`86`	`88`	`none)`
`87`	`89`	`AC_MSG_CHECKING([whether pthreads work without any flags])`
`@@ -125,7 +127,7 @@ for flag in $acx_pthread_flags; do`
`125`	`127`	`[pthread_t th; pthread_join(th, 0);`
`126`	`128`	`pthread_attr_init(0); pthread_cleanup_push(0, 0);`
`127`	`129`	`pthread_create(0,0,0,0); pthread_cleanup_pop(0);],`
`128`		`-[acx_pthread_ok=yes])`
	`130`	`+[acx_pthread_ok=yes],[acx_pthread_ok=no])`
`129`	`131`
`130`	`132`	`LIBS="$save_LIBS"`
`131`	`133`	`CFLAGS="$save_CFLAGS"`
`@@ -138,7 +140,6 @@ for flag in $acx_pthread_flags; do`
`138`	`140`	`PTHREAD_LIBS=" $tryPTHREAD_LIBS $PTHREAD_LIBS"`
`139`	`141`	`PTHREAD_CFLAGS="$PTHREAD_CFLAGS $tryPTHREAD_CFLAGS"`
`140`	`142`	`fi`
`141`		`-`
`142`	`143`	`done`
`143`	`144`	`fi`
`144`	`145`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13204,6 +13204,8 @@ esac`
`13204`	`13204`	`if test x"$acx_pthread_ok" = xno; then`
`13205`	`13205`	`for flag in $acx_pthread_flags; do`
`13206`	`13206`
	`13207`	`+ tryPTHREAD_CFLAGS=""`
	`13208`	`+ tryPTHREAD_LIBS=""`
`13207`	`13209`	`case $flag in`
`13208`	`13210`	`none)`
`13209`	`13211`	`echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5`
`@@ -13317,6 +13319,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5`
`13317`	`13319`	`else`
`13318`	`13320`	`echo "$as_me: failed program was:" >&5`
`13319`	`13321`	`cat conftest.$ac_ext >&5`
	`13322`	`+acx_pthread_ok=no`
`13320`	`13323`	`fi`
`13321`	`13324`	`rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext`
`13322`	`13325`
`@@ -13332,7 +13335,6 @@ echo "${ECHO_T}$acx_pthread_ok" >&6`
`13332`	`13335`	`PTHREAD_LIBS=" $tryPTHREAD_LIBS $PTHREAD_LIBS"`
`13333`	`13336`	`PTHREAD_CFLAGS="$PTHREAD_CFLAGS $tryPTHREAD_CFLAGS"`
`13334`	`13337`	`fi`
`13335`		`-`
`13336`	`13338`	`done`
`13337`	`13339`	`fi`
`13338`	`13340`

Comments

(0)