diff options
| author | Eric Anholt <eric@anholt.net> | 2007-10-01 16:09:13 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-10-01 16:09:13 -0700 |
| commit | 219354af212c7b68c20df689692c55331e36a705 (patch) | |
| tree | befeddc9c2ee6c903d3a171b42485d0f4ef30115 | |
| parent | 1b83e5e589105d05c1b78032fa47eecee478cb99 (diff) | |
Restore building of pciaccess-based tools even if the server doesn't use it.
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/bios_reader/Makefile.am | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 1c7ad04f..e5a7cf6e 100644 --- a/configure.ac +++ b/configure.ac @@ -116,9 +116,15 @@ CFLAGS="$save_CFLAGS" if test x$XSERVER_LIBPCIACCESS = xyes; then PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) +else + PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.5.0], + have_libpciaccess=yes, + have_libpciaccess=no) fi - +have_libpciaccess=no AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) +AM_CONDITIONAL(LIBPCIACCESS, + test "x$XSERVER_LIBPCIACCESS" = xyes -o "x$have_libpciaccess" = xyes) AM_CONDITIONAL(XMODES, test "x$XMODES" = xno) if test "x$XSERVER_SOURCE" = x; then diff --git a/src/Makefile.am b/src/Makefile.am index 13cbf913..118d4b13 100644 --- a/src/Makefile.am +++ b/src/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. -if XSERVER_LIBPCIACCESS +if LIBPCIACCESS REGDUMPER = reg_dumper endif diff --git a/src/bios_reader/Makefile.am b/src/bios_reader/Makefile.am index a4adecb1..76ad15f7 100644 --- a/src/bios_reader/Makefile.am +++ b/src/bios_reader/Makefile.am @@ -2,7 +2,7 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @XMODES_CFLAGS@ noinst_PROGRAMS = bios_reader $(BIOS_DUMPER) -if XSERVER_LIBPCIACCESS +if LIBPCIACCESS BIOS_DUMPER = bios_dumper bios_dumper_SOURCES = bios_dumper.c |