dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: AC_CHECK_FILE() does not work when cross-compiling. 

As autoconf docs say: "like most Autoconf macros, they test a feature
of the host machine, and therefore, they die when cross-compiling."
Therefore use shell-type file existence instead which works for all
cases. This fixes configure failing with:
"error: cannot check for file existence when cross compiling"
This commit is contained in:
Jehan 2016-06-12 02:09:29 +02:00
parent 24334f3e59
commit 0b4fa971b3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -2060,9 +2060,16 @@ if test "x$enable_vector_icons" = "xyes"; then
else
# Check if librsvg was built with --disable-pixbuf-loader.
gdk_pixbuf_moduledir=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0`
AC_CHECK_FILE(["$gdk_pixbuf_moduledir/libpixbufloader-svg.*"],
[enable_vector_icons="yes"],
[enable_vector_icons="no (librsvg GdkPixbuf loader missing)"])
# AC_CHECK_FILE macro does not work when cross-compiling and exits with:
# error: cannot check for file existence when cross compiling
# So let's test files the shell way.
if (test "x$platform_win32" = "xyes" &&
test -f "$gdk_pixbuf_moduledir/libpixbufloader-svg.dll") ||
test -f "$gdk_pixbuf_moduledir/libpixbufloader-svg.so"; then
enable_vector_icons="yes"
else
enable_vector_icons="no (librsvg GdkPixbuf loader missing)"
fi
fi
fi
AM_CONDITIONAL(ENABLE_VECTOR_ICONS, test "x$enable_vector_icons" = "xyes")