summaryrefslogtreecommitdiff
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-04-19 20:21:57 -0700
commit4e7a4bed372a6da4dde8926f3bc30c56e3fbe07b (patch)
treef887a07a43cfda435e8bf51caacae30624627510 /configs
parent4f8bf353bd7e896268e0eb445c61270a8823892a (diff)
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> (cherry picked from commit e725ef171b5a4d5425461f237d9ccab223806913)
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 f07035a098..fbd5faa5f2 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@