parsav  Diff

Differences From Artifact [6ab8d1127e]:

To Artifact [9003b8cb61]:


199
200
201
202
203
204
205






206
207
208
209
210
211
212
213
214
215

216
217
218
219
220
221
222
			if libdir then libdir = libdir .. libsfx end
		incdir = cnfvar('incdir','includedir') 
			if incdir then incdir = incdir .. incsfx end
	end
	libdir = libdir or (prefix .. '/lib'     .. libsfx)
	incdir = incdir or (prefix .. '/include' .. incsfx)







	local libstr = pkc '--libs-only-l' -- (--static is not reliable)
	local libs = fb and fb.libs or {}
	local linkstatic = locdep
	if (not locdep) and libstr then
		libs = {}
		for m in string.gmatch(libstr, '-l(%g+)') do
			libs[#libs + 1] = m
		end
	else
		if #libs == 0 then libs = { name } end

	end

	conf.pkg[name] = {
		prefix = prefix;
		libdir = libdir;
		incdir = incdir;
		dylibs = {}, statlibs = {};







>
>
>
>
>
>
|
<
|
|
|
|
|
|
|
|
>







199
200
201
202
203
204
205
206
207
208
209
210
211
212

213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
			if libdir then libdir = libdir .. libsfx end
		incdir = cnfvar('incdir','includedir') 
			if incdir then incdir = incdir .. incsfx end
	end
	libdir = libdir or (prefix .. '/lib'     .. libsfx)
	incdir = incdir or (prefix .. '/include' .. incsfx)

	local libs, linkstatic, libstr
	if fb and fb.libs then
		libs = fb.libs
		libstr = pkc('--libs-only-l', unpack(fb.libs))
	else
		libs = {}
		libstr = pkc '--libs-only-l' -- (--static is not reliable)

		linkstatic = locdep
		if (not locdep) and libstr then
			libs = {}
			for m in string.gmatch(libstr, '-l(%g+)') do
				libs[#libs + 1] = m
			end
		else
			if #libs == 0 then libs = { name } end
		end
	end

	conf.pkg[name] = {
		prefix = prefix;
		libdir = libdir;
		incdir = incdir;
		dylibs = {}, statlibs = {};