diff -Nur unuran-1.8.0.orig/configure.ac unuran-1.8.0/configure.ac
--- unuran-1.8.0.orig/configure.ac	2010-12-22 05:11:07.000000000 +0000
+++ unuran-1.8.0/configure.ac	2010-12-22 05:15:35.000000000 +0000
@@ -62,10 +62,6 @@
 dnl libm: the standard math library
 AC_CHECK_LIB([m], [sqrt])
 
-dnl libmgsl: the GNU Scientific library 
-dnl (only used for experimental code)
-AC_CHECK_LIB([gsl], [gsl_integration_qagiu])
-
 dnl Optional support for external uniform random number generators
 
 dnl RngStream: Pierre L'Ecuyer's multiple random stream generator
@@ -80,6 +76,11 @@
 AX_ADD_URNG_LIB([gsl],[GSL],[random number generators from GNU Scientific Library],
                 [gsl],[gsl_rng_alloc],[gsl/gsl_rng.h])
 
+if test -n $UNURAN_SUPPORTS_GSL; then
+  AC_PATH_PROG(GSL_CONFIG, gsl-config, no)
+  LIBS="$LIBS `$GSL_CONFIG --libs`"
+fi
+
 dnl Default URNG
 AC_ARG_WITH(urng_default,
 	[AS_HELP_STRING([--with-urng-default],
@@ -215,7 +216,8 @@
 	[],
 	[enable_experimental=no])
 AS_IF([test "x$enable_experimental" = xyes],
-	[AC_DEFINE([USE_EXPERIMENTAL_CODE], [1], 
+	[AC_CHECK_LIB([gsl], [gsl_integration_qagiu])
+	 AC_DEFINE([USE_EXPERIMENTAL_CODE], [1], 
 	           [Define to 1 if you want to use experimental code])], 
 	[])
 AM_CONDITIONAL(ENABLE_EXPERIMENTAL, test x$enable_experimental = xyes)
diff -Nur unuran-1.8.0.orig/tests/Makefile.am unuran-1.8.0/tests/Makefile.am
--- unuran-1.8.0.orig/tests/Makefile.am	2010-12-22 05:11:07.000000000 +0000
+++ unuran-1.8.0/tests/Makefile.am	2010-12-22 05:11:19.000000000 +0000
@@ -9,7 +9,7 @@
  -I$(top_srcdir)/src \
  -I$(top_srcdir)/src/tests
 
-noinst_LTLIBRARIES = libtestroutines.la
+check_LTLIBRARIES = libtestroutines.la
 libtestroutines_la_SOURCES = testroutines.c testcounter.c
 
 LDADD = \