74 lines
2.8 KiB
Plaintext
74 lines
2.8 KiB
Plaintext
$OpenBSD: patch-configure,v 1.17 2011/12/03 14:27:40 ajacoutot Exp $
|
|
--- configure.orig Wed Sep 21 16:27:57 2011
|
|
+++ configure Sat Dec 3 15:10:38 2011
|
|
@@ -18853,7 +18853,8 @@ fi
|
|
done
|
|
|
|
|
|
-ac_fn_c_check_decl "$LINENO" "MSG_NOSIGNAL" "ac_cv_have_decl_MSG_NOSIGNAL" " #include <sys/socket.h>
|
|
+ac_fn_c_check_decl "$LINENO" "MSG_NOSIGNAL" "ac_cv_have_decl_MSG_NOSIGNAL" " #include <sys/types.h>
|
|
+#include <sys/socket.h>
|
|
"
|
|
if test "x$ac_cv_have_decl_MSG_NOSIGNAL" = xyes; then :
|
|
ac_have_decl=1
|
|
@@ -19406,13 +19407,13 @@ fi
|
|
# Thread lib detection
|
|
ac_fn_c_check_func "$LINENO" "pthread_cond_timedwait" "ac_cv_func_pthread_cond_timedwait"
|
|
if test "x$ac_cv_func_pthread_cond_timedwait" = xyes; then :
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_cond_timedwait in -lpthread" >&5
|
|
-$as_echo_n "checking for pthread_cond_timedwait in -lpthread... " >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_cond_timedwait in -pthread" >&5
|
|
+$as_echo_n "checking for pthread_cond_timedwait in -pthread... " >&6; }
|
|
if ${ac_cv_lib_pthread_pthread_cond_timedwait+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lpthread $LIBS"
|
|
+LIBS="-pthread $LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -19443,7 +19444,7 @@ fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_cond_timedwait" >&5
|
|
$as_echo "$ac_cv_lib_pthread_pthread_cond_timedwait" >&6; }
|
|
if test "x$ac_cv_lib_pthread_pthread_cond_timedwait" = xyes; then :
|
|
- THREAD_LIBS="-lpthread"
|
|
+ THREAD_LIBS="-pthread"
|
|
fi
|
|
|
|
fi
|
|
@@ -19658,13 +19659,13 @@ if test x$have_selinux = xyes ; then
|
|
if test "x$ac_cv_func_pthread_create" = xyes; then :
|
|
|
|
else
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
|
|
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
|
|
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
|
|
if ${ac_cv_lib_pthread_pthread_create+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lpthread $LIBS"
|
|
+LIBS="-pthread $LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -19695,7 +19696,7 @@ fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
|
|
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
|
|
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
|
|
- SELINUX_THREAD_LIBS="-lpthread"
|
|
+ SELINUX_THREAD_LIBS="-pthread"
|
|
fi
|
|
|
|
fi
|
|
@@ -20085,6 +20086,7 @@ $as_echo_n "checking for SCM_RIGHTS... " >&6; }
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
+#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/un.h>
|
|
static int x = SCM_RIGHTS;
|