Attachment #273709 for bug #367425

Lines 759-765 Link Here

(-)fontforge-20110222~/fontforge/parsepdf.c (-1 / +5 lines)
759	if ( zlib!=NULL )	759	if ( zlib!=NULL )
760	return( true );	760	return( true );
761		761
762	if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL\|RTLD_LAZY))==NULL ) {	762	if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL\|RTLD_LAZY))==NULL
		763	#ifdef SO_1_EXT
		764	&& (zlib = dlopen("libz" SO_1_EXT,RTLD_LAZY))==NULL
		765	#endif
		766	) {
763	LogError( "%s", dlerror());	767	LogError( "%s", dlerror());
764	return( false );	768	return( false );
765	}	769	}

Lines 1153-1159 Link Here

(-)fontforge-20110222~/fontforge/svg.c (-1 / +5 lines)
1153	if ( xmltested )	1153	if ( xmltested )
1154	return( libxml!=NULL );	1154	return( libxml!=NULL );
1155		1155
1156	dlopen("libz" SO_EXT,RTLD_GLOBAL\|RTLD_LAZY);	1156	dlopen("libz" SO_EXT,RTLD_GLOBAL\|RTLD_LAZY)
		1157	#ifdef SO_1_EXT
		1158	\|\| dlopen("libz" SO_1_EXT,RTLD_LAZY)
		1159	#endif
		1160	;
1157		1161
1158	libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY);	1162	libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY);
1159	# ifdef SO_2_EXT	1163	# ifdef SO_2_EXT

Lines 929-935 Link Here

(-)fontforge-20110222~/fontforge/ufo.c (-1 / +5 lines)
929	if ( xmltested )	929	if ( xmltested )
930	return( libxml!=NULL );	930	return( libxml!=NULL );
931		931
932	dlopen("libz" SO_EXT,RTLD_GLOBAL\|RTLD_LAZY);	932	dlopen("libz" SO_EXT,RTLD_GLOBAL\|RTLD_LAZY)
		933	#ifdef SO_1_EXT
		934	\|\| dlopen("libz" SO_1_EXT,RTLD_LAZY)
		935	#endif
		936	;
933		937
934	libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY);	938	libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY);
935	# ifdef SO_2_EXT	939	# ifdef SO_2_EXT

Lines 76-82 Link Here

(-)fontforge-20110222~/fontforge/woff.c (-1 / +5 lines)
76	if ( zlib!=NULL )	76	if ( zlib!=NULL )
77	return( true );	77	return( true );
78		78
79	if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL\|RTLD_LAZY))==NULL ) {	79	if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL\|RTLD_LAZY))==NULL
		80	#ifdef SO_1_EXT
		81	&& (zlib = dlopen("libz" SO_1_EXT,RTLD_LAZY))==NULL
		82	#endif
		83	) {
80	LogError( "%s", dlerror());	84	LogError( "%s", dlerror());
81	return( false );	85	return( false );
82	}	86	}

Return to bug 367425