pcre++: autoreconf to get a newer configure script

1 files changed, 28 insertions, 17 deletions

diff --git a/Library/Formula/pcre++.rb b/Library/Formula/pcre++.rb
index b064ae65b..75d0f72d6 100644
--- a/Library/Formula/pcre++.rb
+++ b/Library/Formula/pcre++.rb
@@ -1,23 +1,28 @@
-require 'formula'
+require "formula"
 
 class Pcrexx < Formula
-  homepage 'http://www.daemon.de/PCRE'
-  url 'http://www.daemon.de/idisk/Apps/pcre++/pcre++-0.9.5.tar.gz'
-  sha1 '7cb640555c6adf34bf366139b22f6d1a66bd1fb0'
+  homepage "http://www.daemon.de/PCRE"
+  url "http://www.daemon.de/idisk/Apps/pcre++/pcre++-0.9.5.tar.gz"
+  sha1 "7cb640555c6adf34bf366139b22f6d1a66bd1fb0"
 
-  depends_on 'pcre'
+  depends_on "autoconf" => :build
+  depends_on "automake" => :build
+  depends_on "libtool" => :build
+  depends_on "pcre"
 
   # Fix building with libc++. Patch sent to maintainer.
   patch :DATA
 
   def install
-    pcre = Formula["pcre"].opt_prefix
+    pcre = Formula["pcre"]
+    system "autoreconf", "-fvi"
     system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",
+                          "--disable-silent-rules",
                           "--prefix=#{prefix}",
-                          "--mandir=#{man}",
-                          "--with-pcre-dir-lib=#{pcre}"
-    system "make install"
+                          "--with-pcre-lib=#{pcre.opt_lib}",
+                          "--with-pcre-include=#{pcre.opt_include}"
+    system "make", "install"
 
     # Pcre++ ships Pcre.3, which causes a conflict with pcre.3 from pcre
     # in case-insensitive file system. Rename it to pcre++.3 to avoid
@@ -34,14 +39,20 @@ class Pcrexx < Formula
 end
 
 __END__
-diff -urN pcre++-0.9.5.orig/libpcre++/pcre++.cc pcre++-0.9.5/libpcre++/pcre++.cc
---- pcre++-0.9.5.orig/libpcre++/pcre++.cc	2004-08-24 14:59:21.000000000 -0700
-+++ pcre++-0.9.5/libpcre++/pcre++.cc	2013-11-01 11:30:21.000000000 -0700
-@@ -38,6 +38,7 @@
-  *
-  */
- 
+diff --git a/libpcre++/pcre++.h b/libpcre++/pcre++.h
+index d80b387..21869fc 100644
+--- a/libpcre++/pcre++.h
++++ b/libpcre++/pcre++.h
+@@ -47,11 +47,11 @@
+ #include <map>
+ #include <stdexcept>
+ #include <iostream>
 +#include <clocale>
  
- #include "pcre++.h"
  
+ extern "C" {
+   #include <pcre.h>
+-  #include <locale.h>
+ }
+ 
+ namespace pcrepp {