pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401472
This commit is contained in:
Sam Lantinga 2006-03-06 01:05:11 +00:00
parent 0e67f0fd20
commit fbd764a441
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
configure.in
View file

@ -763,11 +763,14 @@ 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"
@ -775,13 +778,8 @@ AC_HELP_STRING([--enable-x11-shared], [dynamically load X11 support [default=yes
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,