From 8353e06738b2428bb1714ad11acc10c5218f5a1c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 8 Jul 2014 08:47:37 +0200
Subject: Updates to build system

---
 configure.ac        |  2 +-
 cutl/Makefile.am    |  4 ++--
 cutl/makefile       |  2 +-
 cutl/xml/parser.hxx |  2 +-
 m4/libtool-link.m4  | 26 +++++++++++++++++++++-----
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 06f3f2f..ec93078 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,7 +100,7 @@ if test x"$external_expat" = xno; then
   AC_DEFINE_UNQUOTED([LIBCUTL_BYTEORDER], [$byteorder], [1234 = little, 4321 = big])
 fi
 
-# Define LIBODB_STATIC_LIB if we are build static library on certain platforms.
+# Define LIBCUTL_STATIC_LIB if we are build static library on certain platforms.
 #
 STATIC_LIB([LIBCUTL_STATIC_LIB], [Static library interface.])
 
diff --git a/cutl/Makefile.am b/cutl/Makefile.am
index 0ebed9c..a7eead6 100644
--- a/cutl/Makefile.am
+++ b/cutl/Makefile.am
@@ -24,5 +24,5 @@ endif
 libcutl_la_SOURCES += __path__(genx_sources)
 nobase_cutlinclude_HEADERS += __path__(genx_headers)
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
-libcutl_la_LDFLAGS = -release __value__(interface_version)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -DLIBCUTL_DYNAMIC_LIB
+AM_LDFLAGS = -release __value__(interface_version) -no-undefined
diff --git a/cutl/makefile b/cutl/makefile
index 61a8419..369b2ca 100644
--- a/cutl/makefile
+++ b/cutl/makefile
@@ -84,7 +84,7 @@ $(cutl.l.cpp-options): value := -I$(out_root) -I$(src_root)
 
 $(call include,$(bld_root)/ld/configuration-lib.make) # ld_lib_type
 
-$(out_base)/details/config.h:
+$(out_base)/details/config.h: | $(out_base)/details/.
 	@echo '/* file      : cutl/details/config.h'               >$@
 	@echo ' * note      : automatically generated'            >>$@
 	@echo ' */'                                               >>$@
diff --git a/cutl/xml/parser.hxx b/cutl/xml/parser.hxx
index 67beaf4..5c3c959 100644
--- a/cutl/xml/parser.hxx
+++ b/cutl/xml/parser.hxx
@@ -209,7 +209,7 @@ namespace cutl
       unsigned long long column () const {return column_;}
 
       // Attribute map lookup. If attribute is not found, then the version
-      // without the default value thows an appropriate parsing exception
+      // without the default value throws an appropriate parsing exception
       // while the version with the default value returns that value.
       //
       // Note also that there is no attribute(ns,name) version since it
diff --git a/m4/libtool-link.m4 b/m4/libtool-link.m4
index 27b07a1..f02811f 100644
--- a/m4/libtool-link.m4
+++ b/m4/libtool-link.m4
@@ -10,8 +10,6 @@ dnl linking and it does this using the C++ compiler.
 dnl
 AC_DEFUN([CXX_LIBTOOL_LINK_IFELSE],[
 AC_LANG_SAVE
-save_CXX="$CXX"
-CXX="./libtool --tag=CXX --mode=link $CXX -no-install"
 AC_LANG(C++)
 
 if test -d .libs; then
@@ -20,11 +18,29 @@ else
   delete_libs_dir=yes
 fi
 
-AC_LINK_IFELSE([$1], [$2], [$3])
+AC_COMPILE_IFELSE([$1],
+[
+  ac_try='./libtool --tag=CXX --mode=link $CXX -no-install $CXXFLAGS $LDFLAGS -o conftest conftest.$OBJEXT $LIBS >&AS_MESSAGE_LOG_FD'
+  if _AC_DO_VAR(ac_try); then
+    libtool_link_ok=yes
+  else
+    libtool_link_ok=no
+  fi
+],
+[
+  libtool_link_ok=no
+])
 
-if test x"$delete_libs_dir" != xyes; then
+if test x"$delete_libs_dir" = xyes; then
   rm -rf .libs
 fi
 
-CXX="$save_CXX"
+if test x"$libtool_link_ok" = xyes; then
+[$2]
+:
+else
+[$3]
+:
+fi
+
 AC_LANG_RESTORE])dnl
-- 
cgit v1.1