From: wolf Date: Tue, 11 Jul 2006 16:54:25 +0000 (+0000) Subject: Re-instate the test for -rpath, since it seems as if Ralf's recent changes made that... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3e25ca771592135d02fe3796cce80a09e5077e6;p=dealii-svn.git Re-instate the test for -rpath, since it seems as if Ralf's recent changes made that unnecessary git-svn-id: https://svn.dealii.org/trunk@13356 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index b412868bf5..12b58ad715 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -1439,13 +1439,7 @@ dnl dnl ------------------------------------------------------------- AC_DEFUN(DEAL_II_CHECK_RPATH, [ OLD_LDFLAGS=$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" + LDFLAGS="-Wl,-rpath,$DEAL_II_PATH/lib $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 a95f4b0e68..e939418d02 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.232 . +# From configure.in Revision: 1.233 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for deal.II 5.3.pre. # @@ -4158,9 +4158,7 @@ echo "${ECHO_T}Unknown C compiler - using generic options" >&6 OLD_LDFLAGS=$LDFLAGS - - - LDFLAGS="-Wl,-rpath $DEAL_II_PATH $LDFLAGS" + LDFLAGS="-Wl,-rpath,$DEAL_II_PATH/lib $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