Kaydet (Commit) c3359bd7 authored tarafından Jürgen Schmidt's avatar Jürgen Schmidt Kaydeden (comit) Caolán McNamara

Related: #i122483# correct library path

(cherry picked from commit f6c713b7)

Change-Id: I327d9946d139aaf3347c42e8b565a8de635b5ed1
üst 95ada2d6
...@@ -179,12 +179,22 @@ int main( int argc, char *argv[] ) ...@@ -179,12 +179,22 @@ int main( int argc, char *argv[] )
value = getenv( ENVVARNAME ); 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; size = strlen( ENVVARNAME ) + strlen( "=" ) + strlen( libpath ) + 1;
#endif
if ( value != NULL ) if ( value != NULL )
size += strlen( PATHSEPARATOR ) + strlen( value ); size += strlen( PATHSEPARATOR ) + strlen( value );
envstr = (char*) malloc( size ); envstr = (char*) malloc( size );
strcpy( envstr, ENVVARNAME ); strcpy( envstr, ENVVARNAME );
#ifdef MACOSX
strcat( envstr, "=/usr/lib:" );
#else
strcat( envstr, "=" ); strcat( envstr, "=" );
#endif
strcat( envstr, libpath ); strcat( envstr, libpath );
if ( freeLibpath != 0 ) if ( freeLibpath != 0 )
{ {
...@@ -199,7 +209,7 @@ int main( int argc, char *argv[] ) ...@@ -199,7 +209,7 @@ int main( int argc, char *argv[] )
} }
else else
{ {
fprintf( stderr, "Warning: no UNO installation found!\n" ); fprintf( stderr, "Warning: no office installation found!\n" );
fflush( stderr ); fflush( stderr );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment