--- configure.orig	2005-01-02 15:19:23.000000000 -0600
+++ configure	2019-11-25 22:55:28.000000000 -0600
@@ -9,17 +9,17 @@
 prefix="/usr/local"
 manprefix='$(PREFIX)'
 #compiler flags
-CC="g++"
-common_cflags="-Wall"
+CC="@CXX@"
+common_cflags="-Wall @CXXFLAGS@"
 devel_cflags="-g -Werror -fno-builtin"
-optimization_cflags="-O3"
+optimization_cflags="@OPTFLAGS@"
 release_cflags=$optimization_cflags
 OFLAGS="-ansi"
 cflags=$common_cflags
 
 #linker flags
 
-lflags=""
+lflags="@LDFLAGS@"
 
 #state vars
 debug="no"
@@ -142,23 +142,10 @@
 #                                               #
 #################################################
 
-# test if compiler is gcc version 3.0 or 3.1
-# if so change optimization flags to -O2
-# they do not seem to like -O3 with mpgtx very much
-
-gcc_major=`gcc --version 2>&1 | head -n1 | sed 's/^[^0-9]*//' | cut -d. -f1`
-gcc_minor=`gcc --version 2>&1 | head -n1 | sed 's/^[^0-9]*//' | cut -d. -f2`
-
-if test "$gcc_major" = "3"; then
-    if test "$gcc_minor" = "0" -o "$gcc_minor" = "1"; then
-	optimization_cflags="-O2";
-    fi
-fi
-
 # Now check if the system handles large file support
 # unless user has specified not to do so
 if test $LFS = "yes"; then
-	echo -n  "Checking Large File Support ... ";
+	printf "Checking Large File Support ... ";
 	cat << EOF >__LFStest.cpp
 		#include <stdio.h>
 		int main(){
@@ -193,7 +193,6 @@
 fi
 
 if test $devel = "no" -a $debug = "no"; then
-lflags="$lflags -s";
 cflags="$cflags $optimization_cflags";
 fi