xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/dixmods/Makefile.am |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit b7dae57f1d50ca3c8197f894c445a00b92a3ee9c
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Aug 4 10:28:51 2019 -0700

    Fix NO_UNDEFINED build with statically linked fb
    
    Stop trying to link to a shared library we no longer build
    
    Fixes: commit c1703cdf3b - "xfree86: Link fb statically"
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index a1f97056a..f658e38c2 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -33,9 +33,6 @@ libglx_la_SOURCES = glxmodule.c
 
 libshadow_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
 libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la
-if NO_UNDEFINED
-libshadow_la_LIBADD += libfb.la
-endif
 libshadow_la_SOURCES = shmodule.c
 
 libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c