mirror of
https://github.com/openbsd/xenocara.git
synced 2025-12-09 18:59:00 +00:00
regen with libtool 1.5.22p10 and metaauto 0.7
This commit is contained in:
matthieu
48
lib/libXpm/aclocal.m4
vendored
48
lib/libXpm/aclocal.m4
vendored
@@ -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])
|
||||
|
||||
92
lib/libXpm/configure
vendored
92
lib/libXpm/configure
vendored
@@ -19538,6 +19538,9 @@ echo "$as_me:$LINENO: checking for XPM" >&5
|
||||
echo $ECHO_N "checking for XPM... $ECHO_C" >&6
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$XPM_CFLAGS"; then
|
||||
pkg_cv_XPM_CFLAGS="$XPM_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto x11\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xproto x11") 2>&5
|
||||
@@ -19548,10 +19551,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 "$XPM_LIBS"; then
|
||||
pkg_cv_XPM_LIBS="$XPM_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto x11\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xproto x11") 2>&5
|
||||
@@ -19562,38 +19569,59 @@ if test -n "$PKG_CONFIG"; then
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
XPM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto x11"`
|
||||
|
||||
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
|
||||
XPM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto x11"`
|
||||
else
|
||||
XPM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto x11"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$XPM_PKG_ERRORS" 1>&5
|
||||
echo "$XPM_PKG_ERRORS" >&5
|
||||
|
||||
{ { echo "$as_me:$LINENO: error: Package requirements (xproto x11) were not met:
|
||||
|
||||
$XPM_PKG_ERRORS
|
||||
|
||||
{ { echo "$as_me:$LINENO: error: Package requirements (xproto x11) 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 XPM_CFLAGS and XPM_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 (xproto x11) were not met.
|
||||
Alternatively, you may set the environment variables XPM_CFLAGS
|
||||
and XPM_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 (xproto x11) were not met:
|
||||
|
||||
$XPM_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
Alternatively you may set the XPM_CFLAGS and XPM_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 XPM_CFLAGS
|
||||
and XPM_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 XPM_CFLAGS and XPM_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 XPM_CFLAGS
|
||||
and XPM_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
|
||||
@@ -19601,9 +19629,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 XPM_CFLAGS and XPM_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 XPM_CFLAGS
|
||||
and XPM_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;}
|
||||
@@ -19922,6 +19950,9 @@ echo "$as_me:$LINENO: checking for SXPM" >&5
|
||||
echo $ECHO_N "checking for SXPM... $ECHO_C" >&6
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$SXPM_CFLAGS"; then
|
||||
pkg_cv_SXPM_CFLAGS="$SXPM_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt xext xextproto\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xt xext xextproto") 2>&5
|
||||
@@ -19932,10 +19963,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 "$SXPM_LIBS"; then
|
||||
pkg_cv_SXPM_LIBS="$SXPM_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt xext xextproto\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xt xext xextproto") 2>&5
|
||||
@@ -19946,16 +19981,31 @@ if test -n "$PKG_CONFIG"; then
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
SXPM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xt xext xextproto"`
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$SXPM_PKG_ERRORS" 1>&5
|
||||
|
||||
build_sxpm=false
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
|
||||
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
|
||||
SXPM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xt xext xextproto"`
|
||||
else
|
||||
SXPM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xt xext xextproto"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$SXPM_PKG_ERRORS" >&5
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
build_sxpm=false
|
||||
elif test $pkg_failed = untried; then
|
||||
build_sxpm=false
|
||||
else
|
||||
|
||||
@@ -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
|
||||
;;
|
||||
|
||||
Reference in New Issue
Block a user