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

Use the right libs in dynamic X11 loading.

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401173
This commit is contained in:
Ryan C. Gordon 2005-11-08 01:34:28 +00:00
parent 5bbfac2e12
commit 0d1c5d91b8
1 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
configure.in
View file

@ -613,20 +613,9 @@ CheckX11()
[ --enable-x11-shared dynamically load X11 support [default=yes]], [ --enable-x11-shared dynamically load X11 support [default=yes]],
, enable_x11_shared=yes) , enable_x11_shared=yes)
dnl !!! FIXME: make this work? dnl !!! FIXME: if a platform needs more than this, fill it in!
dnl x11_lib_spec=`echo $X11_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libX11.so.*/'`
dnl x11_lib=`ls $x11_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
dnl echo "-- $x11_lib_spec -> $x11_lib"
dnl x11ext_lib_spec=`echo $X11EXT_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libXext.so.*/'`
dnl x11ext_lib=`ls $x11ext_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
dnl echo "-- $x11ext_lib_spec -> $x11ext_lib"
x11_lib_spec='/usr/X11R6/lib/libX11.so.*'
x11_lib='libX11.so.6' x11_lib='libX11.so.6'
echo "-- $x11_lib_spec -> $x11_lib" x11ext_lib='libXext.so.6'
x11ext_lib_spec='/usr/X11R6/lib/libXext.so.*'
x11_lib='libXext.so.6'
echo "-- $x11ext_lib_spec -> $x11_lib"
if test x$use_dlopen != xyes && \ if test x$use_dlopen != xyes && \
test x$enable_x11_shared = xyes; then test x$enable_x11_shared = xyes; then
@ -634,7 +623,7 @@ CheckX11()
fi fi
if test x$use_dlopen = xyes && \ if test x$use_dlopen = xyes && \
test x$enable_x11_shared = xyes && test x$x11_lib != x; then test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then
CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_X11 -DXTHREADS -DX11_DYNAMIC=\$(x11_lib) -DX11EXT_DYNAMIC=\$(x11ext_lib) -I$srcdir/include -I$srcdir/src/video" CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_X11 -DXTHREADS -DX11_DYNAMIC=\$(x11_lib) -DX11EXT_DYNAMIC=\$(x11ext_lib) -I$srcdir/include -I$srcdir/src/video"
SYSTEM_LIBS="$SYSTEM_LIBS $X_LIBS" SYSTEM_LIBS="$SYSTEM_LIBS $X_LIBS"
AC_SUBST(x11_lib) AC_SUBST(x11_lib)