[Libreoffice-commits] core.git: odk/source

[Jürgen Schmidt]

 odk/source/unoapploader/unx/unoapploader.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit c3359bd7e662e905fdb85d8f6b3455018b31cf09
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Tue Jun 11 15:00:40 2013 +0000

    Related: #i122483# correct library path
    
    (cherry picked from commit f6c713b7e38d4de5afdf508b8d6bfc6d1d27e000)
    
    Change-Id: I327d9946d139aaf3347c42e8b565a8de635b5ed1

diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c
index f1caf06..5dc3abe 100644
--- a/odk/source/unoapploader/unx/unoapploader.c
+++ b/odk/source/unoapploader/unx/unoapploader.c
@@ -179,12 +179,22 @@ int main( int argc, char *argv[] )
 
         value = getenv( ENVVARNAME );
 
+        // workaround for finding wrong libsqlite3.dylib in the office installation
+        // For MacOS > 10.6 nss uses the system lib -> unresolved symbol _sqlite3_wal_checkpoint
+#ifdef MACOSX
+        size = strlen( ENVVARNAME ) + strlen( "=/usr/lib:" ) + strlen( libpath ) + 1;
+#else
         size = strlen( ENVVARNAME ) + strlen( "=" ) + strlen( libpath ) + 1;
+#endif
         if ( value != NULL )
             size += strlen( PATHSEPARATOR ) + strlen( value );
         envstr = (char*) malloc( size );
         strcpy( envstr, ENVVARNAME );
+#ifdef MACOSX
+        strcat( envstr, "=/usr/lib:" );
+#else
         strcat( envstr, "=" );
+#endif
         strcat( envstr, libpath );
         if ( freeLibpath != 0 )
         {
@@ -199,7 +209,7 @@ int main( int argc, char *argv[] )
     }
     else
     {
-        fprintf( stderr, "Warning: no UNO installation found!\n" );
+        fprintf( stderr, "Warning: no office installation found!\n" );
         fflush( stderr );
     }