diff options
Diffstat (limited to 'lib/libXcursor')
| -rw-r--r-- | lib/libXcursor/aclocal.m4 | 48 | ||||
| -rw-r--r-- | lib/libXcursor/configure | 60 | ||||
| -rw-r--r-- | lib/libXcursor/ltmain.sh | 20 |
3 files changed, 93 insertions, 35 deletions
diff --git a/lib/libXcursor/aclocal.m4 b/lib/libXcursor/aclocal.m4 index 8517bc99e..c5cda24fd 100644 --- a/lib/libXcursor/aclocal.m4 +++ b/lib/libXcursor/aclocal.m4 @@ -6429,7 +6429,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_ifval([$1], [$1], [0.9.0]) + _pkg_min_version=m4_default([$1], [0.9.0]) AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then AC_MSG_RESULT([yes]) @@ -6465,14 +6465,30 @@ fi]) # --------------------------------------------- m4_define([_PKG_CONFIG], [if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else PKG_CHECK_EXISTS([$3], [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], [pkg_failed=yes]) + fi else pkg_failed=untried fi[]dnl ])# _PKG_CONFIG +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], # [ACTION-IF-NOT-FOUND]) # @@ -6494,29 +6510,39 @@ AC_MSG_CHECKING([for $1]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + if test $pkg_failed = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ifelse([$4], , [AC_MSG_ERROR(dnl -[Package requirements ($2) were not met. +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables -to avoid the need to call pkg-config. See the pkg-config man page for -more details.])], - [$4]) +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) elif test $pkg_failed = untried; then ifelse([$4], , [AC_MSG_FAILURE(dnl [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables -to avoid the need to call pkg-config. See the pkg-config man page for -more details. +_PKG_TEXT To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], [$4]) diff --git a/lib/libXcursor/configure b/lib/libXcursor/configure index ccfdea151..6ef87fccc 100644 --- a/lib/libXcursor/configure +++ b/lib/libXcursor/configure @@ -18740,6 +18740,9 @@ echo "$as_me:$LINENO: checking for XCURSOR" >&5 echo $ECHO_N "checking for XCURSOR... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then + if test -n "$XCURSOR_CFLAGS"; then + pkg_cv_XCURSOR_CFLAGS="$XCURSOR_CFLAGS" + else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrender >= 0.8.2 xfixes x11 fixesproto\"") >&5 ($PKG_CONFIG --exists --print-errors "xrender >= 0.8.2 xfixes x11 fixesproto") 2>&5 @@ -18750,10 +18753,14 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi + fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then + if test -n "$XCURSOR_LIBS"; then + pkg_cv_XCURSOR_LIBS="$XCURSOR_LIBS" + else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrender >= 0.8.2 xfixes x11 fixesproto\"") >&5 ($PKG_CONFIG --exists --print-errors "xrender >= 0.8.2 xfixes x11 fixesproto") 2>&5 @@ -18764,38 +18771,59 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi + fi else pkg_failed=untried fi + + if test $pkg_failed = yes; then - XCURSOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrender >= 0.8.2 xfixes x11 fixesproto"` + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + XCURSOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xrender >= 0.8.2 xfixes x11 fixesproto"` + else + XCURSOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrender >= 0.8.2 xfixes x11 fixesproto"` + fi # Put the nasty error message in config.log where it belongs - echo "$XCURSOR_PKG_ERRORS" 1>&5 + echo "$XCURSOR_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (xrender >= 0.8.2 xfixes x11 fixesproto) were not met: + +$XCURSOR_PKG_ERRORS - { { echo "$as_me:$LINENO: error: Package requirements (xrender >= 0.8.2 xfixes x11 fixesproto) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively you may set the XCURSOR_CFLAGS and XCURSOR_LIBS environment variables -to avoid the need to call pkg-config. See the pkg-config man page for -more details." >&5 -echo "$as_me: error: Package requirements (xrender >= 0.8.2 xfixes x11 fixesproto) were not met. +Alternatively, you may set the environment variables XCURSOR_CFLAGS +and XCURSOR_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (xrender >= 0.8.2 xfixes x11 fixesproto) were not met: + +$XCURSOR_PKG_ERRORS + Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively you may set the XCURSOR_CFLAGS and XCURSOR_LIBS environment variables -to avoid the need to call pkg-config. See the pkg-config man page for -more details." >&2;} +Alternatively, you may set the environment variables XCURSOR_CFLAGS +and XCURSOR_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively you may set the XCURSOR_CFLAGS and XCURSOR_LIBS environment variables -to avoid the need to call pkg-config. See the pkg-config man page for -more details. +Alternatively, you may set the environment variables XCURSOR_CFLAGS +and XCURSOR_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -18803,9 +18831,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively you may set the XCURSOR_CFLAGS and XCURSOR_LIBS environment variables -to avoid the need to call pkg-config. See the pkg-config man page for -more details. +Alternatively, you may set the environment variables XCURSOR_CFLAGS +and XCURSOR_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} diff --git a/lib/libXcursor/ltmain.sh b/lib/libXcursor/ltmain.sh index ef5ee686b..25f21fea7 100644 --- a/lib/libXcursor/ltmain.sh +++ b/lib/libXcursor/ltmain.sh @@ -5822,6 +5822,10 @@ relink_command=\"$relink_command\"" esac install_prog="$install_prog $arg" done + case " $install_prog " in + *[\\\ /]cp\ *) extra_mode=;; + *) extra_mode='-m 644';; + esac if test -z "$install_prog"; then $echo "$modename: you must specify an install program" 1>&2 @@ -5976,8 +5980,8 @@ relink_command=\"$relink_command\"" test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. - $show "$install_prog $dir/$srcname $destdir/$realname" - $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? + $show "$install_prog $extra_mode $dir/$srcname $destdir/$realname" + $run eval "$install_prog $extra_mode $dir/$srcname $destdir/$realname" || exit $? if test -n "$stripme" && test -n "$striplib"; then $show "$striplib $destdir/$realname" $run eval "$striplib $destdir/$realname" || exit $? @@ -6022,8 +6026,8 @@ relink_command=\"$relink_command\"" # Install the pseudo-library for information purposes. name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? + $show "$install_prog $extra_mode $instname $destdir/$name" + $run eval "$install_prog $extra_mode $instname $destdir/$name" || exit $? # Maybe install the static library, too. test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" @@ -6058,8 +6062,8 @@ relink_command=\"$relink_command\"" # Install the libtool object if requested. if test -n "$destfile"; then - $show "$install_prog $file $destfile" - $run eval "$install_prog $file $destfile" || exit $? + $show "$install_prog $extra_mode $file $destfile" + $run eval "$install_prog $extra_mode $file $destfile" || exit $? fi # Install the old object if enabled. @@ -6067,8 +6071,8 @@ relink_command=\"$relink_command\"" # Deduce the name of the old-style object file. staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? + $show "$install_prog $extra_mode $staticobj $staticdest" + $run eval "$install_prog $extra_mode \$staticobj \$staticdest" || exit $? fi exit $EXIT_SUCCESS ;; |