75 lines
2.7 KiB
Plaintext
75 lines
2.7 KiB
Plaintext
$OpenBSD: patch-plugins_configure,v 1.3 2008/04/29 11:42:45 ajacoutot Exp $
|
|
--- plugins/configure.orig Fri Oct 19 08:22:33 2007
|
|
+++ plugins/configure Tue Apr 29 09:49:24 2008
|
|
@@ -3479,7 +3479,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 +3487,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 +3523,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 +3595,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 +3979,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 +4485,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
|