1.0-81781.0-8178

6 files changed, 34 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 431c1e5..b3fd621 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,10 @@
 # PKG_CONFIG = pkg-config
 # X11R6_DIR = /usr/X11R6
 
+# default build target
+
+default: all
+
 
 # default definitions; can be overwritten by users
 
@@ -40,6 +44,7 @@ SHELL = /bin/sh
 INSTALL = install
 BUILD_OS := $(shell uname)
 BUILD_ARCH := $(shell uname -m)
+M4 := m4
 
 ifndef CC
   CC = gcc
@@ -184,12 +189,10 @@ DEPS := $(patsubst %.c,$(DEPS_DIR)/%.d,$(SRC))
 
 # and now, the build rules:
 
-default: all
-
-all: $(NVIDIA_SETTINGS)
+all: $(NVIDIA_SETTINGS) doc/$(MANPAGE)
 
-install: $(NVIDIA_SETTINGS)
-	$(STRIP) $<
+install: all
+	$(STRIP) $(NVIDIA_SETTINGS)
 	$(INSTALL_RULE)
 
 $(OBJS_DIR)/%.o: %.c
diff --git a/doc/Makefile.inc b/doc/Makefile.inc
index 63d32a6..564c2fa 100644
--- a/doc/Makefile.inc
+++ b/doc/Makefile.inc
@@ -29,4 +29,11 @@ EXTRA_DIST += \
 	NV-CONTROL-API.txt \
 	FRAMELOCK.txt \
 	nvidia-settings-user-guide.txt \
-	nvidia-settings.1
+	nvidia-settings.1.m4
+
+AUTO_TEXT = ".\\\" WARNING: THIS FILE IS AUTO-GENERATED!  Edit $< instead."
+
+doc/nvidia-settings.1: nvidia-settings.1.m4
+	$(M4) -D__HEADER__=$(AUTO_TEXT) \
+	      -D__BUILD_OS__=$(BUILD_OS) \
+	      $< > $@
diff --git a/doc/nvidia-settings.1 b/doc/nvidia-settings.1.m4
index 6149adf..d5d6cdd 100644
--- a/doc/nvidia-settings.1
+++ b/doc/nvidia-settings.1.m4
@@ -1,10 +1,15 @@
+changequote([[[, ]]])dnl
+dnl Solaris man chokes on three-letter macros.
+ifelse(__BUILD_OS__,SunOS,[[[define(__URL__,UR)]]],[[[define(__URL__,URL)]]])dnl
 .\" Copyright (C) 2005 NVIDIA Corporation.
-.\" Define the URL macro and then load the URL package if it exists.
-.de URL
+__HEADER__
+.\" Define the .__URL__ macro and then override it with the www.tmac package if it
+.\" exists.
+.de __URL__
 \\$2 \(la \\$1 \(ra\\$3
 ..
 .if \n[.g] .mso www.tmac
-.TH nvidia-settings 1 2005-09-06 "nvidia-settings 1.0"
+.TH nvidia-settings 1 2005-12-01 "nvidia-settings 1.0"
 .SH NAME
 nvidia\-settings \- configure the NVIDIA graphics driver
 .SH SYNOPSIS
@@ -26,7 +31,7 @@ has the form:
 .SH DESCRIPTION
 The
 .B nvidia\-settings
-utility is a tool for configuring the NVIDIA Linux graphics driver.
+utility is a tool for configuring the NVIDIA graphics driver.
 It operates by communicating with the NVIDIA X driver, querying and updating state as appropriate.
 This communication is done with the NV-CONTROL X extension.
 .PP
@@ -420,11 +425,11 @@ Please see the
 .BR xauth (1)
 and
 .BR xhost (1)
-man pages, or refer to your Linux Distribution's documentation on remote X applications and security.
+man pages, or refer to your system documentation on remote X applications and security.
 You might also Google for terms such as "remote X security" or "remote X Windows", and see documents such as the Remote X Apps mini-HOWTO:
 .sp
 .ti +5
-.URL http://www.tldp.org/HOWTO/Remote-X-Apps.html
+.__URL__ http://www.tldp.org/HOWTO/Remote-X-Apps.html
 .sp
 Please also note that the remote X server to be controlled must be using the NVIDIA X driver.
 .SS 7. Licensing
@@ -434,7 +439,7 @@ is released as GPL.
 The most recent official version of the source code is available here:
 .sp
 .ti +5
-.URL ftp://download.nvidia.com/XFree86/nvidia-settings/
+.__URL__ ftp://download.nvidia.com/XFree86/nvidia-settings/
 .sp
 Note that
 .B nvidia\-settings
@@ -501,7 +506,7 @@ Aaron Plattner
 .br
 NVIDIA Corporation
 .SH "SEE ALSO"
-.BR nvidia\-xconfig (1),
-.BR nvidia\-installer (1)
+.BR nvidia\-xconfig (1)ifelse(__BUILD_OS__,Linux,[[[,
+.BR nvidia\-installer (1)]]])
 .SH COPYRIGHT
 Copyright \(co 2005 NVIDIA Corporation.
diff --git a/src/gtk+-2.x/ctkdevice.c b/src/gtk+-2.x/ctkdevice.c
index 05f9721..d64e888 100644
--- a/src/gtk+-2.x/ctkdevice.c
+++ b/src/gtk+-2.x/ctkdevice.c
@@ -114,6 +114,7 @@ GtkWidget* ctk_device_new(
         if (tmp == NV_CTRL_BUS_TYPE_AGP) bus_type = "AGP";
         if (tmp == NV_CTRL_BUS_TYPE_PCI) bus_type = "PCI";
         if (tmp == NV_CTRL_BUS_TYPE_PCI_EXPRESS) bus_type = "PCI Express";
+        if (tmp == NV_CTRL_BUS_TYPE_INTEGRATED) bus_type = "Integrated";
     }
     if (!bus_type) bus_type = __unknown;
 
@@ -300,8 +301,8 @@ GtkTextBuffer *ctk_device_create_help(GtkTextTagTable *table,
     ctk_help_heading(b, &i, "Bus Type");
     ctk_help_para(b, &i, "This is the bus type which is "
                   "used to connect the NVIDIA GPU to the rest of "
-                  "your computer; possible values are AGP, PCI, or "
-                  "PCI Express.");
+                  "your computer; possible values are AGP, PCI, "
+                  "PCI Express and Integrated.");
     
     ctk_help_heading(b, &i, "VBIOS Version");
     ctk_help_para(b, &i, "This is the Video BIOS version.");
diff --git a/src/libXNVCtrl/NVCtrl.h b/src/libXNVCtrl/NVCtrl.h
index ac553b4..1cb1d67 100644
--- a/src/libXNVCtrl/NVCtrl.h
+++ b/src/libXNVCtrl/NVCtrl.h
@@ -85,6 +85,7 @@
 #define NV_CTRL_BUS_TYPE_AGP                                    0
 #define NV_CTRL_BUS_TYPE_PCI                                    1
 #define NV_CTRL_BUS_TYPE_PCI_EXPRESS                            2
+#define NV_CTRL_BUS_TYPE_INTEGRATED                             3
 
 
 /*
diff --git a/src/libXNVCtrl/libXNVCtrl.a b/src/libXNVCtrl/libXNVCtrl.a
index c508ca0..8cb374b 100644
--- a/src/libXNVCtrl/libXNVCtrl.a
+++ b/src/libXNVCtrl/libXNVCtrl.a