frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change glib require for tests to auto. 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-05-05 13:47:55 +10:00
parent 749cae8220
commit 1b1b20d6e3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -440,8 +440,8 @@ AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],
[Enable debugging (default: disabled)]), [Enable debugging (default: disabled)]),
[DEBUGGING=$enableval], [DEBUGGING=no]) [DEBUGGING=$enableval], [DEBUGGING=no])
AC_ARG_ENABLE(unit-tests, AS_HELP_STRING([--enable-unit-tests], AC_ARG_ENABLE(unit-tests, AS_HELP_STRING([--enable-unit-tests],
[Enable unit-tests (default: enabled)]), [Enable unit-tests (default: auto)]),
[UNITTESTS=$enableval], [UNITTESTS=yes]) [UNITTESTS=$enableval], [UNITTESTS=auto])
AC_ARG_WITH(int10, AS_HELP_STRING([--with-int10=BACKEND], [int10 backend: vm86, x86emu or stub]), AC_ARG_WITH(int10, AS_HELP_STRING([--with-int10=BACKEND], [int10 backend: vm86, x86emu or stub]),
[INT10="$withval"], [INT10="$withval"],
[INT10="$DEFAULT_INT10"]) [INT10="$DEFAULT_INT10"])
@ -1144,6 +1144,9 @@ if test "x$DEBUGGING" = xyes; then
fi fi
AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes]) AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])
if test "x$UNITTESTS" = xauto; then
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16], [UNITTESTS=yes], [UNITTESTS=no])
fi
if test "x$UNITTESTS" = xyes; then if test "x$UNITTESTS" = xyes; then
AC_DEFINE(UNITTESTS, 1, [Enable unit tests]) AC_DEFINE(UNITTESTS, 1, [Enable unit tests])
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16]) PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16])