summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2007-04-05 20:29:28 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2007-04-05 20:29:28 +0000
commit0f802343683af28230b59c6f06ba5fdfcbf92bad (patch)
tree72cfaddac3a6270084f60055d3350033575df3f4
parent4a798bee8954111bc764c39accb8de7226ccdeaa (diff)
Fix library ordering for static arches
-rw-r--r--app/xdriinfo/Makefile.am2
-rw-r--r--app/xdriinfo/configure.ac1
2 files changed, 1 insertions, 2 deletions
diff --git a/app/xdriinfo/Makefile.am b/app/xdriinfo/Makefile.am
index c5cce1d79..9a4376d2c 100644
--- a/app/xdriinfo/Makefile.am
+++ b/app/xdriinfo/Makefile.am
@@ -21,8 +21,6 @@
bin_PROGRAMS = xdriinfo
xdriinfo_CFLAGS = $(XDRIINFO_CFLAGS)
-# mesa should really use pkg-config ...
-xdriinfo_LDADD = $(XDRIINFO_LIBS)
xdriinfo_SOURCES = \
xdriinfo.c
diff --git a/app/xdriinfo/configure.ac b/app/xdriinfo/configure.ac
index 3bab4d540..a5d9af4ff 100644
--- a/app/xdriinfo/configure.ac
+++ b/app/xdriinfo/configure.ac
@@ -46,6 +46,7 @@ AC_SEARCH_LIBS([glXGetProcAddressARB], [GL], [],
AC_MSG_FAILURE([cannot find GL library - make sure Mesa or other OpenGL package is installed]),
[$XDRIINFO_LIBS])
+LIBS="$LIBS $XDRIINFO_LIBS"
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION