sergiotarxz
/
libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change init prefix fallback order 

Use the configure time prefix second rather than going straight to
search. This should help ruby-vips on homebrew.
This commit is contained in:
John Cupitt 2021-06-22 18:09:57 +01:00
parent 1cd4b848e7
commit eeb64b6968
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libvips/iofuncs/init.c
View File

@ -479,6 +479,11 @@ vips_init( const char *argv0 )
!(libdir = vips_guess_libdir( argv0, "VIPSHOME" )) )
return( -1 );
g_info( "VIPS_PREFIX = %s", VIPS_PREFIX );
g_info( "VIPS_LIBDIR = %s", VIPS_LIBDIR );
g_info( "prefix = %s", prefix );
g_info( "libdir = %s", libdir );
/* Get i18n .mo files from $VIPSHOME/share/locale/.
*/
locale = g_build_filename( prefix, "share", "locale", NULL );
@ -1068,6 +1073,15 @@ guess_prefix( const char *argv0, const char *name )
{
char *prefix;
/* We've already checked for VIPSHOME. If the configure-time
* library prefix looks OK, use the configure-time prefix.
*/
if( vips_existsf( "%s/vips-modules-%d.%d",
VIPS_LIBDIR, VIPS_MAJOR_VERSION, VIPS_MINOR_VERSION ) ) {
g_info( "using configure-time prefix" );
return( VIPS_PREFIX );
}
/* Try to guess from argv0.
*/
if( argv0 ) {
@ -1202,11 +1216,6 @@ vips_guess_libdir( const char *argv0, const char *env_name )
else
libdir = g_strdup_printf( "%s/lib", prefix );
g_info( "VIPS_PREFIX = %s", VIPS_PREFIX );
g_info( "VIPS_LIBDIR = %s", VIPS_LIBDIR );
g_info( "prefix = %s", prefix );
g_info( "libdir = %s", libdir );
return( libdir );
}