--- SConstruct.orig	2012-06-25 17:15:16 UTC
+++ SConstruct
@@ -37,7 +37,7 @@ opts.AddVariables(
   BoolVariable('libkate', 'enable libkate support', 1),
   BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
 )
-env = Environment(options = opts)
+env = Environment(options = opts, ENV=os.environ, CC = Split(os.environ['CC']))
 Help(opts.GenerateHelpText(env))
 
 pkg_flags="--cflags --libs"
@@ -151,7 +151,6 @@ if not env.GetOption('clean'):
       "libavcodec >= 52.30.0",
       "libpostproc",
       "libswscale",
-      "libswresample",
       "libavutil",
   ]
   if os.path.exists("./ffmpeg"):
@@ -200,9 +199,8 @@ if not env.GetOption('clean'):
       env.Append(CCFLAGS=[
         '-DHAVE_ICONV'
       ])
-      if conf.CheckLib('iconv'):
-          env.Append(LIBS=['iconv'])
 
+  env.Append(LIBS=['m'])
   if env['crossmingw']:
       env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
       env.Append(LIBS=['m'])