#
#
# patch "m4/botan.m4"
#  from [9f49602cf6068f13170e1ddee1599ebe3cfd52b0]
#    to [aa7865ca48b0ec45b257865fd12485b002983f12]
# 
# patch "m4/pcre.m4"
#  from [3efce0ef6d442d2f239fff1880779037dde687cc]
#    to [e6f5fe5e4b456ea950ae18bb1686a6bd0ae89353]
#
============================================================
--- m4/botan.m4	9f49602cf6068f13170e1ddee1599ebe3cfd52b0
+++ m4/botan.m4	aa7865ca48b0ec45b257865fd12485b002983f12
@@ -8,16 +8,8 @@ AC_DEFUN([MTN_FIND_BOTAN],
   if test -n "`type -p botan-config`"; then
     BOTAN_VERSION="`botan-config --version`"
     BOTAN_CPPFLAGS="`botan-config --cflags`"
+    BOTAN_LIBS="`botan-config --libs`"
 
-    # botan-config has the annoying habit of telling us to use
-    # -L switches for directories that the compiler will search
-    # automatically.
-    BOTAN_LIBS="`botan-config --libs | \
-	       sed -e 's:-L */usr/lib\(64\)\?/*::' \
-	       	   -e 's:-R */usr/lib\(64\)\?/*::' \
-	           -e 's:-L */lib\(64\)\?/*::' \
-		   -e 's:-R */lib\(64\)\?/*::'`"
-
     found_botan=yes
 
     # make sure we have to do with botan version 1.7
============================================================
--- m4/pcre.m4	3efce0ef6d442d2f239fff1880779037dde687cc
+++ m4/pcre.m4	e6f5fe5e4b456ea950ae18bb1686a6bd0ae89353
@@ -18,12 +18,7 @@ AC_DEFUN([MTN_FIND_PCRE],
      AC_MSG_CHECKING([for PCRE using pcre-config])
      if test -n "`type -p pcre-config`"; then
        PCRE_CFLAGS="`pcre-config --cflags`"
-       # pcre-config has the annoying habit of telling us to use
-       # -L switches for directories that the compiler will search
-       # automatically.
-       PCRE_LIBS="`pcre-config --libs | \
-                   sed -e 's:-L */usr/lib/*::' -e 's:-R */usr/lib/*::' \
-                       -e 's:-L */lib/*::' -e 's:-R */lib/*::'`"
+       PCRE_LIBS="`pcre-config --libs`"
        found_libpcre=yes
        AC_MSG_RESULT([yes])
      fi