[augeas-devel] [PATCH 3/3] Build changes so that 'make' on Opensolaris 5.11 works

[David Lutterkort]

The tests ('make check') still fail, because of trouble with
some of the shell scripts
---
 bootstrap              |    2 ++
 configure.ac           |    5 +++++
 src/Makefile.am        |    2 +-
 src/augeas_sym.version |    3 +--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bootstrap b/bootstrap
index 53d8adc..6dc6a2a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -59,11 +59,13 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 
 modules='
 argz
+fnmatch
 gitlog-to-changelog
 canonicalize-lgpl
 regex
 selinux-h
 strndup
+vasprintf
 '
 
 # Tell gnulib to:
diff --git a/configure.ac b/configure.ac
index 54ec16b..0b22600 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,11 @@ AC_SUBST(AUGEAS_CFLAGS)
 AUGEAS_CHECK_READLINE
 AC_CHECK_FUNCS([open_memstream])
 
+VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+$(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) || \
+    VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
+AC_SUBST(VERSION_SCRIPT_FLAGS)
+
 gl_INIT
 
 AC_OUTPUT(Makefile \
diff --git a/src/Makefile.am b/src/Makefile.am
index 32fca89..a4516aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ libaugeas_la_SOURCES = augeas.h augeas.c pathx.c \
 	memory.h memory.c ref.h \
         syntax.c syntax.h parser.y builtin.c lens.c lens.h regexp.c \
 	transform.c ast.c get.c put.c list.h
-libaugeas_la_LDFLAGS = -Wl,--version-script=$(srcdir)/augeas_sym.version \
+libaugeas_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(srcdir)/augeas_sym.version \
         -version-info $(LIBAUGEAS_VERSION_INFO)
 libaugeas_la_LIBADD = liblexer.la libfa.la $(LIB_SELINUX) $(GNULIB)
 
diff --git a/src/augeas_sym.version b/src/augeas_sym.version
index 6db27b1..26c858c 100644
--- a/src/augeas_sym.version
+++ b/src/augeas_sym.version
@@ -7,11 +7,10 @@
       aug_insert;
       aug_rm;
       aug_mv;
-      aug_ls;
       aug_match;
       aug_save;
       aug_print;
-      /* Symbols with __ are private */
+      # Symbols with __ are private
       __aug_load_module_file;
     local: *;
 };
-- 
1.6.0.6