Skip to content
Permalink
Browse files

Remove legacy X11 package detection

  • Loading branch information...
wmww authored and raveit65 committed Dec 3, 2018
1 parent 8fe7f0c commit c50f7b353fee1023e1a1236e25cc2705d482d1f6
Showing with 1 addition and 20 deletions.
  1. +1 −20 configure.ac
@@ -169,26 +169,7 @@ gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE

dnl X development libraries check

PKG_CHECK_MODULES(X, x11 xau, :, [
# pkg-config modules not found (only present since X11R7 aka Xorg); use
# old-style detection
AC_PATH_XTRA()
# X not found
if test x$no_x = xyes ; then
AC_MSG_ERROR([X development libraries not found])
fi

gp_save_cflags="$CFLAGS"
gp_save_libs="$LIBS"
CFLAGS="$X_CFLAGS"
LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
AC_CHECK_LIB(X11, XFree,, AC_MSG_ERROR([libX11 not found]))
AC_CHECK_LIB(Xau, XauFileName,, AC_MSG_ERROR([libXau not found]))
CFLAGS="$gp_save_cflags"
LIBS="$gp_save_libs"

X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS"
])
PKG_CHECK_MODULES(X, x11 xau, :, AC_MSG_ERROR([X development libraries not found]))

AC_SUBST(X_LIBS)

0 comments on commit c50f7b3

Please sign in to comment.
You can’t perform that action at this time.