From e1c8dc583e8afedf21cfd8ecc7fe7966de780f64 Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Tue, 26 Apr 2005 13:09:16 +0000
Subject: [PATCH] improved test to find libdune.la
[[Imported from SVN: r1943]]
---
m4/dune.m4 | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/m4/dune.m4 b/m4/dune.m4
index b4046ccc4..6f59c7670 100644
--- a/m4/dune.m4
+++ b/m4/dune.m4
@@ -37,11 +37,6 @@ AC_DEFUN([DUNE_PATH_DUNE],[
# expand tilde / other stuff
DUNEROOT=`cd $with_dune && pwd`
- # automagically use directory above if complete Dune-dir was supplied
- if test `basename $DUNEROOT` = "dune" ; then
- DUNEROOT=`cd $DUNEROOT/.. && pwd`
- fi
-
# expand search path (otherwise empty CPPFLAGS)
CPPFLAGS="-I$DUNEROOT"
else
@@ -67,8 +62,8 @@ AC_DEFUN([DUNE_PATH_DUNE],[
LDFLAGS="$LDFLAGS -L$DUNEROOT/dune/lib"
# only check for a .la-file
- if test -s $DUNEROOT/dune/lib/libdune.la ; then
- DUNE_LDFLAGS="-L$DUNEROOT/dune/lib"
+ if test -s $DUNEROOT/lib/libdune.la ; then
+ DUNE_LDFLAGS="-L$DUNEROOT/lib"
echo found libdune.la, setting LDFLAGS to $DUNE_LDFLAGS
# provide arguments like normal lib-check
--
GitLab