On Mon, Mar 21, 2011 at 11:10:06AM +0100, Stephen Kitt wrote:
The attached patch fixes this, and allows dvbstreamer to build with
libev3 or libev4. To use it, simply drop it in debian/patches and add
it to debian/patches/series.
This time with the patch...
Stephen
Description: allow dvbstreamer to build with libev4
The configure script expects ev_loop to be a symbol in libev, which
is no longer the case in version 4. This patch replaces the lib check
with a header declaration check.
.
The important part of the patch is that affecting configure.in; the
configure script was regenerated with autoreconf.
Author: Stephen Kitt st...@sk2.org
Last-Update: 2011-03-21
Index: dvbstreamer-2.1.0/configure
===
--- dvbstreamer-2.1.0.orig/configure2011-03-21 09:51:02.0 +
+++ dvbstreamer-2.1.0/configure 2011-03-21 09:51:58.0 +
@@ -1976,6 +1976,52 @@
eval $as_lineno_stack; test x$as_lineno_stack = x { as_lineno=; unset as_lineno;}
} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# -
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+ as_lineno=${as_lineno-$1} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ as_decl_name=`echo $2|sed 's/ *(.*//'`
+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0/' -e 's/,/) 0 (/g'`
+ { $as_echo $as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared 5
+$as_echo_n checking whether $as_decl_name is declared... 6; }
+if eval test \\${$3+set}\ = set; then :
+ $as_echo_n (cached) 6
+else
+ cat confdefs.h - _ACEOF conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+ (void) $as_decl_use;
+#else
+ (void) $as_decl_name;
+#endif
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile $LINENO; then :
+ eval $3=yes
+else
+ eval $3=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo $as_me:${as_lineno-$LINENO}: result: $ac_res 5
+$as_echo $ac_res 6; }
+ eval $as_lineno_stack; test x$as_lineno_stack = x { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
cat config.log _ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
@@ -6302,13 +6348,13 @@
else
lt_cv_nm_interface=BSD nm
echo int some_variable = 0; conftest.$ac_ext
- (eval echo \\$as_me:6305: $ac_compile\ 5)
+ (eval echo \\$as_me:6351: $ac_compile\ 5)
(eval $ac_compile 2conftest.err)
cat conftest.err 5
- (eval echo \\$as_me:6308: $NM \\\conftest.$ac_objext 5)
+ (eval echo \\$as_me:6354: $NM \\\conftest.$ac_objext 5)
(eval $NM \conftest.$ac_objext\ 2conftest.err conftest.out)
cat conftest.err 5
- (eval echo \\$as_me:6311: output\ 5)
+ (eval echo \\$as_me:6357: output\ 5)
cat conftest.out 5
if $GREP 'External.*some_variable' conftest.out /dev/null; then
lt_cv_nm_interface=MS dumpbin
@@ -7510,7 +7556,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7513 configure' conftest.$ac_ext
+ echo '#line 7559 configure' conftest.$ac_ext
if { { eval echo \\$as_me\:${as_lineno-$LINENO}: \$ac_compile\; } 5
(eval $ac_compile) 25
ac_status=$?
@@ -9081,11 +9127,11 @@
-e 's:.*FLAGS}\{0,1\} :$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo \\$as_me:9084: $lt_compile\ 5)
+ (eval echo \\$as_me:9130: $lt_compile\ 5)
(eval $lt_compile 2conftest.err)
ac_status=$?
cat conftest.err 5
- echo $as_me:9088: \$? = $ac_status 5
+ echo $as_me:9134: \$? = $ac_status 5
if (exit $ac_status) test -s $ac_outfile; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9420,11 +9466,11 @@
-e 's:.*FLAGS}\{0,1\} :$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo \\$as_me:9423: $lt_compile\ 5)
+ (eval echo \\$as_me:9469: $lt_compile\ 5)
(eval $lt_compile 2conftest.err)
ac_status=$?
cat conftest.err 5
- echo $as_me:9427: \$? = $ac_status 5
+ echo $as_me:9473: \$? = $ac_status 5
if (exit $ac_status) test -s $ac_outfile; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9525,11 +9571,11 @@
-e 's:.*FLAGS}\{0,1\} :$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo \\$as_me:9528: $lt_compile\ 5)
+ (eval echo \\$as_me:9574: $lt_compile\ 5)
(eval $lt_compile 2out/conftest.err)
ac_status=$?
cat out/conftest.err 5
- echo
