5 files changed, 19 insertions, 0 deletions
diff --git a/Library/Formula/json-c.rb b/Library/Formula/json-c.rb
index da9aa7075..0b86a77cb 100644
--- a/Library/Formula/json-c.rb
+++ b/Library/Formula/json-c.rb
@@ -13,7 +13,11 @@ class JsonC < Formula
     sha1 "13d7c03bb2c64a60d392390e693f750ccb38be6c" => :lion
   end
 
+  option :universal
+
   def install
+    ENV.universal_binary if build.universal?
+
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     ENV.deparallelize
diff --git a/Library/Formula/libyubikey.rb b/Library/Formula/libyubikey.rb
index 94a746570..f70c98c55 100644
--- a/Library/Formula/libyubikey.rb
+++ b/Library/Formula/libyubikey.rb
@@ -5,7 +5,11 @@ class Libyubikey < Formula
   url 'http://yubico.github.io/yubico-c/releases/libyubikey-1.11.tar.gz'
   sha1 'a939abc129ed66af193d979765a8d8ac59ad7c40'
 
+  option :universal
+
   def install
+    ENV.universal_binary if build.universal?
+
     system "./configure", "--prefix=#{prefix}"
     system "make install"
   end
diff --git a/Library/Formula/pam_yubico.rb b/Library/Formula/pam_yubico.rb
index 7ff6bf78d..f948d21ca 100644
--- a/Library/Formula/pam_yubico.rb
+++ b/Library/Formula/pam_yubico.rb
@@ -5,6 +5,8 @@ class PamYubico < Formula
   url 'https://github.com/Yubico/yubico-pam/archive/2.14.tar.gz'
   sha1 'c86fd78788e6a81cadd57b23411e78bd7fab48bb'
 
+  option :universal
+
   depends_on 'pkg-config' => :build
   depends_on :autoconf
   depends_on :automake
@@ -14,6 +16,8 @@ class PamYubico < Formula
   depends_on 'ykpers'
 
   def install
+    ENV.universal_binary if build.universal?
+
     system "autoreconf -vfi"
     system "./configure", "--prefix=#{prefix}",
                           "--with-libyubikey-prefix=#{HOMEBREW_PREFIX}",
diff --git a/Library/Formula/ykclient.rb b/Library/Formula/ykclient.rb
index 5b86dedd8..e3162d4dc 100644
--- a/Library/Formula/ykclient.rb
+++ b/Library/Formula/ykclient.rb
@@ -5,10 +5,14 @@ class Ykclient < Formula
   url 'http://yubico.github.io/yubico-c-client/releases/ykclient-2.12.tar.gz'
   sha1 '518ce53ba9ef61a619f9150778f19fad23014a9c'
 
+  option :universal
+
   depends_on 'pkg-config' => :build
   depends_on 'help2man' => :build
 
   def install
+    ENV.universal_binary if build.universal?
+
     system "./configure", "--prefix=#{prefix}"
     system "make install"
   end
diff --git a/Library/Formula/ykpers.rb b/Library/Formula/ykpers.rb
index 63cb8bd0e..1f0a13400 100644
--- a/Library/Formula/ykpers.rb
+++ b/Library/Formula/ykpers.rb
@@ -5,11 +5,14 @@ class Ykpers < Formula
   url 'http://yubico.github.io/yubikey-personalization/releases/ykpers-1.14.1.tar.gz'
   sha1 '5ecc0d6bf9c58bdf825c2d8d158361fc61852ff8'
 
+  option :universal
+
   depends_on 'libyubikey'
   depends_on 'json-c' => :recommended
   depends_on 'pkg-config' => :build
 
   def install
+    ENV.universal_binary if build.universal?
     libyubikey_prefix = Formula["libyubikey"].opt_prefix
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",