Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 263679 | Differences between
and this patch

Collapse All | Expand All

(-)xorg-server-1.5.3/configure.ac.old (+13 lines)
Lines 1207-1212 Link Here
1207
if test "x$XVFB" = xyes; then
1207
if test "x$XVFB" = xyes; then
1208
	XVFB_LIBS="$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"
1208
	XVFB_LIBS="$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"
1209
	XVFB_SYS_LIBS="$XVFBMODULES_LIBS"
1209
	XVFB_SYS_LIBS="$XVFBMODULES_LIBS"
1210
	if test "x$GLX_USE_TLS" = xyes; then
1211
		XVFB_SYS_LIBS="$XVFB_SYS_LIBS -lpthread"
1212
		XVFB_DEFINES="-DPTHREADS"
1213
	fi
1210
	AC_SUBST([XVFB_LIBS])
1214
	AC_SUBST([XVFB_LIBS])
1211
	AC_SUBST([XVFB_SYS_LIBS])
1215
	AC_SUBST([XVFB_SYS_LIBS])
1212
fi
1216
fi
Lines 1225-1230 Link Here
1225
if test "x$XNEST" = xyes; then
1229
if test "x$XNEST" = xyes; then
1226
	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_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 $DIX_LIB $OS_LIB $CONFIG_LIB"
1230
	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_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 $DIX_LIB $OS_LIB $CONFIG_LIB"
1227
	XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
1231
	XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
1232
	if test "x$GLX_USE_TLS" = xyes; then
1233
		XNEST_SYS_LIBS="$XNEST_SYS_LIBS -lpthread"
1234
		XNEST_DEFINES="-DPTHREADS"
1235
	fi
1228
	AC_SUBST([XNEST_LIBS])
1236
	AC_SUBST([XNEST_LIBS])
1229
	AC_SUBST([XNEST_SYS_LIBS])
1237
	AC_SUBST([XNEST_SYS_LIBS])
1230
fi
1238
fi
Lines 1957-1962 Link Here
1957
    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
1965
    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
1958
    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS"
1966
    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS"
1959
1967
1968
    if test "x$GLX_USE_TLS" = xyes; then
1969
	KDRIVE_LIBS="$KDRIVE_LIBS -lpthread"
1970
	KDRIVE_CFLAGS="$KDRIVE_CFLAGS -DPTHREADS"
1971
    fi
1972
1960
    # check if we can build Xephyr
1973
    # check if we can build Xephyr
1961
    PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
1974
    PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
1962
1975

Return to bug 263679