- Bug #3960: Add remaining GLX and pci.ids stuff to DIST (Cha Young-Ho,

    Olli Helenius)
- Fix some distcheck problems for non-solaris systems
- Change server version number from the Xorg rev to an independent one
- _POSIX_SOURCE and _XOPEN_SOURCE defined to the right values

7 files changed, 34 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a79cb907..3938f6090 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,20 @@
 2005-08-04  Adam Jackson  <ajax@freedesktop.org>
 
 	* configure.ac:
+	* GL/Makefile.am:
+	* GL/include/Makefile.am:
+	* GL/include/GL/Makefile.am:
+	* hw/xfree86/os-support/solaris/Makefile.am:
+	* hw/xfree86/scanpci/Makefile.am:
+	- Bug #3960: Add remaining GLX and pci.ids stuff to DIST
+	  (Cha Young-Ho, Olli Helenius)
+	- Fix some distcheck problems for non-solaris systems
+	- Change server version number from the Xorg rev to an independent one
+	- _POSIX_SOURCE and _XOPEN_SOURCE defined to the right values
+
+2005-08-04  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
 	* GL/mesa/main/Makefile.am:
 	- Check for vsnprintf
 	- Don't build the Xorg DDX on darwin
diff --git a/GL/Makefile.am b/GL/Makefile.am
index 3705e0e91..23a67d9de 100644
--- a/GL/Makefile.am
+++ b/GL/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = glx mesa
+SUBDIRS = glx mesa include
 
 # someone could get really crazy someday and add support for the SI...
 
diff --git a/GL/include/GL/Makefile.am b/GL/include/GL/Makefile.am
new file mode 100644
index 000000000..f2a902396
--- /dev/null
+++ b/GL/include/GL/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = glx_ansic.h xf86glx.h
diff --git a/GL/include/Makefile.am b/GL/include/Makefile.am
new file mode 100644
index 000000000..1367fb437
--- /dev/null
+++ b/GL/include/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = GL
diff --git a/configure.ac b/configure.ac
index d1a505598..2413ce5d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,9 +24,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-dnl we aren't intelligent about padding the version, so it always has to be four
-dnl digits.  ho hum.
-AC_INIT([xorg-server], 6.99.99.900, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+dnl This is the not the Xorg version number, it's the server version number.
+dnl Yes, that's weird.
+AC_INIT([xorg-server], 0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
@@ -151,7 +151,7 @@ AC_DEFINE_UNQUOTED(OSNAME, "$OSNAME",
 DEFAULT_VENDOR_STRING="X.Org"
 DEFAULT_VENDOR_RELEASE="$PACKAGE_VERSION"
 # e.g. 6.9.99.1 -> 6,9,99,1,0
-VERSION_STRING="${DEFAULT_VENDOR_RELEASE//./,},0"
+VERSION_STRING="6,99,99,900,0"
 DEFAULT_VENDOR_WEB="http://wiki.x.org"
 EXTENSION_LIBS='$(top_builddir)/Xext/libXext.la'
 DMX_EXTENSIONS='$(top_builddir)/Xext/libXext.la'" "'$(top_builddir)/render/librender.la'
@@ -797,8 +797,8 @@ case $host_os in
                 esac
                 ;;
 	*) 
-		AC_DEFINE(_POSIX_SOURCE,500,[POSIX-compliant source])
-		AC_DEFINE(_XOPEN_SOURCE,1,[X/Open-compliant source])
+		AC_DEFINE(_POSIX_SOURCE,1,[POSIX-compliant source])
+		AC_DEFINE(_XOPEN_SOURCE,500,[X/Open-compliant source])
 		AC_DEFINE(_BSD_SOURCE,1,[BSD-compliant source])
 		;;
 esac
@@ -861,6 +861,8 @@ AC_OUTPUT([
 Makefile
 GL/Makefile
 GL/glx/Makefile
+GL/include/Makefile
+GL/include/GL/Makefile
 GL/mesa/Makefile
 GL/mesa/array_cache/Makefile
 GL/mesa/glapi/Makefile
diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am
index d78f1b711..388a9b340 100644
--- a/hw/xfree86/os-support/solaris/Makefile.am
+++ b/hw/xfree86/os-support/solaris/Makefile.am
@@ -1,6 +1,6 @@
 if SOLARIS_USL_CONSOLE
 IO_SRC   = $(srcdir)/../sysv/sysv_io.c
-KBD_SRCS = $(srcdir)/../sysv/sysv_kbd.c $(srcdir)/../shared/std_kbdEv.c
+KBD_SRCS = $(srcdir)/../shared/sysv_kbd.c $(srcdir)/../shared/std_kbdEv.c
 VTSW_SRC = $(srcdir)/../shared/VTsw_usl.c
 else
 IO_SRC   = sun_io.c
@@ -28,13 +28,15 @@ libsolaris_la_SOURCES = sun_bios.c sun_init.c $(IO_SRC) $(KBD_SRCS) \
 	$(srcdir)/../shared/kmod_noop.c $(srcdir)/../shared/pm_noop.c \
 	$(srcdir)/../shared/posix_tty.c $(srcdir)/../shared/sigiostubs.c \
 	$(srcdir)/../shared/stdPci.c $(srcdir)/../shared/stdResource.c \
-	$(VTSW_SRC) $(SOLARIS_INOUT_SRC)
+	$(VTSW_SRC)
+nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
 
-sdk_HEADERS = agpgart.h solaris-$(SOLARIS_INOUT_ARCH).il
+sdk_HEADERS = agpgart.h
+nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il
 
 AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
 
 INCLUDES = $(XORG_INCS) 
 
-EXTRA_DIST = sun_inout.s solaris-amd64.S solaris-ia32.S	solaris-sparcv8plus.S
+EXTRA_DIST = sun_inout.s solaris-amd64.S solaris-ia32.S solaris-sparcv8plus.S
 
diff --git a/hw/xfree86/scanpci/Makefile.am b/hw/xfree86/scanpci/Makefile.am
index bd7324307..ea7df1216 100644
--- a/hw/xfree86/scanpci/Makefile.am
+++ b/hw/xfree86/scanpci/Makefile.am
@@ -17,7 +17,9 @@ EXTRA_DIST = \
 	xf86PciIds.h \
 	xf86PciStdIds.h \
 	xf86PciStr.h \
-	xf86ScanPci.h
+	xf86ScanPci.h \
+	pci.ids \
+	pciid2c.pl
 
 xf86PciData.c:
 	echo "#define PCIDATA" > $@