From: Gábor Gombás <[email protected]>
AC_PATH_XTRA provides a much nicer interface.
---
configure.ac | 1 -
m4/ax_check_gl.m4 | 17 ++---------------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8048781..2c22525 100644
--- a/configure.ac
+++ b/configure.ac
@@ -480,7 +480,6 @@ AC_DEFINE_UNQUOTED(BOINC_LIBDIR,"`eval echo
${libdir}`",[Directory where BOINC l
dnl ---------- decide wether to build the graphical boinc-api libs or not
dnl check for X11
-AC_PATH_X
AC_PATH_XTRA
dnl check for GL library
diff --git a/m4/ax_check_gl.m4 b/m4/ax_check_gl.m4
index 5984130..bd4e630 100644
--- a/m4/ax_check_gl.m4
+++ b/m4/ax_check_gl.m4
@@ -26,21 +26,8 @@ else
AX_LANG_COMPILER_MS
if test X$ax_compiler_ms = Xno; then
- GL_CFLAGS="${PTHREAD_CFLAGS}"
- GL_LIBS="${PTHREAD_LIBS} -lm"
- fi
-
- #
- # Use x_includes and x_libraries if they have been set (presumably by
- # AC_PATH_X).
- #
- if test "X$no_x" != "Xyes"; then
- if test -n "$x_includes"; then
- GL_CFLAGS="-I${x_includes} -I${prefix}/include ${GL_CFLAGS}"
- fi
- if test -n "$x_libraries"; then
- GL_LIBS="-L${x_libraries} -lX11 ${GL_LIBS}"
- fi
+ GL_CFLAGS="${X_CFLAGS} ${PTHREAD_CFLAGS}"
+ GL_LIBS="${X_LIBS} ${PTHREAD_LIBS} -lm"
fi
AC_CHECK_HEADERS([windows.h])
--
1.6.4.3
_______________________________________________
boinc_dev mailing list
[email protected]
http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev
To unsubscribe, visit the above URL and
(near bottom of page) enter your email address.
