Fix XWIN_LIBS definition
Move XWIN_LIBS from XWIN=auto conditional to XWIN=yes conditional, otherwise the build breaks if an explicit --enable-xwin is passed to configure. Also remove obsolete library values from the definition. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
bcd0c02cfd
commit
ed4c6bc79a
|
@ -1696,8 +1696,6 @@ if test "x$XWIN" = xauto; then
|
|||
mingw*) XWIN="yes" ;;
|
||||
*) XWIN="no" ;;
|
||||
esac
|
||||
XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $RANDR_LIB $RENDER_LIB $XTRAP_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $MIEXT_LAYER_LIB $LAYER_LIB $XPSTUBS_LIB $SHADOW_LIB $OS_LIB"
|
||||
AC_SUBST([XWIN_LIBS])
|
||||
fi
|
||||
AC_MSG_RESULT([$XWIN])
|
||||
|
||||
|
@ -1727,7 +1725,9 @@ if test "x$XWIN" = xyes; then
|
|||
XWIN_SYS_LIBS=-lwinsock2
|
||||
;;
|
||||
esac
|
||||
XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $RANDR_LIB $RENDER_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"
|
||||
XWIN_SYS_LIBS="$XWIN_SYS_LIBS $XWINMODULES_LIBS"
|
||||
AC_SUBST(XWIN_LIBS)
|
||||
AC_SUBST(XWIN_SERVER_NAME)
|
||||
AC_SUBST(XWIN_SYS_LIBS)
|
||||
|
||||
|
|
Loading…
Reference in New Issue