diff --git a/.mailmap b/.mailmap index 831be1f648..bfa0774c4b 100644 --- a/.mailmap +++ b/.mailmap @@ -92,3 +92,4 @@ Henrik Holst Christian Schmitz Max Mehl rzrymiak on github <106121613+rzrymiak@users.noreply.github.com> +Oliver Roberts diff --git a/configure.ac b/configure.ac index b4b183f404..5559409427 100644 --- a/configure.ac +++ b/configure.ac @@ -3617,6 +3617,9 @@ if test "$want_pthreads" != "no"; then dnl if it wasn't found without lib, search for it in pthread lib if test "$USE_THREADS_POSIX" != "1" then + # assign PTHREAD for pkg-config use + PTHREAD=" -pthread" + case $host in *-ibm-aix*) dnl Check if compiler is xlC @@ -3627,12 +3630,14 @@ if test "$want_pthreads" != "no"; then CFLAGS="$CFLAGS -qthreaded" fi ;; + powerpc-*amigaos*) + dnl No -pthread option, but link with -lpthread + PTHREAD=" -lpthread" + ;; *) CFLAGS="$CFLAGS -pthread" ;; esac - # assign PTHREAD for pkg-config use - PTHREAD=" -pthread" AC_CHECK_LIB(pthread, pthread_create, [USE_THREADS_POSIX=1], [ CFLAGS="$save_CFLAGS"])