diff --git a/configure.in b/configure.in
index af823d6394b0d22aa0f2ef6d79cf859f430c7371..4356e9d864d7dc8e656f67d01621e9a5d19ad38a 100644
--- a/configure.in
+++ b/configure.in
@@ -22,14 +22,6 @@ dnl Checks for libraries.
 
 dnl Replace `main' with a function in -lm:
 AC_CHECK_LIB(m, main,,AC_MSG_ERROR(No lm library! Exiting...))
-dnl Replace `main' with a function in -lX11:
-AC_CHECK_LIB(X11, main,,AC_MSG_ERROR(Exiting...))
-dnl Replace `main' with a function in -lXext:
-AC_CHECK_LIB(Xext, main,,AC_MSG_ERROR(Exiting...))
-dnl Replace `main' with a function in -lGL:
-AC_CHECK_LIB(GL, main)
-dnl Replace `main' with a function in -lgl:
-AC_CHECK_LIB(gl, main)
 
 dnl Checks for header files.
 AC_HEADER_STDC
@@ -83,10 +75,18 @@ esac
 
 case "$build_os" in
 *linux*)
-AC_CHECK_LIB(g2c, main,,,)
-AC_CHECK_LIB(blas, main,,AC_MSG_WARN(Problems with libblas: also tried lg2c for Linux...)
-make_own_blas_lib=libblas.la,-lg2c);;
+AC_CHECK_LIB(MesaGL, main)
+AC_CHECK_LIB(g2c, main)
+AC_CHECK_LIB(blas, main,,AC_MSG_WARN([Problems with libblas: also tried lg2c for Linux...])
+make_own_blas_lib=libblas.la,-lg2c)
+AC_CHECK_LIB(X11, main,,AC_MSG_ERROR(Exiting...),-L$x_libraries)
+AC_CHECK_LIB(Xext, main,,AC_MSG_ERROR(Exiting...),-L$x_libraries)
+;;
 *)
+AC_CHECK_LIB(X11, main,,AC_MSG_ERROR(Exiting...))
+AC_CHECK_LIB(Xext, main,,AC_MSG_ERROR(Exiting...))
+AC_CHECK_LIB(gl, main)
+AC_CHECK_LIB(GL, main)
 AC_CHECK_LIB(blas, main,,
 AC_MSG_WARN(Problems with libblas: creating our own...)
 make_own_blas_lib=libblas.la,);;
diff --git a/ltconfig b/ltconfig
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000