regen

12 files changed, 91 insertions, 20 deletions

diff --git a/xserver/hw/xfree86/os-support/Makefile.in b/xserver/hw/xfree86/os-support/Makefile.in
index 2102f0607..cde7193fd 100644
--- a/xserver/hw/xfree86/os-support/Makefile.in
+++ b/xserver/hw/xfree86/os-support/Makefile.in
@@ -215,6 +215,10 @@ GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 H3600_TS_FALSE = @H3600_TS_FALSE@
 H3600_TS_TRUE = @H3600_TS_TRUE@
+HP300_VIDEO_FALSE = @HP300_VIDEO_FALSE@
+HP300_VIDEO_TRUE = @HP300_VIDEO_TRUE@
+HPPA_VIDEO_FALSE = @HPPA_VIDEO_FALSE@
+HPPA_VIDEO_TRUE = @HPPA_VIDEO_TRUE@
 I386_VIDEO_FALSE = @I386_VIDEO_FALSE@
 I386_VIDEO_TRUE = @I386_VIDEO_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -486,6 +490,8 @@ XWIN_SYSTEM_LIBS = @XWIN_SYSTEM_LIBS@
 XWIN_TRUE = @XWIN_TRUE@
 XWIN_XV_FALSE = @XWIN_XV_FALSE@
 XWIN_XV_TRUE = @XWIN_XV_TRUE@
+X_PRIVSEP_FALSE = @X_PRIVSEP_FALSE@
+X_PRIVSEP_TRUE = @X_PRIVSEP_TRUE@
 YACC = @YACC@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 ac_ct_AR = @ac_ct_AR@
diff --git a/xserver/hw/xfree86/os-support/bsd/Makefile.in b/xserver/hw/xfree86/os-support/bsd/Makefile.in
index 0baf0ef14..dbf87124d 100644
--- a/xserver/hw/xfree86/os-support/bsd/Makefile.in
+++ b/xserver/hw/xfree86/os-support/bsd/Makefile.in
@@ -62,21 +62,23 @@ am__libbsd_la_SOURCES_DIST = $(srcdir)/../shared/at_scancode.c \
 	$(srcdir)/../shared/vidmem.c bsd_VTsw.c bsd_init.c bsd_io.c \
 	bsd_kbd.c bsd_KbdMap.c bsd_mouse.c alpha_video.c bsd_ev56.c \
 	bsd_axp.c $(srcdir)/../shared/xf86Axp.c arm_video.c \
-	i386_video.c ppc_video.c $(srcdir)/../shared/ioperm_noop.c \
-	sparc64_video.c $(srcdir)/../shared/agp_noop.c \
-	$(srcdir)/../linux/lnx_agp.c $(srcdir)/../shared/pm_noop.c \
-	$(srcdir)/../shared/kmod_noop.c bsd_kmod.c \
-	$(srcdir)/../shared/stdResource.c
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@am__objects_1 = sparc64_video.lo \
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@	ioperm_noop.lo
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@am__objects_1 = ppc_video.lo \
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@	ioperm_noop.lo
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo
+	hp300_video.c hppa_video.c i386_video.c ppc_video.c \
+	$(srcdir)/../shared/ioperm_noop.c sparc64_video.c \
+	$(srcdir)/../shared/agp_noop.c bsd_agp.c \
+	$(srcdir)/../shared/pm_noop.c $(srcdir)/../shared/kmod_noop.c \
+	bsd_kmod.c $(srcdir)/../shared/stdResource.c
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@am__objects_1 = sparc64_video.lo \
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@	ioperm_noop.lo
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@am__objects_1 = ppc_video.lo \
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@	ioperm_noop.lo
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_TRUE@am__objects_1 = hppa_video.lo
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_TRUE@am__objects_1 = hp300_video.lo
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@am__objects_1 = arm_video.lo
 @ALPHA_VIDEO_TRUE@am__objects_1 = alpha_video.lo bsd_ev56.lo \
 @ALPHA_VIDEO_TRUE@	bsd_axp.lo xf86Axp.lo
 @AGP_FALSE@am__objects_2 = agp_noop.lo
