Index: configure
===================================================================
RCS file: /var/lib/mythcvs/mythtv/configure,v
retrieving revision 1.35
diff -u -r1.35 configure
--- configure	23 Mar 2005 00:32:28 -0000	1.35
+++ configure	23 Mar 2005 15:53:48 -0000
@@ -3,6 +3,17 @@
 # ffmpeg configure script (c) 2000, 2001, 2002 Fabrice Bellard
 #
 
+x86_mmx_cpus='pentium-mmx,i686,pentium2,pentium3,pentium3m,pentium-m,pentium4,pentium4m,prescott'
+x86_cpus="i386,i486,i586,pentium,pentiumpro,${x86_mmx_cpus}"
+
+is_x86_mmx() {
+    expr ",${x86_mmx_cpus}," : ".*,$1," > /dev/null
+}
+
+is_x86_cpu() {
+    expr ",${x86_cpus}," : ".*,$1," > /dev/null
+}
+
 # default parameters
 compile_type="release"
 prefix="/usr/local"
@@ -90,6 +101,7 @@
 #echo "  --cc=CC                  use C compiler CC [$cc]"
 #echo "  --make=MAKE              use specified make [$make]"
 echo "  --extra-cflags=ECFLAGS   add ECFLAGS to list of flags for C/C++ compile"
+echo "  --extra-cxxflags=ECXXFLAGS add ECXXFLAGS to list of flags for C++ compile"
 #echo "  --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]"
 #echo "  --extra-libs=ELIBS       add ELIBS [$ELIBS]"
 echo "  --cpu=CPU                only use instructions available on CPU [$cpu]"
@@ -112,7 +124,7 @@
 #echo "  --disable-vhook          disable video hooking support"
 #echo "  --enable-gprof           enable profiling with gprof [$gprof]"
 #echo "  --disable-debug          disable debugging symbols"
-#echo "  --disable-opts           disable compiler optimizations"
+echo "  --disable-opts           disable compiler optimizations"
 #echo "  --disable-mpegaudio-hp   faster (but less accurate)"
 #echo "                           mpegaudio decoding [default=no]"
 #echo "  --disable-ffserver       disable ffserver build"
@@ -196,10 +208,12 @@
 done
 
 
+if is_x86_cpu "$cpu" ; then
+    cpu="x86"
+fi
 
 case "$cpu" in
-  i386|i486|i586|i686|i86pc|BePC)
-    cpu="x86"
+  x86)
   ;;
   x86_64)
     if [ "`$cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \
@@ -480,7 +494,9 @@
   ;;
   --make=*) make=`echo $opt | cut -d '=' -f 2`
   ;;
-  --extra-cflags=*) ECFLAGS="$${opt#--extra-cflags=}"
+  --extra-cflags=*) ECFLAGS="${opt#--extra-cflags=}"
+  ;;
+  --extra-cxxflags=*) ECXXFLAGS="${opt#--extra-cxxflags=}"
   ;;
   --extra-ldflags=*) LDFLAGS=$LDFLAGS ${opt#--extra-ldflags=}
   ;;
@@ -704,7 +720,11 @@
 if test x"$mmx" = x"default"; then
     # defaults to mmx="yes" with i686 (despite pentiumpro),
     mmx="no"
-    if test x"$cpu_raw" = x"i686" -o x"$cpu" = x"x86_64"; then
+    if test x"$cpu" = x"x86_64"; then
+        mmx="yes"
+    fi
+
+    if is_x86_mmx "$cpu_raw"; then
         mmx="yes"
     fi
 
@@ -1680,6 +1700,7 @@
 echo "PROFILEFLAGS=$PROFILEFLAGS" >> config.mak
 echo "OPTFLAGS=$CFLAGS" >> config.mak
 echo "ECFLAGS=$ECFLAGS" >> config.mak
+echo "ECXXFLAGS=$ECXXFLAGS" >> config.mak
 #echo "SHCFLAGS=$SHCFLAGS">>config.mak
 #echo "LDFLAGS=$LDFLAGS" >> config.mak
 #echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak
Index: settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythtv/settings.pro,v
retrieving revision 1.110
diff -u -r1.110 settings.pro
--- settings.pro	23 Mar 2005 00:32:28 -0000	1.110
+++ settings.pro	23 Mar 2005 15:57:35 -0000
@@ -22,26 +22,27 @@
 
 # figure out compile flags based on qmake info
 
-QMAKE_CXXFLAGS += $$ARCHFLAGS
-QMAKE_CXXFLAGS += $$CONFIG_AUDIO_ARTS_CFLAGS
-QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS
-QMAKE_CXXFLAGS_SHLIB = -DPIC -fPIC
-QMAKE_CXXFLAGS += $$ECFLAGS
+QMAKE_CFLAGS += $$ARCHFLAGS $$OPTFLAGS $$ECFLAGS
+QMAKE_CFLAGS_RELEASE += -fomit-frame-pointer
+QMAKE_CFLAGS_RELEASE += $$PROFILEFLAGS
 
 profile:CONFIG += release
 
-QMAKE_CXXFLAGS_RELEASE = $$OPTFLAGS -fomit-frame-pointer
 release:contains( TARGET_ARCH_POWERPC, yes ) {
-    QMAKE_CXXFLAGS_RELEASE = $$OPTFLAGS
+    QMAKE_CFLAGS_RELEASE = $$OPTFLAGS
     # Auto-inlining causes some Qt moc methods to go missing
     macx:QMAKE_CXXFLAGS_RELEASE += -fno-inline-functions
 }
-QMAKE_CXXFLAGS_RELEASE += $$PROFILEFLAGS
 
-QMAKE_CFLAGS += $$ARCHFLAGS
-QMAKE_CFLAGS_SHLIB = -DPIC -fPIC
-QMAKE_CFLAGS_RELEASE = $${QMAKE_CXXFLAGS_RELEASE}
-QMAKE_CFLAGS += $$ECFLAGS
+QMAKE_CXXFLAGS += $${QMAKE_CFLAGS} $$ECXXFLAGS
+QMAKE_CXXFLAGS += $$CONFIG_AUDIO_ARTS_CFLAGS
+QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS
+QMAKE_CFLAGS_SHLIB += -DPIC -fPIC
+
+
+QMAKE_CXXFLAGS_RELEASE += $${QMAKE_CFLAGS_RELEASE}
+QMAKE_CXXFLAGS_DEBUG += $${QMAKE_CFLAGS_DEBUG}
+QMAKE_CXXFLAGS_SHLIB = $${QMAKE_CFLAGS_SHLIB}
 
 # figure out defines