[m-rev.] [PATCH 2/4] Make it possible to build boehm_gc and libatomic_ops as part of Mercury.

[Paul Bone]

Now that we're using the git source for boehm_gc and libatomic_ops rather
than source tarballs we need to ensure that certain extra files are
generated before building, specifically ltmain.sh.

boehm_gc/autogen.sh:
boehm_gc/libatomic_ops/autogen.sh:
    Call libtoolize prior to setting up autotools.

boehm_gc/build_atomic_ops.sh:
boehm_gc/build_atomic_ops.sh.cygwin:
    Call libatomic_ops's autogen.sh script.

boehm_gc/configure.ac:
boehm_gc/libatomic_ops/configure.ac:
    Configure libtool (and other things) to use the current directory as
    their auxiliary directory (where ltmain.sh should be put), rather than
    the Mercury directory.
---
 boehm_gc/autogen.sh                 | 1 +
 boehm_gc/build_atomic_ops.sh        | 1 +
 boehm_gc/build_atomic_ops.sh.cygwin | 1 +
 boehm_gc/configure.ac               | 1 +
 boehm_gc/libatomic_ops/autogen.sh   | 1 +
 boehm_gc/libatomic_ops/configure.ac | 1 +
 6 files changed, 6 insertions(+)

diff --git a/boehm_gc/autogen.sh b/boehm_gc/autogen.sh
index 8a614f9..c267aff 100755
--- a/boehm_gc/autogen.sh
+++ b/boehm_gc/autogen.sh
@@ -12,6 +12,7 @@ set -e
 # prefix.  Otherwise, you may need to invoke autoreconf with the appropriate
 # -I options to locate the required *.m4 files.
 
+libtoolize
 autoreconf -i
 
 echo
diff --git a/boehm_gc/build_atomic_ops.sh b/boehm_gc/build_atomic_ops.sh
index 221ae4b..557b77f 100755
--- a/boehm_gc/build_atomic_ops.sh
+++ b/boehm_gc/build_atomic_ops.sh
@@ -4,5 +4,6 @@ cd libatomic_ops
 # Mercury-specific: allow additional arguments.
 # Mercury-specific: explicitly set --libdir to avoid some 64-bit Linux
 # systems installing in $P/lib64.
+./autogen.sh
 ./configure --prefix=$P --libdir=$P/lib "$@"
 $MAKE CC="$CC" AR="$AR" RANLIB="$RANLIB" install
diff --git a/boehm_gc/build_atomic_ops.sh.cygwin b/boehm_gc/build_atomic_ops.sh.cygwin
index 158a3f3..4d71ff8 100755
--- a/boehm_gc/build_atomic_ops.sh.cygwin
+++ b/boehm_gc/build_atomic_ops.sh.cygwin
@@ -7,6 +7,7 @@ P=`pwd`
 Q=`mktemp -d`
 ln -s "$P" $Q/dir
 cd $Q/dir/libatomic_ops
+./autogen.sh
 ./configure --prefix=$Q/dir/libatomic_ops-install
 $MAKE CC="$CC" install
 cd /
diff --git a/boehm_gc/configure.ac b/boehm_gc/configure.ac
index 7667949..a5342c4 100644
--- a/boehm_gc/configure.ac
+++ b/boehm_gc/configure.ac
@@ -16,6 +16,7 @@ AC_INIT(gc,7.4.2,bdwgc at lists.opendylan.org)
     ## version must conform to [0-9]+[.][0-9]+[.][0-9]+
 AC_CONFIG_SRCDIR(gcj_mlc.c)
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([.])
 AC_CANONICAL_TARGET
 AC_PREREQ(2.61)
 GC_SET_VERSION
diff --git a/boehm_gc/libatomic_ops/autogen.sh b/boehm_gc/libatomic_ops/autogen.sh
index 98b91da..1a4f3b6 100755
--- a/boehm_gc/libatomic_ops/autogen.sh
+++ b/boehm_gc/libatomic_ops/autogen.sh
@@ -4,6 +4,7 @@ set -e
 # This script creates (or regenerates) configure (as well as aclocal.m4,
 # config.h.in, Makefile.in, etc.) missing in the source repository.
 
+libtoolize
 autoreconf -i
 
 echo
diff --git a/boehm_gc/libatomic_ops/configure.ac b/boehm_gc/libatomic_ops/configure.ac
index fd238ab..6a6863d 100644
--- a/boehm_gc/libatomic_ops/configure.ac
+++ b/boehm_gc/libatomic_ops/configure.ac
@@ -5,6 +5,7 @@ AC_PREREQ(2.61)
 AC_CANONICAL_TARGET([])
 AC_CONFIG_SRCDIR(src/atomic_ops.c)
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 nostdinc])
 AM_MAINTAINER_MODE
 
-- 
2.0.0