diff --git a/configure.ac b/configure.ac
index d47b1b545e..f7d8ae4dd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -509,12 +509,8 @@ GST_CHECK_CONFIGPROG(GNOME_VFS, gnome-config vfs)
 dnl *** gsm ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_LIBGSM, true)
 GST_CHECK_FEATURE(LIBGSM, [GSM library], gsmenc gsmdec, [
-GST_CHECK_LIBHEADER(LIBGSM, gsm, gsm_create, , gsm/gsm.h, LIBGSM_LIBS="-lgsm" LIBGSM_CFLAGS="-DGSM_HEADER_IN_SUBDIR")
+GST_CHECK_LIBHEADER(LIBGSM, gsm, gsm_create, , gsm/gsm.h, LIBGSM_LIBS="-lgsm")
 ])
-dnl FIXME: this should be done somewhere in the functions, but it doesn't 
-dnl seem to be happening
-AC_SUBST(LIBGSM_LIBS)
-AC_SUBST(LIBGSM_CFLAGS)
 
 dnl *** Hermes ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_LIBHERMES, true)