# HG changeset patch
# User diego
# Date 1229032367 0
# Node ID 56c53d5738356b52ca753d74359143882f533b92
# Parent  7448d949d6b44b4d32f64cf2ea0dc042e71c1607
Rework Theora test, it was throwing away CFLAGS provided by pkg-config.

diff -r 7448d949d6b4 -r 56c53d573835 configure
--- a/configure	Thu Dec 11 21:45:11 2008 +0000
+++ b/configure	Thu Dec 11 21:52:47 2008 +0000
@@ -6071,15 +6071,25 @@
   return 0;
 }
 EOF
-  for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora -logg"; do
-    cc_check $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" \
-                         && _theora=yes && break
-  done
+  _ld_theora=$($_pkg_config --silence-errors --libs theora)
+  _inc_theora=$($_pkg_config --silence-errors --cflags theora)
+  cc_check $_inc_theora $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" &&
+    _inc_extra="$_inc_extra $_inc_theora" && _theora=yes
+  if test _theora = no; then
+    _ld_theora="-ltheora -logg"
+    cc_check $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" && _theora=yes
+  fi
   if test "$_theora" = no && test "$_tremor_internal" = yes; then
-    for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora -logg"; do
-      cc_check tremor/bitwise.c $_ld_theora \
-        && _ld_extra="$_ld_extra $_ld_theora" && theora=yes && break
-    done
+    _ld_theora=$($_pkg_config --silence-errors --libs theora)
+    _inc_theora=$($_pkg_config --silence-errors --cflags theora)
+    cc_check tremor/bitwise.c $_inc_theora $_ld_theora &&
+      _ld_extra="$_ld_extra $_ld_theora" &&
+      _inc_extra="$_inc_extra $_inc_theora" && _theora=yes
+    if test _theora = no; then
+      _ld_theora="-ltheora -logg"
+      cc_check tremor/bitwise.c $_ld_theora &&
+        _ld_extra="$_ld_extra $_ld_theora" && _theora=yes
+    fi
   fi
 fi
 if test "$_theora" = yes ; then