From 93d2b3c62a2e9446bb71400016553b16585df0be Mon Sep 17 00:00:00 2001 From: Jeff Smith Date: Fri, 12 Mar 2010 18:55:09 -0600 Subject: [PATCH] Add -lX11 to X_LIBS when created by the AC_PATH_XTRA macro Signed-off-by: Jeff Smith --- configure.ac | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 01d7e8b..99d6b58 100644 --- a/configure.ac +++ b/configure.ac @@ -551,6 +551,7 @@ if test "$x11_pkgconfig" = yes; then PKG_CHECK_MODULES([X], [x11]) else AC_PATH_XTRA + X_LIBS="$X_LIBS -lX11" fi dnl Try to tell the user that the --x-* options are only used when @@ -593,7 +594,7 @@ xlib) else # should check these... X11_INCLUDES="$X11_INCLUDES $X_CFLAGS" - GL_LIB_DEPS="$X_LIBS -lX11 -lXext" + GL_LIB_DEPS="$X_LIBS -lXext" GL_PC_LIB_PRIV="$GL_LIB_DEPS" GL_PC_CFLAGS="$X11_INCLUDES" fi @@ -635,7 +636,7 @@ dri) else # should check these... X11_INCLUDES="$X11_INCLUDES $X_CFLAGS" - GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes" + GL_LIB_DEPS="$X_LIBS -lXext -lXxf86vm -lXdamage -lXfixes" GL_PC_LIB_PRIV="$GL_LIB_DEPS" GL_PC_CFLAGS="$X11_INCLUDES" @@ -1041,7 +1042,7 @@ if test "x$enable_glw" = xyes; then GLW_LIB_DEPS="$GLW_LIBS" else # should check these... - GLW_LIB_DEPS="$X_LIBS -lXt -lX11" + GLW_LIB_DEPS="$X_LIBS -lXt" GLW_PC_LIB_PRIV="$GLW_LIB_DEPS" GLW_PC_CFLAGS="$X11_INCLUDES" fi @@ -1122,7 +1123,7 @@ if test "x$enable_glut" = xyes; then GLUT_LIB_DEPS="$GLUT_LIBS" else # should check these... - GLUT_LIB_DEPS="$X_LIBS -lX11 -lXmu -lXi" + GLUT_LIB_DEPS="$X_LIBS -lXmu -lXi" GLUT_PC_LIB_PRIV="$GLUT_LIB_DEPS" GLUT_PC_CFLAGS="$X11_INCLUDES" fi -- 1.6.0.6