Changes by Mike Emmel.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@15120 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Bakefiles/presets.bkl b/Bakefiles/presets.bkl
index 3069b0aaed88982c15bd448608292179b94f95be..15d099177e6aed91add23528058bd444abf4f869 100644 (file)
--- a/Bakefiles/presets.bkl
+++ b/Bakefiles/presets.bkl
@@ -42,10 +42,15 @@ and WebCore. Include this file to use these settings.
             <include>$(SRCDIR)/../JavaScriptCore/os-win32</include><!-- stdint.h is here -->
         </if>
         <if cond="FORMAT=='gnu'">
-                       <ldflags>-L$(SRCDIR)/../JavaScriptCore -lgtkjs</ldflags>
+                       <ldflags>$(SRCDIR)/../JavaScriptCore/libjscore.a</ldflags>
         </if>
     </template>
 
+    <template id="sqlite3">
+          <ldflags>`pkg-config --libs sqlite3`</ldflags>
+          <cxxflags>`pkg-config --cflags sqlite3`</cxxflags>
+       </template>
+
     <template id="freetype">
           <ldflags>`pkg-config --libs freetype2`</ldflags>
           <cxxflags>`pkg-config --cflags freetype2`</cxxflags>
@@ -53,6 +58,16 @@ and WebCore. Include this file to use these settings.
           <cxxflags>`pkg-config --cflags fontconfig`</cxxflags>
        </template>
 
+     <template id="curl">
+          <ldflags>`curl-config --libs `</ldflags>
+          <cxxflags>`curl-config --cflags `</cxxflags>
+       </template>
+ 
+    <template id="cairo">
+          <ldflags>`pkg-config --libs cairo`</ldflags>
+          <cxxflags>`pkg-config --cflags cairo`</cxxflags>
+       </template>
+
     <!-- GTK settings, for GTK ports - wx doesn't use these -->
     <template id="gtk">
         <if cond="FORMAT=='gnu'">