Mesa (master): scons: Fix build on systems without libOpenVG.so

[Jose Fonseca]

Module: Mesa
Branch: master
Commit: b07ad1d6bd08bfe3ab84b660587523d5711ea21f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b07ad1d6bd08bfe3ab84b660587523d5711ea21f

Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed Jan 12 15:06:57 2011 +0000

scons: Fix build on systems without libOpenVG.so

---

 src/gallium/targets/egl-static/SConscript |    3 ++-
 src/mapi/vgapi/SConscript                 |    8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript
index 1fa4080..4bb063b 100644
--- a/src/gallium/targets/egl-static/SConscript
+++ b/src/gallium/targets/egl-static/SConscript
@@ -74,6 +74,7 @@ else:
 
     # OpenVG
     env.Append(CPPDEFINES = ['FEATURE_VG=1'])
+    env.Prepend(LIBPATH = [openvg.dir])
     env.Prepend(LIBS = ['OpenVG', st_vega])
 
 
@@ -115,7 +116,7 @@ egl_gallium = env.SharedLibrary(
     source = sources,
 )
 
-env.Depends(egl_gallium, [vgapi])
+env.Depends(egl_gallium, [openvg])
 
 egl_gallium = env.InstallSharedLibrary(egl_gallium, version=(1, 4, 0))
 
diff --git a/src/mapi/vgapi/SConscript b/src/mapi/vgapi/SConscript
index 8d67159..c0c6c6c 100644
--- a/src/mapi/vgapi/SConscript
+++ b/src/mapi/vgapi/SConscript
@@ -45,15 +45,15 @@ if env['platform'] != 'winddk':
 	env.Depends(vgapi_objects, vgapi_header)
 
 	openvg = env.SharedLibrary(
-		target = 'libOpenVG',
+		target = 'OpenVG',
 		source = vgapi_objects,
 	)
 
 	env.InstallSharedLibrary(openvg, version=(1, 0, 0))
 
 	if env['platform'] == 'windows':
-	    vgapi = env.FindIxes(openvg, 'LIBPREFIX', 'LIBSUFFIX')
+	    openvg = env.FindIxes(openvg, 'LIBPREFIX', 'LIBSUFFIX')
 	else:
-	    vgapi = env.FindIxes(openvg, 'SHLIBPREFIX', 'SHLIBSUFFIX')
+	    openvg = env.FindIxes(openvg, 'SHLIBPREFIX', 'SHLIBSUFFIX')
 
-	Export(['vgapi'])
+	Export(['openvg'])