From 2d0ecd7ff8dc621be91d029ab27f8ad59912ee9f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?utf8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Tue, 6 May 2014 08:07:38 +0000 Subject: [PATCH] configure: Use X11 detection macro from common https://bugzilla.gnome.org/show_bug.cgi?id=729621 --- configure.ac | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/configure.ac b/configure.ac index 1c5c29d..2be8775 100644 --- a/configure.ac +++ b/configure.ac @@ -542,32 +542,7 @@ dnl *** X11 *** translit(dnm, m, l) AM_CONDITIONAL(USE_X, true) AG_GST_CHECK_FEATURE(X, [X libraries and plugins], [ximagesink], [ - AC_PATH_XTRA - ac_cflags_save="$CFLAGS" - ac_cppflags_save="$CPPFLAGS" - CFLAGS="$CFLAGS $X_CFLAGS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - - dnl now try to find the HEADER - HAVE_X="yes" - AC_CHECK_HEADER([X11/Xlib.h], [], [HAVE_X="no"], [AC_INCLUDES_DEFAULT]) - AC_CHECK_HEADER([X11/XKBlib.h], [], [HAVE_X="no"], [AC_INCLUDES_DEFAULT]) - - if test "x$HAVE_X" = "xno" - then - AC_MSG_NOTICE([cannot find X11 development files]) - else - dnl this is much more than we want - X_LIBS="$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS" - dnl AC_PATH_XTRA only defines the path needed to find the X libs, - dnl it does not add the libs; therefore we add them here - X_LIBS="$X_LIBS -lX11" - AC_SUBST(X_CFLAGS) - AC_SUBST(X_LIBS) - fi - AC_SUBST(HAVE_X) - CFLAGS="$ac_cflags_save" - CPPFLAGS="$ac_cppflags_save" + AG_GST_CHECK_X ]) dnl Check for Xv extension -- 2.7.4