Wireshark-commits: [Wireshark-commits] master 032ad5a: Update how we search for Lua with pkg-config
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 8 Jun 2015 08:13:27 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=032ad5a7aa4e807f6389713f4339eddac2e254fa
Submitter: Alexis La Goutte (alexis.lagoutte@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

032ad5a by Jeff Morriss (jeff.morriss.ws@xxxxxxxxx):

    Update how we search for Lua with pkg-config.
    
    First, search for packages with the version number without the period (bug
    11219).
    
    Second, don't look for Lua 5.3 because we don't work with it.  If what we find
    (without pkg-config's help) is Lua 5.3, disable Lua support (bug 10881).
    
    Cmake support by Peter Wu (originally Ie73e5b53640f10432881a9671c0a605f7f027ed8):
    Note the check for "lua<=5.2.99" instead of "lua<5.3" since cmake does not
    support the latter syntax. Tested with lua5.2, lua5.1 and lua (5.3) installed.
    
    Bug: 11219
    Ping-Bug: 10881
    Change-Id: I382d07ca00eafc6111cd4e9faa2b66f6b8f95b6e
    Reviewed-on: https://code.wireshark.org/review/8783
    Petri-Dish: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    

Actions performed:

    from  da1766e   NFSv4: Fix for Bug 10483
    adds  032ad5a   Update how we search for Lua with pkg-config.


Summary of changes:
 acinclude.m4                |   44 +++++++++++++++++++++++++------------------
 cmake/modules/FindLUA.cmake |    5 ++++-
 2 files changed, 30 insertions(+), 19 deletions(-)