[MPlayer-cvslog] r34960 - trunk/configure

[reimar]

Author: reimar
Date: Tue May 22 19:51:08 2012
New Revision: 34960

Log:
Use the same flags for the test as what will be used when
actually compiling MPlayer.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue May 22 11:32:16 2012	(r34959)
+++ trunk/configure	Tue May 22 19:51:08 2012	(r34960)
@@ -6677,22 +6677,25 @@ EOF
   _live=no
   for I in $extra_cflags "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/lib64/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do
     _livelibdir=$(echo $I| sed s/-I//)
+    inc_tmp="-I$_livelibdir/liveMedia/include \
+             -I$_livelibdir/UsageEnvironment/include \
+             -I$_livelibdir/BasicUsageEnvironment/include \
+             -I$_livelibdir/groupsock/include"
+    ld_tmp="$_livelibdir/liveMedia/libliveMedia.a \
+            $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
+            $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
+            $_livelibdir/groupsock/libgroupsock.a \
+            -lstdc++ $ld_sock"
     test -e "$_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a" &&
-        cxx_check $I/liveMedia/include $I/UsageEnvironment/include $I/BasicUsageEnvironment/include $I/groupsock/include $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a $_livelibdir/UsageEnvironment/libUsageEnvironment.a $_livelibdir/groupsock/libgroupsock.a $ld_sock &&
-      extra_ldflags="$_livelibdir/liveMedia/libliveMedia.a \
-                 $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
-                 $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
-                 $_livelibdir/groupsock/libgroupsock.a \
-                 $extra_ldflags  -lstdc++ $ld_sock" \
-      extra_cxxflags="-I$_livelibdir/liveMedia/include \
-                  -I$_livelibdir/UsageEnvironment/include \
-                  -I$_livelibdir/BasicUsageEnvironment/include \
-                  -I$_livelibdir/groupsock/include" &&
+        cxx_check $inc_tmp $ld_tmp &&
+      extra_ldflags="$ld_tmp $extra_ldflags" &&
+      extra_cxxflags="$inc_tmp" &&
       _live=yes && break
   done
   if test "$_live" != yes ; then
       ld_tmp="-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment -lstdc++"
-      if cxx_check -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock $ld_tmp; then
+      inc_tmp="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
+      if cxx_check $inc_tmp $ld_tmp; then
           _live_dist=yes
       fi
   fi
@@ -6706,7 +6709,7 @@ elif test "$_live_dist" = yes && test "$
   _live="yes"
   def_live='#define CONFIG_LIVE555 1'
   extra_ldflags="$extra_ldflags $ld_tmp"
-  extra_cxxflags="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
+  extra_cxxflags="$inc_tmp"
  inputmodules="live555 $inputmodules"
 else
   _live=no