[PATCH wayland] wayland-cursor: add an option that changes the cursor theme directory

[Kristian Høgsberg]

On Fri, Jun 08, 2012 at 11:58:02AM +0300, Ander Conselvan de Oliveira wrote:
> Some distros (e.g. gentoo) install cursor themes in non-standard
> directories. Add option --with-icondir to configure.sh that sets the
> directory in which to look for cursors.

Thanks, that makes sense.
Kristian

> ---
>  configure.ac       |    5 +++++
>  cursor/Makefile.am |    6 +++++-
>  2 files changed, 10 insertions(+), 1 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index a682c9a..d78a82d 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -55,6 +55,11 @@ AC_ARG_ENABLE([documentation],
>  
>  AM_CONDITIONAL(ENABLE_SCANNER, test "x$enable_scanner" = xyes)
>  
> +AC_ARG_WITH(icondir, [  --with-icondir=<dir>    Look for cursor icons here],
> +		     [  ICONDIR=$withval],
> +		     [  ICONDIR=${datadir}/icons])
> +AC_SUBST([ICONDIR])
> +
>  EXPAT_LIB=""
>  AC_ARG_WITH(expat, [  --with-expat=<dir>      Use expat from here],
>  		   [ expat=$withval
> diff --git a/cursor/Makefile.am b/cursor/Makefile.am
> index 168f5dc..3efcb17 100644
> --- a/cursor/Makefile.am
> +++ b/cursor/Makefile.am
> @@ -11,4 +11,8 @@ libwayland_cursor_la_LIBADD = $(top_builddir)/src/libwayland-client.la
>  pkgconfigdir = $(libdir)/pkgconfig
>  pkgconfig_DATA = wayland-cursor.pc
>  
> -AM_CFLAGS = $(GCC_CFLAGS) -I$(top_builddir)/src -I$(top_srcdir)/src
> +AM_CFLAGS = \
> +	$(GCC_CFLAGS) \
> +	-I$(top_builddir)/src \
> +	-I$(top_srcdir)/src \
> +	-DICONDIR=\"$(ICONDIR)\"
> -- 
> 1.7.4.1
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel