diff options
| author | Jack Nagel | 2014-04-03 09:53:36 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-04-03 10:08:13 -0500 |
| commit | 1010217be7fe68496dc96d38267a79ec1c251791 (patch) | |
| tree | 67ebd2ba08c8f8a85f3ac8c684ba7d1346d68e80 /Library/Formula | |
| parent | 419647bdd945fb7ed0f0df38eb3a73bfac74feda (diff) | |
| download | homebrew-1010217be7fe68496dc96d38267a79ec1c251791.tar.bz2 | |
wireshark: switch to optional gtk+ dep to fix upgrades
Fixes #28080.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/wireshark.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Library/Formula/wireshark.rb b/Library/Formula/wireshark.rb index 0c07e7b10..e5bd905ed 100644 --- a/Library/Formula/wireshark.rb +++ b/Library/Formula/wireshark.rb @@ -26,7 +26,6 @@ class Wireshark < Formula sha1 'af2b03338819b300f621048398b49403675db49c' end - option 'with-x', 'Include X11 support' option 'with-qt', 'Use QT for GUI instead of GTK+' option 'with-headers', 'Install Wireshark library headers for plug-in developemnt' @@ -43,11 +42,8 @@ class Wireshark < Formula depends_on 'pcre' => :optional depends_on 'portaudio' => :optional depends_on 'qt' => :optional - - if build.with? 'x' - depends_on :x11 - depends_on 'gtk+' - end + depends_on "gtk+" => :optional + depends_on :x11 if build.with? "gtk+" def install system "./autogen.sh" if build.head? @@ -58,8 +54,8 @@ class Wireshark < Formula "--with-ssl"] args << "--disable-warnings-as-errors" if build.head? - args << "--disable-wireshark" if build.without?("x") && build.without?("qt") - args << "--disable-gtktest" if build.without? "x" + args << "--disable-wireshark" if build.without?("gtk+") && build.without?("qt") + args << "--disable-gtktest" if build.without? "gtk+" args << "--with-qt" if build.with? "qt" system "./configure", *args |
