configure.in
changeset 292 eadc0746dfaf
parent 286 3ea69fd0b095
child 294 d2d48e10f370
--- a/configure.in	Sat Mar 02 16:50:35 2002 +0000
+++ b/configure.in	Tue Mar 05 19:55:32 2002 +0000
@@ -372,7 +372,7 @@
 CheckNAS()
 {
     AC_ARG_ENABLE(nas,
-[  --enable-nas		  support the NAS audio API [default=yes]],
+[  --enable-nas                  support the NAS audio API [default=yes]],
                   , enable_nas=yes)
     if test x$enable_audio = xyes -a x$enable_nas = xyes; then
         AC_MSG_CHECKING(for NAS audio support)
@@ -394,7 +394,7 @@
 CheckDiskAudio()
 {
     AC_ARG_ENABLE(diskaudio,
-[  --enable-diskaudio  	  support the disk writer audio driver [default=yes]],
+[  --enable-diskaudio            support the disk writer audio driver [default=yes]],
                   , enable_diskaudio=yes)
     if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then
         CFLAGS="$CFLAGS -DDISKAUD_SUPPORT"
@@ -445,44 +445,44 @@
 dnl Find the nanox include and library directories
 CheckNANOX()
 {
-	AC_ARG_ENABLE(video-nanox,
-		[  --enable-video-nanox use nanox video driver [default=no]],
-	        , enable_video_nanox=no)
-	AC_ARG_ENABLE(nanox-debug,  
-		[  --enable-nanox-debug print debug messages [default=no]],
-		, enable_nanox_debug=no)
-	AC_ARG_ENABLE(nanox-share-memory,  
-		[  --enable-nanox-share-memory use share memory [default=no]],
-		, enable_nanox_share_memory=no)
+    AC_ARG_ENABLE(video-nanox,
+        [  --enable-video-nanox use nanox video driver [default=no]],
+        , enable_video_nanox=no)
+    AC_ARG_ENABLE(nanox-debug,  
+        [  --enable-nanox-debug print debug messages [default=no]],
+        , enable_nanox_debug=no)
+    AC_ARG_ENABLE(nanox-share-memory,  
+        [  --enable-nanox-share-memory use share memory [default=no]],
+        , enable_nanox_share_memory=no)
 
-	AC_ARG_WITH(nanox_pixel_type, 
-		[  --with-nanox-pixel-type=[rgb/0888/888/565/555/332/pal]])
+    AC_ARG_WITH(nanox_pixel_type, 
+        [  --with-nanox-pixel-type=[rgb/0888/888/565/555/332/pal]])
 
-	if test x$enable_video = xyes -a x$enable_video_nanox = xyes; then
-		if test x$enable_nanox_debug = xyes; then
-			CFLAGS="$CFLAGS -DENABLE_NANOX_DEBUG"
-		fi
+    if test x$enable_video = xyes -a x$enable_video_nanox = xyes; then
+        if test x$enable_nanox_debug = xyes; then
+            CFLAGS="$CFLAGS -DENABLE_NANOX_DEBUG"
+        fi
 
-		if test x$enable_nanox_share_memory = xyes; then
-			CFLAGS="$CFLAGS -DNANOX_SHARE_MEMORY"
-		fi
+        if test x$enable_nanox_share_memory = xyes; then
+            CFLAGS="$CFLAGS -DNANOX_SHARE_MEMORY"
+        fi
 
-		case "$with_nanox_pixel_type" in
-			 rgb) CFLAGS="$CFLAGS -DNANOX_PIXEL_RGB" ;;
-			0888) CFLAGS="$CFLAGS -DNANOX_PIXEL_0888" ;;
-			 888) CFLAGS="$CFLAGS -DNANOX_PIXEL_888"  ;;
-			 565) CFLAGS="$CFLAGS -DNANOX_PIXEL_565"  ;;
-			 555) CFLAGS="$CFLAGS -DNANOX_PIXEL_555"  ;;
-			 332) CFLAGS="$CFLAGS -DNANOX_PIXEL_332"  ;;
-			 pal) CFLAGS="$CFLAGS -DNANOX_PIXEL_PAL"  ;;
-			   *) AC_MSG_ERROR([Invalid nanox_pixel_type]);;
-		esac
+        case "$with_nanox_pixel_type" in
+             rgb) CFLAGS="$CFLAGS -DNANOX_PIXEL_RGB" ;;
+            0888) CFLAGS="$CFLAGS -DNANOX_PIXEL_0888" ;;
+             888) CFLAGS="$CFLAGS -DNANOX_PIXEL_888"  ;;
+             565) CFLAGS="$CFLAGS -DNANOX_PIXEL_565"  ;;
+             555) CFLAGS="$CFLAGS -DNANOX_PIXEL_555"  ;;
+             332) CFLAGS="$CFLAGS -DNANOX_PIXEL_332"  ;;
+             pal) CFLAGS="$CFLAGS -DNANOX_PIXEL_PAL"  ;;
+               *) AC_MSG_ERROR([Invalid nanox_pixel_type]);;
+        esac
 
