[Xorg] [PATCH] fix configure.ac and Makefile.am to allow x86emu

[Kristian Høgsberg]

Yes, I have the i830 driver running, but there were other problems: 
since libvbe.a and libfb.a are linked into the Xorg binary at link time, 
the linker throws aways .o files from the .a file that aren't used by 
the server binary, e.g.

[krh at dinky debrix]$ nm Xorg |grep fbPi
0812b650 T fbPixmapToRegion

no fbPictureInit, but maybe I'm doing something wrong? This happens to 
vbeModes.o and fbpict.o so I added dummy references to symbols in those 
files to get them linked in.  I810VideoInit() segfaults, but I disabled 
that for now and then it works.

Kristian

Jesse Barnes wrote:
> Does it work if you apply the patch and enable it?
> 
> Jesse
> 
> On Tuesday, July 13, 2004 7:38 pm, Kristian Høgsberg wrote:
> 
>>Shouldn't that be enabled by default?  I've been trying to run the i830
>>driver and it doesn't get far with just stub.c...
>>
>>Kristian
>>
>>Jesse Barnes wrote:
>>
>>>Daniel, how does this look?  It seems to compile ok if I pass
>>>--enable-x86emu, and if I don't pass it, the Makefile is generated like
>>>it used to be...  If it looks ok, can you just commit it?
>>>
>>>The original Imakefile also set -D__BIG_ENDIAN__, but that should
>>>probably be a global define if it isn't already.
>>>
>>>Thanks,
>>>Jesse
>>>
>>>
>>>------------------------------------------------------------------------
>>>
>>>Index: configure.ac
>>>===================================================================
>>>RCS file: /cvs/xserver/debrix/configure.ac,v
>>>retrieving revision 1.7
>>>diff -u -r1.7 configure.ac
>>>--- configure.ac	6 Jul 2004 23:53:56 -0000	1.7
>>>+++ configure.ac	13 Jul 2004 22:13:10 -0000
>>>@@ -106,6 +106,7 @@
>>> AC_ARG_ENABLE(glx,           [  --enable-glx
>>>],[GLX=$enableval],[GLX=no]) AC_ARG_ENABLE(dri,           [  --enable-dri
>>>],[DRI=$enableval],[DRI=no]) AC_ARG_ENABLE(xinerama,	     [ 
>>>--disable-xinerama ],[XINERAMA=$enableval],[XINERAMA=yes])
>>>+AC_ARG_ENABLE(x86emu,	     AS_HELP_STRING([--enable-x86emu],[use x86
>>>emulator for int10 library (default:
>>>disabled)]),[X86EMU=$enableval],[X86EMU=no])
>>>
>>> # Transport selection
>>> AC_ARG_ENABLE(unix-transport,[  --disable-unix-transport ],
>>>[UNIXCONN=$enableval], [UNIXCONN=yes]) @@ -215,6 +216,8 @@
>>> 	REQUIRED_MODULES="$REQUIRED_MODULES panoramixext"
>>> fi
>>>
>>>+AM_CONDITIONAL(X86EMU, [test x$X86EMU = xyes])
>>>+
>>> AM_CONDITIONAL(XLOADABLE, [test x$XLOADABLE = xyes])
>>> if test "$XLOADABLE" = yes; then
>>> 	AC_DEFINE(XLOADABLE,1,[Support loadable input and output drivers])
>>>Index: hw/xorg/int10/Makefile.am
>>>===================================================================
>>>RCS file: /cvs/xserver/debrix/hw/xorg/int10/Makefile.am,v
>>>retrieving revision 1.4
>>>diff -u -r1.4 Makefile.am
>>>--- hw/xorg/int10/Makefile.am	1 Jul 2004 17:49:48 -0000	1.4
>>>+++ hw/xorg/int10/Makefile.am	13 Jul 2004 22:13:10 -0000
>>>@@ -2,9 +2,13 @@
>>>
>>> #ibxorgint10_a_SOURCES = stub.c
>>>
>>>-libint10_a_SOURCES = stub.c xf86int10module.c
>>>-
>>>-# FIXME: i386/amd64-only (and Linux-only!!)
>>>+if X86EMU
>>>+AM_CFLAGS = -D_X86EMU -D__DRIVER__ -DFORCE_POST -D_CEXPORT=
>>>-DNO_LONG_LONG +libint10_a_SOURCES = pci.c xf86int10module.c
>>>helper_exec.c helper_mem.c \ +	xf86int10.c xf86x86emu.c generic.c
>>>x86emu.c
>>>+else
>>> AM_CFLAGS = -D_PC -D_VM86_LINUX
>>>+libint10_a_SOURCES = stub.c xf86int10module.c
>>>+endif
>>>
>>> sdk_HEADERS = xf86int10.h
> 
> 
>