Skip to content
Permalink
Browse files

Don't put X_LIBS in the linker flags if we're dynamically loading X11

  • Loading branch information
slouken committed Mar 6, 2006
1 parent d73430a commit e6ed0e5d2ba3760e915d50a5cebf413584669c23
Showing with 5 additions and 7 deletions.
  1. +5 −7 configure.in
@@ -763,25 +763,23 @@ AC_HELP_STRING([--enable-x11-shared], [dynamically load X11 support [default=yes
if test x$ac_cv_func_shmat != xyes; then
X_CFLAGS="$X_CFLAGS -DNO_SHARED_MEMORY"
fi

AC_DEFINE(SDL_VIDEO_DRIVER_X11)
SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
BUILD_CFLAGS="$BUILD_CFLAGS $X_CFLAGS"
if test x$have_loadso != xyes && \
test x$enable_x11_shared = xyes; then
AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic X11 loading])
fi

if test x$have_loadso = xyes && \
test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then
echo "-- dynamic libX11 -> $x11_lib"
echo "-- dynamic libX11ext -> $x11ext_lib"
AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib")
AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib")
else
X_LIBS="$X_LIBS -lX11 -lXext"
BUILD_LDFLAGS="$BUILD_LDFLAGS $X_LIBS -lX11 -lXext"
fi

AC_DEFINE(SDL_VIDEO_DRIVER_X11)
SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
BUILD_CFLAGS="$BUILD_CFLAGS $X_CFLAGS"
BUILD_LDFLAGS="$BUILD_LDFLAGS $X_LIBS"
have_video=yes

AC_ARG_ENABLE(dga,

0 comments on commit e6ed0e5

Please sign in to comment.