fish: don't search extra folders for libiconv

1 files changed, 55 insertions, 0 deletions

diff --git a/Library/Formula/fish.rb b/Library/Formula/fish.rb
index 39edff03d..4ab0e0e76 100644
--- a/Library/Formula/fish.rb
+++ b/Library/Formula/fish.rb
@@ -13,6 +13,9 @@ class Fish < Formula
 
   skip_clean 'share/doc'
 
+  # Don't search extra folders for libiconv
+  def patches; DATA; end
+
   def install
     system "autoconf"
     system "./configure", "--prefix=#{prefix}"
@@ -32,3 +35,55 @@ class Fish < Formula
     EOS
   end
 end
+
+__END__
+diff --git a/configure.ac b/configure.ac
+index 34f25e1..b9afa51 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -98,45 +98,6 @@ AC_PROG_INSTALL
+ 
+ echo "CXXFLAGS: $CXXFLAGS"
+ 
+-#
+-# Detect directories which may contain additional headers, libraries
+-# and commands. This needs to be done early - before Autoconf starts
+-# to mess with CFLAGS and all the other environemnt variables.
+-#
+-# This mostly helps OS X users, since fink usually installs out of
+-# tree and doesn't update CFLAGS.
+-#
+-# It also helps FreeBSD which puts libiconv in /usr/local/lib
+-
+-for i in /usr/pkg /sw /opt /opt/local /usr/local; do
+-
+-  AC_MSG_CHECKING([for $i/include include directory])
+-  if test -d $i/include; then
+-    AC_MSG_RESULT(yes)
+-    CXXFLAGS="$CXXFLAGS -I$i/include/"
+-    CFLAGS="$CFLAGS -I$i/include/"
+-  else
+-  AC_MSG_RESULT(no)
+-  fi
+-
+-  AC_MSG_CHECKING([for $i/lib library directory])
+-  if test -d $i/lib; then
+-    AC_MSG_RESULT(yes)
+-    LDFLAGS="$LDFLAGS -L$i/lib/ -Wl,-rpath,$i/lib/"
+-  else
+-    AC_MSG_RESULT(no)
+-  fi
+-
+-  AC_MSG_CHECKING([for $i/bin command directory])
+-  if test -d $i/bin; then
+-    AC_MSG_RESULT(yes)
+-    optbindirs="$optbindirs $i/bin"
+-  else
+-    AC_MSG_RESULT(no)
+-  fi
+-
+-done
+-
+ 
+ #
+ # Tell autoconf to create config.h header