XFree86 4.3.0.1xf86-4_3_0_1PRE_xf86-4_3_0_1

1 files changed, 98 insertions, 129 deletions

diff --git a/os2.cf b/os2.cf
index ff4400b..c4cc6f0 100644
--- a/os2.cf
+++ b/os2.cf
@@ -1,59 +1,29 @@
-XCOMM $Xorg: os2.cf,v 1.4 2000/11/29 14:14:32 steve Exp $
+XCOMM $Xorg: os2.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/os2.cf,v 3.14 1996/10/17 15:09:58 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/os2.cf,v 3.37 2002/05/31 16:31:18 dawes Exp $
 
-#define OSName           OS/2
-#define OSVendor	 IBM
-#define OSMajorVersion    3
-#define OSMinorVersion    0
+XCOMM hv: This file will now require a compiler that defines
+XCOMM hv: the symbol __UNIXOS2__ (currently a modified EMX gcc,
+XCOMM hv: but in future a separate system)
 
-/*
- * C library features
- */
-#ifdef __EMX__
+#define OSName	OS/2
+#define OSVendor	IBM
+#define OSMajorVersion	4
+#define OSMinorVersion	5
+#define OSTeenyVersion	1
 
-/* set this to what you like (almost :-) 
- * OS/2 does a nonstandard bootstrap of imake 
- */
 #define BootstrapCFlags   -DBSD43
 
-/* X_WCHAR and X_LOCALE are set in Xosdefs.h */
-#define StandardDefines   /**/
+#define StandardDefines   -DX_LOCALE -DX_WCHAR
 #define XawI18nDefines    -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
 
-/* This will redirect everything to /XFree86
- * Care will be taken that programs that need a file from this tree
- * will add the environment variable X11ROOT to the search path
- * so you can redirect the stuff to a different drive
- */
-#ifdef ProjectRoot
-#undef ProjectRoot
-#endif
-/* This will be mangled with a drive letter in most OS/2 rules ... */
-#define ProjectRoot	/XFree86
-
-/* ... but not when a user tries to compile something from a different drive 
- * Please report any directories missed to Holger.Veit@gmd.de 
-*/
-#ifdef UseInstalled
-#define IncRoot $(X11ROOT)/XFree86/include
-#define LdPreLib -L$(X11ROOT)/XFree86/lib
-#endif
-
-/* more directories */
-#define AdmDir		        $(LIBDIR)/adm
-        DESTDIR = $(X11ROOT)
-
 /* for the man pages */
 #define BookFormatManPages	YES
-#define ManDirectoryRoot /XFree86/man/man
-#define ManSuffix	1
-#define LibManSuffix	3
-#define FileManSuffix	4
-#define XmanSearchPath	/XFree86/man/man
-#define ManSourcePath	$(MANPATH)
+#define ManSuffix 1
+#define FileManSuffix 4
+#define DontUseLibPathVar YES
 
 /* you must have installed groff! */
 #define TblCmd		tbl
@@ -61,24 +31,44 @@ XCOMM platform:  $XFree86: xc/config/cf/os2.cf,v 3.14 1996/10/17 15:09:58 dawes
 #define NeqnCmd		eqn 
 #define NroffCmd	groff -Tascii
 #define	EqnCmd 		eqn -Tascii
-#define TroffCmd        groff -Tps
-          COL = /usr/bin/col
+#define HasGroff	YES
          NEQN = NeqnCmd
         NROFF = NroffCmd
 
 /* A set of standard defines: */
-#define OSDefines		-D__EMX__ -D__i386__ -Demxos2 -D_POSIX_SOURCE \
-				-D_BSD_SOURCE -D_GNU_SOURCE
+#define OSDefines		-D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE
 
+#ifndef BuildXKB
 #define BuildXKB		YES
-#define BuildImplibs		YES
+#endif
+#ifndef BuildLBX
+#define BuildLBX		YES
+#endif
+#ifndef DoLoadableServer
+#define DoLoadableServer        YES
+#endif
+#undef MakeDLLModules
+#define MakeDLLModules          NO
+#ifndef BuildModuleInSubdir
+#define BuildModuleInSubdir	YES
+#endif
+
 
 /* some more properties of the OS/2 implementation */
 #define HasNdbm         	YES
 #define HasPutenv       	YES
 #define HasSockets		YES
 #define HasSnprintf		YES
+#define HasWChar32		NO
+#define HasUsableFileMap	NO
+#define HasNCurses		NO
+#define HasVarRun		NO
+#define HasLibPthread		NO
+#define HasPosixThreads		NO
+#define HasVarDb		NO
+#define HasDlopen		NO
 #define HasBsearch		NO
