Mailinglist Archive: radeonhd (529 mails)

[Hans Ulrich Niedermann <hun@xxxxxxxxxxxxxxxx>]

If libpci is found via pkg-config, PCIUTILS_LIBS will contain
something like "-L/path/to/lib -lpci -lz". So we get rid of the
explicit -lpci and -lz in this case.

In case pkg-config does not find libpci, though, we just revert
to the previous behaviour of assuming that "-lpci -lz" will work.

In any case, we make sure linking works before actually using it.
---
 configure.ac               |    4 +++-
 utils/conntest/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index d2ea67f..be420e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,9 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 AC_HEADER_STDC
 
 PKG_CHECK_MODULES(PCIUTILS, libpci,,
-                  [AC_MSG_WARN([libpci not registered in pkgconfig])])
+   [AC_MSG_WARN([libpci not registered in pkgconfig, will guess instead])
+    test "x$PCIUTILS_CFLAGS$PCIUTILS_LIBS" = "x" && PCIUTILS_LIBS="-lpci -lz"
+])
 
 SAVED_CPPFLAGS="$CPPFLAGS"
 SAVED_CFLAGS="$CFLAGS"
diff --git a/utils/conntest/Makefile.am b/utils/conntest/Makefile.am
index 9f1ddcc..6350ef9 100644
--- a/utils/conntest/Makefile.am
+++ b/utils/conntest/Makefile.am
@@ -24,4 +24,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/AtomBios/includes
 
 rhd_conntest_SOURCES = rhd_conntest.c
 nodist_rhd_conntest_SOURCES = git_version.h
-rhd_conntest_LDADD   = -lz @PCIUTILS_LIBS@ -lpci
+rhd_conntest_LDADD   = @PCIUTILS_LIBS@
-- 
1.5.3.4

-- 
To unsubscribe, e-mail: radeonhd+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: radeonhd+help@xxxxxxxxxxxx