Skip to content

Commit

Permalink
configure: Don't do AC_CHECK_FILE when cross compiling
Browse files Browse the repository at this point in the history
  • Loading branch information
oreo639 authored and fujiwarat committed Feb 20, 2024
1 parent d3d7762 commit cc46e62
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -349,11 +349,18 @@ fi
AC_SUBST(X11_PREFIX)

# Check locale dir for Compose files.
AC_CHECK_FILE($X11_PREFIX/share/X11/locale/locale.dir,
X11_LOCALEDATADIR="$X11_PREFIX/share/X11/locale",
[AC_CHECK_FILE($X11_PREFIX/lib/X11/locale/locale.dir,
X11_LOCALEDATADIR="$X11_PREFIX/lib/X11/locale",
X11_LOCALEDATADIR="$(datadir)/X11/locale")])
if test x"$cross_compiling" != xyes; then
AC_CHECK_FILE($X11_PREFIX/share/X11/locale/locale.dir,
X11_LOCALEDATADIR="$X11_PREFIX/share/X11/locale",
[AC_CHECK_FILE($X11_PREFIX/lib/X11/locale/locale.dir,
X11_LOCALEDATADIR="$X11_PREFIX/lib/X11/locale",
X11_LOCALEDATADIR="$(datadir)/X11/locale")])
else
if test x"$X11_LOCALEDATADIR" == x; then
X11_LOCALEDATADIR="$X11_PREFIX/share/X11/locale"
fi
AC_MSG_RESULT([Skipping X11 locale directory check when cross compiling. Using: $X11_LOCALEDATADIR])
fi
AC_SUBST(X11_LOCALEDATADIR)

if test x"$enable_wayland" = x"yes"; then
Expand Down

0 comments on commit cc46e62

Please sign in to comment.