loader: rework xmlconfig dependency

Currently xmlconfig is conditionally used, only when --enable-dri is
available.

As the library has moved to src/util and has wider wisebase, this guard
is no longer correct. Strictly speaking - it wasn't since the
introduction of xmlconfig into st/nine a while ago.

Unconditionally enable xmlconfig and drop the linking. As said before
there's other users of the library, so depending on the configure
options we will get multiple definitions of said symbols.

NOTE: To avoid breaking other combinations, this commit adds the
xmlconfig link to the required places - throughout gallium and the DRI
loaders.

Cc: Aaron Watry <awatry@gmail.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>

src/egl/Makefile.am

@@ -120,8 +120,12 @@ libEGL_common_la_SOURCES += \
 	$(dri2_backend_FILES) \
 	$(dri3_backend_FILES)
 
-libEGL_common_la_LIBADD += $(top_builddir)/src/loader/libloader.la
-libEGL_common_la_LIBADD += $(DLOPEN_LIBS) $(LIBDRM_LIBS) $(CLOCK_LIB)
+libEGL_common_la_LIBADD += \
+	$(top_builddir)/src/loader/libloader.la \
+	$(top_builddir)/src/util/libxmlconfig.la \
+	$(DLOPEN_LIBS) \
+	$(LIBDRM_LIBS) \
+	$(CLOCK_LIB)
 
 GLVND_GEN_DEPS = generate/gen_egl_dispatch.py \
 	generate/egl.xml generate/eglFunctionList.py generate/genCommon.py \

src/gallium/auxiliary/pipe-loader/Makefile.am

@@ -41,9 +41,11 @@ libpipe_loader_dynamic_la_SOURCES += \
 endif
 
 libpipe_loader_static_la_LIBADD = \
-	$(top_builddir)/src/loader/libloader.la
+	$(top_builddir)/src/loader/libloader.la \
+	$(top_builddir)/src/util/libxmlconfig.la
 
 libpipe_loader_dynamic_la_LIBADD = \
-	$(top_builddir)/src/loader/libloader.la
+	$(top_builddir)/src/loader/libloader.la \
+	$(top_builddir)/src/util/libxmlconfig.la
 
 EXTRA_DIST = SConscript

src/gallium/targets/opencl/Makefile.am

@@ -19,7 +19,6 @@ lib@OPENCL_LIBNAME@_la_LIBADD = \
 	$(top_builddir)/src/gallium/state_trackers/clover/libclover.la \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
 	$(top_builddir)/src/util/libmesautil.la \
-	$(top_builddir)/src/util/libxmlconfig.la \
 	$(EXPAT_LIBS) \
 	$(LIBELF_LIBS) \
 	$(DLOPEN_LIBS) \

src/gbm/Makefile.am

@@ -26,6 +26,7 @@ libgbm_la_LDFLAGS = \
 
 libgbm_la_LIBADD = \
 	$(top_builddir)/src/loader/libloader.la \
+	$(top_builddir)/src/util/libxmlconfig.la \
 	$(DLOPEN_LIBS)
 
 if HAVE_PLATFORM_WAYLAND

src/glx/Makefile.am

@@ -97,7 +97,9 @@ libglx_la_SOURCES = \
 	singlepix.c \
 	vertarr.c
 
-libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la
+libglx_la_LIBADD = \
+	$(top_builddir)/src/loader/libloader.la \
+	$(top_builddir)/src/util/libxmlconfig.la
 
 if HAVE_DRISW
 libglx_la_SOURCES += \

src/loader/Makefile.am

@@ -26,6 +26,8 @@ EXTRA_DIST = SConscript
 noinst_LTLIBRARIES = libloader.la
 
 AM_CPPFLAGS = \
+	-I$(top_builddir)/src/util/ \
+	-DUSE_DRICONF \
 	$(DEFINES) \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src \
@@ -37,19 +39,6 @@ libloader_la_CPPFLAGS = $(AM_CPPFLAGS)
 libloader_la_SOURCES = $(LOADER_C_FILES)
 libloader_la_LIBADD =
 
-if HAVE_DRICOMMON
-libloader_la_CPPFLAGS += \
-	-I$(top_builddir)/src/util/ \
-	-I$(top_srcdir)/src/mesa/drivers/dri/common/ \
-	-I$(top_srcdir)/src/mesa/ \
-	-I$(top_srcdir)/src/mapi/ \
-	-DUSE_DRICONF
-
-libloader_la_LIBADD += \
-	$(top_builddir)/src/util/libxmlconfig.la
-
-endif
-
 if HAVE_LIBDRM
 libloader_la_LIBADD += \
 	$(LIBDRM_LIBS)