diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-07 08:26:06 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-07 08:27:25 +0100 |
| commit | c97d11aec40d8fa07d6b456bf8694133a77d35f4 (patch) | |
| tree | 9e14e6f970a86af9f7107053c5c709e2e440d032 /mesalib/configure.ac | |
| parent | 51c3a4e7b08aa904ff2af52a9f6f7adc748b361f (diff) | |
| parent | f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48 (diff) | |
| download | vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.tar.gz vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.tar.bz2 vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xextproto fontconfig libxcb mesa xserver git update 7 Nov 2013
Conflicts:
xorg-server/include/servermd.h
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 0a250471e..a8366ee2f 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -14,10 +14,6 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE([foreign]) -dnl http://people.gnome.org/~walters/docs/build-api.txt -dnl We don't support srcdir != builddir. -echo \#buildapi-variable-no-builddir >/dev/null - # Support silent build rules, requires at least automake-1.11. Disable # by either passing --disable-silent-rules to configure or passing V=1 # to make @@ -974,7 +970,7 @@ if test "x$enable_dri" = xyes; then ;; esac ;; - freebsd* | dragonfly* | *netbsd* | openbsd*) + *freebsd* | dragonfly* | *netbsd* | openbsd*) DEFINES="$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1" DEFINES="$DEFINES -DHAVE_ALIAS" @@ -2096,7 +2092,6 @@ AC_CONFIG_FILES([Makefile src/mesa/drivers/x11/Makefile src/mesa/main/tests/Makefile src/mesa/main/tests/hash_table/Makefile - src/mesa/program/Makefile src/mesa/x86-64/Makefile src/mesa/x86/Makefile]) |