--- /dev/null
+diff --git a/configure b/configure
+index c2c0c91..321e0fb 100755
+--- a/configure
++++ b/configure
+@@ -26704,10 +26704,10 @@ else
+ fi
+
+
+-CPPFLAGS=`eval eval eval eval eval echo "-I$includedir -I$prefix/include $CPPFLAGS"`
++CPPFLAGS=`eval eval eval eval eval echo "$CPPFLAGS"`
+ CPPFLAGS=`echo $CPPFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '`
+ CFLAGS=${CFLAGS--O}
+-LDFLAGS=`eval eval eval eval eval echo "-L$libdir -L$prefix/lib ${LDFLAGS--O}"`
++LDFLAGS=`eval eval eval eval eval echo "${LDFLAGS--O}"`
+ LDFLAGS=`echo $LDFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '`
+ LIBS="$GRLIBS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
+