diff --git a/builds/posix/make.defaults b/builds/posix/make.defaults
index 52d0b7a1a2..2a274bb337 100755
--- a/builds/posix/make.defaults
+++ b/builds/posix/make.defaults
@@ -138,8 +138,6 @@ DECLIB=-ldecFloat$(CROSS)
 # crypt library
 CRYPTLIB=@CRYPTLIB@
 
-ATOMICLIB=-latomic
-
 LSB_FLG=@LSB_FLG@
 ifeq ($(LSB_FLG), Y)
   LSB_UNDEF=-Wl,--allow-shlib-undefined
@@ -184,8 +182,8 @@ STATICLIB_LINK = $(AR) crus
 EXE_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS)
 STATICEXE_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS)
 
-LINK_LIBS = @LIBS@ $(DECLIB) $(ATOMICLIB)
-SO_LINK_LIBS = @LIBS@ $(DECLIB) $(ATOMICLIB)
+LINK_LIBS = @LIBS@ $(DECLIB)
+SO_LINK_LIBS = @LIBS@ $(DECLIB)
 
 # Default extensions
 
diff --git a/configure.ac b/configure.ac
index 86de43eaaf..4f59015375 100644
--- a/configure.ac
+++ b/configure.ac
@@ -872,7 +872,7 @@ if test "$EDITLINE_FLG" = "Y"; then
 fi
 
 AC_SEARCH_LIBS(inet_aton, resolv)
-
+AC_CHECK_LIB(atomic, main)
 
 dnl Check for libraries for static C++ runtime linking
 AC_CHECK_LIB(supc++, main, XE_APPEND(-lsupc++, STATIC_CXXSUPPORT_LIB))