[Xcb-commit] xcb/util-cursor: 2 commits - NEWS configure.ac cursor

[Michael Stapelberg]

 NEWS                 |    5 +++++
 configure.ac         |   10 +++++++++-
 cursor/load_cursor.c |    2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 95b9a8fd876fdbbc854cdf3d90317be3846c7417
Author: Michael Stapelberg <michael at stapelberg.de>
Date:   Thu May 12 09:53:03 2016 +0200

    set version to 0.1.3

diff --git a/NEWS b/NEWS
index 5de201d..ec111be 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Release 0.1.3  (2016-05-12)
+===========================
+
+- Add a --with-cursorpath option to configure
+
 Release 0.1.2  (2015-03-35)
 ===========================
 
diff --git a/configure.ac b/configure.ac
index 44ed10d..828a1bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl XCB_UTIL_M4_WITH_INCLUDE_PATH requires Autoconf >= 2.62
 AC_PREREQ(2.62)
-AC_INIT([xcb-util-cursor],0.1.2,[xcb at lists.freedesktop.org])
+AC_INIT([xcb-util-cursor],0.1.3,[xcb at lists.freedesktop.org])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 
commit 085606514a37726b2527d646cd022e06b1fb0d79
Author: Uli Schlachter <uli.schlachter at informatik.uni-oldenburg.de>
Date:   Tue May 10 12:01:47 2016 +0200

    Add a --with-cursorpath option to configure
    
    This works (hopefully) the same way as the same option does for libXcursor.
    
    Signed-off-by: Uli Schlachter <uli.schlachter at informatik.uni-oldenburg.de>

diff --git a/configure.ac b/configure.ac
index 89efe39..44ed10d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,14 @@ PKG_CHECK_MODULES(XCB_RENDER, xcb-render)
 PKG_CHECK_MODULES(XCB_RENDERUTIL, xcb-renderutil)
 PKG_CHECK_MODULES(XCB_IMAGE, xcb-image)
 
+DEF_CURSORPATH="~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons"
+AC_ARG_WITH(cursorpath,
+	AS_HELP_STRING([--with-cursorpath=<paths>],
+		[Set default search path for cursors]),
+	[XCURSORPATH="$withval"],
+	[XCURSORPATH="$DEF_CURSORPATH"])
+AC_DEFINE_UNQUOTED([XCURSORPATH], ["$XCURSORPATH"])
+
 AC_OUTPUT([Makefile
 	cursor/Makefile cursor/xcb-cursor.pc
 	xcb_util_intro
diff --git a/cursor/load_cursor.c b/cursor/load_cursor.c
index 53da009..e82fc63 100644
--- a/cursor/load_cursor.c
+++ b/cursor/load_cursor.c
@@ -48,7 +48,7 @@ static const char *cursor_path(struct xcb_cursor_context_t *c) {
     if (c->path == NULL) {
         c->path = getenv("XCURSOR_PATH");
         if (c->path == NULL)
-            c->path = "~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons";
+            c->path = XCURSORPATH;
     }
     return c->path;
 }