mirror of https://github.com/encounter/SDL.git
regenerated test/configure
This commit is contained in:
parent
c57bcb47b1
commit
7ac0c73af2
|
@ -584,6 +584,8 @@ PACKAGE_URL=
|
||||||
ac_unique_file="loopwave.c"
|
ac_unique_file="loopwave.c"
|
||||||
ac_subst_vars='LTLIBOBJS
|
ac_subst_vars='LTLIBOBJS
|
||||||
LIBOBJS
|
LIBOBJS
|
||||||
|
libunwind_LIBS
|
||||||
|
libunwind_CFLAGS
|
||||||
SDL_TTF_LIB
|
SDL_TTF_LIB
|
||||||
XLIB
|
XLIB
|
||||||
GLES2LIB
|
GLES2LIB
|
||||||
|
@ -681,7 +683,9 @@ PKG_CONFIG_LIBDIR
|
||||||
SDL_CFLAGS
|
SDL_CFLAGS
|
||||||
SDL_LIBS
|
SDL_LIBS
|
||||||
XMKMF
|
XMKMF
|
||||||
CPP'
|
CPP
|
||||||
|
libunwind_CFLAGS
|
||||||
|
libunwind_LIBS'
|
||||||
|
|
||||||
|
|
||||||
# Initialize some variables set by options.
|
# Initialize some variables set by options.
|
||||||
|
@ -1323,6 +1327,10 @@ Some influential environment variables:
|
||||||
SDL_LIBS linker flags for SDL, overriding pkg-config
|
SDL_LIBS linker flags for SDL, overriding pkg-config
|
||||||
XMKMF Path to xmkmf, Makefile generator for X Window System
|
XMKMF Path to xmkmf, Makefile generator for X Window System
|
||||||
CPP C preprocessor
|
CPP C preprocessor
|
||||||
|
libunwind_CFLAGS
|
||||||
|
C compiler flags for libunwind, overriding pkg-config
|
||||||
|
libunwind_LIBS
|
||||||
|
linker flags for libunwind, overriding pkg-config
|
||||||
|
|
||||||
Use these variables to override the choices made by `configure' or to help
|
Use these variables to override the choices made by `configure' or to help
|
||||||
it to find libraries and programs with nonstandard names/locations.
|
it to find libraries and programs with nonstandard names/locations.
|
||||||
|
@ -4020,6 +4028,96 @@ if test x$have_SDL_ttf = xyes; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
pkg_failed=no
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libunwind" >&5
|
||||||
|
$as_echo_n "checking for libunwind... " >&6; }
|
||||||
|
|
||||||
|
if test -n "$libunwind_CFLAGS"; then
|
||||||
|
pkg_cv_libunwind_CFLAGS="$libunwind_CFLAGS"
|
||||||
|
elif test -n "$PKG_CONFIG"; then
|
||||||
|
if test -n "$PKG_CONFIG" && \
|
||||||
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunwind\""; } >&5
|
||||||
|
($PKG_CONFIG --exists --print-errors "libunwind") 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||||
|
test $ac_status = 0; }; then
|
||||||
|
pkg_cv_libunwind_CFLAGS=`$PKG_CONFIG --cflags "libunwind" 2>/dev/null`
|
||||||
|
else
|
||||||
|
pkg_failed=yes
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
pkg_failed=untried
|
||||||
|
fi
|
||||||
|
if test -n "$libunwind_LIBS"; then
|
||||||
|
pkg_cv_libunwind_LIBS="$libunwind_LIBS"
|
||||||
|
elif test -n "$PKG_CONFIG"; then
|
||||||
|
if test -n "$PKG_CONFIG" && \
|
||||||
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunwind\""; } >&5
|
||||||
|
($PKG_CONFIG --exists --print-errors "libunwind") 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||||
|
test $ac_status = 0; }; then
|
||||||
|
pkg_cv_libunwind_LIBS=`$PKG_CONFIG --libs "libunwind" 2>/dev/null`
|
||||||
|
else
|
||||||
|
pkg_failed=yes
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
pkg_failed=untried
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if test $pkg_failed = yes; then
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||||
|
$as_echo "no" >&6; }
|
||||||
|
|
||||||
|
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
|
||||||
|
libunwind_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libunwind" 2>&1`
|
||||||
|
else
|
||||||
|
libunwind_PKG_ERRORS=`$PKG_CONFIG --print-errors "libunwind" 2>&1`
|
||||||
|
fi
|
||||||
|
# Put the nasty error message in config.log where it belongs
|
||||||
|
echo "$libunwind_PKG_ERRORS" >&5
|
||||||
|
|
||||||
|
as_fn_error $? "Package requirements (libunwind) were not met:
|
||||||
|
|
||||||
|
$libunwind_PKG_ERRORS
|
||||||
|
|
||||||
|
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||||
|
installed software in a non-standard prefix.
|
||||||
|
|
||||||
|
Alternatively, you may set the environment variables libunwind_CFLAGS
|
||||||
|
and libunwind_LIBS to avoid the need to call pkg-config.
|
||||||
|
See the pkg-config man page for more details." "$LINENO" 5
|
||||||
|
elif test $pkg_failed = untried; then
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||||
|
$as_echo "no" >&6; }
|
||||||
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||||
|
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||||
|
as_fn_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 environment variables libunwind_CFLAGS
|
||||||
|
and libunwind_LIBS to avoid the need to call pkg-config.
|
||||||
|
See the pkg-config man page for more details.
|
||||||
|
|
||||||
|
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
|
||||||
|
See \`config.log' for more details" "$LINENO" 5; }
|
||||||
|
else
|
||||||
|
libunwind_CFLAGS=$pkg_cv_libunwind_CFLAGS
|
||||||
|
libunwind_LIBS=$pkg_cv_libunwind_LIBS
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||||
|
$as_echo "yes" >&6; }
|
||||||
|
LIBS="$LIBS $libunwind_LIBS"
|
||||||
|
fi
|
||||||
|
|
||||||
ac_config_files="$ac_config_files Makefile"
|
ac_config_files="$ac_config_files Makefile"
|
||||||
|
|
||||||
cat >confcache <<\_ACEOF
|
cat >confcache <<\_ACEOF
|
||||||
|
|
Loading…
Reference in New Issue