-@AGP_TRUE@am__objects_2 = lnx_agp.lo
+@AGP_TRUE@am__objects_2 = bsd_agp.lo
 am__objects_3 = pm_noop.lo
 @FREEBSD_KLDLOAD_FALSE@am__objects_4 = kmod_noop.lo
 @FREEBSD_KLDLOAD_TRUE@am__objects_4 = bsd_kmod.lo
@@ -227,6 +229,10 @@ GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 H3600_TS_FALSE = @H3600_TS_FALSE@
 H3600_TS_TRUE = @H3600_TS_TRUE@
+HP300_VIDEO_FALSE = @HP300_VIDEO_FALSE@
+HP300_VIDEO_TRUE = @HP300_VIDEO_TRUE@
+HPPA_VIDEO_FALSE = @HPPA_VIDEO_FALSE@
+HPPA_VIDEO_TRUE = @HPPA_VIDEO_TRUE@
 I386_VIDEO_FALSE = @I386_VIDEO_FALSE@
 I386_VIDEO_TRUE = @I386_VIDEO_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -498,6 +504,8 @@ XWIN_SYSTEM_LIBS = @XWIN_SYSTEM_LIBS@
 XWIN_TRUE = @XWIN_TRUE@
 XWIN_XV_FALSE = @XWIN_XV_FALSE@
 XWIN_XV_TRUE = @XWIN_XV_TRUE@
+X_PRIVSEP_FALSE = @X_PRIVSEP_FALSE@
+X_PRIVSEP_TRUE = @X_PRIVSEP_TRUE@
 YACC = @YACC@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 ac_ct_AR = @ac_ct_AR@
@@ -567,7 +575,7 @@ APM_SOURCES = $(srcdir)/../shared/pm_noop.c
 # FIXME: Non-i386/ia64 resource support.
 RES_SOURCES = $(srcdir)/../shared/stdResource.c
 @AGP_FALSE@AGP_SOURCES = $(srcdir)/../shared/agp_noop.c
-@AGP_TRUE@AGP_SOURCES = $(srcdir)/../linux/lnx_agp.c
+@AGP_TRUE@AGP_SOURCES = bsd_agp.c
 
 # Cheat here and piggyback other alpha bits on ALPHA_VIDEO.
 @ALPHA_VIDEO_TRUE@ARCH_SOURCES = \
@@ -577,6 +585,8 @@ RES_SOURCES = $(srcdir)/../shared/stdResource.c
 @ALPHA_VIDEO_TRUE@	$(srcdir)/../shared/xf86Axp.c
 
 @ARM_VIDEO_TRUE@ARCH_SOURCES = arm_video.c
+@HP300_VIDEO_TRUE@ARCH_SOURCES = hp300_video.c
+@HPPA_VIDEO_TRUE@ARCH_SOURCES = hppa_video.c
 @I386_VIDEO_TRUE@ARCH_SOURCES = i386_video.c
 @PPC_VIDEO_TRUE@ARCH_SOURCES = ppc_video.c \
 @PPC_VIDEO_TRUE@	$(srcdir)/../shared/ioperm_noop.c
@@ -688,6 +698,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/at_scancode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_KbdMap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_VTsw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_agp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_axp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_ev56.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_init.Plo@am__quote@
@@ -695,11 +706,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_kbd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_kmod.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_mouse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hp300_video.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hppa_video.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386_video.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioperm_noop.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmod_noop.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libc_wrapper.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_agp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pm_noop.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posix_tty.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc_video.Plo@am__quote@
@@ -802,13 +814,6 @@ agp_noop.lo: $(srcdir)/../shared/agp_noop.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o agp_noop.lo `test -f '$(srcdir)/../shared/agp_noop.c' || echo '$(srcdir)/'`$(srcdir)/../shared/agp_noop.c
 
