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
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
|
$NetBSD: patch-aa,v 1.12 2007/03/23 22:08:56 dmcmahill Exp $
--- configure.in.orig 2006-11-03 15:06:57.000000000 +0000
+++ configure.in
@@ -163,7 +163,7 @@ fi
# use for making scripts in script directory
# different for MIPS Ultrix
-SCILAB_GS=sh
+SCILAB_GS=${SCILAB_GS:-sh}
# scilab script file in script directory: default is "scilab.g" for UNIX
# for gcwin32 use "scilab-gcwin32.g"
SCILABSCRIPT=scilab.g
@@ -413,50 +413,31 @@ case "$host" in
;;
# SUN SOLARIS
*-*-solaris*)
- # standard compilers
- CC=cc
- CC_OPTIONS='-O -DNDEBUG -DSVR4 -DSYSV -Dsolaris'
- CC_LDFLAGS=
- if test "$WITH_G77" != yes; then
- #AC_CHECK_PROG(F77,f77,yes,no)
- AC_CHECK_PROGS(F77,f77 f90 f2c-f77,no)
- if test "$F77" = no; then
- AC_MSG_ERROR([Unable to configure: Fortran f77 compiler not found])
- fi
- FC="$F77"
- fi
- #FC="$F77"
- FC_OPTIONS=-O
- FC_OPTIONS_O0=
- FC_LDFLAGS=
- LD=ld
- LD_LDFLAGS=
+ SCILAB_GS=ksh
+
+ #
+ # C Compiler
+ #
+
+ AC_PROG_CC
+ CC_OPTIONS="${CFLAGS} -DNDEBUG -DSVR4 -DSYSV -Dsolaris"
+ CC_LDFLAGS="${LDFLAGS}"
+
+ #
+ # Fortran Compiler
+ #
+
+ AC_PROG_F77
+ AC_F77_LIBRARY_LDFLAGS
+ FC="$F77"
+ FC_OPTIONS="${FFLAGS}"
+
if test "$enable_debug" = yes; then
- CC_OPTIONS='-g -DSVR4 -DSYSV -Dsolaris'
- FC_OPTIONS=-g
+ CC_OPTIONS="-g ${CC_OPTIONS}"
+ FC_OPTIONS="-g ${CC_OPTIONS}"
fi
- # GNU compilers
- if test "$WITH_GCC" = yes; then
- CC=gcc
- CC_OPTIONS='-O2 -DNDEBUG -DSVR4 -DSYSV -Dsolaris'
- if test "$enable_debug" = yes; then
- CC_OPTIONS='-g -DSVR4 -DSYSV -Dsolaris'
- fi
- fi
- if test "$WITH_G77" = yes; then
- FC=g77
- FC_OPTIONS=-O2
- FC_OPTIONS_O0=
- FC_LDFLAGS='-t'
-# for solaris 2.7 with gcc/g77 2.95.2, binutils 2.9
-# the correct value should be
-# FC_LDFLAGS='-t -Wl,-export-dynamic'
-# but we need to check this case
- if test "$enable_debug" = yes; then
- FC_OPTIONS=-g
- fi
- fi
- AC_F77_LIBRARY_LDFLAGS
+ FC_OPTIONS_O0=`echo $FC_OPTIONS | sed 's/-O[[0-9]]*//g'`
+
MAKEFILE_TARGET=Makefile.solaris
;;
# Linux, old binary format a.out (NO LONGER SUPPORTED)
@@ -854,11 +835,11 @@ i*86-*-linux-gnu | *-linux-gnu )
GCCFIX=fix.o
CC=gcc
if test "$enable_debug" = yes; then
- CC_OPTIONS='-g -Wall -Dlinux -DNARROWPROTO'
+ CC_OPTIONS="${CFLAGS} -g -Wall -Dlinux -DNARROWPROTO"
else
- CC_OPTIONS='-O -DNDEBUG -Dlinux -DNARROWPROTO'
+ CC_OPTIONS="${CFLAGS} -DNDEBUG -Dlinux -DNARROWPROTO"
fi
- CC_LDFLAGS=$LIEEELIB
+ CC_LDFLAGS="${LDFLAGS} $LIEEELIB"
CC_PICFLAGS=-fPIC
# find Fortran compiler
# g77 already asked and found: good
@@ -869,7 +850,7 @@ i*86-*-linux-gnu | *-linux-gnu )
FC_OPTIONS="-g"
FC_OPTIONS_O0=""
else
- FC_OPTIONS="-O"
+ FC_OPTIONS=""
FC_OPTIONS_O0=""
fi
elif test "$WITH_GFORTRAN" = yes;then
@@ -908,7 +889,7 @@ i*86-*-linux-gnu | *-linux-gnu )
FC_OPTIONS="-g"
FC_OPTIONS_O0=""
else
- FC_OPTIONS="-O"
+ FC_OPTIONS=""
FC_OPTIONS_O0=""
fi
else
@@ -957,7 +938,9 @@ i*86-*-linux-gnu | *-linux-gnu )
fi
fi
fi
- FC_LDFLAGS="$LIEEELIB -ldl -rdynamic"
+ FC_OPTIONS="${FFLAGS} ${FC_OPTIONS}"
+ FC_OPTIONS_O0="`echo ${FC_OPTIONS} | sed 's/-O[[0-9]]*//'`"
+ FC_LDFLAGS="${LDFLAGS} $LIEEELIB -ldl -rdynamic"
LD=ld
LD_LDFLAGS=$LIEEELIB
fi
@@ -1337,8 +1320,8 @@ i*86-*-linux-gnu | *-linux-gnu )
AC_F77_LIBRARY_LDFLAGS
FC="$F77"
FC_OPTIONS="${FFLAGS}"
- FC_OPTIONS_O0=`echo $FC_OPTIONS | sed 's/-O[0-9]*//g'`
- FC_LDFLAGS="${LDLAGS} -Wl,-R${X11BASE}/lib"
+ FC_OPTIONS_O0=`echo $FC_OPTIONS | sed 's/-O[[0-9]]*//g'`
+ FC_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib"
FC_PICFLAGS='-fPIC'
# check for --export-dynamic
ac_save_LDFLAGS="$LDFLAGS"
@@ -1418,30 +1401,7 @@ esac
# in "routines/sparse": intreadmps.f
# in "routines/calelm": unsfdcopy.f icopy.f
-FC_OPTIONS1=$FC_OPTIONS
-if test "$WITH_G77" = yes; then
- if test "$enable_debug" = yes; then
- FC_OPTIONS1=$FC_OPTIONS
- else
- FC_OPTIONS1=$FC_OPTIONS_O0
- fi
-fi
-
-if test "$with_f2c" = yes; then
- if test "$enable_debug" = yes; then
- FC_OPTIONS1=$FC_OPTIONS
- else
- FC_OPTIONS1=$FC_OPTIONS_O0
- fi
-fi
-
-if test "$WITH_GFORTRAN" = yes; then
- if test "$enable_debug" = yes; then
- FC_OPTIONS1=$FC_OPTIONS
- else
- FC_OPTIONS1=$FC_OPTIONS_O0
- fi
-fi
+FC_OPTIONS1="`echo $FC_OPTIONS | sed 's/-O[[0-9]]*//g'`"
# due overlapping arguments a few files must not be compiled
# with optimizer on some computers (Sun sparc solaris with at least
@@ -1452,11 +1412,7 @@ FC_OPTIONS2=$FC_OPTIONS
case "$host" in
# Sun solaris
*solaris*)
- if test "$enable_debug" = yes; then
- FC_OPTIONS2=$FC_OPTIONS
- else
- FC_OPTIONS2=$FC_OPTIONS_O0
- fi
+ FC_OPTIONS2="`echo $FC_OPTIONS | sed 's/-O[[0-9]]*//g'`"
;;
esac
@@ -1580,7 +1536,8 @@ if test "$PERIFILE" = periX11.o; then
LDFLAGS="$ac_save_LDFLAGS"
save_cflags=$CFLAGS
CFLAGS="$X_CFLAGS $CC_OPTIONS"
- AC_TRY_COMPILE([#include <X11/IntrinsicP.h> #include <X11/Xaw3d/ViewportP.h>],,,
+ AC_TRY_COMPILE([#include <X11/IntrinsicP.h>
+ #include <X11/Xaw3d/ViewportP.h>],,,
AC_MSG_ERROR([Include file "ViewportP.h" for Xaw3d not found.
Get and put it in <X11/Xaw3d/> .]))
CFLAGS=$save_cflags
@@ -1901,15 +1858,15 @@ if test "$with_tk" != no; then
;;
esac
- GETLIBTK=libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.$SONAME
+ GETLIBTK=libtk$TK_MAJOR_VERSION$TK_MINOR_VERSION.$SONAME
- case "$host" in
- *-*-darwin*)
- GETLIBTK=/sw/lib/libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.dylib
- ;;
- *-*-cygwin* | *-*-mingw32*)
- GETLIBTK=tk$TK_MAJOR_VERSION$TK_MINOR_VERSION.dll
- esac
+ #case "$host" in
+ # *-*-darwin*)
+ # GETLIBTK=/sw/lib/libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.dylib
+ # ;;
+ # *-*-cygwin* | *-*-mingw32*)
+ # GETLIBTK=tk$TK_MAJOR_VERSION$TK_MINOR_VERSION.dll
+ #esac
fi
|
