From a98690a31d495c278e19b45f7054186a14831f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Kl=C3=B6fkorn?= <robertk@dune-project.org>
Date: Thu, 20 Mar 2008 09:55:05 +0000
Subject: [PATCH] use other macro for gnu ld and bugs in alugrid.m4
[[Imported from SVN: r5124]]
---
m4/alugrid.m4 | 6 +++---
m4/grape.m4 | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/m4/alugrid.m4 b/m4/alugrid.m4
index 1c82fad50..3baeacef4 100644
--- a/m4/alugrid.m4
+++ b/m4/alugrid.m4
@@ -16,7 +16,7 @@ ac_save_LIBS="$LIBS"
## do nothing if no --with-alugrid was supplied
if test x$with_alugrid != x && test x$with_alugrid != xno ; then
- if test x$with_alugrid == xyes ; then
+ if test x$with_alugrid = xyes ; then
AC_MSG_ERROR([You have to provide a directory --with-alugrid=PATH])
fi
@@ -32,12 +32,12 @@ if test x$with_alugrid != x && test x$with_alugrid != xno ; then
## check version number
NEEDEDALUGRID_VERSION=1.1
- echo -n "checking ALUGrid version >= $NEEDEDALUGRID_VERSION... "
+ AC_MSG_CHECKING([ALUGrid version >= $NEEDEDALUGRID_VERSION])
if test -f $ALUGRID_VERSIONCHECK; then
ALUGRID_VERSION=`$ALUGRID_VERSIONCHECK -c $NEEDEDALUGRID_VERSION`
if test "x$ALUGRID_VERSION" != "x-1"; then
ALUGRID_VERSIONNO=`$ALUGRID_VERSIONCHECK -v`
- echo "yes (ALUGrid-$ALUGRID_VERSIONNO)"
+ AC_MSG_RESULT([yes (ALUGrid-$ALUGRID_VERSIONNO)])
else
AC_MSG_ERROR([ALUGrid version is too old!])
fi
diff --git a/m4/grape.m4 b/m4/grape.m4
index 2c80881e5..b57e4dc7c 100644
--- a/m4/grape.m4
+++ b/m4/grape.m4
@@ -7,7 +7,7 @@ AC_DEFUN([DUNE_PATH_GRAPE],[
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_PATH_XTRA])
AC_REQUIRE([DUNE_PATH_OPENGL])
- AC_REQUIRE([AC_LIB_PROG_LD_GNU])
+ AC_REQUIRE([AC_PROG_LD_GNU])
AC_ARG_WITH(grape,
AC_HELP_STRING([--with-grape=PATH],[directory with Grape inside]))
@@ -56,7 +56,7 @@ if test "x$X_LIBS" != x && test x$with_grape != xno ; then
LDFLAGS="$LDFLAGS $GL_LDFLAGS"
# if we use the gnu linker add the grape path
- if test x$acl_cv_prog_gnu_ld = xyes ; then
+ if test x$lt_cv_prog_gnu_ld = xyes ; then
GRAPE_LINKER_FLAGS="-Wl,--rpath -Wl,$GRAPEROOT"
fi
--
GitLab