[libgda] Applied patch for bug #642100



commit 7cec21afed79479b1e9fbf1637265e9a54e46e7a
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sat Feb 12 11:27:53 2011 +0100

    Applied patch for bug #642100

 libgda/sqlite/gda-symbols-util.c |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/libgda/sqlite/gda-symbols-util.c b/libgda/sqlite/gda-symbols-util.c
index ac144e1..1350124 100644
--- a/libgda/sqlite/gda-symbols-util.c
+++ b/libgda/sqlite/gda-symbols-util.c
@@ -88,7 +88,22 @@ find_sqlite_library (const gchar *name_part)
 	GModule *handle;
 	const gchar *env;
 
-	/* first try by 'normal' shared library finding */
+	/* first use the compile time SEARCH_LIB_PATH */
+	if (SEARCH_LIB_PATH) {
+		gchar **array;
+		gint i;
+		array = g_strsplit (SEARCH_LIB_PATH, ":", 0);
+		for (i = 0; array[i]; i++) {
+			handle = find_sqlite_in_dir (array [i], name_part);
+			if (handle)
+				break;
+		}
+		g_strfreev (array);
+		if (handle)
+			return handle;
+	}
+
+	/* then try by 'normal' shared library finding */
 	handle = g_module_open (name_part, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
 	if (handle) {
 		gpointer func;
@@ -103,7 +118,7 @@ find_sqlite_library (const gchar *name_part)
 		handle = NULL;
 	}
 
-	/* first, use LD_LIBRARY_PATH */
+	/* lastly, use LD_LIBRARY_PATH */
 	env = g_getenv ("LD_LIBRARY_PATH");
 	if (env) {
 		gchar **array;
@@ -119,21 +134,6 @@ find_sqlite_library (const gchar *name_part)
 			return handle;
 	}
 
-	/* then use the compile time SEARCH_LIB_PATH */
-	if (SEARCH_LIB_PATH) {
-		gchar **array;
-		gint i;
-		array = g_strsplit (SEARCH_LIB_PATH, ":", 0);
-		for (i = 0; array[i]; i++) {
-			handle = find_sqlite_in_dir (array [i], name_part);
-			if (handle)
-				break;
-		}
-		g_strfreev (array);
-		if (handle)
-			return handle;
-	}
-
 	return NULL;
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]