From 791380bb3217aa63c496fb0c8acafb1c8c39cdb7 Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Wed, 26 Mar 2008 16:46:59 +0000
Subject: [PATCH] fix libtool on Mac OS X

[[Imported from SVN: r5128]]
---
 m4/dune.m4     |  1 +
 m4/dune_all.m4 | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/m4/dune.m4 b/m4/dune.m4
index 5088fa7e0..0739d9232 100644
--- a/m4/dune.m4
+++ b/m4/dune.m4
@@ -33,6 +33,7 @@ AC_DEFUN([DUNE_CHECK_MODULES],[
   AC_REQUIRE([AC_PROG_CXX])
   AC_REQUIRE([AC_PROG_CXXCPP])
   AC_REQUIRE([AC_PROG_LIBTOOL])
+  AC_REQUIRE([LT_OUTPUT])
   AC_REQUIRE([PKG_PROG_PKG_CONFIG])
   AC_REQUIRE([DUNE_DISABLE_LIBCHECK])
 
diff --git a/m4/dune_all.m4 b/m4/dune_all.m4
index fa51a2166..6bed07f62 100644
--- a/m4/dune_all.m4
+++ b/m4/dune_all.m4
@@ -28,13 +28,20 @@ m4_define([DUNE_PARSE_MODULE_FILE],[
 ])
 
 m4_define([DUNE_AC_INIT],[
-DUNE_PARSE_MODULE_FILE
-AC_INIT(DUNE_MOD_NAME, DUNE_MOD_VERSION, DUNE_MAINTAINER_NAME)
+  DUNE_PARSE_MODULE_FILE
+  AC_INIT(DUNE_MOD_NAME, DUNE_MOD_VERSION, DUNE_MAINTAINER_NAME)
+  # don't build shared libs per default, this is way better for debugging...
+  LT_INIT([disable-shared])
+  AC_DISABLE_SHARED
 ])
 
 AC_DEFUN([DUNE_CHECK_DEPENDENCIES], [
   AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-  AC_REQUIRE([AC_PROG_LIBTOOL])
+  LT_LANG([C])
+  LT_LANG([C++])
+  AC_PROG_CXX
+  AC_PROG_LIBTOOL
+  LT_OUTPUT
   DUNE_PARSE_MODULE_FILE
   DUNE_MODULE_DEPENDENCIES(DUNE_MOD_NAME)
 ])
@@ -192,8 +199,6 @@ AC_DEFUN([DUNE_CHECK_ALL_M],[
   AC_LANG_PUSH([C++])
 
   AC_REQUIRE([DUNE_SYMLINK])
-  # don't build shared libs per default, this is way better for debugging...
-  AC_REQUIRE([AC_DISABLE_SHARED])
 
   # special settings for check-log
   AC_ARG_WITH(hostid,
-- 
GitLab