| author | Ben Byer <bbyer@bbyer.local> | 2007-11-07 07:19:03 (GMT) |
|---|---|---|
| committer | Ben Byer <bbyer@bbyer.local> | 2007-11-07 07:19:03 (GMT) |
| commit | be688397ef252020565197b4c036cd813d3d7d66 (patch) | |
| tree | ebcf8c16b32905bb1f25474613699193be3b1b37 | |
| parent | 8e1e422ba406d3fa904be8fe3beeb49db900fadc (diff) | |
| download | xserver-be688397ef252020565197b4c036cd813d3d7d66.zip xserver-be688397ef252020565197b4c036cd813d3d7d66.tar.gz xserver-be688397ef252020565197b4c036cd813d3d7d66.tar.bz2 | |
Fixed glx/DarwinGlx symbol problems; other servers (such as xvfb and xnest)
should now be buildable from this code if you pass e.g. --enable-xvfb
to configure.
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | mi/miinitext.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index a65288f..815bd8b 100644 --- a/configure.ac +++ b/configure.ac @@ -656,7 +656,7 @@ if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then PKG_CHECK_MODULES([GL], [glproto >= 1.4.8]) AC_SUBST(XLIB_CFLAGS) AC_DEFINE(GLXEXT, 1, [Build GLX extension]) - GLX_LIBS='$(top_builddir)/GL/apple/indirect.o $(top_builddir)/GL/glx/libglx.la' + GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la' test -d GL || mkdir GL case $host_os in solaris*) @@ -1645,7 +1645,8 @@ return 0;} # LDFLAGS=$save_LDFLAGS # ]) xorg_cv_AGL_framework=no - DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB" + DARWIN_GLX_LIBS='$(top_builddir)/GL/apple/indirect.o $(top_builddir)/GL/glx/libglx.la' + DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DARWIN_GLX_LIBS" AC_SUBST([DARWIN_LIBS]) AC_CHECK_LIB([Xplugin],[xp_init],[:]) AC_SUBST([APPLE_APPLICATIONS_DIR]) diff --git a/mi/miinitext.c b/mi/miinitext.c index fa00674..8736745 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -338,7 +338,7 @@ extern void XFree86DGAExtensionInit(INITARGS); #endif #ifdef GLXEXT typedef struct __GLXprovider __GLXprovider; -#if defined(__DARWIN__) && !defined(INXQUARTZ) +#if defined(__DARWIN__) && defined(INXDARWINAPP) extern __GLXprovider* __DarwinglXMesaProvider; extern void DarwinGlxPushProvider(__GLXprovider *impl); extern void DarwinGlxExtensionInit(INITARGS); @@ -632,7 +632,7 @@ InitExtensions(argc, argv) #endif #endif #ifdef GLXEXT -#if defined(__DARWIN__) && !defined(INXQUARTZ) +#if defined(__DARWIN__) && defined(INXDARWINAPP) DarwinGlxPushProvider(__DarwinglXMesaProvider); if (!noGlxExtension) DarwinGlxExtensionInit(); #else |