Commit 8c92b376 authored by Felix Paul Kühne's avatar Felix Paul Kühne

contrib/theora: fix broken compiler differenciation

This solves compilation issues from the future.

(cherry picked from commit 1df0c91531e3e5b6466d4d9735cd4e1b7792c02a)
parent 41a1e16a
diff -ru libtheora/configure.ac libtheora-fixed/configure.ac
--- libtheora/configure.ac 2009-10-01 20:00:33.000000000 +0200
+++ libtheora-fixed/configure.ac 2014-06-13 20:21:16.000000000 +0200
@@ -155,8 +155,20 @@
dnl Set some target options
+cc_compiler=unknown
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#if ! __clang__
+ #error
+ #endif
+ ]])],
+ cc_compiler=clang,
+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#if ! __GNUC__
+ #error
+ #endif
+ ]])],
+ cc_compiler=gcc, [])])
+
cflags_save="$CFLAGS"
-if test -z "$GCC"; then
+if test $cc_compiler != "gcc" ; then
case $host in
*)
DEBUG="-g -DDEBUG"
......@@ -16,6 +16,7 @@ $(TARBALLS)/libtheora-$(THEORA_VERSION).tar.xz:
libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora
$(UNPACK)
$(APPLY) $(SRC)/theora/libtheora-compiler-differentiation.patch
$(UPDATE_AUTOCONFIG)
$(MOVE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment