diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2015-03-04 11:59:55 +1300 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2015-03-04 11:59:55 +1300 |
| commit | 141501bf1e6052dfb270001658fe8882f94d9e80 (patch) | |
| tree | 3053d52bd3bfe96ac47dc02fa7bdfe9e19d6156d | |
| parent | 1f1f5faf0d8d36caddb1fde53086c15838aab480 (diff) | |
| download | lightdm-git-141501bf1e6052dfb270001658fe8882f94d9e80.tar.gz | |
Only compile liblightdm-qt5 if liblightdm-gobject is being compiled
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index decd05ec..4b757713 100644 --- a/configure.ac +++ b/configure.ac @@ -129,7 +129,7 @@ AC_ARG_ENABLE(liblightdm-qt5, [enable_liblightdm_qt5=$enableval], [enable_liblightdm_qt5="auto"]) compile_liblightdm_qt5=no -if test x"$enable_liblightdm_qt5" != "xno"; then +if test x"$enable_liblightdm_qt5" = "xyes" -o \( x"$enable_liblightdm_qt5" = "xauto" -a x$compile_liblightdm_gobject = xyes \); then PKG_CHECK_MODULES(LIBLIGHTDM_QT5, [ Qt5Core Qt5DBus @@ -140,6 +140,10 @@ if test x"$enable_liblightdm_qt5" != "xno"; then if test x"$(readlink $(which $MOC5))" = xqtchooser; then MOC5="$MOC5 --qt=qt5" fi + if test "x$compile_liblightdm_gobject" != xyes; then + AC_MSG_FAILURE( + [liblightdm-gobject is required to compile liblightdm-qt5]) + fi ], [if test "x$enable_liblightdm_qt5" != xauto; then AC_MSG_FAILURE( |