summaryrefslogtreecommitdiff
path: root/math/freefem++/files/patch-configure
blob: 31bf66e4380cd2c0fcaca03284693d606d93cd2c (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
--- configure.orig	Wed Jul  7 14:03:35 2004
+++ configure	Sat Jul 10 19:31:39 2004
@@ -3701,13 +3701,13 @@
 
 
 
-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
+echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6
 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
+LIBS="-lc_r  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -3760,7 +3760,7 @@
 #define HAVE_LIBPTHREAD 1
 _ACEOF
 
-  LIBS="-lpthread $LIBS"
+  LIBS="-lc_r $LIBS"
 
 fi
 
@@ -6947,82 +6947,15 @@
 	ff_wget=no
 fi
 
-# Looking for the BLAS
-# --------------------
-
-# Trying default locations
 ff_blas_ok=no
-ff_save_libs="$LIBS"
-echo "$as_me:$LINENO: checking for daxpy_ in -lblas" >&5
-echo $ECHO_N "checking for daxpy_ in -lblas... $ECHO_C" >&6
-if test "${ac_cv_lib_blas_daxpy_+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lblas  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char daxpy_ ();
-int
-main ()
-{
-daxpy_ ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_blas_daxpy_=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_blas_daxpy_=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_blas_daxpy_" >&5
-echo "${ECHO_T}$ac_cv_lib_blas_daxpy_" >&6
-if test $ac_cv_lib_blas_daxpy_ = yes; then
-  LIBS="$LIBS -lblas"
-	ff_blas_ok=yes
-	ff_blas_lib="-lblas"
-else
-  LIBS="$ff_save_libs"
-fi
-
 
-# Trying Atlas (location corresponding to Debian package)
+# Trying Atlas (location corresponding to FreeBSD package)
 if test "$ff_blas_ok" = no;
 then
-	echo "$as_me:$LINENO: checking for daxpy_ in /usr/lib/atlas/libblas.a" >&5
-echo $ECHO_N "checking for daxpy_ in /usr/lib/atlas/libblas.a... $ECHO_C" >&6
+	echo "$as_me:$LINENO: checking for daxpy_ in /usr/local/lib/libatlas" >&5
+echo $ECHO_N "checking for daxpy_ in /usr/local/libatlas... $ECHO_C" >&6
 	ff_save_libs="$LIBS"
-	LIBS="$LIBS -L/usr/lib/atlas -lblas"
+	LIBS="$LIBS -lf2c -lf77blas -latlas -lgslcblas"
 	cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -7059,7 +6992,7 @@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ff_blas_ok=yes
-		ff_blas_lib="-L/usr/lib/atlas -lblas"
+		ff_blas_lib="-lf2c -lf77blas -latlas -lgslcblas"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -7477,7 +7410,7 @@
 
 
 
-for ac_header in umfpack.h umfpack/umfpack.h
+for ac_header in UMFPACK/umfpack.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -7690,7 +7623,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lumfpack $ff_umfpack_lib $LIBS"
+LIBS="$ff_umfpack_lib -lumfpack $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -7744,7 +7677,7 @@
 #define HAVE_LIBUMFPACK 1
 _ACEOF
 
-			ff_umfpack_lib="$ff_umfpack_lib -lumfpack"
+			ff_umfpack_lib="-lumfpack $ff_umfpack_lib"
 			ff_umfpack_ok=yes
 fi