Another attempt to fix our lib naming issues.

cmake/Directories.cmake

@@ -24,6 +24,7 @@ set(XPL_DEFAULT_DATA_DIR	${CMAKE_INSTALL_PREFIX}/share/bongo)
 set(XPL_DEFAULT_STATE_DIR	${CMAKE_INSTALL_PREFIX}/var/bongo)
 
 set(XPL_DEFAULT_BIN_DIR		${CMAKE_INSTALL_PREFIX}/sbin)
+set(XPL_DEFAULT_LIB_DIR		${CMAKE_INSTALL_PREFIX}/${LIB_DIR_NAME})
 set(XPL_DEFAULT_CONF_DIR	${CMAKE_INSTALL_PREFIX}/etc/bongo)
 set(XPL_DEFAULT_NLS_DIR		${CMAKE_INSTALL_PREFIX}/share/bongo/nls)
 

config.h.cmake

@@ -47,6 +47,7 @@
 #cmakedefine XPL_DEFAULT_STATE_DIR	"@XPL_DEFAULT_STATE_DIR@"
 
 #cmakedefine XPL_DEFAULT_BIN_DIR	"@XPL_DEFAULT_BIN_DIR@"
+#cmakedefine XPL_DEFAULT_LIB_DIR	"@XPL_DEFAULT_LIB_DIR@"
 #cmakedefine XPL_DEFAULT_CONF_DIR	"@XPL_DEFAULT_CONF_DIR@"
 #cmakedefine XPL_DEFAULT_NLS_DIR	"@XPL_DEFAULT_NLS_DIR@"
 

src/libs/msgapi/msgapi.c

@@ -274,7 +274,7 @@ MsgGetDir(MsgApiDirectory directory, char *buffer, size_t buffer_size)
 			path = XPL_DEFAULT_DBF_DIR;
 			break;
 		case MSGAPI_DIR_LIB:
-			path = LIBDIR;
+			path = XPL_DEFAULT_LIB_DIR;
 			break;
 		case MSGAPI_DIR_MAIL:
 			path = XPL_DEFAULT_MAIL_DIR;

src/libs/msgapi/msgauth.c

@@ -27,7 +27,7 @@ MsgAuthLoadBackend(const char *name, const char *file)
 	AuthPlugin_Init *init_func;
 	MsgAuthAPIFunction *func;
 	
-	snprintf(path, XPL_MAX_PATH, "%s/bongo-auth/%s", LIBDIR, file);
+	snprintf(path, XPL_MAX_PATH, "%s/bongo-auth/%s", XPL_DEFAULT_LIB_DIR, file);
 	auth = XplLoadDLL(path);
 	if (! auth) {
 		Log(LOG_FATAL, "Unable to load auth backend '%s'", file);