--- configure~	2004-08-24 08:09:46.158571000 -0700
+++ configure	2004-08-24 08:17:31.973611105 -0700
@@ -907,11 +907,6 @@
 }
 
 if [ -z "$GCOPTS" ]; then
-    case $CC-$TARGET in
-    gcc-x86_64-*-linux-gnu)
-	GCOPTS='-fPIC'
-	;;
-    esac
     capture $CCOMPILER $ENVOPTS -g -c dummy.c && {
 	Note "Looks like $CCOMPILER supports the -g option."
 	# NB: cannot use captureX here 'cuz we lose stderr
@@ -1069,9 +1064,6 @@
     CC-*-sco3.2v5.*)		# cfront-based or cfront-compatible
 	GCXXOPTS='+a1 +p'
 	;;
-    g++-x86_64-*-linux-gnu)
-	GCXXOPTS='-fPIC'
-	;;
     *)
 	GCXXOPTS=
 	;;
@@ -3389,6 +3381,16 @@
     DSOSUF=a DSOOPTS= DSODELAY= LLDOPTS=
 else
     MAKEDSOINCLUDE="$MAKEINCLUDE"
+    case $CC-$TARGET in
+    gcc-*-linux-gnu)
+	GCOPTS="$GCOPTS -fpic"
+	;;
+    esac
+    case $CXX-$TARGET in
+    g++-*-linux-gnu)
+	GCXXOPTS="$GCXXOPTS -fpic"
+	;;
+    esac
 fi
 
 Note ""