diff options
| author | alanh <alanh> | 2003-12-08 22:16:37 +0000 |
|---|---|---|
| committer | alanh <alanh> | 2003-12-08 22:16:37 +0000 |
| commit | 13d8f7b9ed1fb75f40e56c25d1cc3735bf8befa8 (patch) | |
| tree | ae08fd02e38119f2fa64797645c298138cd9589f | |
| parent | 4be120977b09efe6d80c92f4668d9fa4ab085a29 (diff) | |
statically link in libexpat.a to resolve problems.
| -rw-r--r-- | xc/config/cf/host.def | 6 | ||||
| -rw-r--r-- | xc/lib/GL/mesa/drivers/dri/radeon/Imakefile | 2 | ||||
| -rw-r--r-- | xc/lib/GL/mesa/drivers/dri/sis/Imakefile | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/xc/config/cf/host.def b/xc/config/cf/host.def index 1a0f9e683..eba77ccaa 100644 --- a/xc/config/cf/host.def +++ b/xc/config/cf/host.def @@ -92,8 +92,10 @@ #define XnestServer NO #define XVirtualFramebufferServer NO -/* we don't have libexpat sources in DRI CVS, so assume that it's installed */ -#define HasExpat YES +/* we do have libexpat sources in DRI CVS and want to build static to + * link with libGL to isolate link problems with systems that don't have it */ +#define HasExpat NO +#define NormalLibExpat YES /* * Don't change anything below or the build will fail. diff --git a/xc/lib/GL/mesa/drivers/dri/radeon/Imakefile b/xc/lib/GL/mesa/drivers/dri/radeon/Imakefile index e65680c11..0fdaa556d 100644 --- a/xc/lib/GL/mesa/drivers/dri/radeon/Imakefile +++ b/xc/lib/GL/mesa/drivers/dri/radeon/Imakefile @@ -58,7 +58,7 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/radeon/Imakefile,v 1.9 2002/02/23 00:45:5 OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ $(MESA_ASM_OBJS) $(COMMONOBJS) $(RADEONOBJS) $(HIOBJS) -REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB) +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) StaticLibrary($(BUILDLIBDIR),expat) #include <Library.tmpl> diff --git a/xc/lib/GL/mesa/drivers/dri/sis/Imakefile b/xc/lib/GL/mesa/drivers/dri/sis/Imakefile index 620af3d21..3feb467a4 100644 --- a/xc/lib/GL/mesa/drivers/dri/sis/Imakefile +++ b/xc/lib/GL/mesa/drivers/dri/sis/Imakefile @@ -62,7 +62,7 @@ XCOMM DEBUG_DEFINES = -DSIS_DEBUG OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ $(MESA_ASM_OBJS) $(COMMONOBJS) $(SISOBJS) $(HIOBJS) -REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB) +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) StaticLibrary($(BUILDLIBDIR),expat) #include <Library.tmpl> |