components/x11/libX11/patches/37.locale.paths.patch

   1 Allow passing multi-directory paths to configure search for locale files
   2
   3 diff --git a/configure.ac b/configure.ac
   4 index 95ab955..203a8eb 100644
   5 --- a/configure.ac
   6 +++ b/configure.ac
   7 @@ -423,11 +423,16 @@ AC_ARG_WITH(locale-lib-dir,       AS_HELP_STRING([--with-locale-lib-dir=DIR],
   8   [Directory where locale libraries files are installed (default: $libdir/X11/locale)]),
   9                                 [ X11_LOCALELIBDIR="$withval" ],
  10                                 [ X11_LOCALELIBDIR="${X11_LIBDIR}/locale" ])
  11 -AX_DEFINE_DIR(XLOCALELIBDIR, X11_LOCALELIBDIR, [Location of libX11 locale libraries])
  12 +if test "x$XLOCALELIBDIR" = "x" ; then
  13 +       XLOCALELIBDIR="${X11_LOCALELIBDIR}"
  14 +fi
  15 +AX_DEFINE_DIR(XLOCALELIBDIR, XLOCALELIBDIR, [Location of libX11 locale libraries])
  16  AC_SUBST(X11_LOCALELIBDIR)
  17
  18 -X11_LOCALEDIR="${X11_LOCALEDATADIR}"
  19 -AX_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libX11 locale data])
  20 +if test "x$XLOCALEDIR" = "x" ; then
  21 +       XLOCALEDIR="${X11_LOCALEDATADIR}"
  22 +fi
  23 +AX_DEFINE_DIR(XLOCALEDIR, XLOCALEDIR, [Location of libX11 locale data])
  24  AC_SUBST(X11_LOCALEDIR)
  25
  26  locales="\