From 43c47af0181ada27b558a30b02c51dc665169b99 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 30 Sep 2013 22:09:42 +0200
Subject: Special-case Mac OS X .jnilib

Change-Id: I824e83271997888712f126f4197252d7beefccc1
---
 cppuhelper/source/shlib.cxx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index fc8b6a891dd9..0933ddbb46ca 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -227,7 +227,11 @@ static OUString makeComponentPath(
         if (rPath[ rPath.getLength() -1 ] != '/')
             buf.append( (sal_Unicode) '/' );
     }
-    if (! rLibName.endsWithIgnoreAsciiCase( SAL_DLLEXTENSION ))
+    if (!rLibName.endsWithIgnoreAsciiCase( SAL_DLLEXTENSION )
+#if defined MACOSX
+        && !rLibName.endsWithIgnoreAsciiCase(".jnilib")
+#endif
+        )
     {
 #if defined SAL_DLLPREFIX
         if (! rLibName.endsWithIgnoreAsciiCase( ".uno" ))
-- 
cgit