projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4e7a4be)
progs: Fix linking of Xlib demos for non-autoconf builds
authorDan Nicholson <dbn.lists@gmail.com>
Thu, 1 Apr 2010 21:59:10 +0000 (14:59 -0700)
committerDan Nicholson <dbn.lists@gmail.com>
Tue, 20 Apr 2010 03:21:57 +0000 (20:21 -0700)
The Xlib demos were fixed to use $(X11_LIBS) so that configure could
detect the proper directory to link the library from, but this broke
the non-autoconf builds. Give X11_LIBS a default value to fallback on.
(cherry picked from commit e40fce13e152ecf929c899ed38a8e5f7d198c738)

configs/default patch | blob | history

diff --git a/configs/default b/configs/default
index 47d6923f0195d6a87d2a6d9b68f21bc9b358b5ea..fbd795fe71884fec22ac36220424c343b9fceb62 100644 (file)
--- a/configs/default
+++ b/configs/default
@@ -119,7 +119,7 @@ APP_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LI
 
 # Program dependencies - specific GL/glut libraries added in Makefiles
 APP_LIB_DEPS = -lm
-
+X11_LIBS = -lX11
 
 # Installation directories (for make install)
 INSTALL_DIR = /usr/local