Took PIC out of AFLAGS. It was causing duplication in some cases
This commit is contained in:
parent
c1393a98da
commit
97bd7fbcc6
2 changed files with 29 additions and 33 deletions
34
configure
vendored
34
configure
vendored
|
|
@ -3535,24 +3535,22 @@ precompile_headers=no
|
|||
# get added to compilers and loaders.
|
||||
#
|
||||
if test -z "$AFLAGS" ; then
|
||||
AFLAGS="$PIC"
|
||||
AFLAGS=" "
|
||||
fi
|
||||
if test ! -z "$AFLAGS" ; then
|
||||
if test -z "$CXXFLAGS" ; then
|
||||
if test -z "$CXXFLAGS" ; then
|
||||
CXXFLAGS="$AFLAGS"
|
||||
else
|
||||
else
|
||||
CXXFLAGS="$CXXFLAGS"" ""$AFLAGS"
|
||||
fi
|
||||
if test -z "$CFLAGS" ; then
|
||||
CFLAGS="$AFLAGS"
|
||||
else
|
||||
CFLAGS="$CFLAGS"" ""$AFLAGS"
|
||||
fi
|
||||
if test -z "$FFLAGS" ; then
|
||||
FFLAGS="$AFLAGS"
|
||||
else
|
||||
FFLAGS="$FFLAGS"" ""$AFLAGS"
|
||||
fi
|
||||
fi
|
||||
if test -z "$CFLAGS" ; then
|
||||
CFLAGS="$AFLAGS"
|
||||
else
|
||||
CFLAGS="$CFLAGS"" ""$AFLAGS"
|
||||
fi
|
||||
if test -z "$FFLAGS" ; then
|
||||
FFLAGS="$AFLAGS"
|
||||
else
|
||||
FFLAGS="$FFLAGS"" ""$AFLAGS"
|
||||
fi
|
||||
|
||||
if test "x$OS_IS_WIN" = "x1"; then
|
||||
|
|
@ -8640,7 +8638,7 @@ fi
|
|||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:8643:" \
|
||||
echo "$as_me:8641:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
|
|
@ -8843,7 +8841,7 @@ _ACEOF
|
|||
# flags.
|
||||
ac_save_FFLAGS=$FFLAGS
|
||||
FFLAGS="$FFLAGS $ac_verb"
|
||||
(eval echo $as_me:8846: \"$ac_link\") >&5
|
||||
(eval echo $as_me:8844: \"$ac_link\") >&5
|
||||
ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
|
||||
echo "$ac_f77_v_output" >&5
|
||||
FFLAGS=$ac_save_FFLAGS
|
||||
|
|
@ -8921,7 +8919,7 @@ _ACEOF
|
|||
# flags.
|
||||
ac_save_FFLAGS=$FFLAGS
|
||||
FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
|
||||
(eval echo $as_me:8924: \"$ac_link\") >&5
|
||||
(eval echo $as_me:8922: \"$ac_link\") >&5
|
||||
ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
|
||||
echo "$ac_f77_v_output" >&5
|
||||
FFLAGS=$ac_save_FFLAGS
|
||||
|
|
|
|||
28
configure.in
28
configure.in
|
|
@ -1239,24 +1239,22 @@ precompile_headers=no
|
|||
# get added to compilers and loaders.
|
||||
#
|
||||
if test -z "$AFLAGS" ; then
|
||||
AFLAGS="$PIC"
|
||||
AFLAGS=" "
|
||||
fi
|
||||
if test ! -z "$AFLAGS" ; then
|
||||
if test -z "$CXXFLAGS" ; then
|
||||
if test -z "$CXXFLAGS" ; then
|
||||
CXXFLAGS="$AFLAGS"
|
||||
else
|
||||
else
|
||||
CXXFLAGS="$CXXFLAGS"" ""$AFLAGS"
|
||||
fi
|
||||
if test -z "$CFLAGS" ; then
|
||||
CFLAGS="$AFLAGS"
|
||||
else
|
||||
CFLAGS="$CFLAGS"" ""$AFLAGS"
|
||||
fi
|
||||
if test -z "$FFLAGS" ; then
|
||||
FFLAGS="$AFLAGS"
|
||||
else
|
||||
FFLAGS="$FFLAGS"" ""$AFLAGS"
|
||||
fi
|
||||
fi
|
||||
if test -z "$CFLAGS" ; then
|
||||
CFLAGS="$AFLAGS"
|
||||
else
|
||||
CFLAGS="$CFLAGS"" ""$AFLAGS"
|
||||
fi
|
||||
if test -z "$FFLAGS" ; then
|
||||
FFLAGS="$AFLAGS"
|
||||
else
|
||||
FFLAGS="$FFLAGS"" ""$AFLAGS"
|
||||
fi
|
||||
|
||||
if test "x$OS_IS_WIN" = "x1"; then
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue