[Nix-dev] [PATCH 1/2] Get bootstrap.sh work on macosx.

[Giulio Eulisse]

---
 Makefile.am  |    1 +
 bootstrap.sh |    7 ++++++-
 configure.ac |    3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)
-------------- next part --------------
diff --git a/Makefile.am b/Makefile.am
index cb1a321..a056fce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS = externals src scripts corepkgs doc misc tests
 EXTRA_DIST = substitute.mk nix.spec nix.spec.in bootstrap.sh \
   nix.conf.example NEWS version
+ACLOCAL_AMFLAGS = -I m4
 
 pkginclude_HEADERS = config.h
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 2547f5d..4fca88b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,7 +1,12 @@
 #! /bin/sh -e
 rm -f aclocal.m4
 mkdir -p config
-libtoolize --copy
+if which glibtoolize >/dev/null
+then
+  glibtoolize --copy
+else
+  libtoolize --copy
+fi
 aclocal
 autoheader
 automake --add-missing --copy
diff --git a/configure.ac b/configure.ac
index deb011d..11382ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
-AC_INIT(nix, m4_esyscmd([echo -n $(cat ./version)$VERSION_SUFFIX]))
+AC_INIT(nix, m4_esyscmd([echo $(cat ./version)$VERSION_SUFFIX\\c]))
 AC_CONFIG_SRCDIR(README)
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 
 AC_DEFINE_UNQUOTED(NIX_VERSION, ["$VERSION"], [Nix version.])