--- a/configure.in	Wed Jun 17 04:26:19 2009 +0000
+++ b/configure.in	Wed Jun 24 20:04:08 2009 +0000
@@ -217,6 +217,12 @@
 
 dnl Enable/disable various subsystems of the SDL library
 
+AC_ARG_ENABLE(atomic,
+AC_HELP_STRING([--enable-atomic], [Enable the atomic operations subsystem [[default=yes]]]),
+              , enable_atomic=yes)
+if test x$enable_atomic != xyes; then
+    AC_DEFINE(SDL_ATOMIC_DISABLED)
+fi
 AC_ARG_ENABLE(audio,
 AC_HELP_STRING([--enable-audio], [Enable the audio subsystem [[default=yes]]]),
               , enable_audio=yes)
@@ -2433,6 +2439,16 @@
             ;;
           esac
         fi
+        # Set up files for the atomic operations library
+        if test x$enable_atomic = xyes; then
+          case $ARCH in
+            linux)
+                AC_DEFINE(SDL_ATOMIC_LINUX)
+                SOURCES="$SOURCES $srcdir/src/atomic/linux/*.c"
+                have_atomic=yes
+            ;;
+          esac
+        fi
         # Set up files for the joystick library
         if test x$enable_joystick = xyes; then
           case $ARCH in