diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-03 21:10:20 -0300 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-03 21:10:20 -0300 |
| commit | f16e9d281458a62da986a454522a58d9947bfd76 (patch) | |
| tree | d0a0a46af38639c9244f6c722909051d1b2cb0a4 /configure.in | |
| parent | 2f4f65ce9137aab6acaf1004bacc09d3a975d881 (diff) | |
| parent | 11b4ed1bced4e07dac02ec291c65ef4f4de5c01b (diff) | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 0891aecc..73598cfc 100644 --- a/configure.in +++ b/configure.in @@ -248,6 +248,13 @@ PKG_CHECK_MODULES([X11], [x11 xproto], AC_MSG_RESULT([$XKB_BASE])], [XKB_BASE="$datadir/X11/xkb" AC_MSG_RESULT([(default) $XKB_BASE])]) + AC_MSG_CHECKING([for X11 prefix]) + _PKG_CONFIG([X11_PREFIX], [variable=prefix], [x11]) + AS_IF([test $pkg_failed = no], + [X11_PREFIX="$pkg_cv_X11_PREFIX" + AC_MSG_RESULT([$X11_PREFIX])], + [X11_PREFIX="$prefix" + AC_MSG_RESULT([(default) $X11_PREFIX])]) have_keysymdef_h=no AC_CHECK_HEADER([X11/keysymdef.h], @@ -269,6 +276,7 @@ PKG_CHECK_MODULES([X11], [x11 xproto], ]) AC_SUBST([have_x11]) AC_SUBST([XKB_BASE]) +AC_DEFINE_UNQUOTED([X11_PREFIX], "$X11_PREFIX") AC_SUBST([X11_KEYSYMDEF_H]) # Check for Sun RPC headers and library. |