diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-08 17:55:19 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-08 17:55:19 +0000 |
| commit | 189c9672264c4b62f18f9da9422375b216dc7037 (patch) | |
| tree | e9aeed52889d643601f5d70abb0524575cf26a7b | |
| parent | b8c92a26d01b14cb9d27cd30d261e24833d0c728 (diff) | |
| download | xorg-lib-libXcursor-189c9672264c4b62f18f9da9422375b216dc7037.tar.gz | |
Add configure options to allow hard-coded paths to be changed.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | src/Makefile.am | 6 |
3 files changed, 26 insertions, 1 deletions
@@ -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 |