[Libreoffice-commits] core.git: configure.ac

[Lionel Elie Mamane]

 configure.ac |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 382ad7386698ec994e7fe0bdd4f6f0cbaeacefa0
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Aug 12 13:32:09 2014 +0200

     in replacement is *also* a GNU sed extension - not available on MacOS X
    
    Change-Id: Ic4efe84ba6e6d0e36b520957bc56d24e14161966

diff --git a/configure.ac b/configure.ac
index 504fab5..9ae3d24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8278,7 +8278,11 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
         if test "$enable_bundle_mariadb" = "yes"; then
             AC_MSG_RESULT([yes])
             BUNDLE_MARIADB=TRUE
-            LIBMARIADB=lib$(echo "${MARIADB_LIBS}" | sed -e 's/[[[:space:]]]\{1,\}-l/\n/g' -e 's/^-l/\n/g' | grep -E '(mysqlclient|mariadb)')
+            LIBMARIADB=lib$(echo "${MARIADB_LIBS}" | sed -e 's/[[[:space:]]]\{1,\}-l\([[^[:space:]]]\{1,\}\)/\
+\1\
+/g' -e 's/^-l\([[^[:space:]]]\{1,\}\)[[[:space:]]]*/\
+\1\
+/g' | grep -E '(mysqlclient|mariadb)')
             if test "$_os" = "Darwin"; then
                 LIBMARIADB=${LIBMARIADB}.dylib
             elif test "$_os" = "WINNT"; then