Apply libdir patch (requires reconfiguring)

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1188 0778d3d1-df1d-0410-868b-ea421aaaa00d

ChangeLog

@@ -1,3 +1,13 @@
+2008-06-28	Paul Giblock <drfaygo/at/gmail/dot/com>
+
+	* configure.in:
+	* src/core/config_mgr.cpp:
+	* src/core/ladspa_manager.cpp:
+	Search LIBDIR before any other directories
+
+	* acinclude.m4:
+	Search $QTDIR before any other directories
+
 2008-06-28	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* src/core/song.cpp:

acinclude.m4

@@ -55,7 +55,7 @@ fi
 # Search for available Qt translations
 AH_TEMPLATE(QT_TRANSLATIONS_DIR, [Define to Qt translations directory])
 AC_MSG_CHECKING([Qt translations])
-QT_TRANSLATIONS_SEARCH="/usr/share/qt4 /usr/local/qt /usr/local/Trolltech/Qt-4.3.0 /usr/local/Trolltech/Qt-4.3.1"
+QT_TRANSLATIONS_SEARCH="$QTDIR /usr/share/qt4 /usr/local/qt /usr/local/Trolltech/Qt-4.3.0 /usr/local/Trolltech/Qt-4.3.1"
 for i in $QT_TRANSLATIONS_SEARCH ; do
     if test -d $i/translations -a x$QT_TRANSLATIONS = x ; then
         QT_TRANSLATIONS=$i/translations

configure.in

@@ -18,7 +18,7 @@ AM_PROG_LIBTOOL
 
 if ! test -z "${prefix}" -o "${prefix}" = "NONE" ; then
 	CFLAGS="$CFLAGS -I${prefix}/include"
-	CPPFLAGS="$CPPFLAGS -I${prefix}/include"
+	CPPFLAGS="$CPPFLAGS -I${prefix}/include -DLIBDIR='\"${libdir}\"'"
 	LDFLAGS="$LDFLAGS -L${prefix}/bin"
 fi
 

src/core/config_mgr.cpp

@@ -53,13 +53,12 @@ configManager::configManager( void ) :
 #endif
 									),
 	m_artworkDir( defaultArtworkDir() ),
-	m_pluginDir( qApp->applicationDirPath()
 #ifdef LMMS_BUILD_WIN32
-			+ QDir::separator() + "plugins" + QDir::separator()
+	m_pluginDir( qApp->applicationDirPath()
+			+ QDir::separator() + "plugins" + QDir::separator() ),
 #else
-				.section( '/', 0, -2 ) + "/lib/lmms/"
+	m_pluginDir( QString( LIBDIR ) + "/lmms/" ),
 #endif
-									),
 	m_vstDir( QDir::home().absolutePath() ),
 	m_flDir( QDir::home().absolutePath() )
 {
@@ -329,7 +328,7 @@ bool configManager::loadConfigFile( void )
 #ifdef LMMS_BUILD_WIN32
 		m_ladDir = m_pluginDir + "ladspa" + QDir::separator();
 #else
-		m_ladDir = "/usr/lib/ladspa/:/usr/local/lib/ladspa/";
+		m_ladDir = QString(LIBDIR) + "/ladspa/:/usr/lib/ladspa/:/usr/local/lib/ladspa/";
 #endif
 	}
 

src/core/ladspa_manager.cpp

@@ -42,6 +42,8 @@ ladspaManager::ladspaManager( void )
 	ladspaDirectories += configManager::inst()->ladspaDir().split( ':' );
 
 #ifndef LMMS_BUILD_WIN32
+	ladspaDirectories.push_back( QString( LIBDIR ) + "/lmms/ladspa" );
+	ladspaDirectories.push_back( QString( LIBDIR ) + "/ladspa" );
 	ladspaDirectories.push_back( "/usr/lib/lmms/ladspa" );
 	ladspaDirectories.push_back( "/usr/local/lib/lmms/ladspa" );
 	ladspaDirectories.push_back( "/usr/lib/ladspa" );