$OpenBSD: patch-configure_ac,v 1.4 2012/03/02 09:03:52 ajacoutot Exp $ --- configure.ac.orig Tue Feb 21 23:57:26 2012 +++ configure.ac Fri Mar 2 08:37:06 2012 @@ -201,7 +201,7 @@ case "$target_os" in openbsd* ) OSTYPE=OpenBSD ; OS_TAG="P_OPENBSD" ; OSRELEASE="`sysctl -n kern.osrevision`" ; - ENDLDLIBS="-lossaudio" ; + ENDLDLIBS="" ; need_pragma=yes ; AC_DEFINE(P_PTHREADS, 1, "PThreads found") AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] ) @@ -308,8 +308,12 @@ case "$target_cpu" in LIB64=1 ;; - sparc | sparc64 ) + sparc ) MACHTYPE=sparc + ;; + + sparc64 ) + MACHTYPE=sparc P_64BIT=1 LIB64=1 ;; @@ -779,17 +783,17 @@ dnl MSWIN_DEFINE semaphore,P_HAS_SEMAPHORES dnl Linux, Mac OS X use libpthread and -lpthread dnl FreeBSD uses the -pthread compiler option and uses libc_r +if test ${OSTYPE} = OpenBSD -o ${OSTYPE} = FreeBSD ; then + HAS_PTHREADS=yes + ENDLDLIBS="$ENDLDLIBS -pthread" + STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread" +else AC_CHECK_LIB(pthread, pthread_create, HAS_PTHREADS=yes, HAS_PTHREADS=no) if test ${HAS_PTHREADS} = yes ; then ENDLDLIBS="$ENDLDLIBS -lpthread" STDCCFLAGS="$STDCCFLAGS -D_REENTRANT" -else - if test ${OSTYPE} = FreeBSD ; then - HAS_PTHREADS=yes - ENDLDLIBS="$ENDLDLIBS -pthread" - STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread" - fi fi +fi if test ${HAS_PTHREADS} != yes -a ${NEEDS_PTHREADS} = yes; then @@ -1268,7 +1272,8 @@ else if test $HAS_IPV6 = no ; then AC_MSG_RESULT(no) else - AC_TRY_COMPILE([#include + AC_TRY_COMPILE([#include + #include #include ], [getnameinfo(0, 0, 0, 0, 0, 0, 0);], HAS_IPV6=yes, HAS_IPV6=no) if test $HAS_IPV6 = no ; then @@ -1560,7 +1565,7 @@ dnl ################################################## dnl check for video capture support. dnl videodev.h on linux dnl machine/ioctl_meteor on FreeBSD -dnl i386/ioctl_meteor on OpenBSD +dnl dev/ic/bt8xx (bktr) and sys/videoio (v4l2) on OpenBSD dnl dev/ic/bt8xx on NetBSD HAS_VIDEO_CAPTURE= @@ -1606,6 +1611,7 @@ if test "x${HAS_AUDIO}" = "x1" ; then dnl these are needed to pass through to the plugin configure program AC_ARG_ENABLE(alsa, [ --enable-alsa enable ALSA audio support],enable_alsa=$enableval) AC_ARG_ENABLE(oss, [ --enable-oss enable OSS audio support],enable_oss=$enableval) + AC_ARG_ENABLE(sndio,[ --enable-sndio enable sndio audio support],enable_sndio=$enableval) AC_ARG_ENABLE(pulse, [ --enable-pulse enable PULSE audio support],enable_pulse=$enableval) fi