From 2d1502f131100bb1954da3c08204573229bc91ba Mon Sep 17 00:00:00 2001
From: Haojian Wu <hokein.wu@gmail.com>
Date: Sat, 7 Jun 2014 18:52:14 -0700
Subject: [PATCH] Fix autoconf generated error in bakefile_gen.

---
 build/bakefiles/config.bkl                    | 24 +++++++++++++++++++
 build/bakefiles/multilib.bkl                  | 14 ++---------
 samples/webview_chromium/webview_chromium.bkl | 13 ++--------
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 036d0fce30..93ee1c0574 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -580,4 +580,28 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build.
       </if>
     </set>
 
+    <set var="LIBCEF_NAME">
+      <if cond="PLATFORM_WIN32=='1'">
+        libcef
+      </if>
+      <if cond="PLATFORM_MACOSX=='1'">
+        <!--TODO -->
+      </if>
+      <if cond="PLATFORM_UNIX=='1'">
+        cef
+      </if>
+    </set>
+
+    <set var="LIBCEF_DLL_WRAPPER_NAME">
+      <if cond="PLATFORM_WIN32=='1'">
+        libcef
+      </if>
+      <if cond="PLATFORM_MACOSX=='1'">
+        <!--TODO -->
+      </if>
+      <if cond="PLATFORM_UNIX=='1'">
+        cef_dll_wrapper
+      </if>
+    </set>
+
 </makefile>
diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 650aad7d90..d8faaea142 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -189,18 +189,8 @@
         <include>$(CEF_INCLUDE_DIR)</include>
         <lib-path>$(LIBCEF_PATH)</lib-path>
         <lib-path>$(LIBCEF_WRAPPER_PATH)</lib-path>
-
-        <if cond="PLATFORM_WIN32=='1'">
-          <sys-lib>libcef</sys-lib>
-          <sys-lib>libcef_dll_wrapper</sys-lib>
-        </if>
-        <if cond="PLATFORM_UNIX=='1'">
-          <sys-lib>cef</sys-lib>
-          <sys-lib>cef_dll_wrapper</sys-lib>
-        </if>
-        <if cond="PLATFORM_MACOSX=='1'">
-          <!--TODO -->
-        </if>
+        <sys-lib>$(LIBCEF_NAME)</sys-lib>
+        <sys-lib>$(LIBCEF_DLL_WRAPPER_NAME)</sys-lib>
     </dll>
 
     <lib id="webviewlib" template="wx_lib"
diff --git a/samples/webview_chromium/webview_chromium.bkl b/samples/webview_chromium/webview_chromium.bkl
index bee7bd7fa8..3b88cc6501 100644
--- a/samples/webview_chromium/webview_chromium.bkl
+++ b/samples/webview_chromium/webview_chromium.bkl
@@ -17,17 +17,8 @@
             <lib-path>$(LIBCEF_PATH)</lib-path>
             <lib-path>$(LIBCEF_WRAPPER_PATH)</lib-path>
             <include>$(CEF_INCLUDE_DIR)</include>
-            <if cond="PLATFORM_WIN32=='1'">
-              <sys-lib>libcef</sys-lib>
-              <sys-lib>libcef_dll_wrapper</sys-lib>
-            </if>
-            <if cond="PLATFORM_UNIX=='1'">
-              <sys-lib>cef</sys-lib>
-              <sys-lib>cef_dll_wrapper</sys-lib>
-            </if>
-            <if cond="PLATFORM_MACOSX=='1'">
-              <!--TODO -->
-            </if>
+            <sys-lib>$(LIBCEF_NAME)</sys-lib>
+            <sys-lib>$(LIBCEF_DLL_WRAPPER_NAME)</sys-lib>
         </if>
         <win32-res>../sample.rc</win32-res>