-lnx_agp.lo: $(srcdir)/../linux/lnx_agp.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lnx_agp.lo -MD -MP -MF "$(DEPDIR)/lnx_agp.Tpo" -c -o lnx_agp.lo `test -f '$(srcdir)/../linux/lnx_agp.c' || echo '$(srcdir)/'`$(srcdir)/../linux/lnx_agp.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/lnx_agp.Tpo" "$(DEPDIR)/lnx_agp.Plo"; else rm -f "$(DEPDIR)/lnx_agp.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../linux/lnx_agp.c' object='lnx_agp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lnx_agp.lo `test -f '$(srcdir)/../linux/lnx_agp.c' || echo '$(srcdir)/'`$(srcdir)/../linux/lnx_agp.c
-
 pm_noop.lo: $(srcdir)/../shared/pm_noop.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pm_noop.lo -MD -MP -MF "$(DEPDIR)/pm_noop.Tpo" -c -o pm_noop.lo `test -f '$(srcdir)/../shared/pm_noop.c' || echo '$(srcdir)/'`$(srcdir)/../shared/pm_noop.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/pm_noop.Tpo" "$(DEPDIR)/pm_noop.Plo"; else rm -f "$(DEPDIR)/pm_noop.Tpo"; exit 1; fi
diff --git a/xserver/hw/xfree86/os-support/bus/Makefile.in b/xserver/hw/xfree86/os-support/bus/Makefile.in
index 6b344c033..16a2c5a3d 100644
--- a/xserver/hw/xfree86/os-support/bus/Makefile.in
+++ b/xserver/hw/xfree86/os-support/bus/Makefile.in
@@ -235,6 +235,10 @@ GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 H3600_TS_FALSE = @H3600_TS_FALSE@
 H3600_TS_TRUE = @H3600_TS_TRUE@
+HP300_VIDEO_FALSE = @HP300_VIDEO_FALSE@
+HP300_VIDEO_TRUE = @HP300_VIDEO_TRUE@
+HPPA_VIDEO_FALSE = @HPPA_VIDEO_FALSE@
+HPPA_VIDEO_TRUE = @HPPA_VIDEO_TRUE@
 I386_VIDEO_FALSE = @I386_VIDEO_FALSE@
 I386_VIDEO_TRUE = @I386_VIDEO_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -506,6 +510,8 @@ XWIN_SYSTEM_LIBS = @XWIN_SYSTEM_LIBS@
 XWIN_TRUE = @XWIN_TRUE@
 XWIN_XV_FALSE = @XWIN_XV_FALSE@
 XWIN_XV_TRUE = @XWIN_XV_TRUE@
+X_PRIVSEP_FALSE = @X_PRIVSEP_FALSE@
+X_PRIVSEP_TRUE = @X_PRIVSEP_TRUE@
 YACC = @YACC@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 ac_ct_AR = @ac_ct_AR@
diff --git a/xserver/hw/xfree86/os-support/drm/Makefile.in b/xserver/hw/xfree86/os-support/drm/Makefile.in
index 7a8c399e7..0597e9485 100644
--- a/xserver/hw/xfree86/os-support/drm/Makefile.in
+++ b/xserver/hw/xfree86/os-support/drm/Makefile.in
@@ -207,6 +207,10 @@ GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 H3600_TS_FALSE = @H3600_TS_FALSE@
 H3600_TS_TRUE = @H3600_TS_TRUE@
+HP300_VIDEO_FALSE = @HP300_VIDEO_FALSE@
+HP300_VIDEO_TRUE = @HP300_VIDEO_TRUE@
+HPPA_VIDEO_FALSE = @HPPA_VIDEO_FALSE@
+HPPA_VIDEO_TRUE = @HPPA_VIDEO_TRUE@
 I386_VIDEO_FALSE = @I386_VIDEO_FALSE@
 I386_VIDEO_TRUE = @I386_VIDEO_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -478,6 +482,8 @@ XWIN_SYSTEM_LIBS = @XWIN_SYSTEM_LIBS@
 XWIN_TRUE = @XWIN_TRUE@
 XWIN_XV_FALSE = @XWIN_XV_FALSE@
 XWIN_XV_TRUE = @XWIN_XV_TRUE@
+X_PRIVSEP_FALSE = @X_PRIVSEP_FALSE@
+X_PRIVSEP_TRUE = @X_PRIVSEP_TRUE@
 YACC = @YACC@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 ac_ct_AR = @ac_ct_AR@
