diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-31 08:40:01 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-31 08:40:01 +0100 |
| commit | e4ef724e06621be9325fc41ed886fd404467fdc0 (patch) | |
| tree | be445314647f682fbb4a1e8b94aeb6ee79cede5f /xorg-server/configure.ac | |
| parent | 270d3a1aa4137dc15d7b7e5a0958cc8c0bef9a1a (diff) | |
| download | vcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.tar.gz vcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.tar.bz2 vcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.zip | |
fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013
xserver commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa
xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485
libX11 commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea
glproto commit aacc7a51b6161c765b04524e0d2ab31e5e586834
fontconfig commit 525a135ccf53e4bf3363c3143d9cfdf15fba55ab
mesa commit b16b3c8703f198ca0f025b730d582600df79c19c
Diffstat (limited to 'xorg-server/configure.ac')
| -rw-r--r-- | xorg-server/configure.ac | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index 7b4e70fe7..d29f1706a 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -809,7 +809,7 @@ LIBAPPLEWM="applewm >= 1.4" LIBDMX="dmx >= 1.0.99.1" LIBDRI="dri >= 7.8.0" LIBDRM="libdrm >= 2.3.0" -LIBGL="gl >= 7.1.0" +LIBGL="gl >= 9.2.0" LIBXEXT="xext >= 1.0.99.4" LIBXFONT="xfont >= 1.4.2" LIBXI="xi >= 1.2.99.1" @@ -1070,7 +1070,7 @@ if test "x$GLX" = xyes; then AC_SUBST(XLIB_CFLAGS) AC_DEFINE(GLXEXT, 1, [Build GLX extension]) GLX_LIBS='$(top_builddir)/glx/libglx.la' - GLX_SYS_LIBS="$GLX_SYS_LIBS" + GLX_SYS_LIBS="$GLX_SYS_LIBS -lGL" else GLX=no fi @@ -1080,10 +1080,10 @@ if test "x$GLX" = xno; then AIGLX=no fi -if test "x$AIGLX" = xyes -a \( "x$DRI" = xyes -o "x$DRI2" = xyes \); then +if test "x$AIGLX" = xyes -a \( "x$DRI2" = xyes \); then AC_DEFINE(AIGLX, 1, [Build AIGLX loader]) fi -AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI" = xyes || test "x$DRI2" = xyes; } && test "x$AIGLX" = xyes) +AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI2" = xyes; } && test "x$AIGLX" = xyes) if test "x$GLX_USE_TLS" = xyes ; then GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS" @@ -2238,7 +2238,7 @@ if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno; then ***********************************************]) fi -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile glx/Makefile include/Makefile @@ -2339,3 +2339,4 @@ test/xi2/Makefile xserver.ent xorg-server.pc ]) +AC_OUTPUT |