1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
--- configure.ac.orig 2010-12-09 00:28:54.000000000 +0100
+++ configure.ac 2011-01-23 09:24:11.877867627 +0100
@@ -79,17 +79,26 @@
fi
AM_CONDITIONAL(COMPILE_LIBLIGHTDM_QT, test x"$compile_liblightdm_qt" != "xno")
-PKG_CHECK_MODULES(LIGHTDM_GTK_GREETER, [
- gtk+-2.0
- dbus-glib-1
-], have_gtk=yes, have_gtk=no)
+AC_ARG_ENABLE([liblightdm-gtk],
+ AS_HELP_STRING([--enable-liblightdm-gtk],[Enable LightDM client GTK libraries [[default=no]]]))
+AS_IF([test "x$enable_liblightdm_gtk" = "xyes"], [
+ PKG_CHECK_MODULES(LIGHTDM_GTK_GREETER, [
+ gtk+-2.0
+ dbus-glib-1
+ ], have_gtk=yes, have_gtk=no)
+ ], [have_gtk=no])
AM_CONDITIONAL(HAVE_GTK_GREETER, test $have_gtk = yes)
-PKG_CHECK_MODULES(LIGHTDM_WEBKIT_GREETER, [
- gtk+-2.0
- webkit-1.0
- dbus-glib-1
-], have_webkit=yes, have_webkit=no)
+
+AC_ARG_ENABLE([liblightdm-webkit],
+ AS_HELP_STRING([--enable-liblightdm-webkit],[Enable LightDM client WebKit libraries [[default=no]]]))
+AS_IF([test "x$enable_liblightdm_webkit" = "xyes"], [
+ PKG_CHECK_MODULES(LIGHTDM_WEBKIT_GREETER, [
+ gtk+-2.0
+ webkit-1.0
+ dbus-glib-1
+ ], have_webkit=yes, have_webkit=no)
+ ], [have_webkit=no])
AM_CONDITIONAL(HAVE_WEBKIT_GREETER, test $have_webkit = yes)
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
--- Makefile.am.orig 2011-01-23 09:30:17.525273218 +0100
+++ Makefile.am 2011-01-23 09:30:25.716834495 +0100
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
SUBDIRS =
if COMPILE_LIBLIGHTDM_GOBJECT
SUBDIRS += liblightdm-gobject
|
GitWeb
