Attachment #335478 for bug #408283




		,
		[AC_MSG_ERROR([Required libfbsplashrender was not found])]
	)
	PKG_CHECK_MODULES(
      		[FREETYPE2],
		[freetype2],
		,
		[AC_MSG_ERROR([freetype was not found.])]
	)
	if test -z "${BZ2_LIBS}"; then
		AC_ARG_VAR([BZ2_LIBS], [linker flags for bz2])
		AC_CHECK_LIB(
			[bz2], 
			[BZ2_bzDecompress],
			[BZ2_LIBS="-lbz2"],
			[AC_MSG_ERROR([Required bz2 was not found.])]
		)
	fi
fi

if test "${enable_threads}" = "yes"; then




	resume.c
resume_LDADD=\
	libsuspend-common.a \
	$(common_s2disk_libs) \
	${BZ2_LIBS}
if ENABLE_RESUME_STATIC
resume_LDFLAGS=\
	$(AM_LDFLAGS) \

	fbsplash_funcs.c \
	fbsplash-test.c
fbsplash_test_LDADD=\
	$(FBSPLASH_LIBS) \
	$(BZ2_LIBS)

whitelist.c: whitelist.csv
	$(PERL) wlcsv2c.pl whitelist.csv whitelist.c

Return to bug 408283

Lines 247-252 Link Here

(-)a/configure.ac (+15 lines)
247	,	247	,
248	[AC_MSG_ERROR([Required libfbsplashrender was not found])]	248	[AC_MSG_ERROR([Required libfbsplashrender was not found])]
249	)	249	)
		250	PKG_CHECK_MODULES(
		251	[FREETYPE2],
		252	[freetype2],
		253	,
		254	[AC_MSG_ERROR([freetype was not found.])]
		255	)
		256	if test -z "${BZ2_LIBS}"; then
		257	AC_ARG_VAR([BZ2_LIBS], [linker flags for bz2])
		258	AC_CHECK_LIB(
		259	[bz2],
		260	[BZ2_bzDecompress],
		261	[BZ2_LIBS="-lbz2"],
		262	[AC_MSG_ERROR([Required bz2 was not found.])]
		263	)
		264	fi
250	fi	265	fi
251		266
252	if test "${enable_threads}" = "yes"; then	267	if test "${enable_threads}" = "yes"; then

Lines 129-135 Link Here

(-)a/Makefile.am (-2 / +4 lines)
129	resume.c	129	resume.c
130	resume_LDADD=\	130	resume_LDADD=\
131	libsuspend-common.a \	131	libsuspend-common.a \
132	$(common_s2disk_libs)	132	$(common_s2disk_libs) \
		133	${BZ2_LIBS}
133	if ENABLE_RESUME_STATIC	134	if ENABLE_RESUME_STATIC
134	resume_LDFLAGS=\	135	resume_LDFLAGS=\
135	$(AM_LDFLAGS) \	136	$(AM_LDFLAGS) \
Lines 171-177 Link Here
171	fbsplash_funcs.c \	172	fbsplash_funcs.c \
172	fbsplash-test.c	173	fbsplash-test.c
173	fbsplash_test_LDADD=\	174	fbsplash_test_LDADD=\
174	$(FBSPLASH_LIBS)	175	$(FBSPLASH_LIBS) \
		176	$(BZ2_LIBS)
175		177
176	whitelist.c: whitelist.csv	178	whitelist.c: whitelist.csv
177	$(PERL) wlcsv2c.pl whitelist.csv whitelist.c	179	$(PERL) wlcsv2c.pl whitelist.csv whitelist.c