Skip to content

Commit c50f7b3

Browse files
wmwwraveit65
authored andcommitted
Remove legacy X11 package detection
1 parent 8fe7f0c commit c50f7b3

1 file changed

Lines changed: 1 addition & 20 deletions

File tree

‎configure.ac‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -169,26 +169,7 @@ gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE
169169

170170
dnl X development libraries check
171171

172-
PKG_CHECK_MODULES(X, x11 xau, :, [
173-
# pkg-config modules not found (only present since X11R7 aka Xorg); use
174-
# old-style detection
175-
AC_PATH_XTRA()
176-
# X not found
177-
if test x$no_x = xyes ; then
178-
AC_MSG_ERROR([X development libraries not found])
179-
fi
180-
181-
gp_save_cflags="$CFLAGS"
182-
gp_save_libs="$LIBS"
183-
CFLAGS="$X_CFLAGS"
184-
LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
185-
AC_CHECK_LIB(X11, XFree,, AC_MSG_ERROR([libX11 not found]))
186-
AC_CHECK_LIB(Xau, XauFileName,, AC_MSG_ERROR([libXau not found]))
187-
CFLAGS="$gp_save_cflags"
188-
LIBS="$gp_save_libs"
189-
190-
X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS"
191-
])
172+
PKG_CHECK_MODULES(X, x11 xau, :, AC_MSG_ERROR([X development libraries not found]))
192173

193174
AC_SUBST(X_LIBS)
194175

0 commit comments

Comments
 (0)