From 165af82e9b8ecf098357eb4637888fb5f9487e3d Mon Sep 17 00:00:00 2001
From: - <nemo@alice.(none)>
Date: Thu, 16 May 2013 21:41:00 +0200
Subject: Moved sse flags to SSEFLAGS variable.

---
 configure.in          | 65 +++++++++++++++++++++++++++------------------------
 drumgizmo/Makefile.am |  4 ++--
 lv2/Makefile.am       |  2 +-
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/configure.in b/configure.in
index 1b2123c..ca3b751 100644
--- a/configure.in
+++ b/configure.in
@@ -45,37 +45,6 @@ if test "x$enable_lv2" = "xyes"; then
    dnl Check for Xlib
    dnl ======================
    PKG_CHECK_MODULES(X11, x11 >= 1.0)
-
-   dnl ===========================
-   dnl Check for SSE instructions
-   dnl ===========================
-   AC_MSG_CHECKING([for sse3 instructions])
-   if grep -q "sse3" /proc/cpuinfo
-   then
-     AC_MSG_RESULT([yes])
-     LV2FLAGS="-msse3"
-     AC_SUBST(LV2FLAGS)
-   else
-     AC_MSG_RESULT([no])
-   fi
-   AC_MSG_CHECKING([for sse2 instructions])
-     if grep -q "sse2" /proc/cpuinfo
-   then
-     AC_MSG_RESULT([yes])
-     LV2FLAGS="$LV2FLAGS -msse2"
-     AC_SUBST(LV2FLAGS)
-   else
-     AC_MSG_RESULT([no])
-   fi
-   AC_MSG_CHECKING([for sse instructions])
-   if grep -q "sse" /proc/cpuinfo
-   then
-     AC_MSG_RESULT([yes])
-     LV2FLAGS="$LV2FLAGS -DSSE -msse"
-     AC_SUBST(LV2FLAGS)
-   else
-     AC_MSG_RESULT([no])
-   fi
 else
 	 AC_MSG_RESULT([*** LV2 plugin will not be compiled ***])
    enable_lv2=no
@@ -353,11 +322,45 @@ LIBS="$tmp_LIBS"
 AC_SUBST(EXPAT_CFLAGS)
 AC_SUBST(EXPAT_LIBS)
 
+dnl ===========================
+dnl Check for SSE instructions
+dnl ===========================
+AC_MSG_CHECKING([for sse3 instructions])
+if grep -q "sse3" /proc/cpuinfo
+then
+  AC_MSG_RESULT([yes])
+  SSEFLAGS="-msse3"
+  AC_SUBST(SSEFLAGS)
+else
+  AC_MSG_RESULT([no])
+fi
+AC_MSG_CHECKING([for sse2 instructions])
+if grep -q "sse2" /proc/cpuinfo
+then
+  AC_MSG_RESULT([yes])
+  SSEFLAGS="$SSEFLAGS -msse2"
+  AC_SUBST(SSEFLAGS)
+else
+  AC_MSG_RESULT([no])
+fi
+AC_MSG_CHECKING([for sse instructions])
+if grep -q "sse" /proc/cpuinfo
+then
+  AC_MSG_RESULT([yes])
+  SSEFLAGS="$SSEFLAGS -DSSE -msse"
+  AC_SUBST(SSEFLAGS)
+else
+  AC_MSG_RESULT([no])
+fi
+
+
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(LDFLAGS)
 
+
+
 #	au/Makefile
 
 AC_OUTPUT(
diff --git a/drumgizmo/Makefile.am b/drumgizmo/Makefile.am
index d1c51ae..f816b62 100644
--- a/drumgizmo/Makefile.am
+++ b/drumgizmo/Makefile.am
@@ -11,7 +11,7 @@ bin_PROGRAMS = drumgizmo
 drumgizmo_LDADD = $(DRUMGIZMO_LIBS) $(PTHREAD_LIBS) -ldl
 
 drumgizmo_CXXFLAGS = $(SNDFILE_CXXFLAGS) $(PTHREAD_CFLAGS) $(EXPAT_CFLAGS) \
-	-I$(top_srcdir)/include -I$(top_srcdir)/src -DSSE -msse -msse2 -msse3 \
+	-I$(top_srcdir)/include -I$(top_srcdir)/src $(SSEFLAGS) \
 	-I$(top_srcdir)/hugin -DWITH_HUG_MUTEX
 
 drumgizmo_SOURCES = \
@@ -25,4 +25,4 @@ EXTRA_DIST = \
 	audioinputenginedl.h \
 	audiooutputenginedl.h
 
-endif
\ No newline at end of file
+endif
diff --git a/lv2/Makefile.am b/lv2/Makefile.am
index d875baa..6bc32f2 100644
--- a/lv2/Makefile.am
+++ b/lv2/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/src/Makefile.am.drumgizmo
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/plugingui \
 	-I$(top_srcdir)/include $(SNDFILE_CXXFLAGS) \
 	$(PTHREAD_CFLAGS) $(EXPAT_CFLAGS) $(LV2_CFLAGS) \
-	$(PLUGIN_GUI_CFLAGS) -DX11 $(LV2FLAGS)\
+	$(PLUGIN_GUI_CFLAGS) -DX11 $(SSEFLAGS)\
 	-DUSE_THREAD
 
 plugindir = $(prefix)/lib/lv2/drumgizmo.lv2
-- 
cgit v1.2.3