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 | 0740ae38b50273e39a14e9717d6f87da36b901be (patch) | |
| tree | b93e6236c69941a87fb4a7ba2f58b43b0d507865 | |
| parent | ea8772fde8fe601f0b3a74387a76c4ae3e7882de (diff) | |
| parent | a3aa0a1fed6db8e5e4ab4f3b421758bf3f7b29fc (diff) | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd
| -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. |