diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-10-17 23:23:22 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-10-17 23:23:22 +0000 |
| commit | 2ff37b7da09549f212207d3ea24a0295e5f8c955 (patch) | |
| tree | 21331eb05e41ae6f15b914bbf38cd6280ccb9d84 | |
| parent | 8060bfb0e6211bd8f871770bee40f56df4f5fa2c (diff) | |
Check for <GL/glx.h> & libGL in configure.ac instead of waiting for failure
at build time if neither Mesa nor vendor OpenGL is installed.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 68fdc12..5297b21 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ bin_PROGRAMS = xdriinfo xdriinfo_CFLAGS = $(XDRIINFO_CFLAGS) # mesa should really use pkg-config ... -xdriinfo_LDADD = $(XDRIINFO_LIBS) -lGL +xdriinfo_LDADD = $(XDRIINFO_LIBS) xdriinfo_SOURCES = \ xdriinfo.c diff --git a/configure.ac b/configure.ac index 30ff257..06e0375 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,15 @@ PKG_CHECK_MODULES(XDRIINFO, x11 glproto) AC_SUBST(XDRIINFO_CFLAGS) AC_SUBST(XDRIINFO_LIBS) +# Checks for non-pkg-config packages (Mesa or vendor OpenGL) +AC_CHECK_HEADER([GL/glx.h], [], + AC_MSG_FAILURE([cannot find GL/glx.h - make sure Mesa or other OpenGL package is installed])) + +AC_SEARCH_LIBS([glXGetProcAddress], [GL], [], + AC_MSG_FAILURE([cannot find GL library - make sure Mesa or other OpenGL package is installed]), + [$XDRIINFO_LIBS]) + + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |