File mate-session-manager-check-for-X11-libraries.patch of Package mate-session-manager

Overview Repositories Revisions Requests Users Attributes Meta

File mate-session-manager-check-for-X11-libraries.patch of Package mate-session-manager (Revision c5328eba15dc4b0c403e1b69a2e25b15)

Currently displaying revision c5328eba15dc4b0c403e1b69a2e25b15 , Show latest

--- a/configure.ac	2014-03-25 10:21:28.742946044 +0100
+++ b/configure.ac	2014-03-22 19:17:21.143070000 +0100
@@ -77,6 +77,7 @@
         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)
@@ -148,44 +149,6 @@
 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 ====================================================================
 
--- a/mate-session/Makefile.am	2014-03-25 10:21:28.786946042 +0100
+++ b/mate-session/Makefile.am	2014-03-22 19:18:34.727067000 +0100
@@ -59,6 +59,7 @@
 
 mate_session_CPPFLAGS =			\
 	$(AM_CPPFLAGS)				\
+        $(X11_CFLAGS)                           \
 	$(SM_CFLAGS)				\
 	$(ICE_CFLAGS)				\
 	$(XEXT_CFLAGS)				\
@@ -71,6 +72,7 @@
 
 mate_session_LDADD =				\
 	libgsmutil.la 				\
+        $(X11_CFLAGS)                           \
 	$(top_builddir)/egg/libeggdesktopfile.la \
 	$(SM_LIBS)				\
 	$(ICE_LIBS)				\

Places

File mate-session-manager-check-for-X11-libraries.patch of Package mate-session-manager (Revision c5328eba15dc4b0c403e1b69a2e25b15)

Places