]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Re-instate the test for -rpath, since it seems as if Ralf's recent changes made that...
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 11 Jul 2006 16:54:25 +0000 (16:54 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 11 Jul 2006 16:54:25 +0000 (16:54 +0000)
git-svn-id: https://svn.dealii.org/trunk@13356 0785d39b-7218-0410-832d-ea1e28bc413d

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

index b412868bf52472a9d13ca11b569acf998cba3885..12b58ad71584f70f1d7c47d9bb41e602b85a81d6 100644 (file)
@@ -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([[]],[[]])],
index a95f4b0e688749c9d609ee6399ad09fa0a209550..e939418d0257365a1b4e8e261d0e8b273bc408ff 100755 (executable)
@@ -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

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.