diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2013-06-11 15:00:40 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-11 20:08:40 +0100 |
| commit | c3359bd7e662e905fdb85d8f6b3455018b31cf09 (patch) | |
| tree | 82e28ae0132f7dcc45f24b0300f6167d0fbfd53b /odk | |
| parent | Related: #i122483# set correct classpath, include unoil.jar (diff) | |
| download | core-c3359bd7e662e905fdb85d8f6b3455018b31cf09.tar.gz core-c3359bd7e662e905fdb85d8f6b3455018b31cf09.zip | |
Related: #i122483# correct library path
(cherry picked from commit f6c713b7e38d4de5afdf508b8d6bfc6d1d27e000)
Change-Id: I327d9946d139aaf3347c42e8b565a8de635b5ed1
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/source/unoapploader/unx/unoapploader.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c index f1caf064fd96..5dc3abe874c5 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 ); } |