configure.in
changeset 1174 8c43aceeed81
parent 1173 e9cf8c1b4590
child 1175 867f521591e5
     1.1 --- a/configure.in	Thu Nov 17 03:15:05 2005 +0000
     1.2 +++ b/configure.in	Thu Nov 17 03:16:01 2005 +0000
     1.3 @@ -614,8 +614,16 @@
     1.4                            , enable_x11_shared=yes)
     1.5  
     1.6              dnl !!! FIXME: if a platform needs more than this, fill it in!
     1.7 -            x11_lib='libX11.so.6'
     1.8 -            x11ext_lib='libXext.so.6'
     1.9 +            case "$target" in
    1.10 +                *-*-darwin* )
    1.11 +                    x11_lib='/usr/X11R6/lib/libX11.6.dylib'
    1.12 +                    x11ext_lib='/usr/X11R6/lib/libXext.6.dylib'
    1.13 +                    ;;
    1.14 +                *)
    1.15 +                    x11_lib='libX11.so.6'
    1.16 +                    x11ext_lib='libXext.so.6'
    1.17 +                    ;;
    1.18 +            esac
    1.19  
    1.20              if test x$have_loadso != xyes && \
    1.21                 test x$enable_x11_shared = xyes; then
    1.22 @@ -626,6 +634,8 @@
    1.23                 test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then
    1.24                  CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_X11 -DXTHREADS -DX11_DYNAMIC=\$(x11_lib) -DX11EXT_DYNAMIC=\$(x11ext_lib) -I$srcdir/include -I$srcdir/src/video"
    1.25                  SYSTEM_LIBS="$SYSTEM_LIBS $X_LIBS"
    1.26 +                echo "-- dynamic libX11 -> $x11_lib"
    1.27 +                echo "-- dynamic libX11ext -> $x11ext_lib"
    1.28                  AC_SUBST(x11_lib)
    1.29                  AC_SUBST(x11ext_lib)
    1.30              else
    1.31 @@ -769,28 +779,6 @@
    1.32      fi
    1.33  }
    1.34  
    1.35 -
    1.36 -dnl Check for X11 on Mac OS X / Darwin
    1.37 -CheckMacX11()
    1.38 -{
    1.39 -    AC_ARG_ENABLE(video-x11,
    1.40 -[  --enable-video-x11      use X11 video driver [default=no]],
    1.41 -                  , enable_video_x11=no)
    1.42 -    if test x$enable_video = xyes -a x$enable_video_x11 = xyes; then
    1.43 -        AC_PATH_X
    1.44 -        AC_PATH_XTRA
    1.45 -        if test x$have_x = xyes; then
    1.46 -            CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_X11 -DXTHREADS -I$srcdir/include -I$srcdir/src/video"
    1.47 -            if test x$ac_cv_func_shmat != xyes; then
    1.48 -                CFLAGS="$CFLAGS -DNO_SHARED_MEMORY"
    1.49 -            fi
    1.50 -            SYSTEM_LIBS="$SYSTEM_LIBS $X_LIBS -lX11 -lXext"
    1.51 -            VIDEO_SUBDIRS="$VIDEO_SUBDIRS x11"
    1.52 -            VIDEO_DRIVERS="$VIDEO_DRIVERS x11/libvideo_x11.la"
    1.53 -        fi
    1.54 -    fi
    1.55 -}
    1.56 -
    1.57  dnl Find the X11 DGA 2.0 include and library directories
    1.58  CheckDGA()
    1.59  {
    1.60 @@ -2721,7 +2709,7 @@
    1.61          CheckDiskAudio
    1.62          CheckCOCOA
    1.63          CheckCARBON
    1.64 -        CheckMacX11
    1.65 +        CheckX11
    1.66          CheckMacGL
    1.67          CheckPTHREAD
    1.68          CheckSIGACTION