summaryrefslogblamecommitdiff
path: root/math/freefem++/files/patch-configure.ac
blob: 2f22e6c3da1f5778de03a366e2406afec93d545e (plain) (tree)




























                                                                                                                                                    
                                               



                                                                                                         
                                                              
                                                       
                                                                                   

                                                                 
                                                
--- configure.ac.orig	2020-04-02 12:11:06 UTC
+++ configure.ac
@@ -65,7 +65,7 @@ m4_define([AC_FF_WHERELIB],
         AC_MSG_CHECKING(check $1)
 	ff_save_libs=$LIBS
 	LIBS="$LIBS $2 $4"
-	AC_LINK_IFELSE([AC_LANG_PROGRAM([m4_if($3,,,[#include <$3>])],[])], [ff_WHERE=yes],[ff_WHERE=no])
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([m4_if($3,,,[#include <$3>],[#include <stdint.h>],[#include <stdio.h>])],[])], [ff_WHERE=yes],[ff_WHERE=no])
 	if test "$ff_WHERE" = "yes" ; then
 	    echo "$1 LD $2"  >>$ff_where_lib_conf
 	    ff_WHERE_INC=`AS_DIRNAME(["$3"])`
@@ -674,7 +674,7 @@ ff_prefix_dir_data="$datadir/$PACKAGE_NAME"
 ff_prefix_dir_include="$ff_prefix_dir/include"
 ff_prefix_dir_etc="$ff_prefix_dir/etc"
 ff_prefix_dir_lib_mpi="$ff_prefix_dir/lib/mpi"
-ff_prefix_dir_example="$ff_prefix_dir_data/$PACKAGE_VERSION"
+ff_prefix_dir_example="${prefix}/share/examples/freefem++"
 AC_SUBST(ff_prefix_dir_lib,$ff_prefix_dir_lib)
 AC_SUBST(ff_prefix_dir_include,$ff_prefix_dir_include)
 AC_SUBST(ff_prefix_dir_etc,$ff_prefix_dir_etc)
@@ -2084,7 +2084,7 @@ fi
 
 m4_map([AC_FF_WHERELIB],[
 	[[mumps],[-ldmumps -lzmumps  -lmumps_common  -lpord],[dmumps_c.h],[]],
-	[[mumps_seq],[-ldmumps_seq -lzmumps_seq  -lmumps_common_seq  -lpord_seq -lmpiseq_seq],[dmumps_c.h],[]],
+	[[mumps_seq],[$ff_blas_libs $ff_lapack_lib -ldmumps_seq -lzmumps_seq  -lmumps_common_seq  -lpord_seq -lmpiseq_seq],[dmumps_c.h],[]],
 	[[libseq],[-lmpiseq_seq],[${inc_usr_include}mumps_seq/mpi.h]],
 	[[mumps_ptscotch],[-lpord_ptscotch -lmumps_common_ptscotch -ldmumps_ptscotch -lzmumps_ptscotch -lpord_ptscotch],[dmumps_c.h]],
 	[[mumps_scotch],[-lpord_scotch -lmumps_common_scotch -ldmumps_scotch -lzmumps_scotch -lpord_scotch],[dmumps_c.h]],
@@ -2092,8 +2092,8 @@ m4_map([AC_FF_WHERELIB],[
 	[[superlu],[-lsuperlu],[${inc_usr_include}superlu/superlu_enum_consts.h],[]],
         [[blacs],[ -lblacsCinit$ff_with_mpi	-lblacsF77init$ff_with_mpi	-lblacs$ff_with_mpi],[]],
         [[scalapack],[-lscalapack$ff_with_mpi],[]],
-        [[scotch],[-lscotch -lscotcherr],[scotch.h]],
-        [[ptscotch],[-lptscotch -lptscotcherr],[ptscotch.h]],
+        [[scotch],[-lscotch -lscotcherr], [scotch.h]],
+        [[ptscotch],[-lscotch -lscotcherr -lptscotch -lptscotcherr],[ptscotch.h]],
 	[[metis],[-lmetis],[${inc_usr_include}metis/metis.h],[]],
 	[[metis],[-lmetis],[metis.h],[]],
 	[[parmetis],[-lparmetis -lmetis],[],[]],