diff options
author | Christophe Fergeau <cfergeau@redhat.com> | 2012-01-24 14:43:16 +0100 |
---|---|---|
committer | Christophe Fergeau <cfergeau@redhat.com> | 2012-01-24 18:03:14 +0100 |
commit | a0022c4442eb4e5e6cff1e268d444a24a76ecc1d (patch) | |
tree | 798d68cda193ead1ba96c0b8a3c722e516380ff5 /gtk | |
parent | 5e5064c48263fbd18eea799693db618a33d37aa5 (diff) |
Autodetect usbredir and PolicyKit by default
Currently, usb redirection and policykit are enabled by default,
and configure will error out if the required dependencies cannot
be found. This commit changes the default behaviour, by default
usb redirection/policykit support is automatically enabled/disabled
depending on the availability of the needed dependencies. Passing
--enable-usbredir will error out if the dependencies for usb
redirection cannot be found, ditto for policykit. This should make
things nicer for people running configure or autogen.sh with no
argument.
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/Makefile.am | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 043e48f..6f39888 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -78,9 +78,7 @@ SPICE_COMMON_CPPFLAGS = \ $(SASL_CFLAGS) \ $(GST_CFLAGS) \ $(SMARTCARD_CFLAGS) \ - $(GUDEV_CFLAGS) \ - $(LIBUSB_CFLAGS) \ - $(LIBUSBREDIRHOST_CFLAGS) \ + $(USBREDIR_CFLAGS) \ $(NULL) AM_CPPFLAGS = \ @@ -170,9 +168,7 @@ libspice_client_glib_2_0_la_LIBADD = \ $(GST_LIBS) \ $(SASL_LIBS) \ $(SMARTCARD_LIBS) \ - $(GUDEV_LIBS) \ - $(LIBUSB_LIBS) \ - $(LIBUSBREDIRHOST_LIBS) \ + $(USBREDIR_LIBS) \ $(NULL) if WITH_POLKIT |