diff options
| author | Uli Schlachter <uli.schlachter@informatik.uni-oldenburg.de> | 2016-05-10 12:01:47 +0200 |
|---|---|---|
| committer | Michael Stapelberg <michael@stapelberg.de> | 2016-05-12 09:52:05 +0200 |
| commit | 085606514a37726b2527d646cd022e06b1fb0d79 (patch) | |
| tree | 2884c54aa6d915f5171a14e371db8b9620ee86ef | |
| parent | 8eb844d39a06f42019dede515c70e7a0b155357d (diff) | |
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@informatik.uni-oldenburg.de>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | cursor/load_cursor.c | 2 |
2 files changed, 9 insertions, 1 deletions
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; } |