diff options
Diffstat (limited to 'lib/libXcursor')
| -rw-r--r-- | lib/libXcursor/Makefile.in | 1 | ||||
| -rw-r--r-- | lib/libXcursor/configure | 32 | ||||
| -rw-r--r-- | lib/libXcursor/man/Makefile.in | 70 | ||||
| -rw-r--r-- | lib/libXcursor/src/Makefile.in | 1 |
4 files changed, 86 insertions, 18 deletions
diff --git a/lib/libXcursor/Makefile.in b/lib/libXcursor/Makefile.in index ede89f91a..196dbc190 100644 --- a/lib/libXcursor/Makefile.in +++ b/lib/libXcursor/Makefile.in @@ -180,6 +180,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ XCURSORPATH = @XCURSORPATH@ +XCURSORPATH_LIST = @XCURSORPATH_LIST@ XCURSOR_CFLAGS = @XCURSOR_CFLAGS@ XCURSOR_LIBS = @XCURSOR_LIBS@ ac_ct_AR = @ac_ct_AR@ diff --git a/lib/libXcursor/configure b/lib/libXcursor/configure index 6ef87fccc..a86753eeb 100644 --- a/lib/libXcursor/configure +++ b/lib/libXcursor/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for libXcursor 1.1.8. +# Generated by GNU Autoconf 2.59 for libXcursor 1.1.9. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libXcursor' PACKAGE_TARNAME='libXcursor' -PACKAGE_VERSION='1.1.8' -PACKAGE_STRING='libXcursor 1.1.8' +PACKAGE_VERSION='1.1.9' +PACKAGE_STRING='libXcursor 1.1.9' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -465,7 +465,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ICONDIR XCURSORPATH PKG_CONFIG ac_pt_PKG_CONFIG XCURSOR_CFLAGS XCURSOR_LIBS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LINT LINT_FLAGS LINT_TRUE LINT_FALSE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ICONDIR XCURSORPATH XCURSORPATH_LIST PKG_CONFIG ac_pt_PKG_CONFIG XCURSOR_CFLAGS XCURSOR_LIBS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LINT LINT_FLAGS LINT_TRUE LINT_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -966,7 +966,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libXcursor 1.1.8 to adapt to many kinds of systems. +\`configure' configures libXcursor 1.1.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1032,7 +1032,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXcursor 1.1.8:";; + short | recursive ) echo "Configuration of libXcursor 1.1.9:";; esac cat <<\_ACEOF @@ -1186,7 +1186,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -libXcursor configure 1.1.8 +libXcursor configure 1.1.9 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1200,7 +1200,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libXcursor $as_me 1.1.8, which was +It was created by libXcursor $as_me 1.1.9, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1843,7 +1843,7 @@ fi # Define the identity of the package. PACKAGE='libXcursor' - VERSION='1.1.8' + VERSION='1.1.9' cat >>confdefs.h <<_ACEOF @@ -18617,7 +18617,10 @@ else fi; -DEF_CURSORPATH="~/.icons:${datadir}/icons:${datadir}/pixmaps:$ICONDIR" +DEF_CURSORPATH="~/.icons:${datadir}/icons:${datadir}/pixmaps" +if test "x${ICONDIR}" != "x${datadir}/icons"; then + DEF_CURSORPATH="${DEF_CURSORPATH}:${ICONDIR}" +fi # Check whether --with-cursorpath or --without-cursorpath was given. if test "${with_cursorpath+set}" = set; then @@ -18628,6 +18631,10 @@ else fi; +# Reformat cursor path for man page +XCURSORPATH_LIST=`echo $XCURSORPATH | sed 's/:/, /g'` + + # Check for X @@ -19406,7 +19413,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by libXcursor $as_me 1.1.8, which was +This file was extended by libXcursor $as_me 1.1.9, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19469,7 +19476,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libXcursor config.status 1.1.8 +libXcursor config.status 1.1.9 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -19740,6 +19747,7 @@ s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@ICONDIR@,$ICONDIR,;t t s,@XCURSORPATH@,$XCURSORPATH,;t t +s,@XCURSORPATH_LIST@,$XCURSORPATH_LIST,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@XCURSOR_CFLAGS@,$XCURSOR_CFLAGS,;t t diff --git a/lib/libXcursor/man/Makefile.in b/lib/libXcursor/man/Makefile.in index 8a810f42f..acc09be7e 100644 --- a/lib/libXcursor/man/Makefile.in +++ b/lib/libXcursor/man/Makefile.in @@ -132,6 +132,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ XCURSORPATH = @XCURSORPATH@ +XCURSORPATH_LIST = @XCURSORPATH_LIST@ XCURSOR_CFLAGS = @XCURSOR_CFLAGS@ XCURSOR_LIBS = @XCURSOR_LIBS@ ac_ct_AR = @ac_ct_AR@ @@ -180,14 +181,62 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ libmandir = $(LIB_MAN_DIR) libman_PRE = Xcursor.man -libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) +libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ + $(Xcursor_shadows:=.@LIB_MAN_SUFFIX@) EXTRA_DIST = $(libman_PRE) -CLEANFILES = $(libman_DATA) +CLEANFILES = $(libman_DATA) shadows.DONE SUFFIXES = .$(LIB_MAN_SUFFIX) .man # Strings to replace in man pages XORGRELSTRING = @PACKAGE_STRING@ -all: all-am +MAN_SUBSTS = \ + -e 's|__xorgversion__|"$(XORGRELSTRING)"|' \ + -e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g' \ + -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ + -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ + -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ + -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ + -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' + + +# Generate man page shadow files +LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) +BUILT_SOURCES = shadows.DONE +Xcursor_shadows = \ + XcursorImageCreate \ + XcursorImageDestroy \ + XcursorImagesCreate \ + XcursorImagesDestroy \ + XcursorCursorsCreate \ + XcursorCursorsDestroy \ + XcursorXcFileLoadImage \ + XcursorXcFileLoadImages \ + XcursorXcFileLoadAllImages \ + XcursorXcFileLoad \ + XcursorXcFileSave \ + XcursorFilenameLoadImage \ + XcursorFilenameLoadImages \ + XcursorFilenameLoadAllImages \ + XcursorFilenameLoad \ + XcursorFilenameSaveImages \ + XcursorFilenameSave \ + XcursorLibraryLoadImage \ + XcursorLibraryLoadImages \ + XcursorFilenameLoadCursor \ + XcursorLibraryLoadCursor \ + XcursorLibraryLoadCursors \ + XcursorShapeLoadImage \ + XcursorShapeLoadImages \ + XcursorShapeLoadCursor \ + XcursorShapeLoadCursors \ + XcursorSupportsARGB \ + XcursorSetDefaultSize \ + XcursorGetDefaultSize \ + XcursorSetTheme \ + XcursorGetTheme + +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .$(LIB_MAN_SUFFIX) .man @@ -282,13 +331,15 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am -check: check-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(DATA) all-local installdirs: for dir in "$(DESTDIR)$(libmandir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -313,6 +364,7 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am @@ -375,7 +427,13 @@ all-local: $(libman_DATA) .man.$(LIB_MAN_SUFFIX): -rm -f $@ - sed 's/__xorgversion__/"$(XORGRELSTRING)"/; s/__LIB_MAN_SUFFIX__/$(LIB_MAN_SUFFIX)/; s%__prefix__%$(prefix)%g; s%__ICONDIR__%$(ICONDIR)%g' < $< > $@ + sed $(MAN_SUBSTS) < $< > $@ + +shadows.DONE: + -rm -f $(Xcursor_shadows:=.@LIB_MAN_SUFFIX@) + (for i in $(Xcursor_shadows:=.@LIB_MAN_SUFFIX@) ; do \ + echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcursor.$(LIB_MAN_SUFFIX) > $$i; \ + done) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lib/libXcursor/src/Makefile.in b/lib/libXcursor/src/Makefile.in index f2037fc22..310283cf8 100644 --- a/lib/libXcursor/src/Makefile.in +++ b/lib/libXcursor/src/Makefile.in @@ -155,6 +155,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ XCURSORPATH = @XCURSORPATH@ +XCURSORPATH_LIST = @XCURSORPATH_LIST@ XCURSOR_CFLAGS = @XCURSOR_CFLAGS@ XCURSOR_LIBS = @XCURSOR_LIBS@ ac_ct_AR = @ac_ct_AR@ |