Index: configure.ac
===================================================================
RCS file: /sources/linphone/linphone/mediastreamer2/configure.ac,v
retrieving revision 1.42
diff -u -p -r1.42 configure.ac
--- configure.ac	22 Jan 2008 21:39:15 -0000	1.42
+++ configure.ac	19 Feb 2008 19:39:43 -0000
@@ -290,24 +290,28 @@ AC_SUBST(SPEEX_LIBS)
 AM_CONDITIONAL(BUILD_SPEEX, test x$build_speex = xyes )
 
 dnl check for gsm
+build_gsm=no
 AC_ARG_WITH( gsm,
 		  [  --with-gsm		Sets the installation prefix of gsm codec library [default=/usr] ],
 		  [ gsmdir=${withval}],[ gsmdir=/usr ])
 
-MS_CHECK_DEP([gsm codec],[GSM],[${gsmdir}/include],
-	[${gsmdir}/lib],[gsm/gsm.h],[gsm],[gsm_create])
-
-if test "$GSM_found" = "yes" ; then
-	build_gsm=yes
+if test x"$gsmdir" != xno ; then
+	test x"$gmsdir" = xyes && gsmdir=/usr
+	MS_CHECK_DEP([gsm codec],[GSM],[${gsmdir}/include],
+		[${gsmdir}/lib],[gsm/gsm.h],[gsm],[gsm_create])
+	if test "$GSM_found" = "yes" ; then
+		build_gsm=yes
+	fi
+else
+	build_gsm=no
 fi
+AM_CONDITIONAL(BUILD_GSM, test x$build_gsm = xyes )
 
 
 build_resample=false
 AC_CHECK_LIB(resample,resample_open,[LIBS="$LIBS -lresample"; build_resample=yes])
 AM_CONDITIONAL(BUILD_RESAMPLE, test x$build_resample = xyes )
 
-AM_CONDITIONAL(BUILD_GSM, test x$build_gsm = xyes )
-
 MS_CHECK_VIDEO
 AM_CONDITIONAL(BUILD_VIDEO, test "$video" = "true")
 AM_CONDITIONAL(BUILD_THEORA, test "$have_theora" = "yes")