Index: configure.in
===================================================================
--- configure.in	(revision 86023)
+++ configure.in	(working copy)
@@ -827,6 +827,9 @@
 	esac
 fi
 
+AC_ARG_ENABLE(abi-flags, 
+              AS_HELP_STRING([--disable-abi-flags], [disable ABI flags]))
+
 # For calculating the .so ABI tag.
 AC_SUBST(ABIFLAGS)
 ABIFLAGS=""
@@ -842,7 +845,9 @@
   [Define if you want to build an interpreter with many run-time checks.]) 
   AC_MSG_RESULT(yes); 
   Py_DEBUG='true'
-  ABIFLAGS="${ABIFLAGS}d"
+  if test "$enable_abi_flags" != "no"; then
+    ABIFLAGS="${ABIFLAGS}d"
+  fi
 else AC_MSG_RESULT(no); Py_DEBUG='false'
 fi],
 [AC_MSG_RESULT(no)])
@@ -2434,7 +2439,9 @@
 if test -z "$with_pymalloc"
 then
     with_pymalloc="yes"
-    ABIFLAGS="${ABIFLAGS}m"
+    if test "$enable_abi_flags" != "no"; then
+        ABIFLAGS="${ABIFLAGS}m"
+    fi
 fi
 if test "$with_pymalloc" != "no"
 then
@@ -3547,7 +3554,9 @@
 case "$unicode_size" in
   4)
      AC_DEFINE(Py_UNICODE_SIZE, 4)
-     ABIFLAGS="${ABIFLAGS}u"
+     if test "$enable_abi_flags" != "no"; then
+         ABIFLAGS="${ABIFLAGS}u"
+     fi
      ;;
   *) AC_DEFINE(Py_UNICODE_SIZE, 2) ;;
 esac