Change libX11 variables to not conflict with AC_PATH_XTRA
authorDan Nicholson <dbn.lists@gmail.com>
Tue, 16 Mar 2010 03:53:56 +0000 (20:53 -0700)
committerDan Nicholson <dbn.lists@gmail.com>
Tue, 23 Mar 2010 20:26:50 +0000 (13:26 -0700)
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>
configs/autoconf.in
configure.ac
progs/egl/Makefile
progs/xdemos/Makefile
src/gallium/state_trackers/glx/xlib/Makefile
src/gallium/winsys/xlib/Makefile

index f50fb7d..66c1ee4 100644 (file)
@@ -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@
index 0f51097..26960e8 100644 (file)
@@ -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
index 5f51104..8dfcb4e 100644 (file)
@@ -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 *~
index f81aafe..660c540 100644 (file)
@@ -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)
 
index 582e72b..35509fd 100644 (file)
@@ -6,7 +6,7 @@ LIBNAME = xlib
 LIBRARY_INCLUDES = \
        -I$(TOP)/include \
        -I$(TOP)/src/mesa \
-       $(X_CFLAGS)
+       $(X11_CFLAGS)
 
 C_SOURCES = \
        glx_api.c \
index 18357a4..83d53c5 100644 (file)
@@ -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