Mesa (7.8): progs: Fix linking of Xlib demos for non-autoconf builds
Dan Nicholson
dbn at kemper.freedesktop.org
Tue Apr 20 03:29:30 UTC 2010
Module: Mesa
Branch: 7.8
Commit: 8e5effefc7e1cf147315841894d1548f09b96cbc
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e5effefc7e1cf147315841894d1548f09b96cbc
Author: Dan Nicholson <dbn.lists at gmail.com>
Date: Thu Apr 1 14:59:10 2010 -0700
progs: Fix linking of Xlib demos for non-autoconf builds
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 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configs/default b/configs/default
index 47d6923..fbd795f 100644
--- 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
More information about the mesa-commit
mailing list