New upstream version 2.10.0
This commit is contained in:
Jeremy Bicha
467
configure
vendored
467
configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for GIMP 2.10.0-RC2.
|
||||
# Generated by GNU Autoconf 2.69 for GIMP 2.10.0.
|
||||
#
|
||||
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP>.
|
||||
#
|
||||
@ -591,8 +591,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='GIMP'
|
||||
PACKAGE_TARNAME='gimp'
|
||||
PACKAGE_VERSION='2.10.0-RC2'
|
||||
PACKAGE_STRING='GIMP 2.10.0-RC2'
|
||||
PACKAGE_VERSION='2.10.0'
|
||||
PACKAGE_STRING='GIMP 2.10.0'
|
||||
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@ -978,7 +978,7 @@ LIBTOOL
|
||||
OBJDUMP
|
||||
DLLTOOL
|
||||
AS
|
||||
HAVE_CXX11
|
||||
HAVE_CXX14
|
||||
am__fastdepCXX_FALSE
|
||||
am__fastdepCXX_TRUE
|
||||
CXXDEPMODE
|
||||
@ -1851,7 +1851,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 GIMP 2.10.0-RC2 to adapt to many kinds of systems.
|
||||
\`configure' configures GIMP 2.10.0 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1926,7 +1926,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of GIMP 2.10.0-RC2:";;
|
||||
short | recursive ) echo "Configuration of GIMP 2.10.0:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -2236,7 +2236,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
GIMP configure 2.10.0-RC2
|
||||
GIMP configure 2.10.0
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@ -2780,7 +2780,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by GIMP $as_me 2.10.0-RC2, which was
|
||||
It was created by GIMP $as_me 2.10.0, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -3649,7 +3649,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='gimp'
|
||||
VERSION='2.10.0-RC2'
|
||||
VERSION='2.10.0'
|
||||
|
||||
|
||||
# Some tools Automake needs.
|
||||
@ -3782,7 +3782,7 @@ GIMP_MINOR_VERSION=10
|
||||
GIMP_MICRO_VERSION=0
|
||||
GIMP_INTERFACE_AGE=0
|
||||
GIMP_BINARY_AGE=1000
|
||||
GIMP_VERSION=2.10.0-RC2
|
||||
GIMP_VERSION=2.10.0
|
||||
GIMP_REAL_VERSION=2.10.0
|
||||
GIMP_API_VERSION=2.0
|
||||
GIMP_APP_VERSION=2.10
|
||||
@ -3820,7 +3820,7 @@ GTK_REQUIRED_VERSION=2.24.10
|
||||
GTK_WIN32_RECOMMENDED_VERSION=2.24.32
|
||||
CAIRO_REQUIRED_VERSION=1.12.2
|
||||
CAIRO_PDF_REQUIRED_VERSION=1.12.2
|
||||
GEGL_REQUIRED_VERSION=0.3.34
|
||||
GEGL_REQUIRED_VERSION=0.4.0
|
||||
GEXIV2_REQUIRED_VERSION=0.10.6
|
||||
LCMS_REQUIRED_VERSION=2.8
|
||||
LIBPNG_REQUIRED_VERSION=1.6.25
|
||||
@ -6440,16 +6440,16 @@ fi
|
||||
|
||||
|
||||
|
||||
ax_cxx_compile_alternatives="11 0x" ax_cxx_compile_cxx11_required=true
|
||||
ax_cxx_compile_alternatives="14 1y" ax_cxx_compile_cxx14_required=true
|
||||
ac_ext=cpp
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
ac_success=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features by default" >&5
|
||||
$as_echo_n "checking whether $CXX supports C++11 features by default... " >&6; }
|
||||
if ${ax_cv_cxx_compile_cxx11+:} false; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features by default" >&5
|
||||
$as_echo_n "checking whether $CXX supports C++14 features by default... " >&6; }
|
||||
if ${ax_cv_cxx_compile_cxx14+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
@ -6740,26 +6740,146 @@ namespace cxx11
|
||||
|
||||
|
||||
|
||||
|
||||
// If the compiler admits that it is not ready for C++14, why torture it?
|
||||
// Hopefully, this will speed up the test.
|
||||
|
||||
#ifndef __cplusplus
|
||||
|
||||
#error "This is not a C++ compiler"
|
||||
|
||||
#elif __cplusplus < 201402L
|
||||
|
||||
#error "This is not a C++14 compiler"
|
||||
|
||||
#else
|
||||
|
||||
namespace cxx14
|
||||
{
|
||||
|
||||
namespace test_polymorphic_lambdas
|
||||
{
|
||||
|
||||
int
|
||||
test()
|
||||
{
|
||||
const auto lambda = [](auto&&... args){
|
||||
const auto istiny = [](auto x){
|
||||
return (sizeof(x) == 1UL) ? 1 : 0;
|
||||
};
|
||||
const int aretiny[] = { istiny(args)... };
|
||||
return aretiny[0];
|
||||
};
|
||||
return lambda(1, 1L, 1.0f, '1');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
namespace test_binary_literals
|
||||
{
|
||||
|
||||
constexpr auto ivii = 0b0000000000101010;
|
||||
static_assert(ivii == 42, "wrong value");
|
||||
|
||||
}
|
||||
|
||||
namespace test_generalized_constexpr
|
||||
{
|
||||
|
||||
template < typename CharT >
|
||||
constexpr unsigned long
|
||||
strlen_c(const CharT *const s) noexcept
|
||||
{
|
||||
auto length = 0UL;
|
||||
for (auto p = s; *p; ++p)
|
||||
++length;
|
||||
return length;
|
||||
}
|
||||
|
||||
static_assert(strlen_c("") == 0UL, "");
|
||||
static_assert(strlen_c("x") == 1UL, "");
|
||||
static_assert(strlen_c("test") == 4UL, "");
|
||||
static_assert(strlen_c("another\0test") == 7UL, "");
|
||||
|
||||
}
|
||||
|
||||
namespace test_lambda_init_capture
|
||||
{
|
||||
|
||||
int
|
||||
test()
|
||||
{
|
||||
auto x = 0;
|
||||
const auto lambda1 = [a = x](int b){ return a + b; };
|
||||
const auto lambda2 = [a = lambda1(x)](){ return a; };
|
||||
return lambda2();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
namespace test_digit_separators
|
||||
{
|
||||
|
||||
constexpr auto ten_million = 100'000'000;
|
||||
static_assert(ten_million == 100000000, "");
|
||||
|
||||
}
|
||||
|
||||
namespace test_return_type_deduction
|
||||
{
|
||||
|
||||
auto f(int& x) { return x; }
|
||||
decltype(auto) g(int& x) { return x; }
|
||||
|
||||
template < typename T1, typename T2 >
|
||||
struct is_same
|
||||
{
|
||||
static constexpr auto value = false;
|
||||
};
|
||||
|
||||
template < typename T >
|
||||
struct is_same<T, T>
|
||||
{
|
||||
static constexpr auto value = true;
|
||||
};
|
||||
|
||||
int
|
||||
test()
|
||||
{
|
||||
auto x = 0;
|
||||
static_assert(is_same<int, decltype(f(x))>::value, "");
|
||||
static_assert(is_same<int&, decltype(g(x))>::value, "");
|
||||
return x;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
} // namespace cxx14
|
||||
|
||||
#endif // __cplusplus >= 201402L
|
||||
|
||||
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
ax_cv_cxx_compile_cxx11=yes
|
||||
ax_cv_cxx_compile_cxx14=yes
|
||||
else
|
||||
ax_cv_cxx_compile_cxx11=no
|
||||
ax_cv_cxx_compile_cxx14=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx11" >&5
|
||||
$as_echo "$ax_cv_cxx_compile_cxx11" >&6; }
|
||||
if test x$ax_cv_cxx_compile_cxx11 = xyes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx14" >&5
|
||||
$as_echo "$ax_cv_cxx_compile_cxx14" >&6; }
|
||||
if test x$ax_cv_cxx_compile_cxx14 = xyes; then
|
||||
ac_success=yes
|
||||
fi
|
||||
|
||||
if test x$ac_success = xno; then
|
||||
for alternative in ${ax_cxx_compile_alternatives}; do
|
||||
switch="-std=gnu++${alternative}"
|
||||
cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
|
||||
$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; }
|
||||
cachevar=`$as_echo "ax_cv_cxx_compile_cxx14_$switch" | $as_tr_sh`
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features with $switch" >&5
|
||||
$as_echo_n "checking whether $CXX supports C++14 features with $switch... " >&6; }
|
||||
if eval \${$cachevar+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
@ -7053,6 +7173,126 @@ namespace cxx11
|
||||
|
||||
|
||||
|
||||
|
||||
// If the compiler admits that it is not ready for C++14, why torture it?
|
||||
// Hopefully, this will speed up the test.
|
||||
|
||||
#ifndef __cplusplus
|
||||
|
||||
#error "This is not a C++ compiler"
|
||||
|
||||
#elif __cplusplus < 201402L
|
||||
|
||||
#error "This is not a C++14 compiler"
|
||||
|
||||
#else
|
||||
|
||||
namespace cxx14
|
||||
{
|
||||
|
||||
namespace test_polymorphic_lambdas
|
||||
{
|
||||
|
||||
int
|
||||
test()
|
||||
{
|
||||
const auto lambda = [](auto&&... args){
|
||||
const auto istiny = [](auto x){
|
||||
return (sizeof(x) == 1UL) ? 1 : 0;
|
||||
};
|
||||
const int aretiny[] = { istiny(args)... };
|
||||
return aretiny[0];
|
||||
};
|
||||
return lambda(1, 1L, 1.0f, '1');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
namespace test_binary_literals
|
||||
{
|
||||
|
||||
constexpr auto ivii = 0b0000000000101010;
|
||||
static_assert(ivii == 42, "wrong value");
|
||||
|
||||
}
|
||||
|
||||
namespace test_generalized_constexpr
|
||||
{
|
||||
|
||||
template < typename CharT >
|
||||
constexpr unsigned long
|
||||
strlen_c(const CharT *const s) noexcept
|
||||
{
|
||||
auto length = 0UL;
|
||||
for (auto p = s; *p; ++p)
|
||||
++length;
|
||||
return length;
|
||||
}
|
||||
|
||||
static_assert(strlen_c("") == 0UL, "");
|
||||
static_assert(strlen_c("x") == 1UL, "");
|
||||
static_assert(strlen_c("test") == 4UL, "");
|
||||
static_assert(strlen_c("another\0test") == 7UL, "");
|
||||
|
||||
}
|
||||
|
||||
namespace test_lambda_init_capture
|
||||
{
|
||||
|
||||
int
|
||||
test()
|
||||
{
|
||||
auto x = 0;
|
||||
const auto lambda1 = [a = x](int b){ return a + b; };
|
||||
const auto lambda2 = [a = lambda1(x)](){ return a; };
|
||||
return lambda2();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
namespace test_digit_separators
|
||||
{
|
||||
|
||||
constexpr auto ten_million = 100'000'000;
|
||||
static_assert(ten_million == 100000000, "");
|
||||
|
||||
}
|
||||
|
||||
namespace test_return_type_deduction
|
||||
{
|
||||
|
||||
auto f(int& x) { return x; }
|
||||
decltype(auto) g(int& x) { return x; }
|
||||
|
||||
template < typename T1, typename T2 >
|
||||
struct is_same
|
||||
{
|
||||
static constexpr auto value = false;
|
||||
};
|
||||
|
||||
template < typename T >
|
||||
struct is_same<T, T>
|
||||
{
|
||||
static constexpr auto value = true;
|
||||
};
|
||||
|
||||
int
|
||||
test()
|
||||
{
|
||||
auto x = 0;
|
||||
static_assert(is_same<int, decltype(f(x))>::value, "");
|
||||
static_assert(is_same<int&, decltype(g(x))>::value, "");
|
||||
return x;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
} // namespace cxx14
|
||||
|
||||
#endif // __cplusplus >= 201402L
|
||||
|
||||
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
eval $cachevar=yes
|
||||
@ -7079,9 +7319,9 @@ $as_echo "$ac_res" >&6; }
|
||||
if test x$ac_success = xno; then
|
||||
for alternative in ${ax_cxx_compile_alternatives}; do
|
||||
for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
|
||||
cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
|
||||
$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; }
|
||||
cachevar=`$as_echo "ax_cv_cxx_compile_cxx14_$switch" | $as_tr_sh`
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features with $switch" >&5
|
||||
$as_echo_n "checking whether $CXX supports C++14 features with $switch... " >&6; }
|
||||
if eval \${$cachevar+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
@ -7375,6 +7615,126 @@ namespace cxx11
|
||||
|
||||
|
||||
|
||||
|
||||
// If the compiler admits that it is not ready for C++14, why torture it?
|
||||
// Hopefully, this will speed up the test.
|
||||
|
||||
#ifndef __cplusplus
|
||||
|
||||
#error "This is not a C++ compiler"
|
||||
|
||||
#elif __cplusplus < 201402L
|
||||
|
||||
#error "This is not a C++14 compiler"
|
||||
|
||||
#else
|
||||
|
||||
namespace cxx14
|
||||
{
|
||||
|
||||
namespace test_polymorphic_lambdas
|
||||
{
|
||||
|
||||
int
|
||||
test()
|
||||
{
|
||||
const auto lambda = [](auto&&... args){
|
||||
const auto istiny = [](auto x){
|
||||
return (sizeof(x) == 1UL) ? 1 : 0;
|
||||
};
|
||||
const int aretiny[] = { istiny(args)... };
|
||||
return aretiny[0];
|
||||
};
|
||||
return lambda(1, 1L, 1.0f, '1');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
namespace test_binary_literals
|
||||
{
|
||||
|
||||
constexpr auto ivii = 0b0000000000101010;
|
||||
static_assert(ivii == 42, "wrong value");
|
||||
|
||||
}
|
||||
|
||||
namespace test_generalized_constexpr
|
||||
{
|
||||
|
||||
template < typename CharT >
|
||||
constexpr unsigned long
|
||||
strlen_c(const CharT *const s) noexcept
|
||||
{
|
||||
auto length = 0UL;
|
||||
for (auto p = s; *p; ++p)
|
||||
++length;
|
||||
return length;
|
||||
}
|
||||
|
||||
static_assert(strlen_c("") == 0UL, "");
|
||||
static_assert(strlen_c("x") == 1UL, "");
|
||||
static_assert(strlen_c("test") == 4UL, "");
|
||||
static_assert(strlen_c("another\0test") == 7UL, "");
|
||||
|
||||
}
|
||||
|
||||
namespace test_lambda_init_capture
|
||||
{
|
||||
|
||||
int
|
||||
test()
|
||||
{
|
||||
auto x = 0;
|
||||
const auto lambda1 = [a = x](int b){ return a + b; };
|
||||
const auto lambda2 = [a = lambda1(x)](){ return a; };
|
||||
return lambda2();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
namespace test_digit_separators
|
||||
{
|
||||
|
||||
constexpr auto ten_million = 100'000'000;
|
||||
static_assert(ten_million == 100000000, "");
|
||||
|
||||
}
|
||||
|
||||
namespace test_return_type_deduction
|
||||
{
|
||||
|
||||
auto f(int& x) { return x; }
|
||||
decltype(auto) g(int& x) { return x; }
|
||||
|
||||
template < typename T1, typename T2 >
|
||||
struct is_same
|
||||
{
|
||||
static constexpr auto value = false;
|
||||
};
|
||||
|
||||
template < typename T >
|
||||
struct is_same<T, T>
|
||||
{
|
||||
static constexpr auto value = true;
|
||||
};
|
||||
|
||||
int
|
||||
test()
|
||||
{
|
||||
auto x = 0;
|
||||
static_assert(is_same<int, decltype(f(x))>::value, "");
|
||||
static_assert(is_same<int&, decltype(g(x))>::value, "");
|
||||
return x;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
} // namespace cxx14
|
||||
|
||||
#endif // __cplusplus >= 201402L
|
||||
|
||||
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
eval $cachevar=yes
|
||||
@ -7407,19 +7767,19 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
if test x$ax_cxx_compile_cxx11_required = xtrue; then
|
||||
if test x$ax_cxx_compile_cxx14_required = xtrue; then
|
||||
if test x$ac_success = xno; then
|
||||
as_fn_error $? "*** A compiler with support for C++11 language features is required." "$LINENO" 5
|
||||
as_fn_error $? "*** A compiler with support for C++14 language features is required." "$LINENO" 5
|
||||
fi
|
||||
fi
|
||||
if test x$ac_success = xno; then
|
||||
HAVE_CXX11=0
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5
|
||||
$as_echo "$as_me: No compiler with C++11 support was found" >&6;}
|
||||
HAVE_CXX14=0
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++14 support was found" >&5
|
||||
$as_echo "$as_me: No compiler with C++14 support was found" >&6;}
|
||||
else
|
||||
HAVE_CXX11=1
|
||||
HAVE_CXX14=1
|
||||
|
||||
$as_echo "#define HAVE_CXX11 1" >>confdefs.h
|
||||
$as_echo "#define HAVE_CXX14 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
@ -22734,12 +23094,12 @@ if test -n "$GEGL_CFLAGS"; then
|
||||
pkg_cv_GEGL_CFLAGS="$GEGL_CFLAGS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.3 >= 0.3.34\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "gegl-0.3 >= 0.3.34") 2>&5
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.4 >= 0.4.0\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "gegl-0.4 >= 0.4.0") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_GEGL_CFLAGS=`$PKG_CONFIG --cflags "gegl-0.3 >= 0.3.34" 2>/dev/null`
|
||||
pkg_cv_GEGL_CFLAGS=`$PKG_CONFIG --cflags "gegl-0.4 >= 0.4.0" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
@ -22751,12 +23111,12 @@ if test -n "$GEGL_LIBS"; then
|
||||
pkg_cv_GEGL_LIBS="$GEGL_LIBS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.3 >= 0.3.34\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "gegl-0.3 >= 0.3.34") 2>&5
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.4 >= 0.4.0\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "gegl-0.4 >= 0.4.0") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_GEGL_LIBS=`$PKG_CONFIG --libs "gegl-0.3 >= 0.3.34" 2>/dev/null`
|
||||
pkg_cv_GEGL_LIBS=`$PKG_CONFIG --libs "gegl-0.4 >= 0.4.0" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
@ -22777,27 +23137,27 @@ else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
GEGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gegl-0.3 >= 0.3.34" 2>&1`
|
||||
GEGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gegl-0.4 >= 0.4.0" 2>&1`
|
||||
else
|
||||
GEGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gegl-0.3 >= 0.3.34" 2>&1`
|
||||
GEGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gegl-0.4 >= 0.4.0" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$GEGL_PKG_ERRORS" >&5
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.3 >= 0.3.34" >&5
|
||||
$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.3 >= 0.3.34" >&6;}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.4 >= 0.4.0" >&5
|
||||
$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.4 >= 0.4.0" >&6;}
|
||||
required_deps="$required_deps
|
||||
- Error: missing dependency gegl-0.3 >= 0.3.34"
|
||||
- Error: missing dependency gegl-0.4 >= 0.4.0"
|
||||
|
||||
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}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.3 >= 0.3.34" >&5
|
||||
$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.3 >= 0.3.34" >&6;}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.4 >= 0.4.0" >&5
|
||||
$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.4 >= 0.4.0" >&6;}
|
||||
required_deps="$required_deps
|
||||
- Error: missing dependency gegl-0.3 >= 0.3.34"
|
||||
- Error: missing dependency gegl-0.4 >= 0.4.0"
|
||||
|
||||
else
|
||||
GEGL_CFLAGS=$pkg_cv_GEGL_CFLAGS
|
||||
@ -26209,7 +26569,7 @@ LIBS=$gimp_save_LIBS
|
||||
# Check for Intel vector intrinsics
|
||||
###################################
|
||||
intrinsics_save_CFLAGS="$CFLAGS"
|
||||
#FIXME: Check the CFLAGS separatly
|
||||
#FIXME: Check the CFLAGS separately
|
||||
|
||||
SSE_MATH_CFLAG=
|
||||
for flag in '-mfpmath=sse'; do
|
||||
@ -30055,7 +30415,7 @@ fi
|
||||
|
||||
|
||||
have_sendmail=no
|
||||
# Sendmail must be explicitely enabled to replace xdg-email implementation.
|
||||
# Sendmail must be explicitly enabled to replace xdg-email implementation.
|
||||
if test "x$with_sendmail" != "x" && test "x$with_sendmail" != "xno"; then
|
||||
if test "x$with_sendmail" = "xyes"; then
|
||||
sendmail_path=$PATH:/usr/sbin:/usr/lib
|
||||
@ -32129,7 +32489,7 @@ GIMP_MODULES=modules
|
||||
ac_config_commands="$ac_config_commands libgimpbase/gimpversion.h"
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files INSTALL tools/Makefile pdb/Makefile libgimp/Makefile libgimpbase/Makefile libgimpconfig/Makefile libgimpcolor/Makefile libgimpmath/Makefile libgimpmodule/Makefile libgimpthumb/Makefile libgimpwidgets/Makefile app/Makefile app/actions/Makefile app/config/Makefile app/core/Makefile app/operations/Makefile app/operations/layer-modes/Makefile app/operations/layer-modes-legacy/Makefile app/operations/tests/Makefile app/gegl/Makefile app/dialogs/Makefile app/display/Makefile app/file/Makefile app/gui/Makefile app/menus/Makefile app/paint/Makefile app/pdb/Makefile app/plug-in/Makefile app/propgui/Makefile app/text/Makefile app/tools/Makefile app/vectors/Makefile app/widgets/Makefile app/xcf/Makefile app/tests/Makefile app/tests/files/Makefile app/tests/gimpdir-empty/Makefile app/tests/gimpdir-empty/brushes/Makefile app/tests/gimpdir-empty/gradients/Makefile app/tests/gimpdir-empty/patterns/Makefile app/tests/gimpdir/Makefile app/tests/gimpdir/brushes/Makefile app/tests/gimpdir/gradients/Makefile app/tests/gimpdir/patterns/Makefile app-tools/Makefile build/Makefile build/windows/Makefile build/windows/gimp.rc build/windows/gimp-plug-ins.rc build/windows/installer/Makefile build/windows/installer/lang/Makefile plug-ins/Makefile plug-ins/file-bmp/Makefile plug-ins/file-exr/Makefile plug-ins/file-faxg3/Makefile plug-ins/file-fits/Makefile plug-ins/file-fli/Makefile plug-ins/file-ico/Makefile plug-ins/file-jpeg/Makefile plug-ins/file-psd/Makefile plug-ins/file-raw/Makefile plug-ins/file-sgi/Makefile plug-ins/file-tiff/Makefile plug-ins/file-webp/Makefile plug-ins/flame/Makefile plug-ins/fractal-explorer/Makefile plug-ins/fractal-explorer/examples/Makefile plug-ins/gfig/Makefile plug-ins/gfig/gfig-examples/Makefile plug-ins/gfig/images/Makefile plug-ins/ui/Makefile plug-ins/gimpressionist/Brushes/Makefile plug-ins/gimpressionist/Makefile plug-ins/gimpressionist/Paper/Makefile plug-ins/gimpressionist/Presets/Makefile plug-ins/gradient-flare/Makefile plug-ins/gradient-flare/flares/Makefile plug-ins/help-browser/Makefile plug-ins/help/Makefile plug-ins/ifs-compose/Makefile plug-ins/imagemap/Makefile plug-ins/imagemap/images/Makefile plug-ins/lighting/Makefile plug-ins/lighting/images/Makefile plug-ins/map-object/Makefile plug-ins/metadata/Makefile plug-ins/pagecurl/Makefile plug-ins/print/Makefile plug-ins/pygimp/Makefile plug-ins/pygimp/plug-ins/Makefile plug-ins/screenshot/Makefile plug-ins/script-fu/Makefile plug-ins/script-fu/ftx/Makefile plug-ins/script-fu/scripts/Makefile plug-ins/script-fu/scripts/images/Makefile plug-ins/script-fu/tinyscheme/Makefile plug-ins/selection-to-path/Makefile plug-ins/twain/Makefile plug-ins/common/Makefile modules/Makefile devel-docs/Makefile devel-docs/app/Makefile devel-docs/app/version devel-docs/libgimp/Makefile devel-docs/libgimp/version devel-docs/libgimpbase/Makefile devel-docs/libgimpbase/version devel-docs/libgimpconfig/Makefile devel-docs/libgimpconfig/version devel-docs/libgimpcolor/Makefile devel-docs/libgimpcolor/version devel-docs/libgimpmath/Makefile devel-docs/libgimpmath/version devel-docs/libgimpmodule/Makefile devel-docs/libgimpmodule/version devel-docs/libgimpthumb/Makefile devel-docs/libgimpthumb/version devel-docs/libgimpwidgets/Makefile devel-docs/libgimpwidgets/version devel-docs/tools/Makefile docs/Makefile menus/Makefile cursors/Makefile icons/Makefile icons/Color/Makefile icons/Legacy/Makefile icons/Symbolic/Makefile icons/Symbolic-Inverted/Makefile themes/Makefile themes/System/Makefile themes/Dark/Makefile themes/Gray/Makefile themes/Light/Makefile data/Makefile data/brushes/Makefile data/brushes/Basic/Makefile data/brushes/gimp-obsolete-files/Makefile data/brushes/Media/Makefile data/brushes/Legacy/Makefile data/brushes/Sketch/Makefile data/brushes/Splatters/Makefile data/brushes/Texture/Makefile data/dynamics/Makefile data/dynamics/Basic/Makefile data/dynamics/FX/Makefile data/environ/Makefile data/gradients/Makefile data/images/Makefile data/interpreters/Makefile data/palettes/Makefile data/patterns/Makefile data/patterns/Animal/Makefile data/patterns/Fabric/Makefile data/patterns/Food/Makefile data/patterns/Legacy/Makefile data/patterns/Paper/Makefile data/patterns/Plant/Makefile data/patterns/Sky/Makefile data/patterns/Stone/Makefile data/patterns/Water/Makefile data/patterns/Wood/Makefile data/tags/Makefile data/tips/Makefile data/tool-presets/Makefile data/tool-presets/Crop/Makefile data/tool-presets/FX/Makefile data/tool-presets/Paint/Makefile data/tool-presets/Selection/Makefile data/tool-presets/Sketch/Makefile desktop/Makefile desktop/gimp.desktop.in desktop/org.gimp.GIMP.appdata.xml.in etc/Makefile etc/gimprc m4macros/Makefile po/Makefile.in po-libgimp/Makefile.in po-plug-ins/Makefile.in po-python/Makefile.in po-script-fu/Makefile.in po-tips/Makefile.in po-windows-installer/Makefile.in gimp-zip Makefile"
|
||||
ac_config_files="$ac_config_files INSTALL tools/Makefile pdb/Makefile libgimp/Makefile libgimpbase/Makefile libgimpconfig/Makefile libgimpcolor/Makefile libgimpmath/Makefile libgimpmodule/Makefile libgimpthumb/Makefile libgimpwidgets/Makefile app/Makefile app/actions/Makefile app/config/Makefile app/core/Makefile app/operations/Makefile app/operations/layer-modes/Makefile app/operations/layer-modes-legacy/Makefile app/operations/tests/Makefile app/gegl/Makefile app/dialogs/Makefile app/display/Makefile app/file/Makefile app/gui/Makefile app/menus/Makefile app/paint/Makefile app/pdb/Makefile app/plug-in/Makefile app/propgui/Makefile app/text/Makefile app/tools/Makefile app/vectors/Makefile app/widgets/Makefile app/xcf/Makefile app/tests/Makefile app/tests/files/Makefile app/tests/gimpdir-empty/Makefile app/tests/gimpdir-empty/brushes/Makefile app/tests/gimpdir-empty/gradients/Makefile app/tests/gimpdir-empty/patterns/Makefile app/tests/gimpdir/Makefile app/tests/gimpdir/brushes/Makefile app/tests/gimpdir/gradients/Makefile app/tests/gimpdir/patterns/Makefile app-tools/Makefile build/Makefile build/windows/Makefile build/windows/gimp.rc build/windows/gimp-plug-ins.rc build/windows/installer/Makefile build/windows/installer/lang/Makefile plug-ins/Makefile plug-ins/file-bmp/Makefile plug-ins/file-exr/Makefile plug-ins/file-faxg3/Makefile plug-ins/file-fits/Makefile plug-ins/file-fli/Makefile plug-ins/file-ico/Makefile plug-ins/file-jpeg/Makefile plug-ins/file-psd/Makefile plug-ins/file-raw/Makefile plug-ins/file-sgi/Makefile plug-ins/file-tiff/Makefile plug-ins/file-webp/Makefile plug-ins/flame/Makefile plug-ins/fractal-explorer/Makefile plug-ins/fractal-explorer/examples/Makefile plug-ins/gfig/Makefile plug-ins/gfig/gfig-examples/Makefile plug-ins/gfig/images/Makefile plug-ins/ui/Makefile plug-ins/gimpressionist/Brushes/Makefile plug-ins/gimpressionist/Makefile plug-ins/gimpressionist/Paper/Makefile plug-ins/gimpressionist/Presets/Makefile plug-ins/gradient-flare/Makefile plug-ins/gradient-flare/flares/Makefile plug-ins/help-browser/Makefile plug-ins/help/Makefile plug-ins/ifs-compose/Makefile plug-ins/imagemap/Makefile plug-ins/imagemap/images/Makefile plug-ins/lighting/Makefile plug-ins/lighting/images/Makefile plug-ins/map-object/Makefile plug-ins/metadata/Makefile plug-ins/pagecurl/Makefile plug-ins/print/Makefile plug-ins/pygimp/Makefile plug-ins/pygimp/plug-ins/Makefile plug-ins/screenshot/Makefile plug-ins/script-fu/Makefile plug-ins/script-fu/ftx/Makefile plug-ins/script-fu/scripts/Makefile plug-ins/script-fu/scripts/images/Makefile plug-ins/script-fu/tinyscheme/Makefile plug-ins/selection-to-path/Makefile plug-ins/twain/Makefile plug-ins/common/Makefile modules/Makefile devel-docs/Makefile devel-docs/app/Makefile devel-docs/app/version devel-docs/libgimp/Makefile devel-docs/libgimp/version devel-docs/libgimpbase/Makefile devel-docs/libgimpbase/version devel-docs/libgimpconfig/Makefile devel-docs/libgimpconfig/version devel-docs/libgimpcolor/Makefile devel-docs/libgimpcolor/version devel-docs/libgimpmath/Makefile devel-docs/libgimpmath/version devel-docs/libgimpmodule/Makefile devel-docs/libgimpmodule/version devel-docs/libgimpthumb/Makefile devel-docs/libgimpthumb/version devel-docs/libgimpwidgets/Makefile devel-docs/libgimpwidgets/version devel-docs/tools/Makefile docs/Makefile menus/Makefile cursors/Makefile icons/Makefile icons/Color/Makefile icons/Legacy/Makefile icons/Symbolic/Makefile icons/Symbolic-Inverted/Makefile themes/Makefile themes/System/Makefile themes/Dark/Makefile themes/Gray/Makefile themes/Light/Makefile data/Makefile data/brushes/Makefile data/brushes/Basic/Makefile data/brushes/Fun/Makefile data/brushes/gimp-obsolete-files/Makefile data/brushes/Media/Makefile data/brushes/Legacy/Makefile data/brushes/Sketch/Makefile data/brushes/Splatters/Makefile data/brushes/Texture/Makefile data/dynamics/Makefile data/dynamics/Basic/Makefile data/dynamics/FX/Makefile data/environ/Makefile data/gradients/Makefile data/images/Makefile data/interpreters/Makefile data/palettes/Makefile data/patterns/Makefile data/patterns/Animal/Makefile data/patterns/Fabric/Makefile data/patterns/Food/Makefile data/patterns/Legacy/Makefile data/patterns/Paper/Makefile data/patterns/Plant/Makefile data/patterns/Sky/Makefile data/patterns/Stone/Makefile data/patterns/Water/Makefile data/patterns/Wood/Makefile data/tags/Makefile data/tips/Makefile data/tool-presets/Makefile data/tool-presets/Crop/Makefile data/tool-presets/FX/Makefile data/tool-presets/Paint/Makefile data/tool-presets/Selection/Makefile data/tool-presets/Sketch/Makefile desktop/Makefile desktop/gimp.desktop.in desktop/org.gimp.GIMP.appdata.xml.in etc/Makefile etc/gimprc m4macros/Makefile po/Makefile.in po-libgimp/Makefile.in po-plug-ins/Makefile.in po-python/Makefile.in po-script-fu/Makefile.in po-tips/Makefile.in po-windows-installer/Makefile.in gimp-zip Makefile"
|
||||
|
||||
|
||||
# Files with versions in their names
|
||||
@ -32931,7 +33291,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by GIMP $as_me 2.10.0-RC2, which was
|
||||
This file was extended by GIMP $as_me 2.10.0, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -32997,7 +33357,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
GIMP config.status 2.10.0-RC2
|
||||
GIMP config.status 2.10.0
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
@ -33505,7 +33865,7 @@ fi
|
||||
gimp_major_ver=2
|
||||
gimp_minor_ver=10
|
||||
gimp_micro_ver=0
|
||||
gimp_ver=2.10.0-RC2
|
||||
gimp_ver=2.10.0
|
||||
gimp_api_ver=2.0
|
||||
|
||||
|
||||
@ -33658,6 +34018,7 @@ do
|
||||
"data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
|
||||
"data/brushes/Makefile") CONFIG_FILES="$CONFIG_FILES data/brushes/Makefile" ;;
|
||||
"data/brushes/Basic/Makefile") CONFIG_FILES="$CONFIG_FILES data/brushes/Basic/Makefile" ;;
|
||||
"data/brushes/Fun/Makefile") CONFIG_FILES="$CONFIG_FILES data/brushes/Fun/Makefile" ;;
|
||||
"data/brushes/gimp-obsolete-files/Makefile") CONFIG_FILES="$CONFIG_FILES data/brushes/gimp-obsolete-files/Makefile" ;;
|
||||
"data/brushes/Media/Makefile") CONFIG_FILES="$CONFIG_FILES data/brushes/Media/Makefile" ;;
|
||||
"data/brushes/Legacy/Makefile") CONFIG_FILES="$CONFIG_FILES data/brushes/Legacy/Makefile" ;;
|
||||
|
||||
Reference in New Issue
Block a user