6905171 X11R7.5 / Xorg 1.7.3 integration
6907686 Move X files from /usr/X11 to /usr [PSARC 2009/482]
6907695 Mesa & OpenGL switcher for SPARC [LSARC 2009/569]
6742737 deliver xf86-input-synaptics
Allow passing multi-directory paths to configure search for locale files
--- configure.ac Fri Dec 4 22:17:54 2009
+++ configure.ac Fri Dec 4 23:18:01 2009
@@ -412,10 +412,15 @@
[Directory where locale libraries files are installed (default: $libdir/X11/locale)]),
[ X11_LOCALELIBDIR="$withval" ],
[ X11_LOCALELIBDIR="${X11_LIBDIR}/locale" ])
-AC_DEFINE_DIR(XLOCALELIBDIR, X11_LOCALELIBDIR, [Location of libX11 locale libraries])
+if test "x$XLOCALELIBDIR" = "x" ; then
+ XLOCALELIBDIR="${X11_LOCALELIBDIR}"
+fi
+AC_DEFINE_DIR(XLOCALELIBDIR, XLOCALELIBDIR, [Location of libX11 locale libraries])
AC_SUBST(X11_LOCALELIBDIR)
-X11_LOCALEDIR="${X11_LOCALEDATADIR}"
-AC_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libX11 locale data])
+if test "x$XLOCALEDIR" = "x" ; then
+ XLOCALEDIR="${X11_LOCALEDATADIR}"
+fi
+AC_DEFINE_DIR(XLOCALEDIR, XLOCALEDIR, [Location of libX11 locale data])
AC_SUBST(X11_LOCALEDIR)