diff --git a/xserver/hw/xfree86/os-support/hurd/Makefile.in b/xserver/hw/xfree86/os-support/hurd/Makefile.in
index 1165210ec..f2f9f58c8 100644
--- a/xserver/hw/xfree86/os-support/hurd/Makefile.in
+++ b/xserver/hw/xfree86/os-support/hurd/Makefile.in
@@ -200,6 +200,10 @@ GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 H3600_TS_FALSE = @H3600_TS_FALSE@
 H3600_TS_TRUE = @H3600_TS_TRUE@
+HP300_VIDEO_FALSE = @HP300_VIDEO_FALSE@
+HP300_VIDEO_TRUE = @HP300_VIDEO_TRUE@
+HPPA_VIDEO_FALSE = @HPPA_VIDEO_FALSE@
+HPPA_VIDEO_TRUE = @HPPA_VIDEO_TRUE@
 I386_VIDEO_FALSE = @I386_VIDEO_FALSE@
 I386_VIDEO_TRUE = @I386_VIDEO_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -471,6 +475,8 @@ XWIN_SYSTEM_LIBS = @XWIN_SYSTEM_LIBS@
 XWIN_TRUE = @XWIN_TRUE@
 XWIN_XV_FALSE = @XWIN_XV_FALSE@
 XWIN_XV_TRUE = @XWIN_XV_TRUE@
+X_PRIVSEP_FALSE = @X_PRIVSEP_FALSE@
+X_PRIVSEP_TRUE = @X_PRIVSEP_TRUE@
 YACC = @YACC@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 ac_ct_AR = @ac_ct_AR@
diff --git a/xserver/hw/xfree86/os-support/linux/Makefile.in b/xserver/hw/xfree86/os-support/linux/Makefile.in
index 0b339c009..f3a8a7776 100644
--- a/xserver/hw/xfree86/os-support/linux/Makefile.in
+++ b/xserver/hw/xfree86/os-support/linux/Makefile.in
@@ -218,6 +218,10 @@ GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 H3600_TS_FALSE = @H3600_TS_FALSE@
 H3600_TS_TRUE = @H3600_TS_TRUE@
+HP300_VIDEO_FALSE = @HP300_VIDEO_FALSE@
+HP300_VIDEO_TRUE = @HP300_VIDEO_TRUE@
+HPPA_VIDEO_FALSE = @HPPA_VIDEO_FALSE@
+HPPA_VIDEO_TRUE = @HPPA_VIDEO_TRUE@
 I386_VIDEO_FALSE = @I386_VIDEO_FALSE@
 I386_VIDEO_TRUE = @I386_VIDEO_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -489,6 +493,8 @@ XWIN_SYSTEM_LIBS = @XWIN_SYSTEM_LIBS@
 XWIN_TRUE = @XWIN_TRUE@
 XWIN_XV_FALSE = @XWIN_XV_FALSE@
 XWIN_XV_TRUE = @XWIN_XV_TRUE@
+X_PRIVSEP_FALSE = @X_PRIVSEP_FALSE@
+X_PRIVSEP_TRUE = @X_PRIVSEP_TRUE@
 YACC = @YACC@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 ac_ct_AR = @ac_ct_AR@
diff --git a/xserver/hw/xfree86/os-support/lynxos/Makefile.in b/xserver/hw/xfree86/os-support/lynxos/Makefile.in
index cada46269..20fecc593 100644
--- a/xserver/hw/xfree86/os-support/lynxos/Makefile.in
+++ b/xserver/hw/xfree86/os-support/lynxos/Makefile.in
@@ -179,6 +179,10 @@ GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 H3600_TS_FALSE = @H3600_TS_FALSE@
 H3600_TS_TRUE = @H3600_TS_TRUE@
+HP300_VIDEO_FALSE = @HP300_VIDEO_FALSE@
+HP300_VIDEO_TRUE = @HP300_VIDEO_TRUE@
+HPPA_VIDEO_FALSE = @HPPA_VIDEO_FALSE@
+HPPA_VIDEO_TRUE = @HPPA_VIDEO_TRUE@
 I386_VIDEO_FALSE = @I386_VIDEO_FALSE@
 I386_VIDEO_TRUE = @I386_VIDEO_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -450,6 +454,8 @@ XWIN_SYSTEM_LIBS = @XWIN_SYSTEM_LIBS@
 XWIN_TRUE = @XWIN_TRUE@
 XWIN_XV_FALSE = @XWIN_XV_FALSE@
 XWIN_XV_TRUE = @XWIN_XV_TRUE@
