comparison configure.in @ 1306:0c105755b110

Changed references to XFree86 to Xext to match change in directory structure. Reference Bugzilla #116.
author Ryan C. Gordon <icculus@icculus.org>
date Tue, 31 Jan 2006 18:39:32 +0000
parents 2bf9dda618e5
children 1c775d9abd2c
comparison
equal deleted inserted replaced
1305:babc963b6f8d 1306:0c105755b110
668 video_x11_vm=yes 668 video_x11_vm=yes
669 ]) 669 ])
670 AC_MSG_RESULT($video_x11_vm) 670 AC_MSG_RESULT($video_x11_vm)
671 if test x$video_x11_vm = xyes; then 671 if test x$video_x11_vm = xyes; then
672 CFLAGS="$CFLAGS -DXFREE86_VM" 672 CFLAGS="$CFLAGS -DXFREE86_VM"
673 VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86vm" 673 VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86vm"
674 VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86vm/libXFree86_Xxf86vm.la" 674 VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86vm/libXFree86_Xxf86vm.la"
675 AC_MSG_CHECKING(for XFree86 VidMode gamma support) 675 AC_MSG_CHECKING(for XFree86 VidMode gamma support)
676 video_x11_vmgamma=no 676 video_x11_vmgamma=no
677 AC_TRY_COMPILE([ 677 AC_TRY_COMPILE([
678 #include <X11/Xlib.h> 678 #include <X11/Xlib.h>
679 #include <XFree86/extensions/xf86vmode.h> 679 #include <XFree86/extensions/xf86vmode.h>
708 if test x$video_x11_dga = xyes; then 708 if test x$video_x11_dga = xyes; then
709 CFLAGS="$CFLAGS -DXFREE86_DGAMOUSE" 709 CFLAGS="$CFLAGS -DXFREE86_DGAMOUSE"
710 if test x$enable_video_x11_dgamouse = xyes; then 710 if test x$enable_video_x11_dgamouse = xyes; then
711 CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE" 711 CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE"
712 fi 712 fi
713 VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86dga" 713 VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86dga"
714 VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86dga/libXFree86_Xxf86dga.la" 714 VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86dga/libXFree86_Xxf86dga.la"
715 fi 715 fi
716 fi 716 fi
717 AC_ARG_ENABLE(video-x11-xv, 717 AC_ARG_ENABLE(video-x11-xv,
718 [ --enable-video-x11-xv use X11 XvImage extension for video [default=yes]], 718 [ --enable-video-x11-xv use X11 XvImage extension for video [default=yes]],
719 , enable_video_x11_xv=yes) 719 , enable_video_x11_xv=yes)
732 video_x11_xv=yes 732 video_x11_xv=yes
733 ]) 733 ])
734 AC_MSG_RESULT($video_x11_xv) 734 AC_MSG_RESULT($video_x11_xv)
735 if test x$video_x11_xv = xyes; then 735 if test x$video_x11_xv = xyes; then
736 CFLAGS="$CFLAGS -DXFREE86_XV" 736 CFLAGS="$CFLAGS -DXFREE86_XV"
737 VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xv" 737 VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xv"
738 VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xv/libXFree86_Xv.la" 738 VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xv/libXFree86_Xv.la"
739 fi 739 fi
740 fi 740 fi
741 AC_ARG_ENABLE(video-x11-xinerama, 741 AC_ARG_ENABLE(video-x11-xinerama,
742 [ --enable-video-x11-xinerama enable X11 Xinerama support [default=yes]], 742 [ --enable-video-x11-xinerama enable X11 Xinerama support [default=yes]],
743 , enable_video_x11_xinerama=yes) 743 , enable_video_x11_xinerama=yes)
753 video_x11_xinerama=yes 753 video_x11_xinerama=yes
754 ]) 754 ])
755 AC_MSG_RESULT($video_x11_xinerama) 755 AC_MSG_RESULT($video_x11_xinerama)
756 if test x$video_x11_xinerama = xyes; then 756 if test x$video_x11_xinerama = xyes; then
757 CFLAGS="$CFLAGS -DHAVE_XINERAMA" 757 CFLAGS="$CFLAGS -DHAVE_XINERAMA"
758 VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xinerama" 758 VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xinerama"
759 VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xinerama/libXFree86_Xinerama.la" 759 VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xinerama/libXFree86_Xinerama.la"
760 fi 760 fi
761 fi 761 fi
762 AC_ARG_ENABLE(video-x11-xme, 762 AC_ARG_ENABLE(video-x11-xme,
763 [ --enable-video-x11-xme enable Xi Graphics XME for fullscreen [default=yes]], 763 [ --enable-video-x11-xme enable Xi Graphics XME for fullscreen [default=yes]],
764 , enable_video_x11_xme=yes) 764 , enable_video_x11_xme=yes)
766 AC_MSG_CHECKING(for Xi Graphics XiGMiscExtension support) 766 AC_MSG_CHECKING(for Xi Graphics XiGMiscExtension support)
767 video_x11_xme=yes 767 video_x11_xme=yes
768 AC_MSG_RESULT($video_x11_xme) 768 AC_MSG_RESULT($video_x11_xme)
769 if test x$video_x11_xme = xyes; then 769 if test x$video_x11_xme = xyes; then
770 CFLAGS="$CFLAGS -DHAVE_XIGXME" 770 CFLAGS="$CFLAGS -DHAVE_XIGXME"
771 VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/XME" 771 VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/XME"
772 VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/XME/libXME.la" 772 VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/XME/libXME.la"
773 fi 773 fi
774 fi 774 fi
775 fi 775 fi
776 fi 776 fi
777 } 777 }
3055 CFLAGS="$CFLAGS -I\$(top_srcdir)/include" 3055 CFLAGS="$CFLAGS -I\$(top_srcdir)/include"
3056 CFLAGS="$CFLAGS -I\$(top_srcdir)/include/SDL" 3056 CFLAGS="$CFLAGS -I\$(top_srcdir)/include/SDL"
3057 CFLAGS="$CFLAGS -I\$(top_srcdir)/src -I\$(top_srcdir)/src/main/$ARCH" 3057 CFLAGS="$CFLAGS -I\$(top_srcdir)/src -I\$(top_srcdir)/src/main/$ARCH"
3058 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/audio" 3058 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/audio"
3059 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video" 3059 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video"
3060 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/XFree86/extensions" 3060 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/Xext/extensions"
3061 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/events" 3061 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/events"
3062 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/joystick" 3062 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/joystick"
3063 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/cdrom" 3063 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/cdrom"
3064 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/thread" 3064 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/thread"
3065 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/timer" 3065 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/timer"
3152 src/video/windib/Makefile 3152 src/video/windib/Makefile
3153 src/video/windx5/Makefile 3153 src/video/windx5/Makefile
3154 src/video/gapi/Makefile 3154 src/video/gapi/Makefile
3155 src/video/x11/Makefile 3155 src/video/x11/Makefile
3156 src/video/xbios/Makefile 3156 src/video/xbios/Makefile
3157 src/video/XFree86/Makefile 3157 src/video/Xext/Makefile
3158 src/video/XFree86/extensions/Makefile 3158 src/video/Xext/extensions/Makefile
3159 src/video/XFree86/Xinerama/Makefile 3159 src/video/Xext/Xinerama/Makefile
3160 src/video/XFree86/Xv/Makefile 3160 src/video/Xext/Xv/Makefile
3161 src/video/XFree86/Xxf86dga/Makefile 3161 src/video/Xext/Xxf86dga/Makefile
3162 src/video/XFree86/Xxf86vm/Makefile 3162 src/video/Xext/Xxf86vm/Makefile
3163 src/video/XFree86/XME/Makefile 3163 src/video/Xext/XME/Makefile
3164 src/events/Makefile 3164 src/events/Makefile
3165 src/joystick/Makefile 3165 src/joystick/Makefile
3166 src/joystick/amigaos/Makefile 3166 src/joystick/amigaos/Makefile
3167 src/joystick/beos/Makefile 3167 src/joystick/beos/Makefile
3168 src/joystick/bsd/Makefile 3168 src/joystick/bsd/Makefile