diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2009-02-11 14:18:03 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2009-02-15 21:51:46 +1000 |
| commit | 7e5c512104c3ae9b4ddd121f6bbf9464f8d73181 (patch) | |
| tree | f98deafded81c20407a2cbc71465140884e6a13d | |
| parent | eb78c53aa1a980e60c0dd1f2d0d2f04cb9cb2622 (diff) | |
libdrm: make libdrm_nouveau conditional, disabled by default
libdrm isn't supposed to ship APIs not present in a released kernel.
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | libdrm/Makefile.am | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 62d1a292..dbead723 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,10 @@ AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev], [Enable support for using udev instead of mknod (default: disabled)]), [UDEV=$enableval], [UDEV=no]) +AC_ARG_ENABLE(nouveau-experimental-api, + AS_HELP_STRING([--enable-nouveau-experimental-api], + [Enable support for nouveau's experimental API (default: disabled)]), + [NOUVEAU=$enableval], [NOUVEAU=no]) dnl =========================================================================== dnl check compiler flags @@ -119,6 +123,11 @@ if test "x$UDEV" = xyes; then AC_DEFINE(UDEV, 1, [Have UDEV support]) fi +if test "x$NOUVEAU" = xyes; then +NOUVEAU_SUBDIR="nouveau" +AC_SUBST(NOUVEAU_SUBDIR) +fi + PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no]) if test "x$HAVE_CAIRO" = xyes; then AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support]) diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am index cba45864..76145bcb 100644 --- a/libdrm/Makefile.am +++ b/libdrm/Makefile.am @@ -18,7 +18,7 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -SUBDIRS = . intel nouveau +SUBDIRS = . intel @NOUVEAU_SUBDIR@ libdrm_la_LTLIBRARIES = libdrm.la libdrm_ladir = $(libdir) |