parsav  Diff

Differences From Artifact [6ab8d1127e]:

To Artifact [9003b8cb61]:


   201    201   			if incdir then incdir = incdir .. incsfx end
   202    202   	end
   203    203   	libdir = libdir or (prefix .. '/lib'     .. libsfx)
   204    204   	incdir = incdir or (prefix .. '/include' .. incsfx)
   205    205   
   206         -	local libstr = pkc '--libs-only-l' -- (--static is not reliable)
   207         -	local libs = fb and fb.libs or {}
   208         -	local linkstatic = locdep
   209         -	if (not locdep) and libstr then
          206  +	local libs, linkstatic, libstr
          207  +	if fb and fb.libs then
          208  +		libs = fb.libs
          209  +		libstr = pkc('--libs-only-l', unpack(fb.libs))
          210  +	else
   210    211   		libs = {}
   211         -		for m in string.gmatch(libstr, '-l(%g+)') do
   212         -			libs[#libs + 1] = m
          212  +		libstr = pkc '--libs-only-l' -- (--static is not reliable)
          213  +		linkstatic = locdep
          214  +		if (not locdep) and libstr then
          215  +			libs = {}
          216  +			for m in string.gmatch(libstr, '-l(%g+)') do
          217  +				libs[#libs + 1] = m
          218  +			end
          219  +		else
          220  +			if #libs == 0 then libs = { name } end
   213    221   		end
   214         -	else
   215         -		if #libs == 0 then libs = { name } end
   216    222   	end
   217    223   
   218    224   	conf.pkg[name] = {
   219    225   		prefix = prefix;
   220    226   		libdir = libdir;