45 lines
1.3 KiB
Text
45 lines
1.3 KiB
Text
$NetBSD: patch-aa,v 1.8 2003/11/01 12:26:21 dmcmahill Exp $
|
|
|
|
--- configure.in.orig 2003-02-06 02:42:05.000000000 -0500
|
|
+++ configure.in
|
|
@@ -427,8 +427,8 @@ case "$host" in
|
|
*-*-solaris*)
|
|
# standard compilers
|
|
CC=cc
|
|
- CC_OPTIONS='-O -DSVR4 -DSYSV -Dsolaris'
|
|
- CC_LDFLAGS=
|
|
+ CC_OPTIONS="${CFLAGS} -DSVR4 -DSYSV -Dsolaris"
|
|
+ CC_LDFLAGS="${LDFLAGS}"
|
|
if test "$WITH_G77" != yes; then
|
|
#AC_CHECK_PROG(F77,f77,yes,no)
|
|
AC_CHECK_PROGS(F77,f77 f90 f2c-f77,no)
|
|
@@ -438,9 +438,9 @@ case "$host" in
|
|
FC="$F77"
|
|
fi
|
|
#FC="$F77"
|
|
- FC_OPTIONS=-O
|
|
+ FC_OPTIONS="${FFLAGS}"
|
|
FC_OPTIONS_O0=
|
|
- FC_LDFLAGS=
|
|
+ FC_LDFLAGS="${LDFLAGS}"
|
|
LD=ld
|
|
LD_LDFLAGS=
|
|
if test "$enable_debug" = yes; then
|
|
@@ -459,7 +459,7 @@ case "$host" in
|
|
FC=g77
|
|
FC_OPTIONS=-O2
|
|
FC_OPTIONS_O0=
|
|
- FC_LDFLAGS='-t'
|
|
+ FC_LDFLAGS="${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'
|
|
@@ -991,7 +991,7 @@ case "$host" in
|
|
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_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib"
|
|
FC_PICFLAGS='-fPIC'
|
|
# check for --export-dynamic
|
|
ac_save_LDFLAGS="$LDFLAGS"
|