+X_PRIVSEP_FALSE = @X_PRIVSEP_FALSE@
+X_PRIVSEP_TRUE = @X_PRIVSEP_TRUE@
 YACC = @YACC@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 ac_ct_AR = @ac_ct_AR@
diff --git a/xserver/hw/xfree86/os-support/misc/Makefile.in b/xserver/hw/xfree86/os-support/misc/Makefile.in
index dee87e9ae..603ee5882 100644
--- a/xserver/hw/xfree86/os-support/misc/Makefile.in
+++ b/xserver/hw/xfree86/os-support/misc/Makefile.in
@@ -199,6 +199,10 @@ GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 H3600_TS_FALSE = @H3600_TS_FALSE@
 H3600_TS_TRUE = @H3600_TS_TRUE@
+HP300_VIDEO_FALSE = @HP300_VIDEO_FALSE@
+HP300_VIDEO_TRUE = @HP300_VIDEO_TRUE@
+HPPA_VIDEO_FALSE = @HPPA_VIDEO_FALSE@
+HPPA_VIDEO_TRUE = @HPPA_VIDEO_TRUE@
 I386_VIDEO_FALSE = @I386_VIDEO_FALSE@
 I386_VIDEO_TRUE = @I386_VIDEO_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -470,6 +474,8 @@ XWIN_SYSTEM_LIBS = @XWIN_SYSTEM_LIBS@
 XWIN_TRUE = @XWIN_TRUE@
 XWIN_XV_FALSE = @XWIN_XV_FALSE@
 XWIN_XV_TRUE = @XWIN_XV_TRUE@
+X_PRIVSEP_FALSE = @X_PRIVSEP_FALSE@
+X_PRIVSEP_TRUE = @X_PRIVSEP_TRUE@
 YACC = @YACC@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 ac_ct_AR = @ac_ct_AR@
diff --git a/xserver/hw/xfree86/os-support/sco/Makefile.in b/xserver/hw/xfree86/os-support/sco/Makefile.in
index 4375b4e85..e4f66232e 100644
--- a/xserver/hw/xfree86/os-support/sco/Makefile.in
+++ b/xserver/hw/xfree86/os-support/sco/Makefile.in
@@ -179,6 +179,10 @@ GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 H3600_TS_FALSE = @H3600_TS_FALSE@
 H3600_TS_TRUE = @H3600_TS_TRUE@
+HP300_VIDEO_FALSE = @HP300_VIDEO_FALSE@
+HP300_VIDEO_TRUE = @HP300_VIDEO_TRUE@
+HPPA_VIDEO_FALSE = @HPPA_VIDEO_FALSE@
+HPPA_VIDEO_TRUE = @HPPA_VIDEO_TRUE@
 I386_VIDEO_FALSE = @I386_VIDEO_FALSE@
 I386_VIDEO_TRUE = @I386_VIDEO_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -450,6 +454,8 @@ XWIN_SYSTEM_LIBS = @XWIN_SYSTEM_LIBS@
 XWIN_TRUE = @XWIN_TRUE@
 XWIN_XV_FALSE = @XWIN_XV_FALSE@
 XWIN_XV_TRUE = @XWIN_XV_TRUE@
+X_PRIVSEP_FALSE = @X_PRIVSEP_FALSE@
+X_PRIVSEP_TRUE = @X_PRIVSEP_TRUE@
 YACC = @YACC@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 ac_ct_AR = @ac_ct_AR@
diff --git a/xserver/hw/xfree86/os-support/solaris/Makefile.in b/xserver/hw/xfree86/os-support/solaris/Makefile.in
index 3268f567b..f0618b7f2 100644
--- a/xserver/hw/xfree86/os-support/solaris/Makefile.in
+++ b/xserver/hw/xfree86/os-support/solaris/Makefile.in
@@ -235,6 +235,10 @@ GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 H3600_TS_FALSE = @H3600_TS_FALSE@
 H3600_TS_TRUE = @H3600_TS_TRUE@
