From: wolf Date: Thu, 6 Jul 2006 12:54:05 +0000 (+0000) Subject: Undo last change. Add comment. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db92d668454fbec912fe526d09cd3f03b8a724ab;p=dealii-svn.git Undo last change. Add comment. git-svn-id: https://svn.dealii.org/trunk@13342 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 77fc71eecd..5b352eb8df 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -1439,7 +1439,13 @@ dnl dnl ------------------------------------------------------------- AC_DEFUN(DEAL_II_CHECK_RPATH, [ OLD_LDFLAGS=$LDFLAGS - LDFLAGS="-Wl,-rpath,$DEAL_II_PATH/lib $LDFLAGS" + + dnl ??? The following path is bogus -- it should be $DEAL_II_PATH/lib + dnl instead of just $DEAL_II_PATH. However, if we make that change (as + dnl in CVS version 1.319), then we can't link with PETSc any more. + dnl Strange strange... + + LDFLAGS="-Wl,-rpath $DEAL_II_PATH $LDFLAGS" AC_MSG_CHECKING([whether compiler understands option -Wl,-rpath]) AC_LINK_IFELSE( [ AC_LANG_PROGRAM([[]],[[]])], diff --git a/deal.II/configure b/deal.II/configure index 6a41f26ee5..1520e327e7 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -4158,7 +4158,9 @@ echo "${ECHO_T}Unknown C compiler - using generic options" >&6 OLD_LDFLAGS=$LDFLAGS - LDFLAGS="-Wl,-rpath,$DEAL_II_PATH/lib $LDFLAGS" + + + LDFLAGS="-Wl,-rpath $DEAL_II_PATH $LDFLAGS" echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-rpath" >&5 echo $ECHO_N "checking whether compiler understands option -Wl,-rpath... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF