[xserver-commit] xfree86 ChangeLog,1.1,1.2 configure.ac,1.1,1.2

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xfree86
In directory pdx:/tmp/cvs-serv8925

Modified Files:
	ChangeLog configure.ac 
Log Message:
ChangeLog: fix up the date of my initial entry, add new entry.

* configure.ac:
* os-support/Makefile.am:
* os-support/bus/Makefile.am:
* OS autodetection magic for the planned supported platforms (Linux,
  BSD, Solaris); also, SBus build for SPARC. Linux/i386 is no longer
  a valid assumption.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xfree86/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/ChangeLog	19 Feb 2004 03:50:05 -0000	1.1
+++ b/ChangeLog	19 Feb 2004 13:18:29 -0000	1.2
@@ -1,4 +1,14 @@
-2004-02-15  Daniel Stone  <daniel@freedesktop.org>
+2004-02-19  Daniel Stone  <daniel@freedesktop.org>
+
+	* configure.ac:
+	* os-support/Makefile.am:
+	* os-support/bus/Makefile.am:
+	* OS autodetection magic for the planned supported platforms (Linux,
+	  BSD, Solaris); also, SBus build for SPARC. Linux/i386 is no longer
+	  a valid assumption.
+
+2004-02-19  Daniel Stone  <daniel@freedesktop.org>
+
 	* Import the XFree86 DDX.
 	* Assumptions made by this checkin:
 	  + The loader is always enabled.

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xfree86/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/configure.ac	19 Feb 2004 04:02:48 -0000	1.1
+++ b/configure.ac	19 Feb 2004 13:18:29 -0000	1.2
@@ -373,22 +373,58 @@
 
 XF86_LIBS=
 XF86_INCS=
+XF86_OS=
 if test "$XF86SERVER" = yes; then
 	PKG_CHECK_MODULES(XF86SERVER, $XF86_REQUIRED_MODULES)
 	XF86_LIB='$(top_builddir)/hw/xfree86/libxfree86.a'
 	XF86_INC='-I$(top_srcdir)/hw/xfree86/include \\\
 	-I$(top_srcdir)/hw/xfree86/common \\\
 	-I$(top_srcdir)/hw/xfree86/os-support \\\
+	-I$(top_srcdir)/include \\\
 	-I$(top_srcdir)/hw/xfree86/os-support/bus'
 	XF86_LIBS="$DIX_LIB $OS_LIB $XF86_LIB $EXTENSION_LIBS $MI_LIB \
 	           $SHADOW_LIB $XF86SERVER_LIBS"
 	XF86_INCS="$XF86_INC $EXTENSION_INCS $MI_INC $XF86SERVER_INCS"
 	XF86_CFLAGS="$XF86SERVER_CFLAGS -D_XOPEN_SOURCE -D_POSIX_SOURCE=500 \
 	             -Wall"
+	case $host_os in
+	  linux-gnu*)
+	  	XF86_OS="linux"
+		XF86_OS_SUBDIR="linux"
+		;;
+	  freebsd*)
+	  	XF86_OS="freebsd"
+		XF86_OS_SUBDIR="bsd"
+		;;
+	  netbsd*)
+	  	XF86_OS="netbsd"
+		XF86_OS_SUBDIR="bsd"
+		;;
+	  openbsd*)
+	  	XF86_OS="openbsd"
+		XF86_OS_SUBDIR="bsd"
+		;;
+	  solaris*)
+	  	XF86_OS="solaris"
+		XF86_OS_SUBDIR="solaris"
+		;;
+	  *)
+	  	XF86_OS="unknown"
+		AC_MSG_ERROR([Your OS is unknown. xserver currently only supports Linux, Free/Open/NetBSD, and Solaris. If you are interested in porting xserver to your platform, please email xserver@freedesktop.org.])
+		;;
+	esac
+	case $host_cpu in
+	  sparc*)
+	  	xf86_bus_sbus="yes"
+		;;
+	esac
 fi
 AC_SUBST([XF86_LIBS])
 AC_SUBST([XF86_INCS])
 AC_SUBST([XF86_CFLAGS])
+AC_SUBST([XF86_OS])
+AC_SUBST([XF86_OS_SUBDIR])
+AM_CONDITIONAL([XF86_BUS_SBUS], [test "x$xf86_bus_sbus" = xyes])
 
 AC_CHECK_HEADERS([X11/XF86keysym.h],,,${XSERVER_CFLAGS})