gettext: Enable Emacs support unconditionally

Revert e93c776803d6b8c2c96b971307899ad61f09a43c and turn on Emacs
support without an option, per discussion in #20313.

Closes #20385.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

1 files changed, 11 insertions, 28 deletions

diff --git a/Library/Formula/gettext.rb b/Library/Formula/gettext.rb
index e52580844..0e038aef0 100644
--- a/Library/Formula/gettext.rb
+++ b/Library/Formula/gettext.rb
@@ -1,14 +1,5 @@
 require 'formula'
 
-class EmacsRequirement < Requirement
-  fatal true
-  satisfy { which('emacs') }
-
-  def message
-    "Emacs support requires Emacs to be installed."
-  end
-end
-
 class Gettext < Formula
   homepage 'http://www.gnu.org/software/gettext/'
   url 'http://ftpmirror.gnu.org/gettext/gettext-0.18.2.tar.gz'
@@ -24,11 +15,8 @@ class Gettext < Formula
   end
 
   option :universal
-  option 'with-emacs', 'Build with emacs support'
   option 'with-examples', 'Keep example files'
 
-  depends_on EmacsRequirement if build.include? "with-emacs"
-
   def patches
     unless build.include? 'with-examples'
       # Use a MacPorts patch to disable building examples at all,
@@ -41,22 +29,17 @@ class Gettext < Formula
     ENV.libxml2
     ENV.universal_binary if build.universal?
 
-    args = ["--disable-dependency-tracking",
-            "--disable-debug",
-            "--prefix=#{prefix}",
-            "--with-included-gettext",
-            "--with-included-glib",
-            "--with-included-libcroco",
-            "--with-included-libunistring",
-            # Don't use VCS systems to create these archives
-            "--without-git",
-            "--without-cvs"]
-    if build.include? "with-emacs"
-      args << "--with-emacs"
-    else
-      args << "--without-emacs"
-    end
-    system "./configure", *args
+    system "./configure", "--disable-dependency-tracking",
+                          "--disable-debug",
+                          "--prefix=#{prefix}",
+                          "--with-included-gettext",
+                          "--with-included-glib",
+                          "--with-included-libcroco",
+                          "--with-included-libunistring",
+                          "--with-emacs",
+                          # Don't use VCS systems to create these archives
+                          "--without-git",
+                          "--without-cvs"
     system "make"
     ENV.deparallelize # install doesn't support multiple make jobs
     system "make install"