summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2010-03-15 20:53:56 -0700
committerDan Nicholson <dbn.lists@gmail.com>2010-03-23 13:26:50 -0700
commite725ef171b5a4d5425461f237d9ccab223806913 (patch)
treeeaadc7d655afd1cbd445ef58e549b72b74fe61fe /configs
parentba5a53edd12fac24c176e714560b1f9ec255bbdb (diff)
downloadexternal_mesa3d-e725ef171b5a4d5425461f237d9ccab223806913.zip
external_mesa3d-e725ef171b5a4d5425461f237d9ccab223806913.tar.gz
external_mesa3d-e725ef171b5a4d5425461f237d9ccab223806913.tar.bz2
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>
Diffstat (limited to 'configs')
-rw-r--r--configs/autoconf.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in
index f50fb7d..66c1ee4 100644
--- 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@