103 lines
4.5 KiB
Plaintext
103 lines
4.5 KiB
Plaintext
$OpenBSD: patch-plugins_configure,v 1.4 2009/01/17 12:30:08 jakemsr Exp $
|
|
--- plugins/configure.orig Thu Oct 18 23:22:33 2007
|
|
+++ plugins/configure Sat Oct 18 23:11:09 2008
|
|
@@ -309,7 +309,7 @@ ac_includes_default="\
|
|
# include <unistd.h>
|
|
#endif"
|
|
|
|
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT PWLIBDIR PWINSTDIR INSTALLPREFIX LIBDIR CC CFLAGS ac_ct_CC CPP EGREP HAS_ALSA HAS_ESD HAS_OSS HAS_SUNAUDIO HAS_V4L HAS_V4L2 HAS_BSDVIDEOCAP HAS_AVC1394 HAS_DC1394 DC_CFLAGS LIBOBJS LTLIBOBJS'
|
|
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT PWLIBDIR PWINSTDIR INSTALLPREFIX LIBDIR CC CFLAGS ac_ct_CC CPP EGREP HAS_ALSA HAS_ESD HAS_LIBSNDIO HAS_OSS HAS_SUNAUDIO HAS_V4L HAS_V4L2 HAS_BSDVIDEOCAP HAS_AVC1394 HAS_DC1394 DC_CFLAGS LIBOBJS LTLIBOBJS'
|
|
ac_subst_files=''
|
|
|
|
# Initialize some variables set by options.
|
|
@@ -3459,6 +3459,10 @@ echo "${ECHO_T}no" >&6
|
|
fi
|
|
|
|
|
|
+# for now ...
|
|
+HAS_LIBSNDIO=1
|
|
+
|
|
+
|
|
# Check whether --enable-oss or --disable-oss was given.
|
|
if test "${enable_oss+set}" = set; then
|
|
enableval="$enable_oss"
|
|
@@ -3479,7 +3483,7 @@ echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6
|
|
else
|
|
# Is the header compilable?
|
|
echo "$as_me:$LINENO: checking sys/soundcard.h usability" >&5
|
|
-echo $ECHO_N "checking sys/soundcard.h usability... $ECHO_C" >&6
|
|
+echo $ECHO_N "checking soundcard.h usability... $ECHO_C" >&6
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -3487,7 +3491,7 @@ cat confdefs.h >>conftest.$ac_ext
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
$ac_includes_default
|
|
-#include <sys/soundcard.h>
|
|
+#include <soundcard.h>
|
|
_ACEOF
|
|
rm -f conftest.$ac_objext
|
|
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
@@ -3523,18 +3527,18 @@ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
echo "${ECHO_T}$ac_header_compiler" >&6
|
|
|
|
# Is the header present?
|
|
-echo "$as_me:$LINENO: checking sys/soundcard.h presence" >&5
|
|
-echo $ECHO_N "checking sys/soundcard.h presence... $ECHO_C" >&6
|
|
+echo "$as_me:$LINENO: checking soundcard.h presence" >&5
|
|
+echo $ECHO_N "checking soundcard.h presence... $ECHO_C" >&6
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
cat confdefs.h >>conftest.$ac_ext
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
-#include <sys/soundcard.h>
|
|
+#include <soundcard.h>
|
|
_ACEOF
|
|
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ (eval $ac_compile) 2>conftest.er1
|
|
ac_status=$?
|
|
grep -v '^ *+' conftest.er1 >conftest.err
|
|
rm -f conftest.er1
|
|
@@ -3595,7 +3599,7 @@ _ASBOX
|
|
;;
|
|
esac
|
|
echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5
|
|
-echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6
|
|
+echo $ECHO_N "checking for soundcard.h... $ECHO_C" >&6
|
|
if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
@@ -3979,7 +3983,7 @@ if test "${enable_v4l2}z" = "yesz" ; then
|
|
if test "${OSTYPE}z" = "solaris2.11z"; then
|
|
VIDEODEV="sys/videodev2.h"
|
|
else
|
|
- VIDEODEV="linux/videodev2.h"
|
|
+ VIDEODEV="sys/videoio.h"
|
|
fi
|
|
as_ac_Header=`echo "ac_cv_header_$VIDEODEV" | $as_tr_sh`
|
|
echo "$as_me:$LINENO: checking for $VIDEODEV" >&5
|
|
@@ -4485,8 +4489,8 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
#include <dev/ic/bt8xx.h>
|
|
_ACEOF
|
|
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+(eval $ac_compile) 2>conftest.er1
|
|
ac_status=$?
|
|
grep -v '^ *+' conftest.er1 >conftest.err
|
|
rm -f conftest.er1
|
|
@@ -6059,6 +6063,7 @@ s,@CPP@,$CPP,;t t
|
|
s,@EGREP@,$EGREP,;t t
|
|
s,@HAS_ALSA@,$HAS_ALSA,;t t
|
|
s,@HAS_ESD@,$HAS_ESD,;t t
|
|
+s,@HAS_LIBSNDIO@,$HAS_LIBSNDIO,;t t
|
|
s,@HAS_OSS@,$HAS_OSS,;t t
|
|
s,@HAS_SUNAUDIO@,$HAS_SUNAUDIO,;t t
|
|
s,@HAS_V4L@,$HAS_V4L,;t t
|