Skip to content
Snippets Groups Projects
Commit ae177edc authored by Moe Jette's avatar Moe Jette
Browse files

Fix for clean AIX build, find openssl in proper location

parent d1c6ca63
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ endif ...@@ -10,7 +10,7 @@ endif
PLUGIN_FLAGS = -module -avoid-version --export-dynamic PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common INCLUDES = -I$(top_srcdir) $(SSL_CPPFLAGS) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = $(openssl_lib) pkglib_LTLIBRARIES = $(openssl_lib)
...@@ -21,7 +21,7 @@ crypto_openssl_la_SOURCES = \ ...@@ -21,7 +21,7 @@ crypto_openssl_la_SOURCES = \
# Add libslurm to switch_elan to provide some symbols that are not # Add libslurm to switch_elan to provide some symbols that are not
# available in slurmctld (slurm_setenvpf) # available in slurmctld (slurm_setenvpf)
crypto_openssl_la_LIBADD = $(OPEN_LIBS) \ crypto_openssl_la_LIBADD = $(SSL_LIBS) \
$(top_builddir)/src/api/libslurm.la $(top_builddir)/src/api/libslurm.la
crypto_openssl_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) crypto_openssl_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
......
...@@ -74,7 +74,9 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ...@@ -74,7 +74,9 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(pkglibdir)" am__installdirs = "$(DESTDIR)$(pkglibdir)"
pkglibLTLIBRARIES_INSTALL = $(INSTALL) pkglibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pkglib_LTLIBRARIES) LTLIBRARIES = $(pkglib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@HAVE_OPENSSL_TRUE@crypto_openssl_la_DEPENDENCIES = \ @HAVE_OPENSSL_TRUE@crypto_openssl_la_DEPENDENCIES = \
@HAVE_OPENSSL_TRUE@ $(am__DEPENDENCIES_1) \
@HAVE_OPENSSL_TRUE@ $(top_builddir)/src/api/libslurm.la @HAVE_OPENSSL_TRUE@ $(top_builddir)/src/api/libslurm.la
am__crypto_openssl_la_SOURCES_DIST = crypto_openssl.c am__crypto_openssl_la_SOURCES_DIST = crypto_openssl.c
@HAVE_OPENSSL_TRUE@am_crypto_openssl_la_OBJECTS = crypto_openssl.lo @HAVE_OPENSSL_TRUE@am_crypto_openssl_la_OBJECTS = crypto_openssl.lo
...@@ -267,7 +269,7 @@ AUTOMAKE_OPTIONS = foreign ...@@ -267,7 +269,7 @@ AUTOMAKE_OPTIONS = foreign
@HAVE_OPENSSL_FALSE@openssl_lib = @HAVE_OPENSSL_FALSE@openssl_lib =
@HAVE_OPENSSL_TRUE@openssl_lib = crypto_openssl.la @HAVE_OPENSSL_TRUE@openssl_lib = crypto_openssl.la
PLUGIN_FLAGS = -module -avoid-version --export-dynamic PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common INCLUDES = -I$(top_srcdir) $(SSL_CPPFLAGS) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = $(openssl_lib) pkglib_LTLIBRARIES = $(openssl_lib)
@HAVE_OPENSSL_TRUE@crypto_openssl_la_SOURCES = \ @HAVE_OPENSSL_TRUE@crypto_openssl_la_SOURCES = \
@HAVE_OPENSSL_TRUE@ crypto_openssl.c @HAVE_OPENSSL_TRUE@ crypto_openssl.c
...@@ -275,7 +277,7 @@ pkglib_LTLIBRARIES = $(openssl_lib) ...@@ -275,7 +277,7 @@ pkglib_LTLIBRARIES = $(openssl_lib)
# Add libslurm to switch_elan to provide some symbols that are not # Add libslurm to switch_elan to provide some symbols that are not
# available in slurmctld (slurm_setenvpf) # available in slurmctld (slurm_setenvpf)
@HAVE_OPENSSL_TRUE@crypto_openssl_la_LIBADD = $(OPEN_LIBS) \ @HAVE_OPENSSL_TRUE@crypto_openssl_la_LIBADD = $(SSL_LIBS) \
@HAVE_OPENSSL_TRUE@ $(top_builddir)/src/api/libslurm.la @HAVE_OPENSSL_TRUE@ $(top_builddir)/src/api/libslurm.la
@HAVE_OPENSSL_TRUE@crypto_openssl_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) @HAVE_OPENSSL_TRUE@crypto_openssl_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment