diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-08-21 17:10:05 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-08-21 17:10:05 +0000 |
| commit | 1f46a5a39c128aa885b462af178370f43d7ad56e (patch) | |
| tree | 2ced0ee40240af3400bd07b58c1c70186d1c641b | |
| parent | 9c77cb886ab91770f0788caadead23f0a1f5e851 (diff) | |
Make building of Rush optional, bump to 1.0.1.
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | src/Makefile.am | 10 |
2 files changed, 15 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 428af70..4447afa 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-apm], - 1.0.0, + 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-apm) @@ -49,8 +49,13 @@ AC_SUBST(moduledir) PKG_CHECK_MODULES(XORG, xorg-server xproto) sdkdir=$(pkg-config --variable=sdkdir xorg-server) -CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include' +PKG_CHECK_MODULES(XF86RUSH, xxf86rush, have_xf86rush=yes, have_xf86rush=no) +AM_CONDITIONAL(XF86RUSH, test "x$have_xf86rush" = xyes) +AC_SUBST([XF86RUSH_LIBS]) +AC_SUBST([XF86RUSH_CFLAGS]) + +CFLAGS="$CFLAGS $XORG_CFLAGS $XF86RUSH_CFLAGS"' -I$(top_srcdir)/src' +INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src -I$(prefix)/include' AC_SUBST([CFLAGS]) AC_SUBST([INCLUDES]) diff --git a/src/Makefile.am b/src/Makefile.am index eaa0751..d641e62 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,9 +35,13 @@ apm_drv_la_SOURCES = \ apm_driver.c \ apm.h \ apm_i2c.c \ - apm_regs.h \ - apm_rush.c + apm_regs.h + +if XF86RUSH +apm_drv_la_SOURCES += apm_rush.c +endif EXTRA_DIST = \ apm_funcs.c \ - apm_video.c + apm_video.c \ + apm_rush.c |