Change libX11 variables to not conflict with AC_PATH_XTRA

The variable X_LIBS from AC_PATH_XTRA contains only the -L searchdir
parameter and not the -lX11 to link to Xlib. Use X11 prefixed build vars
for linking with Xlib to avoid the conflict.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>

diff --git a/configs/autoconf.in b/configs/autoconf.in
index f50fb7dd0935ffd0aafaaedb11e672ae0c89a55e..66c1ee48e87a6b4741e3bd4385d1518547faa2a2 100644 (file)
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -24,8 +24,8 @@ RADEON_CFLAGS = @RADEON_CFLAGS@
 RADEON_LDFLAGS = @RADEON_LDFLAGS@
 INTEL_LIBS = @INTEL_LIBS@
 INTEL_CFLAGS = @INTEL_CFLAGS@
-X_LIBS = @X_LIBS@
-X_CFLAGS = @X_CFLAGS@
+X11_LIBS = @X11_LIBS@
+X11_CFLAGS = @X11_CFLAGS@
 
 # Assembler
 MESA_ASM_SOURCES = @MESA_ASM_SOURCES@

diff --git a/configure.ac b/configure.ac
index 0f51097ef623427b03ef3437f6579e40592d90d4..26960e85ea47f97f5b1017f6ad96fbee009fc071 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -548,9 +548,13 @@ else
 fi
 dnl Use the autoconf macro if no pkg-config files
 if test "$x11_pkgconfig" = yes; then
-    PKG_CHECK_MODULES([X], [x11])
+    PKG_CHECK_MODULES([X11], [x11])
 else
     AC_PATH_XTRA
+    test -z "$X11_CFLAGS" && X11_CFLAGS="$X_CFLAGS"
+    test -z "$X11_LIBS" && X11_LIBS="$X_LIBS -lX11"
+    AC_SUBST([X11_CFLAGS])
+    AC_SUBST([X11_LIBS])
 fi
 
 dnl Try to tell the user that the --x-* options are only used when

diff --git a/progs/egl/Makefile b/progs/egl/Makefile
index 5f51104fed6fbc6d3bda0f8d852e260fbf49180a..8dfcb4eabcbd1c1892ce6714dd23f9ed7e388219 100644 (file)
--- a/progs/egl/Makefile
+++ b/progs/egl/Makefile
@@ -57,13 +57,13 @@ peglgears: peglgears.o $(HEADERS) $(LIB_DEP)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(LIBDRM_LIB) -lm
 
 xeglgears: xeglgears.o $(HEADERS) $(LIB_DEP)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lm $(X_LIBS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lm $(X11_LIBS)
 
 xeglthreads: xeglthreads.o $(HEADERS) $(LIB_DEP)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lm $(X_LIBS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lm $(X11_LIBS)
 
 xegl_tri: xegl_tri.o $(HEADERS) $(LIB_DEP)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lm $(X_LIBS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lm $(X11_LIBS)
 
 clean:
        -rm -f *.o *~

diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
index f81aafe00f629c5a3c378f0dad4216708efd616b..660c540657a7f2ae729ca9f4664e11810b99aaa0 100644 (file)
--- a/progs/xdemos/Makefile
+++ b/progs/xdemos/Makefile
@@ -9,7 +9,7 @@ INCDIR = $(TOP)/include
 LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
 
 # Add X11 and pthread libs to satisfy GNU gold.
-APP_LIB_DEPS += $(X_LIBS) -lpthread
+APP_LIB_DEPS += $(X11_LIBS) -lpthread
 
 LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
 

diff --git a/src/gallium/state_trackers/glx/xlib/Makefile b/src/gallium/state_trackers/glx/xlib/Makefile
index 582e72bb46350e79aec5a8fa176c5c374e81b664..35509fd708ba7a818a155915ec7ae03057b0dce7 100644 (file)
--- a/src/gallium/state_trackers/glx/xlib/Makefile
+++ b/src/gallium/state_trackers/glx/xlib/Makefile
@@ -6,7 +6,7 @@ LIBNAME = xlib
 LIBRARY_INCLUDES = \
        -I$(TOP)/include \
        -I$(TOP)/src/mesa \
-       $(X_CFLAGS)
+       $(X11_CFLAGS)
 
 C_SOURCES = \
        glx_api.c \

diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
index 18357a411278133f4282ad5aa3518f32f66a502d..83d53c595428aa8d2962201a175fc77c34f2c748 100644 (file)
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -7,7 +7,7 @@ LIBRARY_INCLUDES = \
        -I$(TOP)/src/gallium/include \
        -I$(TOP)/src/gallium/drivers \
        -I$(TOP)/src/gallium/auxiliary \
-       $(X_CFLAGS)
+       $(X11_CFLAGS)
 
 C_SOURCES = \
        xlib_sw_winsys.c