configure.in
changeset 1170 bb1a52a8d3d6
parent 1168 045f186426e1
child 1173 e9cf8c1b4590
     1.1 --- a/configure.in	Sun Nov 06 17:05:12 2005 +0000
     1.2 +++ b/configure.in	Tue Nov 08 01:34:28 2005 +0000
     1.3 @@ -613,20 +613,9 @@
     1.4  [  --enable-x11-shared     dynamically load X11 support [default=yes]],
     1.5                            , enable_x11_shared=yes)
     1.6  
     1.7 -            dnl !!! FIXME: make this work?
     1.8 -            dnl x11_lib_spec=`echo $X11_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libX11.so.*/'`
     1.9 -            dnl x11_lib=`ls $x11_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
    1.10 -            dnl echo "-- $x11_lib_spec -> $x11_lib"
    1.11 -            dnl x11ext_lib_spec=`echo $X11EXT_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libXext.so.*/'`
    1.12 -            dnl x11ext_lib=`ls $x11ext_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
    1.13 -            dnl echo "-- $x11ext_lib_spec -> $x11ext_lib"
    1.14 -
    1.15 -            x11_lib_spec='/usr/X11R6/lib/libX11.so.*'
    1.16 +            dnl !!! FIXME: if a platform needs more than this, fill it in!
    1.17              x11_lib='libX11.so.6'
    1.18 -            echo "-- $x11_lib_spec -> $x11_lib"
    1.19 -            x11ext_lib_spec='/usr/X11R6/lib/libXext.so.*'
    1.20 -            x11_lib='libXext.so.6'
    1.21 -            echo "-- $x11ext_lib_spec -> $x11_lib"
    1.22 +            x11ext_lib='libXext.so.6'
    1.23  
    1.24              if test x$use_dlopen != xyes && \
    1.25                 test x$enable_x11_shared = xyes; then
    1.26 @@ -634,7 +623,7 @@
    1.27              fi
    1.28  
    1.29              if test x$use_dlopen = xyes && \
    1.30 -               test x$enable_x11_shared = xyes && test x$x11_lib != x; then
    1.31 +               test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then
    1.32                  CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_X11 -DXTHREADS -DX11_DYNAMIC=\$(x11_lib) -DX11EXT_DYNAMIC=\$(x11ext_lib) -I$srcdir/include -I$srcdir/src/video"
    1.33                  SYSTEM_LIBS="$SYSTEM_LIBS $X_LIBS"
    1.34                  AC_SUBST(x11_lib)