Add configure options to allow hard-coded paths to be changed.

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:

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])

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