-		CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_NANOX"
-		SYSTEM_LIBS="$SYSTEM_LIBS -lnano-X"
-		VIDEO_SUBDIRS="$VIDEO_SUBDIRS nanox"
-		VIDEO_DRIVERS="$VIDEO_DRIVERS nanox/libvideo_nanox.la"
-	fi
+        CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_NANOX"
+        SYSTEM_LIBS="$SYSTEM_LIBS -lnano-X"
+        VIDEO_SUBDIRS="$VIDEO_SUBDIRS nanox"
+        VIDEO_DRIVERS="$VIDEO_DRIVERS nanox/libvideo_nanox.la"
+    fi
 }
 
 dnl Find the X11 include and library directories
@@ -495,7 +495,7 @@
         AC_PATH_X
         AC_PATH_XTRA
         if test x$have_x = xyes; then
-            CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_X11"
+            CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_X11 -Isrc/video"
             if test x$ac_cv_func_shmat != xyes; then
                 CFLAGS="$CFLAGS -DNO_SHARED_MEMORY"
             fi
@@ -511,7 +511,7 @@
                 video_x11_vm=no
                 AC_TRY_COMPILE([
                  #include <X11/Xlib.h>
-                 #include <X11/extensions/xf86vmode.h>
+                 #include <XFree86/extensions/xf86vmode.h>
                 ],[
                 ],[
                 video_x11_vm=yes
@@ -519,34 +519,15 @@
                 AC_MSG_RESULT($video_x11_vm)
                 if test x$video_x11_vm = xyes; then
                     CFLAGS="$CFLAGS -DXFREE86_VM"
-                    # Check for nasty XFree86 4.0/Glide hack
-                    AC_ARG_ENABLE(xfree86_glidehack,
-[  --enable-xfree86-glidehack Alternate vidmode lib for old Glide [default=no]],
-                                  , enable_xfreeglidehack=no)
-                    if test x$enable_xfree86_glidehack = xyes; then
-                        ac_save_libs="$LIBS"
-                        LIBS="$LIBS $X_LIBS -lX11 -lXext"
-                        if test x$xfree86_glidehack = x; then
-                            AC_CHECK_LIB(Xxf86vm, XF40VidModeQueryExtension, xfree86_glidehack=Xxf86vm)
-                        fi
-                        if test x$xfree86_glidehack = x; then
-                            AC_CHECK_LIB(Xxf86vm40, XF40VidModeQueryExtension, xfree86_glidehack=Xxf86vm40)
-                        fi
-                        LIBS="$ac_save_libs"
-                    fi
-                    if test x$xfree86_glidehack != x; then
-                        CFLAGS="$CFLAGS -DXFREE86_VM_DYNAMIC_HACK"
-                        SYSTEM_LIBS="$SYSTEM_LIBS -l$xfree86_glidehack"
-                    else
-                        SYSTEM_LIBS="$SYSTEM_LIBS -lXxf86vm"
-                    fi
+                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86vm"
+                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86vm/libXFree86_Xxf86vm.la"
                     AC_MSG_CHECKING(for XFree86 VidMode gamma support)
                     video_x11_vmgamma=no
                     AC_TRY_COMPILE([
                      #include <X11/Xlib.h>
-                     #include <X11/extensions/xf86vmode.h>
+                     #include <XFree86/extensions/xf86vmode.h>
                     ],[
-                     XF86VidModeGamma gamma;
+                     SDL_NAME(XF86VidModeGamma) gamma;
                     ],[
                     video_x11_vmgamma=yes
                     ])
@@ -567,7 +548,7 @@
                 video_x11_dga=no
                 AC_TRY_COMPILE([
                  #include <X11/Xlib.h>
-                 #include <X11/extensions/xf86dga.h>
+                 #include <XFree86/extensions/xf86dga.h>
                 ],[
                 ],[
                 video_x11_dga=yes
@@ -578,7 +559,8 @@
                     if test x$enable_video_x11_dgamouse = xyes; then
                         CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE"
                     fi
-                    SYSTEM_LIBS="$SYSTEM_LIBS -lXxf86dga"
+                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86dga"
+                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86dga/libXFree86_Xxf86dga.la"
                 fi
             fi
             AC_ARG_ENABLE(video-x11-xv,
@@ -592,16 +574,17 @@
                  #include <sys/ipc.h>
                  #include <sys/shm.h>
                  #include <X11/extensions/XShm.h>
-                 #include <X11/extensions/Xvlib.h>
+                 #include <XFree86/extensions/Xvlib.h>
                 ],[
-                 XvImage *image;
+                 SDL_NAME(XvImage) *image;
                 ],[
                 video_x11_xv=yes
                 ])
                 AC_MSG_RESULT($video_x11_xv)
                 if test x$video_x11_xv = xyes; then
                     CFLAGS="$CFLAGS -DXFREE86_XV"
-                    SYSTEM_LIBS="$SYSTEM_LIBS -lXv"
+                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xv"
+                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xv/libXFree86_Xv.la"
                 fi
             fi
             AC_ARG_ENABLE(video-x11-xinerama,
@@ -612,16 +595,17 @@
                 video_x11_xinerama=no
                 AC_TRY_COMPILE([
                  #include <X11/Xlib.h>
-                 #include <X11/extensions/Xinerama.h>
+                 #include <XFree86/extensions/Xinerama.h>
                 ],[
-                 XineramaScreenInfo *xinerama;
+                 SDL_NAME(XineramaScreenInfo) *xinerama;
                 ],[
                 video_x11_xinerama=yes
                 ])
                 AC_MSG_RESULT($video_x11_xinerama)
                 if test x$video_x11_xinerama = xyes; then
                     CFLAGS="$CFLAGS -DHAVE_XINERAMA"
-                    SYSTEM_LIBS="$SYSTEM_LIBS -lXinerama"
+                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xinerama"
+                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xinerama/libXFree86_Xinerama.la"
                 fi
             fi
             AC_ARG_ENABLE(video-x11-xme,
@@ -648,6 +632,33 @@
     fi
 }
 
+dnl Find the X11 DGA 2.0 include and library directories
+CheckDGA()
+{
+    AC_ARG_ENABLE(video-dga,
+[  --enable-video-dga      use DGA 2.0 video driver [default=yes]],
+                  , enable_video_dga=yes)
+    if test x$video_x11_dga = xyes -a x$enable_video_dga = xyes; then
+        save_CFLAGS="$CFLAGS"; CFLAGS="$CFLAGS -Isrc/video"
+        AC_MSG_CHECKING(for XFree86 DGA 2.0 support)
+        video_x11_dga2=no
+        AC_TRY_COMPILE([
+         #include <X11/Xlib.h>
+         #include <XFree86/extensions/xf86dga.h>
+        ],[
+         SDL_NAME(XDGAEvent) xevent;
+        ],[
+        video_x11_dga2=yes
+        ])
+        AC_MSG_RESULT($video_x11_dga2)
+        if test x$video_x11_dga2 = xyes; then
+            CFLAGS="$CFLAGS -DENABLE_DGA"
+            VIDEO_SUBDIRS="$VIDEO_SUBDIRS dga"
+            VIDEO_DRIVERS="$VIDEO_DRIVERS dga/libvideo_dga.la"
+        fi
+    fi
+}
+
 CheckPHOTON()
 {
     AC_ARG_ENABLE(video-photon,
@@ -677,32 +688,6 @@
     fi
 }
 
-dnl Find the X11 DGA 2.0 include and library directories
-CheckDGA()
-{
-    AC_ARG_ENABLE(video-dga,
-[  --enable-video-dga      use DGA 2.0 video driver [default=yes]],
-                  , enable_video_dga=yes)
-    if test x$video_x11_dga = xyes -a x$enable_video_dga = xyes; then
-        AC_MSG_CHECKING(for XFree86 DGA 2.0 support)
-        video_x11_dga2=no
-        AC_TRY_COMPILE([
-         #include <X11/Xlib.h>
-         #include <X11/extensions/xf86dga.h>
-        ],[
-         XDGAEvent xevent;
-        ],[
-        video_x11_dga2=yes
-        ])
-        AC_MSG_RESULT($video_x11_dga2)
-        if test x$video_x11_dga2 = xyes; then
-            CFLAGS="$CFLAGS -DENABLE_DGA"
-            VIDEO_SUBDIRS="$VIDEO_SUBDIRS dga"
-            VIDEO_DRIVERS="$VIDEO_DRIVERS dga/libvideo_dga.la"
-        fi
-    fi
-}
-
 dnl Find the framebuffer console includes
 CheckFBCON()
 {
@@ -2335,6 +2320,7 @@
 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/main"
 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/audio"
 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video"
+CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/XFree86/extensions"
 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/events"
 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/joystick"
 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/cdrom"
@@ -2391,6 +2377,12 @@
 src/audio/windx5/Makefile
 src/audio/disk/Makefile
 src/video/Makefile
+src/video/XFree86/Makefile
+src/video/XFree86/extensions/Makefile
+src/video/XFree86/Xinerama/Makefile
+src/video/XFree86/Xv/Makefile
+src/video/XFree86/Xxf86dga/Makefile
+src/video/XFree86/Xxf86vm/Makefile
 src/video/cybergfx/Makefile
 src/video/x11/Makefile
 src/video/dga/Makefile