104 lines
3.3 KiB
Plaintext
104 lines
3.3 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.23 2012/07/06 12:51:11 sthen Exp $
|
|
--- configure.ac.orig Mon Jun 25 10:46:34 2012
|
|
+++ configure.ac Sat Jun 30 22:40:47 2012
|
|
@@ -122,10 +122,6 @@ case "${host_os}" in
|
|
;;
|
|
openbsd*)
|
|
SYS=openbsd
|
|
- CPPFLAGS_save="${CPPFLAGS_save} -I/usr/local/include -I/usr/X11R6/include"
|
|
- CPPFLAGS="${CPPFLAGS_save}"
|
|
- LDFLAGS_save="${LDFLAGS_save} -L/usr/local/lib -L/usr/X11R6/lib/"
|
|
- LDFLAGS="${LDFLAGS_save}"
|
|
;;
|
|
netbsd*)
|
|
SYS=netbsd
|
|
@@ -688,6 +684,20 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
|
|
dnl Check for pthreads - borrowed from XMMS
|
|
THREAD_LIB=error
|
|
if test "${THREAD_LIB}" = "error"; then
|
|
+ AC_MSG_CHECKING(for pthread_create in -pthread)
|
|
+ save_LDFLAGS="${LDFLAGS}"
|
|
+ LDFLAGS="${LDFLAGS} -pthread"
|
|
+ AC_LINK_IFELSE(
|
|
+ [AC_LANG_PROGRAM(
|
|
+ [[#include <pthread.h>
|
|
+ pthread_t thr;]],
|
|
+ [pthread_create(&thr, NULL, NULL, NULL);])],
|
|
+ [THREAD_LIB="-pthread"
|
|
+ AC_MSG_RESULT(yes)],
|
|
+ [AC_MSG_RESULT(no)])
|
|
+ LDFLAGS="${save_LDFLAGS}"
|
|
+fi
|
|
+ if test "${THREAD_LIB}" = "error"; then
|
|
AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
|
|
fi
|
|
if test "${THREAD_LIB}" = "error"; then
|
|
@@ -964,33 +974,6 @@ dnl Check for various optimization flags
|
|
AS_IF([test "${enable_optimizations}" != "no"], [
|
|
|
|
C_O=""
|
|
- dnl -O4 and -O3 only in production builds
|
|
- AS_IF([test "{enable_debug}" = "no"], [
|
|
- AC_CACHE_CHECK([if $CC accepts -O4], [ac_cv_c_o4], [
|
|
- CFLAGS="${CFLAGS_save} -O4"
|
|
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
|
|
- ac_cv_c_o4=yes
|
|
- ], [
|
|
- ac_cv_c_o4=no
|
|
- ])
|
|
- ])
|
|
- AS_IF([test "${ac_cv_c_o4}" != "no"], [
|
|
- C_O="-O4"
|
|
- ], [
|
|
- AC_CACHE_CHECK([if $CC accepts -O3], [ac_cv_c_o3], [
|
|
- CFLAGS="${CFLAGS_save} -O3"
|
|
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
|
|
- ac_cv_c_o3=yes
|
|
- ], [
|
|
- ac_cv_c_o3=no
|
|
- ])
|
|
- ])
|
|
- AS_IF([test "${ac_cv_c_o3}" != "no"], [
|
|
- C_O="-O3"
|
|
- ])
|
|
- ])
|
|
- ])
|
|
-
|
|
VLC_RESTORE_FLAGS
|
|
CFLAGS="${CFLAGS} ${C_O}"
|
|
CXXFLAGS="${CXXFLAGS} ${C_O}"
|
|
@@ -1736,7 +1719,7 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"
|
|
AC_LANG_PUSH(C++)
|
|
CPPFLAGS_save="${CPPFLAGS}"
|
|
AS_IF([test -z "${CONTRIB_DIR}"], [
|
|
- CPPFLAGS_live555="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment"
|
|
+ CPPFLAGS_live555="-I${LOCALBASE}/live/liveMedia/include -I${LOCALBASE}/live/groupsock/include -I${LOCALBASE}/live/BasicUsageEnvironment/include -I${LOCALBASE}/live/UsageEnvironment/include"
|
|
], [
|
|
CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment"
|
|
])
|
|
@@ -3509,6 +3492,24 @@ AS_IF([test "$enable_oss" != "no"], [
|
|
])
|
|
AC_SUBST(OSS_LIBS)
|
|
AM_CONDITIONAL([HAVE_OSS], [test "${have_oss}" = "yes"])
|
|
+
|
|
+dnl
|
|
+dnl OpenBSD sndio module
|
|
+dnl
|
|
+AC_ARG_ENABLE([sndio],
|
|
+ [AS_HELP_STRING([--disable-sndio],
|
|
+ [support the OpenBSD sndio (default auto)])],, [
|
|
+ AS_IF([test "$SYS" = "opensd"], [
|
|
+ enable_sndio="yes"
|
|
+ ])
|
|
+])
|
|
+have_sndio="no"
|
|
+AS_IF([test "$enable_sndio" != "no"], [
|
|
+ AC_CHECK_HEADER([sndio.h], [
|
|
+ have_sndio="yes"
|
|
+ ])
|
|
+])
|
|
+AM_CONDITIONAL([HAVE_SNDIO], [test "${have_sndio}" = "yes"])
|
|
|
|
dnl
|
|
dnl Portaudio module
|