configure: don't check xfont always for each server
It's already defined inside REQUIRED_LIBS and all DDX are getting it already. No semantical changes. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
75536ee805
commit
3b3c77b870
|
@ -1515,7 +1515,7 @@ fi
|
||||||
|
|
||||||
dnl Xnest DDX
|
dnl Xnest DDX
|
||||||
|
|
||||||
PKG_CHECK_MODULES(XNESTMODULES, [xfont $LIBXEXT x11 xau $XDMCP_MODULES], [have_xnest=yes], [have_xnest=no])
|
PKG_CHECK_MODULES(XNESTMODULES, [$LIBXEXT x11 xau $XDMCP_MODULES], [have_xnest=yes], [have_xnest=no])
|
||||||
AC_MSG_CHECKING([whether to build Xnest DDX])
|
AC_MSG_CHECKING([whether to build Xnest DDX])
|
||||||
if test "x$XNEST" = xauto; then
|
if test "x$XNEST" = xauto; then
|
||||||
XNEST="$have_xnest"
|
XNEST="$have_xnest"
|
||||||
|
@ -1867,7 +1867,7 @@ if test "x$XWIN" = xyes; then
|
||||||
AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
|
AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
|
||||||
AC_CHECK_TOOL(WINDRES, windres)
|
AC_CHECK_TOOL(WINDRES, windres)
|
||||||
|
|
||||||
PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont])
|
PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau])
|
||||||
|
|
||||||
if test "x$WINDOWSWM" = xauto; then
|
if test "x$WINDOWSWM" = xauto; then
|
||||||
PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no])
|
PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no])
|
||||||
|
@ -1956,7 +1956,7 @@ AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes])
|
||||||
dnl DMX DDX
|
dnl DMX DDX
|
||||||
PKG_CHECK_MODULES(
|
PKG_CHECK_MODULES(
|
||||||
[DMXMODULES],
|
[DMXMODULES],
|
||||||
[xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES],
|
[xmuu $LIBXEXT x11 xrender xfixes $LIBXI $DMXPROTO xau $XDMCP_MODULES],
|
||||||
[PKG_CHECK_MODULES(
|
[PKG_CHECK_MODULES(
|
||||||
[XDMXCONFIG_DEP],
|
[XDMXCONFIG_DEP],
|
||||||
[xaw7 xmu xt xpm x11],
|
[xaw7 xmu xt xpm x11],
|
||||||
|
@ -2061,7 +2061,7 @@ if test "$KDRIVE" = yes; then
|
||||||
AC_DEFINE(KDRIVE_MOUSE, 1, [Enable KDrive mouse driver])
|
AC_DEFINE(KDRIVE_MOUSE, 1, [Enable KDrive mouse driver])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xfont xau xdmcp"
|
XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xau xdmcp"
|
||||||
if test "x$XV" = xyes; then
|
if test "x$XV" = xyes; then
|
||||||
XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"
|
XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue
Block a user