use curl from homebrew for Mountain Lion

shrop · Aug 31, 2012 · 1f73bc7 · 1f73bc7
1 parent 502341a
commit 1f73bc7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Formula/php53.rb b/Formula/php53.rb
@@ -15,6 +15,7 @@ class Php53 < Formula
   # So PHP extensions don't report missing symbols
   skip_clean ['bin', 'sbin']
 
+  depends_on 'curl'
   depends_on 'freetds' if ARGV.include? '--with-mssql'
   depends_on 'freetype'
   depends_on 'gettext'
@@ -138,14 +139,13 @@ def _install
       "--enable-bcmath",
       "--enable-calendar",
       "--with-zlib=#{Formula.factory('zlib').prefix}",
-      "--with-bz2=/usr",
       "--with-ldap",
       "--with-ldap-sasl=/usr",
       "--with-xmlrpc",
       "--with-kerberos=/usr",
       "--with-libxml-dir=#{Formula.factory('libxml2').prefix}",
       "--with-xsl=/usr",
-      "--with-curl=/usr",
+      "--with-curl=#{Formula.factory('curl').prefix}",
       "--with-gd",
       "--enable-gd-native-ttf",
       "--with-freetype-dir=#{Formula.factory('freetype').prefix}",
@@ -159,6 +159,10 @@ def _install
       "--mandir=#{man}",
     ]
 
+    unless ARGV.include? '--without-bz2'
+      args << '--with-bz2=/usr'
+    end
+
     if ARGV.include? '--with-homebrew-openssl'
       args << "--with-openssl=" + Formula.factory('openssl').prefix.to_s
     else

diff --git a/Formula/php54.rb b/Formula/php54.rb
@@ -15,6 +15,7 @@ class Php54 < Formula
   # So PHP extensions don't report missing symbols
   skip_clean ['bin', 'sbin']
 
+  depends_on 'curl'
   depends_on 'freetds' if ARGV.include? '--with-mssql'
   depends_on 'freetype'
   depends_on 'gettext'
@@ -143,14 +144,13 @@ def _install
       "--enable-bcmath",
       "--enable-calendar",
       "--with-zlib=#{Formula.factory('zlib').prefix}",
-      "--with-bz2=/usr",
       "--with-ldap",
       "--with-ldap-sasl=/usr",
       "--with-xmlrpc",
       "--with-kerberos=/usr",
       "--with-libxml-dir=#{Formula.factory('libxml2').prefix}",
       "--with-xsl=/usr",
-      "--with-curl=/usr",
+      "--with-curl=#{Formula.factory('curl').prefix}",
       "--with-gd",
       "--enable-gd-native-ttf",
       "--with-freetype-dir=#{Formula.factory('freetype').prefix}",
@@ -163,6 +163,10 @@ def _install
       "--mandir=#{man}",
     ]
 
+    unless ARGV.include? '--without-bz2'
+      args << '--with-bz2=/usr'
+    end
+
     if ARGV.include? '--with-homebrew-openssl'
       args << "--with-openssl=" + Formula.factory('openssl').prefix.to_s
     else