[libgda/LIBGDA_5.4: 2/3] Avoid build SQLCipher if is disable

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 61023d02e396f5101b2bdc60d96c80b3317344ac
Author: Daniel Espinosa <esodan gmail com>
Date:   Sat Sep 22 23:14:32 2018 -0500

    Avoid build SQLCipher if is disable

 configure.ac              |  3 ++-
 libgda/sqlite/Makefile.am | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d483b9ccc..c9e2c7122 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define(major, 5)
 m4_define(minor, 2)
-m4_define(micro, 4)
+m4_define(micro, 5)
 m4_define([gda_stable],
        m4_if(m4_eval(minor % 2), [0], [yes], [no]))
 AC_CONFIG_MACRO_DIR([m4])
@@ -18,6 +18,7 @@ m4_include(m4/ldap.m4)
 AC_INIT([GNU Data 
Access],[major.minor.micro],[https://bugzilla.gnome.org/enter_bug.cgi?product=libgda],[libgda],[http://www.gnome-db.org])
 AC_PREREQ([2.68])
 AC_CONFIG_SRCDIR(libgda/libgda.h.in)
+AM_PROG_AR
 AM_INIT_AUTOMAKE([1.11.1 -Wall no-define no-dist-gzip dist-xz])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/libgda/sqlite/Makefile.am b/libgda/sqlite/Makefile.am
index ce3309c56..ff5736280 100644
--- a/libgda/sqlite/Makefile.am
+++ b/libgda/sqlite/Makefile.am
@@ -10,7 +10,12 @@ sqliteinc= -I$(top_srcdir)/libgda/sqlite/sqlite-src \
 endif
 SUBDIRS+= virtual
 
-noinst_LTLIBRARIES = libgda-sqlite.la libgda-sqlcipher.la
+noinst_LTLIBRARIES = libgda-sqlite.la
+
+if HAVE_LIBCRYPTO
+noinst_LTLIBRARIES += libgda-sqlcipher.la
+endif
+
 if BDBSQL
 noinst_LTLIBRARIES += libgda-bdbsqlite.la
 endif
@@ -71,15 +76,19 @@ libgda_sqlite_la_LIBADD = \
        $(sqlitelibs) \
        $(COREDEPS_LIBS)
 
+if BDBSQL
 libgda_bdbsqlite_la_SOURCES = $(sqlitesources)
 libgda_bdbsqlite_la_CFLAGS = $(BDBSQL_CFLAGS) -DPNAME=\""BDBSql"\" -DCLASS_PREFIX=\""GdaDBDSql"\" 
$(BDBSQL_CFLAGS) -DWITH_BDBSQLITE -DSEARCH_LIB_PATH=\""$(BDBSQL_PATH)"\"
 libgda_bdbsqlite_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
 libgda_bdbsqlite_la_LIBADD = 
+endif
 
+if HAVE_LIBCRYPTO
 libgda_sqlcipher_la_SOURCES = $(sqlitesources)
 libgda_sqlcipher_la_CFLAGS = -DPNAME=\""SQLCipher"\" -DCLASS_PREFIX=\""GdaSQLCipher"\" -DSTATIC_SQLITE 
-DSQLITE_HAS_CODEC -DSEARCH_LIB_PATH=\"""\"
 libgda_sqlcipher_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
 libgda_sqlcipher_la_LIBADD = 
+endif
 
 gdaincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda/sqlite
 gdainclude_HEADERS=$(sqliteheaders)