--- dovecot-2.0.rc5/configure.in	2010-08-09 19:59:46.000000000 +0100
+++ dovecot-2.0.rc5/configure.in	2010-08-11 12:20:53.496580514 +0100
@@ -2160,8 +2160,8 @@
 		done
 	done
   else
-    MYSQL_INCLUDE="`$MYSQL_CONFIG --include`"
-    MYSQL_LIBS="`$MYSQL_CONFIG --libs`"
+    MYSQL_INCLUDE="`$MYSQL_CONFIG --cflags | tr -d \'`"
+    MYSQL_LIBS="`$MYSQL_CONFIG --libs | tr -d \'`"
   fi
 
   old_LIBS=$LIBS
--- dovecot-2.0.rc5/configure	2010-08-09 20:00:08.000000000 +0100
+++ dovecot-2.0.rc5/configure	2010-08-11 12:22:15.828402842 +0100
@@ -22242,8 +22242,8 @@
 		done
 	done
   else
-    MYSQL_INCLUDE="`$MYSQL_CONFIG --include`"
-    MYSQL_LIBS="`$MYSQL_CONFIG --libs`"
+    MYSQL_INCLUDE="`$MYSQL_CONFIG --cflags | tr -d \'`"
+    MYSQL_LIBS="`$MYSQL_CONFIG --libs | tr -d \'`"
   fi
 
   old_LIBS=$LIBS