From: Ivan Maidanski <ivmai@mail.ru>
Date: Mon, 12 Sep 2011 08:22:27 +0000 (+0400)
Subject: Regenerate configure, update ChangeLog for commit 2620c11.
X-Git-Tag: gc7_2~138^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4009e279f3cde5075fe00d5d81a78fdd97b3987a;p=gc

Regenerate configure, update ChangeLog for commit 2620c11.
---

diff --git a/ChangeLog b/ChangeLog
index 9021db94..c83035c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-11  Ivan Maidanski <ivmai@mail.ru> (really Petter Urkedal)
+
+	* 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.
+	* Makefile.in: Regenerate.
+	* configure: Ditto.
+
 2011-08-09  Ivan Maidanski <ivmai@mail.ru> (really Jie Liu)
 
 	* configure.ac: Add GC_RTEMS_PTHREADS AH_TEMPLATE and configure
diff --git a/Makefile.in b/Makefile.in
index 29d41ea0..8241d21c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -555,9 +555,6 @@ AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
 
 # files used by makefiles other than Makefile.am
 #
-
-# The libatomic_ops library.  This is not ideal, since we pick up junk from
-# there.
 EXTRA_DIST = gc_cpp.cpp README.QUICK BCC_MAKEFILE NT_MAKEFILE \
 	OS2_MAKEFILE PCR-Makefile digimars.mak EMX_MAKEFILE \
 	Makefile.direct Makefile.dj Makefile.DLLs SMakefile.amiga \
@@ -570,10 +567,10 @@ EXTRA_DIST = gc_cpp.cpp README.QUICK BCC_MAKEFILE NT_MAKEFILE \
 	mach_dep.c extra/setjmp_t.c extra/threadlibs.c extra/AmigaOS.c \
 	Mac_files/datastart.c Mac_files/dataend.c \
 	Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-	include/private/msvc_dbg.h extra/msvc_dbg.c libatomic_ops \
-	cord/cordbscs.c cord/cordtest.c cord/de.c cord/cordprnt.c \
-	cord/cordxtra.c cord/de_cmds.h cord/de_win.h cord/de_win.c \
-	cord/de_win.RC cord/de_win.ICO
+	include/private/msvc_dbg.h extra/msvc_dbg.c cord/cordbscs.c \
+	cord/cordtest.c cord/de.c cord/cordprnt.c cord/cordxtra.c \
+	cord/de_cmds.h cord/de_win.h cord/de_win.c cord/de_win.RC \
+	cord/de_win.ICO
 
 # C Library
 # ---------
diff --git a/configure b/configure
index dab24e1f..bcf2805c 100755
--- a/configure
+++ b/configure
@@ -16611,6 +16611,12 @@ fi
 
 fi
 
+# If we have neither an external or an internal version, offer a useful hint
+# and exit.
+if test x"$with_libatomic_ops" = xno -a ! -e "$srcdir/libatomic_ops"; then :
+   as_fn_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." "$LINENO" 5
+fi
+
 # Finally, emit the definitions for bundled or pre-installed AO.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking which libatomic_ops to use" >&5
 $as_echo_n "checking which libatomic_ops to use... " >&6; }
@@ -16622,8 +16628,8 @@ $as_echo "pre-installed" >&6; }
     ATOMIC_OPS_LIBS="-latomic_ops"
 
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: bundled" >&5
-$as_echo "bundled" >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     subdirs="$subdirs libatomic_ops"