summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac15
-rw-r--r--src/Makefile.am6
3 files changed, 26 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b60c33..3735f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ * src/Makefile.am:
+ Add configure options to allow hard-coded paths to be changed.
+
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
* man/Makefile.am:
diff --git a/configure.ac b/configure.ac
index db5b40b..964a56d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,21 @@ AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_LIBTOOL
+AC_ARG_WITH(icondir,
+ AC_HELP_STRING([--with-icondir=<path>],
+ [Set default icon directory (default: ${datadir}/icons)]),
+ [ICONDIR="$withval"],
+ [ICONDIR=${datadir}/icons])
+AC_SUBST([ICONDIR])
+
+DEF_CURSORPATH="~/.icons:/usr/share/icons:/usr/share/pixmaps:$ICONDIR"
+AC_ARG_WITH(cursorpath,
+ AC_HELP_STRING([--with-cursorpath=<paths>],
+ [Set default search path for cursors]),
+ [XCURSORPATH="$withval"],
+ [XCURSORPATH=$DEF_CURSORPATH])
+AC_SUBST([XCURSORPATH])
+
# Check for X
PKG_CHECK_MODULES(XCURSOR, xrender >= 0.8.2 xfixes x11 fixesproto)
AC_DEFINE(HAVE_XFIXES, 1, [Define to 1 if you have Xfixes])
diff --git a/src/Makefile.am b/src/Makefile.am
index aff4521..d52a0f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,12 @@ lib_LTLIBRARIES = libXcursor.la
libXcursor_la_SOURCES = xcursorint.h cursor.c display.c file.c library.c xlib.c
+ICONDIR=@ICONDIR@
+XCURSORPATH=@XCURSORPATH@
+
libXcursor_la_LIBADD = $(XCURSOR_LIBS)
-AM_CFLAGS = $(XCURSOR_CFLAGS)
+AM_CFLAGS = $(XCURSOR_CFLAGS) \
+ -DICONDIR=\"$(ICONDIR)\" -DXCURSORPATH=\"$(XCURSORPATH)\"
INCLUDES = -I$(top_srcdir)/include/X11/Xcursor