diff options
| author | Eric Anholt <eric@anholt.net> | 2009-02-21 10:01:40 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-02-21 10:01:40 -0800 |
| commit | 4d5341340fb6df22fffa7d4a214c54c085a1b1cf (patch) | |
| tree | c76225467fc73a69ea8b051f560915769b665548 | |
| parent | 2f1cdf79a7b7679f2602f27f18a0737f6e40e490 (diff) | |
Fix distcheck for optional nouveau stuff.
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | libdrm/Makefile.am | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 041374b3..c1ee9380 100644 --- a/configure.ac +++ b/configure.ac @@ -123,10 +123,7 @@ 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 +AM_CONDITIONAL(HAVE_NOUVEAU, [text "x$NOUVEAU" = xyes]) PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no]) if test "x$HAVE_CAIRO" = xyes; then diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am index 76145bcb..4c066e0e 100644 --- a/libdrm/Makefile.am +++ b/libdrm/Makefile.am @@ -18,7 +18,11 @@ # 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_SUBDIR@ +if HAVE_NOUVEAU +NOUVEAU_SUBDIR = nouveau +endif + +SUBDIRS = . intel $(NOUVEAU_SUBDIR) libdrm_la_LTLIBRARIES = libdrm.la libdrm_ladir = $(libdir) |