--- configure.ac.orig	2013-01-31 16:18:06.537834009 +0400
+++ configure.ac	2013-01-31 16:19:00.138835711 +0400
@@ -12,7 +12,7 @@
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 
-CFLAGS="-D_GNU_SOURCE -Wall -Wunused -Wstrict-prototypes"
+CFLAGS="-D_GNU_SOURCE -Wall -Wunused -Wstrict-prototypes ${CFLAGS}"
 
 use_sasl=false
 use_apop=false
@@ -99,7 +99,6 @@
 	;;
 	yes)
 	AC_DEFINE(NDEBUG, [1], [Use debug functionality])
-	CFLAGS="$CFLAGS -g"
 	optimize="no"
 	;;
 	*)
@@ -119,7 +118,6 @@
 	;;
 	yes)
 	AC_DEFINE(NDEBUG, [1], [Use debug functionality])
-	CFLAGS="$CFLAGS -pg -g"
 	optimize="yes"
 	;;
 	*)
@@ -127,9 +125,6 @@
 	;;
 	esac
 	])
-if test $optimize = "yes"; then
-	CFLAGS="$CFLAGS -O2"
-fi
 AM_CONDITIONAL([LIBMAIL_USE_SASL], [test x$use_sasl = xtrue])
 AM_CONDITIONAL([LIBMAIL_USE_APOP], [test x$use_apop = xtrue])
 AM_CONDITIONAL([LIBMAIL_USE_TLS], [test x$use_tls = xtrue])