[beast/temp-rc1] BUILD: rename MMX_SSE_FLAGS

[Tim Janik <timj src gnome org>]

commit 29da4df75da6855dd71df4a2fdcd7ac78024cd61
Author: Tim Janik <timj gnu org>
Date:   Fri Oct 17 06:01:32 2014 +0200

    BUILD: rename MMX_SSE_FLAGS

 beast-gtk/bstmain.cc |    2 +-
 bse/bseplugin.cc     |    2 +-
 configure.ac         |   24 ++++++++++++------------
 plugins/Makefile.am  |    6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/beast-gtk/bstmain.cc b/beast-gtk/bstmain.cc
index eac76ab..ba8032d 100644
--- a/beast-gtk/bstmain.cc
+++ b/beast-gtk/bstmain.cc
@@ -678,7 +678,7 @@ bst_exit_print_version (void)
 #endif
   g_print (", GXK %s", BST_VERSION);
   g_print ("\n");
-  g_print ("Compiled for %s %s SSE plugins.\n", BST_ARCH_NAME, BSE_WITH_SSE_FLAGS ? "with" : "without");
+  g_print ("Compiled for %s %s SSE plugins.\n", BST_ARCH_NAME, BSE_WITH_MMX_SSE ? "with" : "without");
   g_print ("Intrinsic code selected according to runtime CPU detection:\n");
   g_print ("%s", Rapicorn::cpu_info().c_str());
   g_print ("\n");
diff --git a/bse/bseplugin.cc b/bse/bseplugin.cc
index e9413ae..4c6584a 100644
--- a/bse/bseplugin.cc
+++ b/bse/bseplugin.cc
@@ -762,7 +762,7 @@ bse_plugin_path_list_files (gboolean include_drivers,
     {
       const std::string cinfo = Rapicorn::cpu_info();
       const char *exts[] = { ".FPU" PLUGIN_EXTENSION, ".FPU.la", PLUGIN_EXTENSION, ".la", };
-      if (BSE_WITH_SSE_FLAGS && !bse_main_args->force_fpu &&
+      if (BSE_WITH_MMX_SSE && !bse_main_args->force_fpu &&
           cinfo.find (" MMX ") != cinfo.npos &&
           cinfo.find (" SSE ") != cinfo.npos &&
           cinfo.find (" SSESYS ") != cinfo.npos)
diff --git a/configure.ac b/configure.ac
index d9ae43d..eb20142 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,16 +211,16 @@ AC_SUBST(AM_CPPFLAGS)
 # Intel Pentium 3: CMOV MMX SSE (1999)
 # VIA C3 Nehemiah: CMOV MMX SSE (2003)
 # Athlon Palomino: CMOV MMX SSE 3DNow (2001)
-SIMD_FLAGS=
-MC_CC_TRY_OPTION(SIMD_FLAGS, -mmmx)
-MC_CC_TRY_OPTION(SIMD_FLAGS, -msse)
+MMX_SSE_FLAGS=
+MC_CC_TRY_OPTION(MMX_SSE_FLAGS, -mmmx)
+MC_CC_TRY_OPTION(MMX_SSE_FLAGS, -msse)
 # Note, -mfpmath=sse can harm FPU-algorithm performance
 # Note, -funroll-loops can harm SSE loop performance
-#MC_CC_TRY_OPTION(SIMD_FLAGS, -funroll-loops)
-#AC_SUBST(SIMD_FLAGS)
+#MC_CC_TRY_OPTION(MMX_SSE_FLAGS, -funroll-loops)
+#AC_SUBST(MMX_SSE_FLAGS)
 # Expect the target architecture to support MMX/SSE if the compiler does it.
-MC_EVAR_ADD(AM_CFLAGS,   "$SIMD_FLAGS")
-MC_EVAR_ADD(AM_CXXFLAGS, "$SIMD_FLAGS")
+MC_EVAR_ADD(AM_CFLAGS,   "$MMX_SSE_FLAGS")
+MC_EVAR_ADD(AM_CXXFLAGS, "$MMX_SSE_FLAGS")
 # Newer vectorization instruction sets, should be optionally supported
 # SSE >= 2, AVX
 SSEAVX_FLAGS=
@@ -256,13 +256,13 @@ MC_CXX_TRY_OPTION(FAST_MATH_FLAGS, -fivopts)
 AC_SUBST(FAST_MATH_FLAGS)
 MC_CXX_TRY_OPTION(FPU_FLAGS, -funroll-loops)
 AC_SUBST(FPU_FLAGS)
-SSE_FLAGS="$SIMD_FLAGS"
-AC_SUBST(SSE_FLAGS)
+MMX_SSE_FLAGS="$MMX_SSE_FLAGS"
+AC_SUBST(MMX_SSE_FLAGS)
 
 # == SSE Build Conditionals ==
-lacking_mmx_sse=`echo "$SIMD_FLAGS" | grep 'mmx.*sse' -q ; echo $?` # sh truth values: 1 (without sse) or 0 
(with sse)
-AM_CONDITIONAL(WITH_SSE_FLAGS, test 0 == $lacking_mmx_sse)
-AC_DEFINE_UNQUOTED(BSE_WITH_SSE_FLAGS, [(0 == $lacking_mmx_sse)], [wether MMX and SSE are supported])
+lacking_mmx_sse=`echo "$MMX_SSE_FLAGS" | grep 'mmx.*sse' -q ; echo $?` # sh truth values: 1 (without sse) or 
0 (with sse)
+AM_CONDITIONAL(WITH_MMX_SSE, test 0 == $lacking_mmx_sse)
+AC_DEFINE_UNQUOTED(BSE_WITH_MMX_SSE, [(0 == $lacking_mmx_sse)], [wether MMX and SSE are supported])
 
 # C & C++ idioms
 AC_C_CONST
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 5941c23..1c920fb 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -69,9 +69,9 @@ FPU_PLUGIN_CXXFLAGS     = $(AM_CXXFLAGS) $(PLUGIN_FLAGS) $(FPU_FLAGS)
 plugin_SSE_ltlibs        =     # listed in Makefile.plugins
 plugin_SSE_LTLIBRARIES   = $(plugin_SSE_cond_libs) cxxplugins.SSE.la
 plugin_SSEdir            = $(bseplugindir)
-SSE_PLUGIN_CFLAGS        = $(AM_CFLAGS) $(PLUGIN_FLAGS) $(SSE_FLAGS)
-SSE_PLUGIN_CXXFLAGS      = $(AM_CXXFLAGS) $(PLUGIN_FLAGS) $(SSE_FLAGS)
-if WITH_SSE_FLAGS
+SSE_PLUGIN_CFLAGS        = $(AM_CFLAGS) $(PLUGIN_FLAGS) $(MMX_SSE_FLAGS)
+SSE_PLUGIN_CXXFLAGS      = $(AM_CXXFLAGS) $(PLUGIN_FLAGS) $(MMX_SSE_FLAGS)
+if WITH_MMX_SSE
 plugin_SSE_cond_libs     = $(plugin_SSE_ltlibs)
 else
 plugin_SSE_cond_libs     =