configure.in
changeset 1306 0c105755b110
parent 1299 2bf9dda618e5
child 1307 1c775d9abd2c
     1.1 --- a/configure.in	Tue Jan 31 18:08:33 2006 +0000
     1.2 +++ b/configure.in	Tue Jan 31 18:39:32 2006 +0000
     1.3 @@ -670,8 +670,8 @@
     1.4                  AC_MSG_RESULT($video_x11_vm)
     1.5                  if test x$video_x11_vm = xyes; then
     1.6                      CFLAGS="$CFLAGS -DXFREE86_VM"
     1.7 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86vm"
     1.8 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86vm/libXFree86_Xxf86vm.la"
     1.9 +                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86vm"
    1.10 +                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86vm/libXFree86_Xxf86vm.la"
    1.11                      AC_MSG_CHECKING(for XFree86 VidMode gamma support)
    1.12                      video_x11_vmgamma=no
    1.13                      AC_TRY_COMPILE([
    1.14 @@ -710,8 +710,8 @@
    1.15                      if test x$enable_video_x11_dgamouse = xyes; then
    1.16                          CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE"
    1.17                      fi
    1.18 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86dga"
    1.19 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86dga/libXFree86_Xxf86dga.la"
    1.20 +                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86dga"
    1.21 +                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86dga/libXFree86_Xxf86dga.la"
    1.22                  fi
    1.23              fi
    1.24              AC_ARG_ENABLE(video-x11-xv,
    1.25 @@ -734,8 +734,8 @@
    1.26                  AC_MSG_RESULT($video_x11_xv)
    1.27                  if test x$video_x11_xv = xyes; then
    1.28                      CFLAGS="$CFLAGS -DXFREE86_XV"
    1.29 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xv"
    1.30 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xv/libXFree86_Xv.la"
    1.31 +                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xv"
    1.32 +                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xv/libXFree86_Xv.la"
    1.33                  fi
    1.34              fi
    1.35              AC_ARG_ENABLE(video-x11-xinerama,
    1.36 @@ -755,8 +755,8 @@
    1.37                  AC_MSG_RESULT($video_x11_xinerama)
    1.38                  if test x$video_x11_xinerama = xyes; then
    1.39                      CFLAGS="$CFLAGS -DHAVE_XINERAMA"
    1.40 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xinerama"
    1.41 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xinerama/libXFree86_Xinerama.la"
    1.42 +                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xinerama"
    1.43 +                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xinerama/libXFree86_Xinerama.la"
    1.44                  fi
    1.45              fi
    1.46              AC_ARG_ENABLE(video-x11-xme,
    1.47 @@ -768,8 +768,8 @@
    1.48                  AC_MSG_RESULT($video_x11_xme)
    1.49                  if test x$video_x11_xme = xyes; then
    1.50                      CFLAGS="$CFLAGS -DHAVE_XIGXME"
    1.51 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/XME"
    1.52 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/XME/libXME.la"
    1.53 +                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/XME"
    1.54 +                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/XME/libXME.la"
    1.55                  fi
    1.56              fi
    1.57          fi
    1.58 @@ -3057,7 +3057,7 @@
    1.59  CFLAGS="$CFLAGS -I\$(top_srcdir)/src -I\$(top_srcdir)/src/main/$ARCH"
    1.60  CFLAGS="$CFLAGS -I\$(top_srcdir)/src/audio"
    1.61  CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video"
    1.62 -CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/XFree86/extensions"
    1.63 +CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/Xext/extensions"
    1.64  CFLAGS="$CFLAGS -I\$(top_srcdir)/src/events"
    1.65  CFLAGS="$CFLAGS -I\$(top_srcdir)/src/joystick"
    1.66  CFLAGS="$CFLAGS -I\$(top_srcdir)/src/cdrom"
    1.67 @@ -3154,13 +3154,13 @@
    1.68  src/video/gapi/Makefile
    1.69  src/video/x11/Makefile
    1.70  src/video/xbios/Makefile
    1.71 -src/video/XFree86/Makefile
    1.72 -src/video/XFree86/extensions/Makefile
    1.73 -src/video/XFree86/Xinerama/Makefile
    1.74 -src/video/XFree86/Xv/Makefile
    1.75 -src/video/XFree86/Xxf86dga/Makefile
    1.76 -src/video/XFree86/Xxf86vm/Makefile
    1.77 -src/video/XFree86/XME/Makefile
    1.78 +src/video/Xext/Makefile
    1.79 +src/video/Xext/extensions/Makefile
    1.80 +src/video/Xext/Xinerama/Makefile
    1.81 +src/video/Xext/Xv/Makefile
    1.82 +src/video/Xext/Xxf86dga/Makefile
    1.83 +src/video/Xext/Xxf86vm/Makefile
    1.84 +src/video/Xext/XME/Makefile
    1.85  src/events/Makefile
    1.86  src/joystick/Makefile
    1.87  src/joystick/amigaos/Makefile