diff options
| author | posophe <[email protected]> | 2014-11-02 14:27:21 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-12-15 13:04:03 +0100 |
| commit | cb2c9df221c016789f867cb95f61db8f21db233d (patch) | |
| tree | 7f11f38ffbe728ecbf1391b4538f02271659f493 /configure.ac | |
| parent | 8fd72cfd68716694cc13074180b4dfce7c7c9ecd (diff) | |
| download | mate-session-manager-cb2c9df221c016789f867cb95f61db8f21db233d.tar.bz2 mate-session-manager-cb2c9df221c016789f867cb95f61db8f21db233d.tar.xz | |
Update configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/configure.ac b/configure.ac index 1801d03..4d5a9cb 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,7 @@ PKG_CHECK_MODULES(SESSION_PROPERTIES, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED ) +PKG_CHECK_MODULES(X11, x11) PKG_CHECK_MODULES(SM, sm) PKG_CHECK_MODULES(ICE, ice) PKG_CHECK_MODULES(XEXT, xext xau) @@ -150,44 +151,6 @@ AM_CONDITIONAL(HAVE_UPOWER, test "x$has_upower" = "xyes") AC_SUBST(HAVE_UPOWER) dnl ==================================================================== -dnl X development libraries check -dnl ==================================================================== - -# If Pango included the shared library dependencies from X11 in -# the pkg-config output, then we use that (to avoid duplicates). -# but if they were omitted to avoid binary compatibility problems -# then we need to repeat the checks. - -if $PKG_CONFIG --exists pangoxft ; then - PANGO_PACKAGES="pangox pangoxft" -else - PANGO_PACKAGES="pangox" -fi - -x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`" -case x_libs in - *-lX11*) pango_omitted_x_deps=no ;; - *) pango_omitted_x_deps=yes ;; -esac - -if test $pango_omitted_x_deps = yes ; then - AC_PATH_XTRA - - if test x$no_x = xyes ; then - AC_MSG_ERROR([X development libraries not found]) - else - X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" - fi -fi - -AC_CHECK_LIB(Xau, XauFileName, [X_LIBS="$X_LIBS -lXau"], - [AC_MSG_ERROR([ -*** Cant find the Xauth library. It is needed to compile mate-session.])], - $X_LIBS) - -AC_SUBST(X_LIBS) - -dnl ==================================================================== dnl Check for XSync extension dnl ==================================================================== |