Added Matthew Garrett's hal-setup.patchrelease-0.8.3-1

2 files changed, 15 insertions, 5 deletions

diff --git a/configure.in b/configure.in
index 3601d69..33de1a4 100644
--- a/configure.in
+++ b/configure.in
@@ -30,6 +30,17 @@ dnl Configuration
 WCM_MODVER=
 WCM_ENV_XFREE86=no
 WCM_ENV_XORGSDK=no
+WCM_XDRIVER_QUIRKS=
+
+#dnl Check for HAL
+have_hal=no
+PKG_CHECK_MODULES(HAL, hal >= 0.5.0, have_hal=yes, have_hal=no)
+if test "x$have_hal" = "xyes"; then
+	AC_SUBST([HAL_CFLAGS])
+	AC_SUBST([HAL_LIBS])
+	WCM_XDRIVER_QUIRKS="$WCM_XDRIVER_QUIRKS hal"
+fi
+AM_CONDITIONAL(WCM_HAVE_HAL, test "x$have_hal" = "xyes")
 
 dnl Setup paths based on configuration parameters
 WCM_PREFIX=$prefix
@@ -271,7 +282,6 @@ if test "$WCM_ENV_XLIB" = yes; then
 fi
 
 dnl =======================================================
-WCM_XDRIVER_QUIRKS=
 dnl Check for XFree86 source or X.org SDK
 test -d "x-include" && WCM_XFREE86_DIR="x-include"
 AC_ARG_WITH(x-src,
@@ -338,10 +348,6 @@ else
 	AM_CONDITIONAL(WCM_ENV_XFREE86, false)
 fi
 
-PKG_CHECK_MODULES(HAL, [hal])
-AC_SUBST([HAL_CFLAGS])
-AC_SUBST([HAL_LIBS])
-
 dnl Check for X.org SDK
 if test "$WCM_ENV_XFREE86" != yes; then
 	AC_ARG_WITH(xorg-sdk,
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 75afb8a..e8dbbc0 100755
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -18,7 +18,9 @@ AM_CFLAGS = -Wall -pedantic $(WACOMCFG_INCLUDES)
 # potentially be built or installed depending on the results of
 # the configuration.
 EXTRA_PROGRAMS = wacdump xidump xsetwacom 
+if WCM_HAVE_HAL
 libexec_PROGRAMS = hal-setup-wacom
+endif
 
 # Source dependencies
 wacdump_SOURCES = wacdump.c wacscrn.c wacscrn.h \
@@ -42,7 +44,9 @@ libwacomcfg_la_LIBADD = @WCM_LIBWACOMCFG_LIBS@
 xsetwacom_SOURCES = xsetwacom.c wacomcfg.h wcmAction.c wcmAction.h ../include/Xwacom.h
 xsetwacom_LDADD = libwacomcfg.la
 
+if WCM_HAVE_HAL
 hal_setup_wacom_SOURCES = hal-setup-wacom.c
 hal_setup_wacom_LDADD = $(HAL_LIBS)
+endif