configure.ac: Fix es state tracker build.
mesa/es should be built before the es state trackers. This is done by separating those that need to be built early from SRC_DIRS to CORE_DIRS. The new variable is not exported, and will be prepended to SRC_DIRS. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
This commit is contained in:
parent
3f3340ca16
commit
99a37ed195
12
configure.ac
12
configure.ac
|
@ -419,7 +419,11 @@ esac
|
||||||
dnl
|
dnl
|
||||||
dnl Driver specific build directories
|
dnl Driver specific build directories
|
||||||
dnl
|
dnl
|
||||||
SRC_DIRS="glsl mesa glew"
|
|
||||||
|
dnl this variable will be prepended to SRC_DIRS and is not exported
|
||||||
|
CORE_DIRS="glsl mesa"
|
||||||
|
|
||||||
|
SRC_DIRS="glew"
|
||||||
GLU_DIRS="sgi"
|
GLU_DIRS="sgi"
|
||||||
WINDOW_SYSTEM=""
|
WINDOW_SYSTEM=""
|
||||||
GALLIUM_DIRS="auxiliary drivers state_trackers"
|
GALLIUM_DIRS="auxiliary drivers state_trackers"
|
||||||
|
@ -434,7 +438,7 @@ xlib)
|
||||||
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib"
|
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib"
|
||||||
;;
|
;;
|
||||||
dri)
|
dri)
|
||||||
SRC_DIRS="glx/x11 $SRC_DIRS"
|
CORE_DIRS="glx/x11 $CORE_DIRS"
|
||||||
DRIVER_DIRS="dri"
|
DRIVER_DIRS="dri"
|
||||||
WINDOW_SYSTEM="dri"
|
WINDOW_SYSTEM="dri"
|
||||||
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm"
|
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm"
|
||||||
|
@ -1191,7 +1195,7 @@ yes)
|
||||||
;;
|
;;
|
||||||
es)
|
es)
|
||||||
# mesa/es is required to build es state tracker
|
# mesa/es is required to build es state tracker
|
||||||
SRC_DIRS="mesa/es $SRC_DIRS"
|
CORE_DIRS="$CORE_DIRS mesa/es"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
@ -1306,6 +1310,8 @@ if test "x$enable_gallium_nouveau" = xyes; then
|
||||||
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nv04 nv10 nv20 nv30 nv40 nv50"
|
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nv04 nv10 nv20 nv30 nv40 nv50"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl prepend CORE_DIRS to SRC_DIRS
|
||||||
|
SRC_DIRS="$CORE_DIRS $SRC_DIRS"
|
||||||
|
|
||||||
dnl Restore LDFLAGS and CPPFLAGS
|
dnl Restore LDFLAGS and CPPFLAGS
|
||||||
LDFLAGS="$_SAVE_LDFLAGS"
|
LDFLAGS="$_SAVE_LDFLAGS"
|
||||||
|
|
Loading…
Reference in New Issue