--- kphoneSI_1.0/configure.in	2006/03/14 14:21:36	1.3
+++ kphoneSI_1.0/configure.in	2006/05/28 12:55:07	1.4
@@ -121,7 +121,7 @@
 fi
 
 
-CFLAGS="-I$ac_cv_qt_inc -Wall"
+CFLAGS="-I$ac_cv_qt_inc -Wall $CFLAGS"
 LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname -L/usr/local/lib -L/usr/X11R6/lib64 -L/usr/X11R6/lib"
 
 dnl Check for X libraries.
@@ -212,7 +212,7 @@
 fi
 
 
-AC_OUTPUT(Makefile kphone/Makefile dissipate2/Makefile ilbc/Makefile gsm/Makefile icons/Makefile po/Makefile $srtp_make )
+AC_OUTPUT(Makefile kphone/Makefile dissipate2/Makefile ilbc/Makefile gsm/Makefile Speex/Makefile icons/Makefile po/Makefile $srtp_make ringing/Makefile)
 
 echo ""
 echo "Now type 'make', followed by 'make install' as root."
--- kphoneSI_1.0/configure.orig	2006-06-17 14:57:24.000000000 +0200
+++ kphoneSI_1.0/configure	2006-06-17 14:59:18.000000000 +0200
@@ -1296,7 +1296,7 @@
 fi
 
 
-CFLAGS="-I$ac_cv_qt_inc -Wall"
+CFLAGS="-I$ac_cv_qt_inc -Wall $CFLAGS"
 LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname -L/usr/local/lib -L/usr/X11R6/lib64 -L/usr/X11R6/lib"
 
 ac_ext=c
--- kphoneSI_1.0/configure.in.orig	2006-06-17 15:02:32.000000000 +0200
+++ kphoneSI_1.0/configure.in	2006-06-17 15:06:35.000000000 +0200
@@ -198,7 +198,7 @@
          CFLAGS="$CFLAGS -g -DDEBUG"
 AC_MSG_RESULT(yes)
 else
-CFLAGS="$CFLAGS -O3"
+CFLAGS="-O2 $CFLAGS"
 AC_MSG_RESULT(no)
 fi
 
--- kphoneSI_1.0/configure.orig	2006-06-17 15:02:26.000000000 +0200
+++ kphoneSI_1.0/configure	2006-06-17 15:04:55.000000000 +0200
@@ -2150,7 +2150,6 @@
          CFLAGS="$CFLAGS -g -DDEBUG"
 echo "$ac_t""yes" 1>&6
 else
-CFLAGS="$CFLAGS -O3"
 echo "$ac_t""no" 1>&6
 fi