configure.in
changeset 1468 fecfef92fc94
parent 1467 b69f2b0309a0
child 1477 577b41f7dc1d
equal deleted inserted replaced
1467:b69f2b0309a0 1468:fecfef92fc94
   761 
   761 
   762             X_CFLAGS="$X_CFLAGS -DXTHREADS"
   762             X_CFLAGS="$X_CFLAGS -DXTHREADS"
   763             if test x$ac_cv_func_shmat != xyes; then
   763             if test x$ac_cv_func_shmat != xyes; then
   764                 X_CFLAGS="$X_CFLAGS -DNO_SHARED_MEMORY"
   764                 X_CFLAGS="$X_CFLAGS -DNO_SHARED_MEMORY"
   765             fi
   765             fi
       
   766 
       
   767             AC_DEFINE(SDL_VIDEO_DRIVER_X11)
       
   768             SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
       
   769             BUILD_CFLAGS="$BUILD_CFLAGS $X_CFLAGS"
   766             if test x$have_loadso != xyes && \
   770             if test x$have_loadso != xyes && \
   767                test x$enable_x11_shared = xyes; then
   771                test x$enable_x11_shared = xyes; then
   768                 AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic X11 loading])
   772                 AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic X11 loading])
   769             fi
   773             fi
   770 
       
   771             if test x$have_loadso = xyes && \
   774             if test x$have_loadso = xyes && \
   772                test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then
   775                test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then
   773                 echo "-- dynamic libX11 -> $x11_lib"
   776                 echo "-- dynamic libX11 -> $x11_lib"
   774                 echo "-- dynamic libX11ext -> $x11ext_lib"
   777                 echo "-- dynamic libX11ext -> $x11ext_lib"
   775                 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib")
   778                 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib")
   776                 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib")
   779                 AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib")
   777             else
   780             else
   778                 X_LIBS="$X_LIBS -lX11 -lXext"
   781                 BUILD_LDFLAGS="$BUILD_LDFLAGS $X_LIBS -lX11 -lXext"
   779             fi
   782             fi
   780 
       
   781             AC_DEFINE(SDL_VIDEO_DRIVER_X11)
       
   782             SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
       
   783             BUILD_CFLAGS="$BUILD_CFLAGS $X_CFLAGS"
       
   784             BUILD_LDFLAGS="$BUILD_LDFLAGS $X_LIBS"
       
   785             have_video=yes
   783             have_video=yes
   786 
   784 
   787             AC_ARG_ENABLE(dga,
   785             AC_ARG_ENABLE(dga,
   788 AC_HELP_STRING([--enable-dga], [allow use of X11 DGA code [default=yes]]),
   786 AC_HELP_STRING([--enable-dga], [allow use of X11 DGA code [default=yes]]),
   789                           , enable_dga=yes)
   787                           , enable_dga=yes)