Skip to content
Snippets Groups Projects
Commit a98690a3 authored by Robert Klöfkorn's avatar Robert Klöfkorn
Browse files

use other macro for gnu ld and bugs in alugrid.m4

[[Imported from SVN: r5124]]
parent ce293a75
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment