Wireshark-commits: [Wireshark-commits] master b8a2364: Don't do the desktop integration stuff if we

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 4 Dec 2014 08:03:35 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b8a23643b339037e13e61baa22ce86fba7c96869
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

b8a2364 by Guy Harris (guy@xxxxxxxxxxxx):

    Don't do the desktop integration stuff if we're not building Wireshark.
    
    Wireshark is the desktop app; if we're not building it (i.e., we're only
    building the command-line TShark), we don't need any desktop files.
    
    Change-Id: Id8244b417fd53c9d55b4d77fe3ad748c98868ad7
    Reviewed-on: https://code.wireshark.org/review/5615
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  c02417f   Don't do all the fd.o desktop integration stuff on OS X.
    adds  b8a2364   Don't do the desktop integration stuff if we're not building Wireshark.


Summary of changes:
 Makefile.am  |   16 ++++++++++++++--
 configure.ac |    1 +
 2 files changed, 15 insertions(+), 2 deletions(-)