merged some of Javiers recent changes to trunk

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.3@570 0778d3d1-df1d-0410-868b-ea421aaaa00d

configure.in

@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(lmms, 0.3.0, lmms-devel/at/lists/dot/sf/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.3.0)
+AC_INIT(lmms, 0.3.0-svn20071008, lmms-devel/at/lists/dot/sf/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.3.0-svn20071008)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -218,7 +218,17 @@ if test "x$with_vst" = "xyes" ; then
 
 	if test "$build_linux" = "true" ; then
 		AC_CHECK_PROG(WINECXX, wineg++, /usr/bin/wineg++,,/usr/bin)
-		AC_CHECK_LIB([wine], [wine_init], true)
+
+		if test "x`uname -m`" != "xx86_64" ; then
+			AC_CHECK_LIB([wine], [wine_init], true)
+		else
+			AMD64_BUILD=yes
+			OLDCFLAGS="$CFLAGS"
+			CFLAGS="-m32 $CFLAGS"
+			AC_CHECK_LIB([wine], [wine_init], true)
+			CFLAGS="$OLDCFLAGS"
+		fi
+
 		if test ! -z "$WINECXX" ; then
 			AC_LANG_PUSH(C++)
 #			CXXFLAGS="$CXXFLAGS -I${prefix}/include/wine/windows"
@@ -226,6 +236,7 @@ if test "x$with_vst" = "xyes" ; then
 			OLDCPPFLAGS="$CPPFLAGS"
 			CXX="$WINECXX"
 			CPPFLAGS="$CPPFLAGS -I${prefix}/include/wine/windows"
+			CPPFLAGS+=" -I/usr/include/wine/windows"
 			AC_CHECK_HEADER(windows.h, HAVE_WINDOWS_H="true")
 			CXX="$OLDCXX"
 			CPPFLAGS="$OLDCPPFLAGS"
@@ -237,6 +248,7 @@ if test "x$with_vst" = "xyes" ; then
 	fi
 fi
 AM_CONDITIONAL(VST_SUPPORT, test ! -z "$WINECXX")
+AM_CONDITIONAL(AMD64_BUILD, test "x$AMD64_BUILD" = "xyes")
 
 
 # check for LADSPA-SDK