[libgda] sqlite: System installed libraries detection improvements

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit bd94c5516a1083e3c9b87e52906753e3ec95badd
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date:   Mon Feb 25 17:10:29 2019 -0600

    sqlite: System installed libraries detection improvements
    
    Now use system installed libraries for SQLite and SQLCipher
    if they met the requirements

 meson.build | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index 6ae3bffb2..6b6d04ab0 100644
--- a/meson.build
+++ b/meson.build
@@ -107,26 +107,33 @@ lbdb_cargs = []
 # endforeach
 
 sqlite_dep = dependency ('sqlite3', version: '>= 3.22.0', required: false)
+sqlite_system_required = get_option('system-sqlite')
 sqlite_internal = true
 if sqlite_dep.found()
        sqlite3_table_column_metadata = compiler.has_function('sqlite3_table_column_metadata',
-                                                               required: false,
+                                                               required: sqlite_system_required,
                                                                dependencies: sqlite_dep)
-       if not sqlite3_table_column_metadata
-               message('Using embeded SQLite library')
+       if sqlite3_table_column_metadata
+               message('Using system installed SQLite library')
                sqlite_internal = false
        else
-               message('Using system installed SQLite library')
+               message('Using embeded SQLite library')
        endif
 endif
 
 
-sqlcipher_dep = dependency ('sqlcipher', version: '>= 3.4.1', required: false)
+sqlcipher_dep = dependency ('sqlcipher', version: '>= 3.4', required: false)
+sqlcipher_system_required = get_option('system-sqlcipher')
 sqlcipher_internal = true
-if sqlcipher_dep.found() and get_option('system-sqlcipher')
-       sqlcipher_table_column_metadata = compiler.find_function('sqlcipher_table_column_metadata', required: 
false)
+if sqlcipher_dep.found()
+       sqlcipher_table_column_metadata = compiler.has_function('sqlite3_table_column_metadata',
+                                                               required: sqlcipher_system_required,
+                                                               dependencies: sqlcipher_dep)
        if sqlcipher_table_column_metadata
                sqlcipher_internal = false
+               message('Using system installed SQLCipher library')
+       else
+               message('Using embeded SQLCipher library')
        endif
 endif