diff options
| author | Takao Fujiwara <tfujiwar@redhat.com> | 2015-09-07 18:10:19 +0900 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2015-10-09 00:19:41 -0400 |
| commit | a41f02f9b1843e0f0085f801430e55f413a9bf9c (patch) | |
| tree | de71f7f2f8971f7b6251f09604f7c09485214a97 /configure.ac | |
| parent | 138187755fc16afca1898bfae6df8317e1c76429 (diff) | |
| download | gtk+-a41f02f9b1843e0f0085f801430e55f413a9bf9c.tar.gz | |
GtkIMContextSimple: Load locale compose tables dynamically.
Load /usr/share/X11/locale/$LOCALE/Compose and $HOME/.XCompose
dynamically.
https://bugzilla.gnome.org/show_bug.cgi?id=721120
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index d6f549d911..55ea5a95db 100644 --- a/configure.ac +++ b/configure.ac @@ -1375,6 +1375,14 @@ if test x"$os_win32" = xyes; then GTK_EXTRA_CFLAGS="$msnative_struct" fi +if $PKG_CONFIG --exists x11; then + X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`" +elif test x"$prefix" != xNONE; then + X11_PREFIX="$prefix" +else + X11_PREFIX="$ac_default_prefix" +fi + GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" @@ -1387,6 +1395,7 @@ AC_SUBST(GTK_EXTRA_CFLAGS) AC_SUBST(GTK_DEP_LIBS) AC_SUBST(GTK_DEP_CFLAGS) +AC_SUBST(X11_PREFIX) AC_SUBST(GLIB_PREFIX) AC_SUBST(ATK_PREFIX) AC_SUBST(PANGO_PREFIX) |