mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: make setbacklight optional

Browse Source 
Modify the pkg-config check for setbacklight so that failure only
disables building setbacklight, instead of failing the whole configure.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen
2012-08-03 14:39:16 +03:00
committed by Kristian Høgsberg
parent b6df4f7de4
commit 4b141597c6
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+2 -1
View File
@@ -216,7 +216,8 @@ fi
AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert) AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert)
AM_CONDITIONAL(HAVE_RSVG_CONVERT, test -n "$RSVG_CONVERT") AM_CONDITIONAL(HAVE_RSVG_CONVERT, test -n "$RSVG_CONVERT")
PKG_CHECK_MODULES(SETBACKLIGHT, [libudev libdrm]) PKG_CHECK_MODULES(SETBACKLIGHT, [libudev libdrm], enable_setbacklight=yes, enable_setbacklight=no)
AM_CONDITIONAL(BUILD_SETBACKLIGHT, test "x$enable_setbacklight" = "xyes")
if test "x$GCC" = "xyes"; then if test "x$GCC" = "xyes"; then
my_common_gcc_flags="-Wall -Wextra -Wno-unused-parameter \ my_common_gcc_flags="-Wall -Wextra -Wno-unused-parameter \
tests/Makefile.am
+5 -1
View File
@@ -22,7 +22,7 @@ event_test_la_SOURCES = event-test.c $(test_runner_src)
test_client_SOURCES = test-client.c test_client_SOURCES = test-client.c
test_client_LDADD = $(SIMPLE_CLIENT_LIBS) test_client_LDADD = $(SIMPLE_CLIENT_LIBS)
noinst_PROGRAMS = setbacklight matrix-test noinst_PROGRAMS = $(setbacklight) matrix-test
matrix_test_SOURCES = \ matrix_test_SOURCES = \
matrix-test.c \ matrix-test.c \
@@ -38,4 +38,8 @@ setbacklight_SOURCES = \
setbacklight_CFLAGS = $(AM_CFLAGS) $(SETBACKLIGHT_CFLAGS) setbacklight_CFLAGS = $(AM_CFLAGS) $(SETBACKLIGHT_CFLAGS)
setbacklight_LDADD = $(SETBACKLIGHT_LIBS) setbacklight_LDADD = $(SETBACKLIGHT_LIBS)
if BUILD_SETBACKLIGHT
setbacklight = setbacklight
endif
EXTRA_DIST = weston-test EXTRA_DIST = weston-test