]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Undo last change. Add comment.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 6 Jul 2006 12:54:05 +0000 (12:54 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 6 Jul 2006 12:54:05 +0000 (12:54 +0000)
git-svn-id: https://svn.dealii.org/trunk@13342 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure

index 77fc71eecd00402304f1a1a54495e4fd8bc53818..5b352eb8dfd2e8b943b63809625480ca4221c296 100644 (file)
@@ -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([[]],[[]])],
index 6a41f26ee5451f862a39e028510f9dff27b48901..1520e327e713d8a0af2d2aa0855bde60f13de5de 100755 (executable)
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.