If either of those is not found, rhd_conntest is not built. Affects automake builds only. --- configure.ac | 9 +++++++++ utils/conntest/Makefile.am | 5 +++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 40bc1c8..47abaa9 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,13 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Header files checks. AC_HEADER_STDC +AC_CHECK_HEADER([pci/pci.h], + [AC_DEFINE([HAVE_PCI_PCI_H], [1], + [Define to 1 if you have <pci/pci.h>.]) + have_pci_pci_h=yes], + [AC_MSG_WARN([Caution: Will not compile rhd_conntest without pciutils headers.])]) +AM_CONDITIONAL([HAVE_PCI_PCI_H], [test "x$have_pci_pci_h" = "xyes"]) + SAVED_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $XORG_CFLAGS" @@ -113,6 +120,8 @@ AM_CONDITIONAL(ATOM_BIOS, test x$support_atombios = xyes) AM_CONDITIONAL(ATOM_BIOS_PARSER, test x$support_atombios_parser = xyes) # libraries checks. +AC_CHECK_LIB([z], [gzopen], [have_zlib=yes], [have_zlib=no]) +AM_CONDITIONAL([HAVE_ZLIB], [test "x$have_zlib" = "xyes"]) # compiler flags diff --git a/utils/conntest/Makefile.am b/utils/conntest/Makefile.am index b3a3308..924625f 100644 --- a/utils/conntest/Makefile.am +++ b/utils/conntest/Makefile.am @@ -4,7 +4,12 @@ include $(top_srcdir)/RadeonHD.am EXTRA_DIST = README Imakefile +EXTRA_PROGRAMS = rhd_conntest +if HAVE_PCI_PCI_H +if HAVE_ZLIB noinst_PROGRAMS = rhd_conntest +endif +endif # Including config.h requires xorg-config.h, so we need the XORG_CFLAGS here AM_CFLAGS = @XORG_CFLAGS@ @WARN_CFLAGS@ -- 1.5.3.4 -- To unsubscribe, e-mail: radeonhd+unsubscribe@opensuse.org For additional commands, e-mail: radeonhd+help@opensuse.org