Adjust after removal of libatomic_ops from the source tree.

configure.ac: Since we no longer bundle libatomic_ops, we must check for
the sub-directory before using it, in case we didn't find an installed
version.
Makefile.am: Don't include libatomic_ops in the distribution.

diff --git a/Makefile.am b/Makefile.am
index 4de6e46f96cac0777d4fa294ddd285921c1beec0..f389e3a38791add79c642df2eed08ec12ed72c6e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -186,10 +186,6 @@ EXTRA_DIST += extra/add_gc_prefix.c extra/gc.c extra/gcname.c \
     Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
     include/private/msvc_dbg.h extra/msvc_dbg.c
 
-# The libatomic_ops library.  This is not ideal, since we pick up junk from
-# there.
-EXTRA_DIST += libatomic_ops
-
 # this is an auxiliary shell file used by Makefile and Makefile.direct
 #
 CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host

diff --git a/configure.ac b/configure.ac
index d0d6e3fccef82f2f3ffe07b1b4db2cc65fe3a8da..82da25fe0ba7586e99a4936c9a26804de17181d6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -703,13 +703,18 @@ AS_IF([test x"$with_libatomic_ops" != xno],
               [AC_MSG_ERROR([A pre-installed libatomic_ops was not found.])])
         with_libatomic_ops=no ]) ])
 
+# If we have neither an external or an internal version, offer a useful hint
+# and exit.
+AS_IF([test x"$with_libatomic_ops" = xno -a ! -e "$srcdir/libatomic_ops"],
+  [ AC_MSG_ERROR([libatomic_ops is required.  You can either install it on your system, or fetch and unpack a resent version into the source directory and link or rename it to libatomic_ops.]) ])
+
 # Finally, emit the definitions for bundled or pre-installed AO.
 AC_MSG_CHECKING([which libatomic_ops to use])
 AS_IF([test x"$with_libatomic_ops" != xno],
   [ AC_MSG_RESULT([pre-installed])
     ATOMIC_OPS_LIBS="-latomic_ops"
     AC_SUBST([ATOMIC_OPS_LIBS]) ],
-  [ AC_MSG_RESULT([bundled])
+  [ AC_MSG_RESULT([internal])
     AC_CONFIG_SUBDIRS([libatomic_ops])
   ])
 AM_CONDITIONAL([USE_INTERNAL_LIBATOMIC_OPS],