Move -L search paths to LIBS (LDFLAGS is only for special options).

Removed default include path.

[[Imported from SVN: r5577]]

m4/parmetis.m4

@@ -61,10 +61,9 @@ AC_DEFUN([DUNE_PATH_PARMETIS],[
       PARMETIS_LIB_PATH="$with_parmetis$lib_path"
       PARMETIS_INCLUDE_PATH="$with_parmetis$lib_path"
                   
-      PARMETIS_LDFLAGS="-L$PARMETIS_LIB_PATH $MPI_LDFLAGS"
+      PARMETIS_LIBS="-L$PARMETIS_LIB_PATH $MPI_LDFLAGS $MPI_LIBS"
 
       # set variables so that tests can use them
-      LDFLAGS="$LDFLAGS -L$PARMETIS_LIB_PATH $MPI_LDFLAGS"
       CPPFLAGS="$CPPFLAGS -I$PARMETIS_INCLUDE_PATH $MPI_CPPFLAGS"
 
       # check for central header
@@ -81,21 +80,19 @@ AC_DEFUN([DUNE_PATH_PARMETIS],[
       
       # if header is found check for the libs
 
-      LIBS="$LIBS $MPILIBS $MPI_LDFLAGS -lm"
+      LIBS="$LIBS $PARMETIS_LIBS -lm"
       
       if test x$HAVE_PARMETIS = x1 ; then
 	  AC_CHECK_LIB(metis, [metis_partgraphkway],[
-		  PARMETIS_LIBS="-lm -lmetis"
-		  PARMETIS_LDFLAGS="-L$PARMETIS_LIB_PATH"
+		  PARMETIS_LIBS="$PARMETIS_LIBS -lmetis"
 		  LIBS="$LIBS -lmetis"],[
 		  HAVE_PARMETIS="0"
-		  AC_MSG_WARN(libparmetis not found!)])
+		  AC_MSG_WARN(libmetis not found!)])
       fi
 
       if test x$HAVE_PARMETIS = x1 ; then
 	  AC_CHECK_LIB(parmetis, [parmetis_v3_partkway],[
-		  PARMETIS_LIBS="-lparmetis -lmetis $MPILIBS $MPI_LDFLAGS"
-		  PARMETIS_LDFLAGS="$MPI_LDFLAGS -L$PARMETIS_LIB_PATH"
+		  PARMETIS_LIBS="$PARMETIS_LIBS -lparmetis -lmetis"
 		  HAVE_PARMETIS="1"],[
 		  HAVE_PARMETIS="0"
 		  AC_MSG_WARN(libparmetis not found!)])
@@ -109,7 +106,6 @@ AC_DEFUN([DUNE_PATH_PARMETIS],[
       # did it work?
       AC_MSG_CHECKING(ParMETIS in $with_parmetis)
       if test x$HAVE_PARMETIS = x1 ; then
-	  AC_SUBST(PARMETIS_LDFLAGS, $PARMETIS_LDFLAGS)
 	  AC_SUBST(PARMETIS_LIBS, $PARMETIS_LIBS)
 	  AC_SUBST(PARMETIS_CPPFLAGS, $PARMETIS_CPPFLAGS)
 	  AC_DEFINE(HAVE_PARMETIS,ENABLE_PARMETIS,[Define if you have the Parmetis library.
@@ -118,13 +114,13 @@ AC_DEFUN([DUNE_PATH_PARMETIS],[
 	  AC_MSG_RESULT(ok)
 	  
     # add to global list
-	  DUNE_PKG_LDFLAGS="$DUNE_PKG_LDFLAGS $PARMETIS_LDFLAGS"
 	  DUNE_PKG_LIBS="$DUNE_PKG_LIBS $PARMETIS_LIBS"
 	  DUNE_PKG_CPPFLAGS="$DUNE_PKG_CPPFLAGS $PARMETIS_CPPFLAGS"
 	  
     # re-set variable correctly
 	  with_parmetis="yes"
       else
+	  with_parmetis="no"
 	  AC_MSG_RESULT(failed)
       fi 
       

m4/superlu.m4

@@ -94,7 +94,6 @@ AC_DEFUN([DUNE_PATH_SUPERLU],[
 	    SUPERLU_LIB_PATH="$with_superlu/$my_lib_path"
 	    SUPERLU_INCLUDE_PATH="$with_superlu/$my_include_path"
 	    
-	    SUPERLU_LDFLAGS="-L$SUPERLU_LIB_PATH"
 	    
       # set variables so that tests can use them
 	    CPPFLAGS="$CPPFLAGS -I$SUPERLU_INCLUDE_PATH"
@@ -110,9 +109,6 @@ AC_DEFUN([DUNE_PATH_SUPERLU],[
       # if header is found check for the libs
 	    
 	    if test x$HAVE_SUPERLU = x1 ; then
-
-		OLDFLAGS="$LDFLAGS"
-		LDFLAGS="$LDFLAGS -L$SUPERLU_LIB_PATH"
 		# if no blas was found, we assume that superlu was compiled with 
 		# internal blas
 		if test "x$BLAS_LIBS" = "x"; then
@@ -124,8 +120,7 @@ AC_DEFUN([DUNE_PATH_SUPERLU],[
 
 		if test x$with_superlu_lib = x; then
 		    AC_CHECK_LIB(superlu, [dgssvx],[
-			    SUPERLU_LIBS="-lsuperlu $LIBS"
-			    SUPERLU_LDFLAGS="$LDFLAGS"
+			    SUPERLU_LIBS="$SUPERLU_LIBS -lsuperlu $LIBS"
 			    HAVE_SUPERLU="1"
 			    ],[
 			    HAVE_SUPERLU="0"
@@ -140,7 +135,6 @@ AC_DEFUN([DUNE_PATH_SUPERLU],[
 			LIBS="$SUPERLU_LIB_PATH/$with_superlu_lib $LIBS"
 			AC_CHECK_FUNC(dgssvx,
 			    [
-				SUPERLU_LDFLAGS="$OLDFLAGS"
 				SUPERLU_LIBS="$LIBS"
 				HAVE_SUPERLU="1"
 				AC_MSG_RESULT(yes)
@@ -162,7 +156,6 @@ AC_DEFUN([DUNE_PATH_SUPERLU],[
       # did it work?
 	    AC_MSG_CHECKING([SuperLU in $with_superlu])
 	    if test x$HAVE_SUPERLU = x1 ; then
-		AC_SUBST(SUPERLU_LDFLAGS, $SUPERLU_LDFLAGS)
 		AC_SUBST(SUPERLU_LIBS, $SUPERLU_LIBS)
 		AC_SUBST(SUPERLU_CPPFLAGS, $SUPERLU_CPPFLAGS)
 		AC_DEFINE(HAVE_SUPERLU, 1, [Define to 1 if SUPERLU is found])
@@ -172,7 +165,6 @@ AC_DEFUN([DUNE_PATH_SUPERLU],[
 		AC_MSG_RESULT(ok)
 		
     # add to global list
-		DUNE_PKG_LDFLAGS="$DUNE_PKG_LDFLAGS $SUPERLU_LDFLAGS"
 		DUNE_PKG_LIBS="$DUNE_PKG_LIBS $SUPERLU_LIBS"
 		DUNE_PKG_CPPFLAGS="$DUNE_PKG_CPPFLAGS $SUPERLU_CPPFLAGS"