Wireshark-commits: [Wireshark-commits] master-1.12 64c9597: When configuring with Wireshark disable

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 29 Apr 2015 01:02:35 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=64c95975c97ef9a1d00f4bd5060cb8e24943f262
Submitter: Jeff Morriss (jeff.morriss.ws@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

64c9597 by Jeff Morriss (jeff.morriss.ws@xxxxxxxxx):

    When configuring with Wireshark disabled, don't complain if uic and moc
    aren't found.
    
    This would work before but only if you explicitly disabled Qt.
    
    Conflicts:
    	configure.ac
    
    Bug: 11157
    Change-Id: I1e4c2c18277e28c38b1ed2ffcaf45e49926e7a1f
    Reviewed-on: https://code.wireshark.org/review/8232
    Reviewed-by: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
    (cherry picked from commit 9e91ca2157a3650b2ee905e5b8f8d4f90826579d)
    Reviewed-on: https://code.wireshark.org/review/8234
    

Actions performed:

    from  b580243   Add more files to the distribution.
    adds  64c9597   When configuring with Wireshark disabled, don't complain if uic and moc aren't found.


Summary of changes:
 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)