Merge OpenBSD specific configuration code

- arches supports
- kdrive

1 files changed, 38 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index 80605e155..22bee86ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -306,6 +306,7 @@ case $host_cpu in
 	case $host_os in
 	        *freebsd*)	SYS_LIBS=-lio ;;
 		*netbsd*)	AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO]) ;;
+		*openbsd*)	SYS_LIBS=-lalpha ;;
 	esac
 	GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
 	;;
@@ -331,6 +332,14 @@ case $host_cpu in
 		*freebsd*)	DEFAULT_INT10=stub ;;
 	esac
 	;;
+  m68k)
+	HP300_VIDEO=yes
+	BSD_ARCH_SOURCES="hp300_video.c ioperm_noop.c"
+	;;
+  mips*)
+	SGI_VIDEO=yes
+	BSD_ARCH_SOURCES="sgi_video.c ioperm_noop.c"
+	;;
   sparc*)
 	SPARC64_VIDEO=yes
 	BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
@@ -362,8 +371,11 @@ AC_SUBST(GLX_ARCH_DEFINES)
 dnl BSD *_video.c selection
 AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
 AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes])
+AM_CONDITIONAL(HP300_VIDEO, [test "x$HP300_VIDEO" = xyes])
+AM_CONDITIONAL(HPPA_VIDEO, [test "x$HPPA_VIDEO" = xyes])
 AM_CONDITIONAL(I386_VIDEO, [test "x$I386_VIDEO" = xyes])
 AM_CONDITIONAL(PPC_VIDEO, [test "x$PPC_VIDEO" = xyes])
+AM_CONDITIONAL(SGI_VIDEO, [test "x$SGI_VIDEO" = xyes])
 AM_CONDITIONAL(SPARC64_VIDEO, [test "x$SPARC64_VIDEO" = xyes])
 
 DRI=no
@@ -391,6 +403,7 @@ case $host_os in
 	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
 	AC_DEFINE(PCVT_SUPPORT, 1, [System has PC console])
 	AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])
+	KDRIVE_HW=yes
 	;;
   *linux*)
 	DRI=yes
@@ -1179,7 +1192,14 @@ if test "x$GCC" = "xyes"; then
 fi
 case $host_os in
        openbsd*)
-       LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic"
+       case $host_cpu in
+       		m68k|m88k|vax)
+		LD_EXPORT_SYMBOLS_FLAGS=""
+		;;
+		*)
+		LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic"
+		;;
+		esac
        ;;
 esac
 AC_SUBST([LD_EXPORT_SYMBOLS_FLAG])
@@ -1381,7 +1401,15 @@ if test "x$XORG" = xyes; then
 
 	case $host_cpu in
 	  sparc*)
-		xorg_bus_sparc="yes"
+		xorg_bus_sparcpci="yes"
+		case $host_os in
+		  openbsd*)
+		    xorg_bus_sparc="no"
+		    ;;
+		  *)
+		    xorg_bus_sparc="yes"
+		    ;;
+		esac
 		;;
 	esac
 
@@ -1736,6 +1764,10 @@ if test "$KDRIVE" = yes; then
 	    KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
             KDRIVELINUX=yes
 	    ;;
+	*openbsd*)
+	    KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/openbsd/libopenbsd.a'
+	    KDRIVEOPENBSD=yes
+	    ;;
     esac
     KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
     KDRIVE_LOCAL_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
@@ -1755,9 +1787,11 @@ AC_SUBST([KDRIVE_PURE_LIBS])
 AC_SUBST([KDRIVE_LOCAL_LIBS])
 AC_SUBST([KDRIVE_LIBS])
 AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes])
+AM_CONDITIONAL(KDRIVEOPENBSD, [test "x$KDRIVEOPENBSD" = xyes])
 AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])
 AM_CONDITIONAL(KDRIVEVESA, [test "x$KDRIVEVESA" = xyes])
 AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes])
+AM_CONDITIONAL(KDRIVEWSCONS, [test x"$ac_cv_header_dev_wscons_wsconsio_h" = xyes])
 AM_CONDITIONAL(XSDLSERVER, [test x"$XSDL" = xyes])
 AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
 AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes])
@@ -1904,7 +1938,9 @@ hw/kdrive/ephyr/Makefile
 hw/kdrive/fake/Makefile
 hw/kdrive/fbdev/Makefile
 hw/kdrive/linux/Makefile
+hw/kdrive/openbsd/Makefile
 hw/kdrive/sdl/Makefile
 hw/kdrive/src/Makefile
+hw/kdrive/wscons/Makefile
 xorg-server.pc
 ])