+#define HasFchown		NO
 #define HasLargeTmp		NO
 #define HasPoll			NO
 #define HasBSD44Sockets 	NO
@@ -86,37 +76,43 @@ XCOMM platform:  $XFree86: xc/config/cf/os2.cf,v 3.14 1996/10/17 15:09:58 dawes
 #define	HasSymLinks		NO
 #define HasVFork		NO
 #define HasVarDirectory		NO
+#define HasStrcasecmp		YES
+#define StrcasecmpDefines	-DNEED_STRCASECMP -Dstrcasecmp=stricmp -Dstrncasecmp=strnicmp
 #define Malloc0ReturnsNull	YES
 #define SetTtyGroup     	NO
 #ifndef HasLibCrypt
 # define HasLibCrypt		NO
 #endif
 #ifndef HasShm
-# define HasShm          	NO
+# define HasShm          	YES
 #endif
-#define ConnectionFlags		-DTCPCONN -DOS2PIPECONN
-#define StdIncDir $(C_INCLUDE_PATH)
+#define ConnectionFlags		-DTCPCONN 
+/*-DOS2PIPECONN excluded*/
+#define StdIncDir	/usr/include
 #define HasStickyDirBit		NO
+#define HasMkstemp		NO
+#define BuildThreadStubLibrary	NO
+
 
 
-/* XF86Setup stuff */
-#define HasTcl			YES
-#define TclLibDir		$(X11ROOT)$(SHLIBDIR)
-#define TclIncDir		$(X11ROOT)$(INCROOT)/tcl
-#define TclLibName		xtcl
+/* XF86Setup stuff - does not work yet! */
+#define HasTcl			NO
+/*define TclLibDir		$(X11ROOT)$(SHLIBDIR)*/
+/*define TclIncDir		$(X11ROOT)$(INCROOT)/tcl*/
+/*define TclLibName		xtcl*/
 
-#define HasTk			YES
-#define TkLibDir		$(X11ROOT)$(SHLIBDIR)
-#define TkIncDir		$(X11ROOT)$(INCROOT)/tk
-#define TkLibName		xtk
+#define HasTk			NO
+/*define TkLibDir		$(X11ROOT)$(SHLIBDIR)*/
+/*define TkIncDir		$(X11ROOT)$(INCROOT)/tk*/
+/*define TkLibName		xtk*/
 
 /*
  * Compiler Features
  */
-#define HasGcc			YES
-#define HasGcc2			YES
+#define DefaultGcc2i386Opt	-O2 -fstrength-reduce
+#define UseGccMakeDepend	YES
 #define HasCplusplus		YES
-#define HasGcc2ForCplusplus	YES
+#define HasGnuMake		YES
 #define GccUsesGas		YES
 #define UseGas			YES
 #define GnuCpp			YES
@@ -127,8 +123,13 @@ XCOMM platform:  $XFree86: xc/config/cf/os2.cf,v 3.14 1996/10/17 15:09:58 dawes
 #define NeedVarargsPrototypes	YES
 #define NeedWidePrototypes	NO
 
+#define HasPlugin		NO
+#define VendorHasX11R6_3libExt	YES
+
 #define CppCmd	cpp
-#define StandardCppDefines	-traditional
+#define YaccCmd	bison -y
+#define StandardCppOptions	-traditional
+#define StandardCppDefines	/**/
 #define PreProcessCmd	CppCmd
 
 #define CcCmd	gcc
@@ -136,48 +137,50 @@ XCOMM platform:  $XFree86: xc/config/cf/os2.cf,v 3.14 1996/10/17 15:09:58 dawes
 #define LibraryCCOptions	-D__ST_MT_ERRNO -Zmtd -Zsysv-signals
 #define ServerCCOptions		-D__ST_MT_ERRNO  -Zmtd -Zsysv-signals
 
+#define ModuleCcCmd		gcc_elf
+#define ModuleCppCmd		cpp_elf
+#define ModuleCFlags -D__UNIXOS2__ $(CDEBUGFLAGS) $(THREADS_CFLAGS) $(ALLDEFINES)
+#define ModuleAsCmd		as_elf
+#define ModuleLdCmd		ld_elf
+#define ModuleLdCombineFlags	-X -r
+#define ModuleArCmd		ar_elf cq 
+#define NeedModuleRanlib	YES
+#define ModuleRanlibCmd		ranlib_elf
+#define HasPerl5		YES
+
 #define CplusplusCmd	g++
 #define CplusplusOptions	-Zmtd -Zsysv-signals
 
-#define MakeCmd x11make 
-#define AsCmd	gcc -S
+#define AsCmd	as
 #define GccGasOption	-DGCCUSESGAS
 #define AsmDefines	-DUSE_GAS
 
 #define InstallCmd	install
 
 #define LdCmd	ld
