Index: speex-1.2rc1/configure.ac
===================================================================
--- speex-1.2rc1.orig/configure.ac
+++ speex-1.2rc1/configure.ac
@@ -112,9 +112,6 @@ AC_MSG_RESULT($has_visibility)
 
 AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
 
-XIPH_PATH_OGG([src="src"], [src=""])
-AC_SUBST(src)
-
 AC_CHECK_LIB(m, sin)
 
 # Check for getopt_long; if not found, use included source.
@@ -139,10 +136,16 @@ AC_ARG_ENABLE(valgrind, [  --enable-valg
   AC_DEFINE([ENABLE_VALGRIND], , [Enable valgrind extra checks])
 fi])
 
+AC_ARG_ENABLE(ogg, [  --enable-ogg            Enable OGG support], [if test "$enableval" = yes; then
+  XIPH_PATH_OGG([src="src"], [src=""])
+  AC_SUBST(src)
+fi
+])
+
 AC_ARG_ENABLE(sse, [  --enable-sse            Enable SSE support], [
 if test "x$enableval" != xno; then
 has_sse=yes
-CFLAGS="$CFLAGS -O3 -msse"
+CFLAGS="$CFLAGS -msse"
 else
 has_sse=no
 fi
