dovecot.m4: Preserve original CFLAGS/LDFLAGS

Correct flags are detected during configure, so avoid
overwriting them here by accident.

diff --git a/m4/dovecot.m4 b/m4/dovecot.m4
index a115bed0d9d55f6689c051fcd2a1db0cd7be1180..9b03ecda16c1dd251678e429bb6eb14e38714419 100644 (file)
--- a/m4/dovecot.m4
+++ b/m4/dovecot.m4
@@ -368,9 +368,20 @@ AC_DEFUN([DC_DOVECOT],[
        cd $old
        DISTCHECK_CONFIGURE_FLAGS="--with-dovecot=$abs_dovecotdir --without-dovecot-install-dirs"
 
+       dnl Make sure dovecot-config doesn't accidentically override flags
+       ORIG_CFLAGS="$CFLAGS"
+       ORIG_LDFLAGS="$LDFLAGS"
+       ORIG_BINARY_CFLAGS="$BINARY_CFLAGS"
+       ORIG_BINARY_LDFLAGS="$BINARY_LDFLAGS"
+
        eval `grep -i '^dovecot_[[a-z_]]*=' "$dovecotdir"/dovecot-config`
        eval `grep '^LIBDOVECOT[[A-Z0-9_]]*=' "$dovecotdir"/dovecot-config`
 
+        CFLAGS="$ORIG_CFLAGS"
+        LDFLAGS="$ORIG_LDFLAGS"
+        BINARY_CFLAGS="$ORIG_BINARY_CFLAGS"
+        BINARY_LDFLAGS="$ORIG_BINARY_LDFLAGS"
+
        dovecot_installed_moduledir="$dovecot_moduledir"
 
        AS_IF([test "$use_install_dirs" = "no"], [