Wireshark-commits: [Wireshark-commits] master c602119: Use pkg-config if possible; if not, use pcap

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 27 Apr 2019 03:15:57 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c602119bcf2d711348425f892d47aa2bcc9a17f8
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

c602119 by Guy Harris (guy@xxxxxxxxxxxx):

    Use pkg-config if possible; if not, use pcap-config if present.
    
    First try finding libpcap with pkg-config.  If that fails (either because
    the system doesn't have pkg-config or because it does but there's no .pc
    file for libpcap), check for pcap-config and, if it's present, use that,
    otherwise fall back on manually searching for it.
    
    Pick up the code from tcpdump's FindPCAP.cmake.
    
    Change-Id: I87963aaa7cccac0b5cd942f48eb5d08779695f92
    Reviewed-on: https://code.wireshark.org/review/32992
    Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  d0ce552   GTPv2: Update a value string.
     add  c602119   Use pkg-config if possible; if not, use pcap-config if present.


Summary of changes:
 cmake/modules/FindPCAP.cmake | 251 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 219 insertions(+), 32 deletions(-)