diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-28 08:38:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-28 08:38:39 +0100 |
| commit | 22fb212bb84a69ab20a494aed1c197da1d2dbdf7 (patch) | |
| tree | d11c21c9260bee0f56c34ee6e241671befd5257f /mesalib/configure.ac | |
| parent | c1296df0ebe19a8e90fb7d7f0135d7034f16a76d (diff) | |
| parent | 7417e9a171736b5279881cd4381fb58c617a23d9 (diff) | |
| download | vcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.tar.gz vcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.tar.bz2 vcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 8885a6d74..febb9f680 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -1469,8 +1469,20 @@ dnl dnl XA configuration dnl if test "x$enable_xa" = xyes; then +AC_PROG_AWK +AC_PROG_GREP +AC_CHECK_PROG(NM, nm, "nm") +if test "x$AWK" = x || test "x$GREP" = x || test "x$NM" = x; then +AC_MSG_WARN([Missing one of nm, grep or awk. Disabling xa.]) +enable_xa=no +fi +fi +if test "x$enable_xa" = xyes; then GALLIUM_STATE_TRACKERS_DIRS="xa $GALLIUM_STATE_TRACKERS_DIRS" HAVE_ST_XA=yes + AC_SUBST(AWK) + AC_SUBST(GREP) + AC_SUBST(NM) fi dnl |