Changeset 65811 in webkit


Ignore:
Timestamp:
Aug 23, 2010 8:20:36 AM (14 years ago)
Author:
xan@webkit.org
Message:

2010-08-23 Xan Lopez <xlopez@igalia.com>

Reviewed by Martin Robinson.

[GTK] run-launcher fails if WebKitGTK+ compiled with GTK+-3.0 support
https://bugs.webkit.org/show_bug.cgi?id=42026

If a GTK+ 3.x build is present return that as the library to use,
otherwise fallback to the GTK+ 2.x build.

  • Scripts/webkitdirs.pm:
Location:
trunk/WebKitTools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r65808 r65811  
     12010-08-23  Xan Lopez  <xlopez@igalia.com>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [GTK] run-launcher fails if WebKitGTK+ compiled with GTK+-3.0 support
     6        https://bugs.webkit.org/show_bug.cgi?id=42026
     7
     8        If a GTK+ 3.x build is present return that as the library to use,
     9        otherwise fallback to the GTK+ 2.x build.
     10
     11        * Scripts/webkitdirs.pm:
     12
    1132010-08-23  Balazs Kelemen  <kb@inf.u-szeged.hu>
    214
  • trunk/WebKitTools/Scripts/webkitdirs.pm

    r65377 r65811  
    598598    }
    599599    if (isGtk()) {
    600         return "$configurationProductDir/$libraryName/../.libs/libwebkitgtk-1.0.so";
     600        my $libraryDir = "$configurationProductDir/$libraryName/../.libs/";
     601        if (-e $libraryDir . "libwebkitgtk-3.0.so") {
     602            return $libraryDir . "libwebkitgtk-3.0.so";
     603        }
     604        return $libraryDir . "libwebkitgtk-1.0.so";
    601605    }
    602606    if (isEfl()) {
Note: See TracChangeset for help on using the changeset viewer.