From eb99ab60dbd601dec2d9584e48c5a1c99554584b Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Sun, 29 Jul 2007 19:34:18 +0000
Subject: [PATCH] made 0.3.0-rc1 release

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@498 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog    | 11 +++++++++++
 acinclude.m4 | 10 +++++-----
 configure.in |  7 +++----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 151fcde11..bf4c59a07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-07-29	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* configure.in:
+	- made 0.3.0-rc1 release
+	- replaced "+=" operator by according X="$X ..." constructs as older
+	  bashes have problems with it
+
+	* acinclude.m4:
+	disabled Qt4-support - re-enable it / rewrite Qt4-detection code in
+	0.4.x-devel-branch
+
 2007-07-23	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* plugins/midi_import/midi_import.h:
diff --git a/acinclude.m4 b/acinclude.m4
index 2408654a7..c4767fb80 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -9,13 +9,13 @@ AC_ARG_WITH([qtdir], [  --with-qtdir=DIR        Qt installation directory [defau
 # Check that QTDIR is defined or that --with-qtdir given
 if test x"$QTDIR" = x ; then
 	# some usual Qt-locations
-	QT_SEARCH="/usr /usr/lib/qt /usr/lib/qt3 /usr/lib/qt31 /usr/lib/qt32 /usr/lib/qt33 /usr/lib/qt-3.0 /usr/lib/qt-3.1 /usr/lib/qt-3.2 /usr/lib/qt-3.3 /usr/local/qt /usr/local/qt3 /usr/local/qt31 /usr/local/qt32 /usr/local/qt33 /usr/share/qt3 /usr/X11R6 /usr/share/qt4 /usr/local/Trolltech/Qt-4.0.0 /usr/local/Trolltech/Qt-4.0.1 /usr/local/Trolltech/Qt-4.1.0 /usr/local/Trolltech/Qt-4.1.0"
+	QT_SEARCH="/usr /usr/lib/qt /usr/lib/qt3 /usr/lib/qt31 /usr/lib/qt32 /usr/lib/qt33 /usr/lib/qt-3.0 /usr/lib/qt-3.1 /usr/lib/qt-3.2 /usr/lib/qt-3.3 /usr/local/qt /usr/local/qt3 /usr/local/qt31 /usr/local/qt32 /usr/local/qt33 /usr/share/qt3 /usr/X11R6" # /usr/share/qt4 /usr/local/Trolltech/Qt-4.0.0 /usr/local/Trolltech/Qt-4.0.1 /usr/local/Trolltech/Qt-4.1.0 /usr/local/Trolltech/Qt-4.1.0"
 else
 	QT_SEARCH=$QTDIR
 	QTDIR=""
 fi
 for i in $QT_SEARCH ; do
-	QT_INCLUDE_SEARCH="include include/qt include/qt3 include/qt4/Qt include/Qt"
+	QT_INCLUDE_SEARCH="include include/qt include/qt3" # include/qt4/Qt include/Qt"
 	for j in $QT_INCLUDE_SEARCH ; do
 	        if test -f $i/$j/qglobal.h -a x$QTDIR = x ; then
 			QTDIR=$i
@@ -51,9 +51,9 @@ case "${QT_VER}" in
     3*)
         QT_MAJOR="3"
     ;;
-    4*)
-	QT_MAJOR="4"
-    ;;
+#    4*)
+#	QT_MAJOR="4"
+#    ;;
     *)
         AC_MSG_ERROR([*** Don't know how to handle this Qt major version])
     ;;
diff --git a/configure.in b/configure.in
index 2b8713dce..45c822a6c 100644
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(lmms, 0.2.1-svn20070723, lmms-devel/at/lists/dot/sf/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.2.1-svn20070723)
+AC_INIT(lmms, 0.3.0-rc1, lmms-devel/at/lists/dot/sf/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.3.0-rc1)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -346,8 +346,7 @@ if test ! -z "$HAVE_SAMPLERATE_H" ; then
 		[Define to 1 to enable SingerBot plugin support.])
 	if test "x$with_singerbot" = "xyes" ; then
 		ORIG_CPPFLAGS=$CPPFLAGS
-		CPPFLAGS+=" -I/usr/include/festival -I/usr/include/speech_tools"
-		CPPFLAGS+=" -Wno-non-template-friend"
+		CPPFLAGS="$CPPFLAGS -I/usr/include/festival -I/usr/include/speech_tools -Wno-non-template-friend"
 		AC_CHECK_HEADER([festival.h], FESTIVAL_SUPPORT="true")
 		AC_CHECK_LIB([Festival], [main], true, FESTIVAL_SUPPORT="")
 		CPPFLAGS=$ORIG_CPPFLAGS