From cfb8e0bd85bea2985cb01e0493fa0bb92fce1014 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 27 Jul 2017 19:43:00 -0400 Subject: [PATCH] Fix build when configured with --disable-threads Signed-off-by: Theodore Ts'o --- configure | 6 +++++- configure.ac | 12 ++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 5f7b429..5318e2f 100755 --- a/configure +++ b/configure @@ -13519,7 +13519,10 @@ $as_echo "#define HAVE_OPTRESET 1" >>confdefs.h fi SEM_INIT_LIB='' -ac_fn_c_check_func "$LINENO" "sem_init" "ac_cv_func_sem_init" +echo GL_THREADS_API: ${gl_threads_api} +if test "${gl_threads_api}" != none +then + ac_fn_c_check_func "$LINENO" "sem_init" "ac_cv_func_sem_init" if test "x$ac_cv_func_sem_init" = xyes; then : else @@ -13652,6 +13655,7 @@ fi fi fi +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unified diff option" >&5 $as_echo_n "checking for unified diff option... " >&6; } diff --git a/configure.ac b/configure.ac index 9da7b86..4ede01c 100644 --- a/configure.ac +++ b/configure.ac @@ -1235,16 +1235,20 @@ dnl Test for sem_init, and which library it might require: dnl AH_TEMPLATE([HAVE_SEM_INIT], [Define to 1 if sem_init() exists]) SEM_INIT_LIB='' -AC_CHECK_FUNC(sem_init, , - AC_CHECK_LIB(pthread, sem_init, +echo GL_THREADS_API: ${gl_threads_api} +if test "${gl_threads_api}" != none +then + AC_CHECK_FUNC(sem_init, , + AC_CHECK_LIB(pthread, sem_init, AC_DEFINE(HAVE_SEM_INIT, 1) SEM_INIT_LIB=-lpthread, - AC_CHECK_LIB(rt, sem_init, + AC_CHECK_LIB(rt, sem_init, AC_DEFINE(HAVE_SEM_INIT, 1) SEM_INIT_LIB=-lrt, - AC_CHECK_LIB(posix4, sem_init, + AC_CHECK_LIB(posix4, sem_init, AC_DEFINE(HAVE_SEM_INIT, 1) SEM_INIT_LIB=-lposix4))))dnl +fi AC_SUBST(SEM_INIT_LIB) dnl dnl Check for unified diff -- 1.8.3.1