From 97bd7fbcc61673ae3b154dacca108c976c56710a Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Tue, 15 Jan 2008 17:18:17 +0000
Subject: [PATCH] Took PIC out of AFLAGS. It was causing duplication in some
 cases

---
 configure    | 34 ++++++++++++++++------------------
 configure.in | 28 +++++++++++++---------------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/configure b/configure
index 4a7c39c9b..145b50388 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.in b/configure.in
index 200cf7477..688b1cd71 100755
--- a/configure.in
+++ b/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