[xiph-commits] r17185 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2010-04-29 01:04:22 -0700 (Thu, 29 Apr 2010)
New Revision: 17185

Modified:
   trunk/ffmpeg2theora/SConstruct
Log:
better way to check for ffmpeg libs

Modified: trunk/ffmpeg2theora/SConstruct
===================================================================
--- trunk/ffmpeg2theora/SConstruct	2010-04-29 07:29:27 UTC (rev 17184)
+++ trunk/ffmpeg2theora/SConstruct	2010-04-29 08:04:22 UTC (rev 17185)
@@ -138,19 +138,20 @@
   Exit(1) 
 ParsePKGConfig(env, XIPH_LIBS)
 
-FFMPEG_LIBS="libavcodec >= 52.30.0 libavformat libavdevice libpostproc libswscale"
+FFMPEG_LIBS=["libavcodec >= 52.30.0", "libavformat", "libavdevice", "libpostproc", "libswscale"]
 if os.path.exists("./ffmpeg"):
   os.environ['PKG_CONFIG_PATH'] = "./ffmpeg/libavutil:./ffmpeg/libavformat:./ffmpeg/libavcodec:./ffmpeg/libavdevice:./ffmpeg/libswscale:./ffmpeg/libpostproc:" + os.environ.get('PKG_CONFIG_PATH', '')
-if not conf.CheckPKG(FFMPEG_LIBS): 
+if not conf.CheckPKG(' '.join(FFMPEG_LIBS)): 
   print """
       Could not find %s.
       You can install it via
        sudo apt-get install %s
       or update PKG_CONFIG_PATH to point to ffmpeg's source folder
       or run ./get_ffmpeg_svn.sh (for more information see INSTALL)
-  """ %(FFMPEG_LIBS, " ".join(["%s-dev"%l for l in FFMPEG_LIBS.split()]))
+  """ %(" ".join(FFMPEG_LIBS), " ".join(["%s-dev"%l.split()[0] for l in FFMPEG_LIBS]))
   Exit(1) 
-for lib in FFMPEG_LIBS.split():
+
+for lib in FFMPEG_LIBS:
     ParsePKGConfig(env, lib)
 
 if conf.CheckCHeader('libavformat/framehook.h'):