From 6da4d368865c545bcaa567b919ba3424be7410c5 Mon Sep 17 00:00:00 2001 From: Adam Vandenberg Date: Thu, 13 Jun 2013 09:29:24 -0700 Subject: [PATCH] wireshark: always build with SSl support --- Formula/wireshark.rb | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/Formula/wireshark.rb b/Formula/wireshark.rb index 62e966a348..9213fd04a8 100644 --- a/Formula/wireshark.rb +++ b/Formula/wireshark.rb @@ -8,36 +8,33 @@ class Wireshark < Formula option 'with-x', 'Include X11 support' option 'with-qt', 'Use QT for GUI instead of GTK+' - option 'with-ssl', 'Enable SSL support' depends_on 'pkg-config' => :build - depends_on 'c-ares' => :optional - depends_on 'pcre' => :optional - depends_on 'qt' => :optional - depends_on 'lua' => :optional - depends_on 'portaudio' => :optional + depends_on 'glib' + depends_on 'gnutls2' + depends_on 'libgcrypt' + depends_on 'geoip' => :recommended + depends_on 'c-ares' => :optional + depends_on 'lua' => :optional + depends_on 'pcre' => :optional + depends_on 'portaudio' => :optional + depends_on 'qt' => :optional + if build.with? 'x' depends_on :x11 depends_on 'gtk+' end - if build.with? 'ssl' - depends_on 'gnutls2' - depends_on 'libgcrypt' - end - def install - args = ["--disable-dependency-tracking", "--prefix=#{prefix}"] + args = ["--disable-dependency-tracking", + "--prefix=#{prefix}", + "--with-gnutls", + "--with-ssl"] - args << '--with-qt' if build.with? 'qt' - - if build.with? 'ssl' - args << '--with-gnutls' - args << '--with-ssl' - end + args << "--with-qt" if build.with? "qt" system "./configure", *args system "make"