[Xorg-commit] xc/config/cf FreeBSD.cf,1.1.4.2,1.1.4.3 Imake.cf,1.1.4.4,1.1.4.5 X11.tmpl,1.1.4.3,1.1.4.4 linux.cf,1.1.4.3,1.1.4.4 sco5.cf,1.1.4.1,1.1.4.2 scoLib.rules,1.1.4.1,1.1.4.2
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Sat Dec 20 02:28:57 EET 2003
Committed by: kaleb
Update of /cvs/xorg/xc/config/cf
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/config/cf
Modified Files:
Tag: XORG-CURRENT
FreeBSD.cf Imake.cf X11.tmpl linux.cf sco5.cf scoLib.rules
Log Message:
merge XFree86 RC2 (4.3.99.902) from vendor branch
Index: FreeBSD.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/FreeBSD.cf,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- FreeBSD.cf 26 Nov 2003 22:48:15 -0000 1.1.4.2
+++ FreeBSD.cf 20 Dec 2003 00:28:21 -0000 1.1.4.3
@@ -1,8 +1,9 @@
XCOMM platform: $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
+XCOMM platform: $XdotOrg$
XCOMM
XCOMM
XCOMM
-XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.144 2003/11/21 04:58:54 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.145 2003/12/06 19:24:11 dawes Exp $
#ifndef UseElfFormat
#define UseElfFormat DefaultToElfFormat
@@ -425,7 +426,7 @@
#endif
#define HasGroff YES
-#define NroffCmd groff -Tascii
+#define NroffCmd env GROFF_NO_SGR=y groff -Tascii
#define SetTtyGroup YES
#ifndef ExtraFilesToClean
Index: Imake.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imake.cf,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- Imake.cf 15 Dec 2003 16:00:01 -0000 1.1.4.4
+++ Imake.cf 20 Dec 2003 00:28:21 -0000 1.1.4.5
@@ -18,7 +18,7 @@
*
* 4. Create a .cf file with the name given by MacroFile.
*/
-XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.87 2003/11/29 01:08:30 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
#if defined(__APPLE__)
# undef __APPLE__
@@ -103,6 +103,7 @@
# undef __OpenBSD__
# undef __NetBSD__
# define OpenBSDArchitecture
+# define KOpenBSDArchitecture
# define MacroIncludeFile <OpenBSD.cf>
# define MacroFile OpenBSD.cf
# ifdef __i386__
@@ -179,7 +180,7 @@
#endif /* OpenBSD */
/* Systems based on kernel of OpenBSD */
-#if defined(__OpenBSD__) || defined(__OpenBSD_kernel__)
+#if defined(__OpenBSD_kernel__)
#define KOpenBSDArchitecture
#endif
@@ -188,6 +189,7 @@
# define MacroFile NetBSD.cf
# undef __NetBSD__
# define NetBSDArchitecture
+# define KNetBSDArchitecture
# ifdef __i386__
# define i386BsdArchitecture
# define i386Architecture
@@ -231,7 +233,7 @@
#endif /* NetBSD */
/* Systems based on kernel of NetBSD */
-#if defined(__NetBSD__) || defined(__NetBSD_kernel__)
+#if defined(__NetBSD_kernel__)
#define KNetBSDArchitecture
#endif
@@ -240,6 +242,7 @@
# define MacroFile FreeBSD.cf
# undef __FreeBSD__
# define FreeBSDArchitecture
+# define KFreeBSDArchitecture
# ifdef __i386__
# define i386BsdArchitecture
# define i386Architecture
@@ -266,7 +269,7 @@
#endif /* __FreeBSD__ */
/* Systems based on kernel of FreeBSD */
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD_kernel__)
#define KFreeBSDArchitecture
#endif
Index: X11.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- X11.tmpl 18 Dec 2003 19:29:11 -0000 1.1.4.3
+++ X11.tmpl 20 Dec 2003 00:28:21 -0000 1.1.4.4
@@ -6,7 +6,7 @@
XCOMM
XCOMM
XCOMM
-XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.235 2003/11/21 04:58:54 dawes Exp $
+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.239 2003/12/12 03:20:32 dawes Exp $
/***************************************************************************
* *
@@ -1219,7 +1219,8 @@
#endif
#ifndef MesaUseX86Asm
-# if HasX86Support
+/* The current Mesa X86 ASM code doesn't work well with SVR4 shared libs. */
+# if HasX86Support && !SystemV4
# define MesaUseX86Asm YES
# else
# define MesaUseX86Asm NO
@@ -1375,6 +1376,9 @@
#ifndef ModuleDir
#define ModuleDir $(USRLIBDIR)/modules
#endif
+#ifndef InstSrcDir
+#define InstSrcDir Concat(ProjectRoot,/src)
+#endif
#ifndef LibexecDir
#ifdef ProjectRoot
#define LibexecDir Concat(ProjectRoot,/libexec)
@@ -1546,6 +1550,8 @@
MODULEDIR = ModuleDir
TOP_X_INCLUDES = TopXInclude
+ INSTSRCDIR = InstSrcDir /* Installed source (kernel modules). */
+
#ifdef EtcX11Directory
ETCX11DIR = EtcX11Directory
#endif
@@ -3003,6 +3009,9 @@
#ifndef Freetype2IncDir
#define Freetype2IncDir Freetype2Dir/include
+# if Freetype2DirStandard
+# define Freetype2IncDirStandard YES
+# endif
#endif
FREETYPE2DIR = Freetype2Dir
@@ -3018,8 +3027,16 @@
#endif /* else BuildFreetype2Library */
+#ifndef Freetype2IncDirStandard
+# define Freetype2IncDirStandard NO
+#endif
+
#if BuildFreetype2Library || HasFreetype2
+#if Freetype2IncDirStandard
+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2
+#else
FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2
+#endif
FREETYPE2DEFINES = -DFREETYPE2
#endif
@@ -4103,7 +4120,7 @@
file.idx.ps: srcs index.raw @@\
sed -n '$$p' index.raw > index.pageno @@\
grep '^[1-9]' index.raw | \ @@\
- (sort -f '-t:' -k1,1n 2>/dev/null || \ @@\
+ (sort -f '-t:' -k2,2 -k1,1n 2>/dev/null || \ @@\
sort -f '-t:' +1 -3 +0n -1n) | \ @@\
awk -f $(DOCUTILSRC)/fixindex.awk | \ @@\
awk -f $(DOCUTILSRC)/block.awk > index.troff @@\
Index: linux.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/linux.cf,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- linux.cf 6 Dec 2003 13:22:41 -0000 1.1.4.3
+++ linux.cf 20 Dec 2003 00:28:21 -0000 1.1.4.4
@@ -5,7 +5,7 @@
-XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.216 2003/11/25 19:11:54 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.219 2003/12/19 01:47:26 dawes Exp $
#ifndef LinuxElfDefault
# define LinuxElfDefault YES
@@ -110,6 +110,12 @@
# define NormalLibGlu YES
# define FSUseSyslog YES
+# define DriverManSuffix 4x
+# define DriverManDir $(MANSOURCEPATH)4
+
+# define MiscManSuffix 7x
+# define MiscManDir $(MANSOURCEPATH)7
+
/*
*
*
@@ -253,6 +259,8 @@
#ifndef HasLinuxInput
# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 4)
# define HasLinuxInput YES
+# else
+# define HasLinuxInput NO
# endif
#endif
@@ -720,8 +728,12 @@
# define XF86OSCardDrivers v4l
#endif
-#ifndef OSXinputDrivers
-# define OSXinputDrivers ur98 aiptek
+#ifndef OSXInputDrivers
+# if HasLinuxInput
+# define OSXInputDrivers ur98 aiptek
+# else
+# define OSXInputDrivers ur98
+# endif
#endif
#if UseElfFormat
Index: sco5.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sco5.cf,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- sco5.cf 26 Nov 2003 22:48:15 -0000 1.1.4.1
+++ sco5.cf 20 Dec 2003 00:28:21 -0000 1.1.4.2
@@ -1,4 +1,5 @@
-XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.13 2003/07/07 15:34:20 eich Exp $
+XCOMM $XdotOrg$
+XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.15 2003/12/19 02:05:37 dawes Exp $
/*
* This is for SCO Open Server 5.0.6A or later. You must have the
@@ -94,7 +95,7 @@
#endif
#define AsmDefines -D__ELF__ -D__PIC__
-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
+#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
#define ServerExtraSysLibs $(CBRT) -lm -levent SCODynamicFlags
#define ExtraLibraries -lsocket
#define NeedWidePrototypes NO
@@ -107,6 +108,7 @@
#define HasPutenv YES
#define HasSnprintf YES
#define HasSetenv NO
+#define HasMkstemp YES
#define ExecableScripts YES
#define HasShadowPasswd YES
#define ManSourcePath $(MANPATH)/man
@@ -127,6 +129,7 @@
#define HasExpat YES
#define HasFreetype2 YES
#define HasLibpng YES
+#define HasPerl YES
#define HasPerl5 YES
#define HasDlopen YES
#define HasShm YES
@@ -138,21 +141,30 @@
#define SystemV YES
#define LdCombineFlags -r
+#define AvoidNullMakeCommand YES
#define HasLdRunPath YES
#define HasPoll YES
#define PatheticCpp YES
+#define HasGnuMake YES
+
+#define MesaUseX86Asm NO
+
+#define MakeNamedTargetSubdir(dir,flags,subname)\
+ $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
+
#define ArCmdBase ar
#define AsCmd CcCmd
#define CppCmd /lib/cpp
#define PreProcessCmd CppCmd
#define RawCppCmd CppCmd
#define LdCmd ld
-#define LexCmd flex
-#define MakeCmd make
-#define YaccCmd yacc
+#define LexCmd /usr/gnu/bin/flex
+#define MakeCmd /usr/gnu/bin/gmake
+#define YaccCmd /usr/gnu/bin/bison -y
#define InstallCmd /usr/gnu/bin/ginstall
+
#ifndef UseSeparateConfDir
#define UseSeparateConfDir NO
#endif
Index: scoLib.rules
===================================================================
RCS file: /cvs/xorg/xc/config/cf/scoLib.rules,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- scoLib.rules 17 Nov 2003 19:03:18 -0000 1.1.4.1
+++ scoLib.rules 20 Dec 2003 00:28:21 -0000 1.1.4.2
@@ -1,5 +1,10 @@
+XCOMM $XdotOrg$
XCOMM $Xorg: scoLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.9 2002/11/20 23:00:34 dawes Exp $
+XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.10 2003/12/18 16:38:34 dawes Exp $
+
+#ifndef UseExportLists
+# define UseExportLists NO
+#endif
#ifndef ExtraLoadFlags
#define ExtraLoadFlags -R $(USRLIBDIRPATH)
More information about the xorg-commit
mailing list