--- libogg-1.3.3/configure.ac.orig	2010-11-01 21:13:42.000000000 +0100
+++ libogg-1.3.3/configure.ac	2010-11-03 21:34:19.187102452 +0100
@@ -46,8 +46,8 @@
         case $host in
         *-*-linux*)
                 DEBUG="-g -Wall -fsigned-char"
-                CFLAGS="-O2 -Wall -ffast-math -fsigned-char"
-                PROFILE="-Wall -W -pg -g -O2 -ffast-math -fsigned-char"
+                CFLAGS="$CFLAGS -Wall -ffast-math -fsigned-char"
+                PROFILE="$CFLAGS -Wall -W -pg -g -ffast-math -fsigned-char"
 		;;
         sparc-sun-*)
                 DEBUG="-g -Wall -fsigned-char"
@@ -61,8 +61,8 @@
 		;;
         *)
                 DEBUG="-g -Wall -fsigned-char"
-                CFLAGS="-O2 -fsigned-char"
-                PROFILE="-O2 -g -pg -fsigned-char"
+                CFLAGS="$CFLAGS -fsigned-char"
+                PROFILE="$CFLAGS -g -pg -fsigned-char"
 		;;
         esac
 fi
--- libogg-1.2.2/ogg.m4~	2009-05-21 00:57:14.000000000 +0200
+++ libogg-1.2.2/ogg.m4	2011-07-25 12:09:42.870545070 +0200
@@ -14,16 +14,6 @@
 AC_ARG_WITH(ogg-includes,AC_HELP_STRING([--with-ogg-includes=DIR],[Directory where libogg header files are installed (optional)]), ogg_includes="$withval", ogg_includes="")
 AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--disable-oggtest],[Do not try to compile and run a test Ogg program]),, enable_oggtest=yes)
 
-  if test "x$ogg_libraries" != "x" ; then
-    OGG_LIBS="-L$ogg_libraries"
-  elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then
-    OGG_LIBS=""
-  elif test "x$ogg_prefix" != "x" ; then
-    OGG_LIBS="-L$ogg_prefix/lib"
-  elif test "x$prefix" != "xNONE" ; then
-    OGG_LIBS="-L$prefix/lib"
-  fi
-
   if test "x$ogg_prefix" != "xno" ; then
     OGG_LIBS="$OGG_LIBS -logg"
   fi