Wireshark-commits: [Wireshark-commits] master-1.12 489b06e: Make some inconsistent configuration op

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 14 Aug 2015 18:39:11 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=489b06e9868fce46d8b2824161861c73dd9153e3
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

489b06e by Guy Harris (guy@xxxxxxxxxxxx):

    Make some inconsistent configuration options errors.
    
    This way, if you ask for both setuid and setcap installation of dumpcap,
    it will fail, rather than silently (other than a message you might miss)
    ignoring the request for setuid installation.  See bug 10246.
    
    Also:
    
    	if you ask for setuid or setcap installation of dumpcap, but
    	dumpcap isn't built, it'll let you know that there's nothing to
    	make setuid/setcap, and fail;
    
    	if you ask for setcap installation of dumpcap, but setcap wasn't
    	found, it'll let you know that it can't install it setcap, and
    	fail;
    
    so that it won't silently (other than a message you might miss) ignore
    those requests, either.
    
    Change-Id: Ibc01593e59fd1cd1be8c68d8cdacbfdca863efa0
    Reviewed-on: https://code.wireshark.org/review/2771
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 096aca67defc82e72daeb45e109d13227cc80eed)
    Reviewed-on: https://code.wireshark.org/review/10033
    

Actions performed:

    from  2edab9f   [config.nmake] Also look for Chocolatey install of Python
    adds  489b06e   Make some inconsistent configuration options errors.


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