-#define ExtraLoadFlags	/**/
-#define ExtraLibraries	$(LIBRARY_PATH)/binmode.Osuf -lsocket -lbsd
-/*define ServerExtraSysLibs -lemxio*/
+#define ExtraLoadFlags	-Zbin-files
+#define ExtraLibraries	-lshm -lemxfix -lsocket -lbsd
+#define ServerExtraSysLibs     -lregex -lshm -lemxfix -lsocket
 
 /* quite a number of programs you need, most of them the same as
  * with Unix, but listed here for completeness
  */
 #define ArCmd	ar cq
 #define RanlibCmd	ar s
-#define BourneShell	/**/
+#define BourneShell	/bin/sh
 #define LexCmd	flex -l
+#define HasFlex YES
 #define LexLib	-lfl
-#define YaccCmd	yacc
 #define LintCmd	/**/
 #define MvCmd	mv
 #define CompressCmd	compress
+#define GzipCmd	gzip
 #define LnCmd cp
 #define CpCmd cp
-#define RmCmd	ImakeHelper 4 
-
-#ifndef UseInstalled
-#define ImakeCmd \imake
-#define MkdirHierCmd \mkdirhier
-#define DependCmd \makedepend
-#else
-/* imake and mkdirhier come from Imake.tmpl, but DependCmd must be overriden */
-#define DependCmd makedepend
-#endif
+#define RmCmd	rm -f
 
 /* "shell scripts" in OS/2 have this extension */
-#define SHsuf cmd
+#define SHsuf sh
 
 #define InstPgmFlags /**/
 #define InstBinFlags /**/
@@ -188,69 +191,35 @@ XCOMM platform:  $XFree86: xc/config/cf/os2.cf,v 3.14 1996/10/17 15:09:58 dawes
 #define InstDatFlags /**/
 #define InstallFlags /**/
 
-#ifdef i386Architecture
-# define OptimizedCDebugFlags 	-m486 DefaultGcc2i386Opt
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-#else
-# define OptimizedCDebugFlags 	-O
-# define ServerOSDefines 	/**/
-#endif
-#ifdef i386Architecture
-#define ServerExtraDefines GccGasOption XFree86ServerDefines
-#else
-#define ServerExtraDefines GccGasOption
-#endif
+#define OptimizedCDebugFlags 	DefaultGcc2i386Opt
+#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
+#define ServerExtraDefines	GccGasOption XFree86ServerDefines
 
 /*
  * Make & install Features
  */
 
 #define AvoidNullMakeCommand 	YES
-_NULLCMD_ = @ rem
-#define NullMakeCommand	@ rem
+_NULLCMD_ = 
+#define NullMakeCommand
 #define StripInstalledPrograms	NO
 #define CompressAllFonts	YES
 #define CompressManPages	YES
-#define DefaultUserPath		.;/os2;/emx/bin;/tcpip/bin;$(BINDIR)
-#define DefaultSystemPath	/os2;/emx/bin;$(BINDIR)
+#define GzipFontCompression	YES
+#define DefaultUserPath		$(BINDIR)
+#define DefaultSystemPath	$(BINDIR)
+#define CaseSensitiveFileSystem	NO
 
 #ifndef ExtraFilesToClean
 # define ExtraFilesToClean 	*.~* *.exe *.dll *.obj *.lib *.map
 #endif
 
-#if CompressManPages
-#define CompressManCmd	gzip -n
-   COMPRESSMANCMD = CompressManCmd
-#endif
-
-#define ProgramTargetName(target)target.exe
-
-/* we don't name libraries lib*.a */
-#define LibraryTargetName(libname) libname.a
-#define LibraryTargetNameSuffix(libname,suffix)Concat(libname,suffix.a)
-
-/* ... and we even don't do it in rules that should have used the above
- * LibraryTargetName macro
- */
-#ifndef UnSharedLibReferences
-#define UnsharedLibReferences(varname,libname,libsource)		@@\
-Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,$(BUILDLIBDIR)/,libname.a)	@@\
-Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
-#ifndef SharedLibReferences
-#define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
-Concat3(DEP,varname,LIB) = SharedLibDependencies(libname,libsource,revname) @@\
-Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
-LintLibReferences(varname,libname,libsource)
-#endif
+#define ProgramTargetName(target) Concat(target,.exe)
+#define HostProgramTargetName(target) ProgramTargetName(target)
 
 #include <os2.rules>
 #include <os2Lib.rules>
 
 # include <xfree86.cf>
 
-#else
-#error You must edit os2.cf for your (non-EMX) OS/2 dev system
-#endif
+