Permalink
Browse files

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.
  • Loading branch information...
1 parent e773036 commit 8e32d79455fc2e6abac454a2ae96aea890c7e8e9 @paurkedal paurkedal committed Aug 11, 2011
Showing with 6 additions and 5 deletions.
  1. +0 −4 Makefile.am
  2. +6 −1 configure.ac
View
@@ -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
View
@@ -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],

0 comments on commit 8e32d79

Please sign in to comment.