--- configure.in.orig	Sat Feb 21 19:38:28 2004
+++ configure.in	Sat Mar 20 07:14:42 2004
@@ -52,7 +52,7 @@
 
 dnl Check for pthread support, which GL libs may require (e.g. FreeBSD)
 AC_CHECK_HEADER(pthread.h, , dontcare=y)
-AC_CHECK_LIB(pthread, pthread_create, LIBS="-lpthread $LIBS")
+AC_CHECK_LIB(pthread, pthread_create, LIBS="%%PTHREAD_LIBS%% $LIBS")
 
 
 dnl Build Mesa generic driver
@@ -171,14 +171,14 @@
 dnl the Mesa generic driver and the (hopefully) accelerated one
 if test -f makefile; then
 	echo '# Remove older build'
-	make veryclean
+	%%GMAKE%% veryclean
 	agl_make_depend="yes";
 fi
 
 
 dnl If dependencies are not built yet then do it !
 if (test ! -f make/makefile.dep); then
-	echo '# Execute "make depend".' > make/makefile.dep
+	echo '# Execute "%%GMAKE%% depend".' > make/makefile.dep
 	agl_make_depend="yes";
 fi
 
@@ -189,5 +189,5 @@
 
 dnl Run "make depend" if necessary
 if test -n "$agl_make_depend"; then
-	make depend
+	%%GMAKE%% depend
 fi