From ce177ca1a0a28a3c6af1966e3da359125ef2968d Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Wed, 21 Jan 2009 22:11:49 +0000
Subject: [PATCH] * disable shared libs (was broken for newer libtool) * now
libdunegrid is found * delay LT_OUTPUT as long as possible
[[Imported from SVN: r5410]]
---
bin/dunecontrol | 3 +--
m4/dune.m4 | 3 ++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/dunecontrol b/bin/dunecontrol
index db11db110..67c93fdc9 100755
--- a/bin/dunecontrol
+++ b/bin/dunecontrol
@@ -616,7 +616,7 @@ m4_define([DUNE_AC_INIT],[
DUNE_PARSE_MODULE_VERSION([$name], [$version])
# don't build shared libs per default, this is way better for debugging...
m4_ifdef([LT_INIT],
- [LT_INIT],
+ [LT_INIT([disable-shared])],
[AC_DEFUN([LT_OUTPUT])])
AC_DISABLE_SHARED
@@ -632,7 +632,6 @@ AC_DEFUN([DUNE_CHECK_MOD_DEPENDENCIES], [
AC_REQUIRE([AC_PROG_CXXCPP])
AC_REQUIRE([AC_PROG_LIBTOOL])
m4_ifdef([AC_LIBTOOL_LANG_CXX_CONFIG],[AC_LIBTOOL_LANG_CXX_CONFIG])
- AC_REQUIRE([LT_OUTPUT])
EOF
### initialize AM_CONDITIONAL for suggestions that were not found
for name in $(eval echo \$SUGS_$mainmod); do
diff --git a/m4/dune.m4 b/m4/dune.m4
index 7bdaeb624..a54f4cb33 100644
--- a/m4/dune.m4
+++ b/m4/dune.m4
@@ -62,6 +62,7 @@ AC_DEFUN([DUNE_CHECK_MODULES],[
AC_REQUIRE([AC_PROG_CXXCPP])
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
AC_REQUIRE([DUNE_DISABLE_LIBCHECK])
+ AC_REQUIRE([LT_OUTPUT])
# ____DUNE_CHECK_MODULES_____ ($1)
@@ -189,7 +190,7 @@ AC_DEFUN([DUNE_CHECK_MODULES],[
CXX="$LTCXXLINK"
# use module LDFLAGS
- LDFLAGS="$LDFLAGS $DUNE_LDFLAGS $_DUNE_MODULE[]_LDFLAGS"
+ LDFLAGS="$LDFLAGS $DUNE_PKG_LDFLAGS $_DUNE_MODULE[]_LDFLAGS"
LIBS="$DUNE_LIBS $_DUNE_MODULE[]_LIBS"
AC_MSG_CHECKING([for lib[]_dune_lib])
--
GitLab