+HP300_VIDEO_FALSE = @HP300_VIDEO_FALSE@
+HP300_VIDEO_TRUE = @HP300_VIDEO_TRUE@
+HPPA_VIDEO_FALSE = @HPPA_VIDEO_FALSE@
+HPPA_VIDEO_TRUE = @HPPA_VIDEO_TRUE@
 I386_VIDEO_FALSE = @I386_VIDEO_FALSE@
 I386_VIDEO_TRUE = @I386_VIDEO_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -506,6 +510,8 @@ XWIN_SYSTEM_LIBS = @XWIN_SYSTEM_LIBS@
 XWIN_TRUE = @XWIN_TRUE@
 XWIN_XV_FALSE = @XWIN_XV_FALSE@
 XWIN_XV_TRUE = @XWIN_XV_TRUE@
+X_PRIVSEP_FALSE = @X_PRIVSEP_FALSE@
+X_PRIVSEP_TRUE = @X_PRIVSEP_TRUE@
 YACC = @YACC@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 ac_ct_AR = @ac_ct_AR@
diff --git a/xserver/hw/xfree86/os-support/sysv/Makefile.in b/xserver/hw/xfree86/os-support/sysv/Makefile.in
index 8e4bc614c..db242375e 100644
--- a/xserver/hw/xfree86/os-support/sysv/Makefile.in
+++ b/xserver/hw/xfree86/os-support/sysv/Makefile.in
@@ -179,6 +179,10 @@ GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 H3600_TS_FALSE = @H3600_TS_FALSE@
 H3600_TS_TRUE = @H3600_TS_TRUE@
+HP300_VIDEO_FALSE = @HP300_VIDEO_FALSE@
+HP300_VIDEO_TRUE = @HP300_VIDEO_TRUE@
+HPPA_VIDEO_FALSE = @HPPA_VIDEO_FALSE@
+HPPA_VIDEO_TRUE = @HPPA_VIDEO_TRUE@
 I386_VIDEO_FALSE = @I386_VIDEO_FALSE@
 I386_VIDEO_TRUE = @I386_VIDEO_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -450,6 +454,8 @@ XWIN_SYSTEM_LIBS = @XWIN_SYSTEM_LIBS@
 XWIN_TRUE = @XWIN_TRUE@
 XWIN_XV_FALSE = @XWIN_XV_FALSE@
 XWIN_XV_TRUE = @XWIN_XV_TRUE@
+X_PRIVSEP_FALSE = @X_PRIVSEP_FALSE@
+X_PRIVSEP_TRUE = @X_PRIVSEP_TRUE@
 YACC = @YACC@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 ac_ct_AR = @ac_ct_AR@
diff --git a/xserver/hw/xfree86/os-support/usl/Makefile.in b/xserver/hw/xfree86/os-support/usl/Makefile.in
index df0625fb3..6043d0653 100644
--- a/xserver/hw/xfree86/os-support/usl/Makefile.in
+++ b/xserver/hw/xfree86/os-support/usl/Makefile.in
@@ -179,6 +179,10 @@ GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 H3600_TS_FALSE = @H3600_TS_FALSE@
 H3600_TS_TRUE = @H3600_TS_TRUE@
+HP300_VIDEO_FALSE = @HP300_VIDEO_FALSE@
+HP300_VIDEO_TRUE = @HP300_VIDEO_TRUE@
+HPPA_VIDEO_FALSE = @HPPA_VIDEO_FALSE@
+HPPA_VIDEO_TRUE = @HPPA_VIDEO_TRUE@
 I386_VIDEO_FALSE = @I386_VIDEO_FALSE@
 I386_VIDEO_TRUE = @I386_VIDEO_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -450,6 +454,8 @@ XWIN_SYSTEM_LIBS = @XWIN_SYSTEM_LIBS@
 XWIN_TRUE = @XWIN_TRUE@
 XWIN_XV_FALSE = @XWIN_XV_FALSE@
 XWIN_XV_TRUE = @XWIN_XV_TRUE@
+X_PRIVSEP_FALSE = @X_PRIVSEP_FALSE@
+X_PRIVSEP_TRUE = @X_PRIVSEP_TRUE@
 YACC = @YACC@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 ac_ct_AR = @ac_ct_AR@