1 files changed, 12 insertions, 0 deletions

diff --git a/autogen/configure b/autogen/configure
index 1251680b942..8226d489f72 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -3367,7 +3367,19 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+
 emacs_config_options="$@"
+## Add some environment variables, if they were passed via the environment
+## rather than on the command-line.
+for var in CFLAGS CPPFLAGS LDFLAGS; do
+    case "$emacs_config_options" in
+      *$var=*) continue ;;
+    esac
+    eval val="\$${var}"
+    test x"$val" = x && continue
+    emacs_config_options="${emacs_config_options}${emacs_config_options:+ }$var=$val"
+done
+
 ac_config_headers="$ac_config_headers src/config.h:src/config.in"