[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/xf86config xorgconfig.c, NONE, 1.1.10.1 xorgconfig.man, NONE, 1.1.10.1 Cards, 1.1.4.2, 1.1.4.3 Imakefile, 1.1.4.3, 1.1.4.4 xf86config.c, 1.1.4.3, NONE xf86config.man, 1.1.4.1, NONE

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86config
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/xf86config

Modified Files:
      Tag: XORG-CURRENT
	Cards Imakefile 
Added Files:
      Tag: XORG-CURRENT
	xorgconfig.c xorgconfig.man 
Removed Files:
      Tag: XORG-CURRENT
	xf86config.c xf86config.man 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


--- NEW FILE: xorgconfig.c ---
/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c,v 3.69 2003/02/20 04:05:15 dawes Exp $ */

/*
 * This is a configuration program that will create a base XF86Config
 * file based on menu choices. Its main feature is that clueless users
 * may be less inclined to select crazy sync rates way over monitor spec,
 * by presenting a menu with standard monitor types. Also some people
 * don't read docs unless an executable that they can run tells them to.
 *
 * It assumes a 24-line or bigger text console.
 *
 * Revision history:
 * 25Sep94 Initial version.
 * 27Sep94 Fix hsync range of monitor types to match with best possible mode.
 *         Remove 'const'.
 *         Tweak descriptions.
 * 28Sep94 Fixes from J"org Wunsch:
 *           Don't use gets().
 *           Add mouse device prompt.
[...2867 lines suppressed...]
	emptylines();

	carddb_configuration();

	emptylines();

 	screen_configuration();

	emptylines();

	depth_configuration();

	emptylines();

	write_XF86Config(ask_XF86Config_location());

	printf("%s", finalcomment_text);

	exit(0);
}

--- NEW FILE: xorgconfig.man ---
.\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.man,v 1.5 2001/11/01 23:35:34 dawes Exp $
.TH xorgconfig 1 __vendorversion__
.SH NAME
xorgconfig \- generate an __XCONFIGFILE__ file
.SH SYNOPSIS
.B xorgconfig
.SH DESCRIPTION
\fIxorgconfig\fP is an interactive program for generating an __XCONFIGFILE__ file
for use with __XSERVERNAME__ X servers.
.PP
Note that the default name used by \fIxorgconfig\fP for the __XCONFIGFILE__ file
is system-dependent.  For instance, on some systems, __XCONFIGFILE__-4 is used,
and on OS/2, XConfig is used.
.SH FILES
.TP
.I __projectroot__/lib/X11/Cards
Video cards database
.SH "SEE ALSO"
__XSERVERNAME__(1), __XCONFIGFILE__(__filemansuffix__), reconfig(1)
.SH AUTHOR
Harm Hanemaayer.
.\" $TOG: xf86conf.man /main/9 1997/07/19 10:53:08 kaleb $

Index: Cards
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86config/Cards,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Cards	5 Mar 2004 13:41:01 -0000	1.1.4.2
+++ b/Cards	15 Apr 2004 10:17:17 -0000	1.1.4.3
@@ -2979,7 +2979,7 @@
 
 NAME Appian Jeronimo 2000
 CHIPSET PERMEDIA 3
-SERVER XFree86
+SERVER 3DLabs
 DRIVER glint
 NOCLOCKPROBE
 

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86config/Imakefile,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Imakefile	5 Mar 2004 13:41:02 -0000	1.1.4.3
+++ b/Imakefile	15 Apr 2004 10:17:17 -0000	1.1.4.4
@@ -1,33 +1,39 @@
 XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Imakefile,v 3.14tsi Exp $
 
 
+#include <Server.tmpl>
 
 
 
 XCOMM $XConsortium: Imakefile /main/5 1996/02/21 18:12:46 kaleb $
 
-            SRCS = xf86config.c cards.c
-            OBJS = xf86config.o cards.o
+            SRCS = xorgconfig.c cards.c
+            OBJS = xorgconfig.o cards.o
  LOCAL_LIBRARIES = $(XKBFILELIB) $(XONLYLIB)
          DEPLIBS =
       CARDDBFILE = $(LIBDIR)/Cards
 
 XCONFIGFILE = XConfigFile
+#if defined XFree86Version
 XVERS = XFree86Version
+#elif defined (XorgVersion)
+XVERS = XorgVersion
+#endif
 XCONSOLEDEFS = XFree86ConsoleDefines
 
          DEFINES = -DCARD_DATABASE_FILE='"$(CARDDBFILE)"' \
 		   -DXKB_RULES_DIR=\"$(LIBDIR)/xkb/rules\" \
 		   -DXCONFIGFILE=\"$(XCONFIGFILE)\" \
-		   -DXVERSION="$(XVERS)" $(XCONSOLEDEFS)
+		   -DXVERSION="$(XVERS)" $(XCONSOLEDEFS) $(CONFIG_DEFINES) \
+		   $(XKBDEFRULESDEFS)
 
-AllTarget(ProgramTargetName(xf86config))
+AllTarget(ProgramTargetName(xorgconfig))
 
-NormalProgramTarget(xf86config,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
-InstallProgram(xf86config,$(BINDIR))
+NormalProgramTarget(xorgconfig,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
+InstallProgram(xorgconfig,$(BINDIR))
 
 DependTarget()
 
 InstallNonExecFile(Cards,$(LIBDIR))
-
-InstallManPage(xf86config,$(MANDIR))
+EXTRAMANDEFS = -D__XCONFIGFILE__=$(XCONFIGFILE) -D__XSERVERNAME__=$(XSERVERNAME)
+InstallManPage(xorgconfig,$(MANDIR))

--- xf86config.c DELETED ---

--- xf86config.man DELETED ---