diff options
| author | Niels de Vos <ndevos@redhat.com> | 2015-05-17 15:26:03 +0200 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-06-03 06:53:43 -0700 |
| commit | 0209b18fd65f9df5ebd0a8764ebf864d0d392998 (patch) | |
| tree | 332573977e0468d28a55a4519fd155b33ee79d35 /extras | |
| parent | 990cb828a2e9b0d83a767977712305534fac39e2 (diff) | |
build: fix compiling on older distributions
data-tiering is disabled on RHEL-5 because it depends on a too new
SQLite version.
This change also prevents installing some of files that are used by
geo-replication, which is also not available on RHEL-5. geo-replication
depends on a too recent version of Python.
Due to an older version of OpenSSL, some of the newer functions can not
be used. A fallback to previous functions is done. Unfortunately RHEL-5
does not seem to have TLSv1.2 support, so only older versions can be
used.
Change-Id: I672264a673f5432358d2e83b17e2a34efd9fd913
BUG: 1222317
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/10803
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/Makefile.am | 4 | ||||
| -rw-r--r-- | extras/geo-rep/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/hook-scripts/Makefile.am | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/extras/Makefile.am b/extras/Makefile.am index d54f7507210..ba2bef31420 100644 --- a/extras/Makefile.am +++ b/extras/Makefile.am @@ -1,5 +1,5 @@ -gsyncddir = $(libexecdir)/glusterfs -gsyncd_SCRIPTS = peer_add_secret_pub +addonexecdir = $(libexecdir)/glusterfs +addonexec_SCRIPTS = peer_add_secret_pub EditorModedir = $(docdir) EditorMode_DATA = glusterfs-mode.el glusterfs.vim diff --git a/extras/geo-rep/Makefile.am b/extras/geo-rep/Makefile.am index e0aab77644e..7ebede32686 100644 --- a/extras/geo-rep/Makefile.am +++ b/extras/geo-rep/Makefile.am @@ -5,7 +5,7 @@ scripts_DATA = gsync-upgrade.sh generate-gfid-file.sh get-gfid.sh \ scripts_PROGRAMS = gsync-sync-gfid gsync_sync_gfid_CFLAGS = $(GF_CFLAGS) -Wall -I$(top_srcdir)/libglusterfs/src gsync_sync_gfid_LDFLAGS = $(GF_LDFLAGS) -gsync_sync_gfid_LDADD = $(GF_LIBS) $(top_builddir)/libglusterfs/src/libglusterfs.la +gsync_sync_gfid_LDADD = $(GF_LDADD) $(top_builddir)/libglusterfs/src/libglusterfs.la gsync_sync_gfid_SOURCES = gsync-sync-gfid.c gsync_sync_gfid_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src diff --git a/extras/hook-scripts/Makefile.am b/extras/hook-scripts/Makefile.am index fa126f90591..771b37e3fdf 100644 --- a/extras/hook-scripts/Makefile.am +++ b/extras/hook-scripts/Makefile.am @@ -2,4 +2,6 @@ EXTRA_DIST = S40ufo-stop.py S56glusterd-geo-rep-create-post.sh SUBDIRS = add-brick set start stop reset scriptsdir = $(GLUSTERD_WORKDIR)/hooks/1/gsync-create/post/ +if USE_GEOREP scripts_SCRIPTS = S56glusterd-geo-rep-create-post.sh +endif |