fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-09 03:38:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure.ac: move all AM_CONDITIONALs into one place

Browse source 
Makes it easier to see in one go what is conditional in the build.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer 2016-11-14 09:51:46 +10:00
parent 8616cc0bb9
commit ba75b56c74
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -159,7 +159,6 @@ if test "x$build_eventgui" = "xyes"; then
PKG_CHECK_MODULES(CAIRO, [cairo]) PKG_CHECK_MODULES(CAIRO, [cairo])
PKG_CHECK_MODULES(GTK, [glib-2.0 gtk+-3.0]) PKG_CHECK_MODULES(GTK, [glib-2.0 gtk+-3.0])
fi fi
AM_CONDITIONAL(BUILD_EVENTGUI, [test "x$build_eventgui" = "xyes"])
AC_ARG_ENABLE(tests, AC_ARG_ENABLE(tests,
AS_HELP_STRING([--enable-tests], [Build the tests (default=auto)]), AS_HELP_STRING([--enable-tests], [Build the tests (default=auto)]),
@ -199,7 +198,6 @@ if test "x$build_tests" = "xyes"; then
AC_DEFINE_UNQUOTED(ADDR2LINE, ["$ADDR2LINE"], [Path to addr2line]) AC_DEFINE_UNQUOTED(ADDR2LINE, ["$ADDR2LINE"], [Path to addr2line])
fi fi
fi fi
AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$HAVE_LIBUNWIND" = xyes])
AC_ARG_ENABLE(libwacom, AC_ARG_ENABLE(libwacom,
AS_HELP_STRING([--enable-libwacom], AS_HELP_STRING([--enable-libwacom],
@ -227,12 +225,14 @@ if test "x$use_libwacom" = "xyes"; then
LIBS=$OLD_LIBS LIBS=$OLD_LIBS
CFLAGS=$OLD_CFLAGS CFLAGS=$OLD_CFLAGS
fi fi
AM_CONDITIONAL(HAVE_LIBWACOM_GET_PAIRED_DEVICE, AM_CONDITIONAL(HAVE_LIBWACOM_GET_PAIRED_DEVICE,
[test "x$libwacom_have_get_paired_device" == "xyes"]) [test "x$libwacom_have_get_paired_device" == "xyes"])
AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"]) AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"])
AM_CONDITIONAL(BUILD_TESTS, [test "x$build_tests" = "xyes"]) AM_CONDITIONAL(BUILD_TESTS, [test "x$build_tests" = "xyes"])
AM_CONDITIONAL(BUILD_DOCS, [test "x$build_documentation" = "xyes"]) AM_CONDITIONAL(BUILD_DOCS, [test "x$build_documentation" = "xyes"])
AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$HAVE_LIBUNWIND" = xyes])
AM_CONDITIONAL(BUILD_EVENTGUI, [test "x$build_eventgui" = "xyes"])
# Used by the udev rules so we can use callouts during testing without # Used by the udev rules so we can use callouts during testing without
# installing everything first. Default is the empty string so the installed # installing everything first. Default is the empty string so the installed