From ae177edc0ad99e4246a21114a7e7bf923b71f07a Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 26 Jul 2007 23:25:37 +0000
Subject: [PATCH] Fix for clean AIX build, find openssl in proper location

---
 src/plugins/crypto/openssl/Makefile.am | 4 ++--
 src/plugins/crypto/openssl/Makefile.in | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/crypto/openssl/Makefile.am b/src/plugins/crypto/openssl/Makefile.am
index 16816adf5d8..efc8107d8c8 100644
--- a/src/plugins/crypto/openssl/Makefile.am
+++ b/src/plugins/crypto/openssl/Makefile.am
@@ -10,7 +10,7 @@ endif
 
 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)
 
@@ -21,7 +21,7 @@ crypto_openssl_la_SOURCES =	\
 # Add libslurm to switch_elan to provide some symbols that are not
 #  available in slurmctld (slurm_setenvpf)
 
-crypto_openssl_la_LIBADD  = $(OPEN_LIBS) \
+crypto_openssl_la_LIBADD  = $(SSL_LIBS) \
 			$(top_builddir)/src/api/libslurm.la
 
 crypto_openssl_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
diff --git a/src/plugins/crypto/openssl/Makefile.in b/src/plugins/crypto/openssl/Makefile.in
index dc166f3e7f3..7b039ff00ce 100644
--- a/src/plugins/crypto/openssl/Makefile.in
+++ b/src/plugins/crypto/openssl/Makefile.in
@@ -74,7 +74,9 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(pkglibdir)"
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
 @HAVE_OPENSSL_TRUE@crypto_openssl_la_DEPENDENCIES =  \
+@HAVE_OPENSSL_TRUE@	$(am__DEPENDENCIES_1) \
 @HAVE_OPENSSL_TRUE@	$(top_builddir)/src/api/libslurm.la
 am__crypto_openssl_la_SOURCES_DIST = crypto_openssl.c
 @HAVE_OPENSSL_TRUE@am_crypto_openssl_la_OBJECTS = crypto_openssl.lo
@@ -267,7 +269,7 @@ AUTOMAKE_OPTIONS = foreign
 @HAVE_OPENSSL_FALSE@openssl_lib = 
 @HAVE_OPENSSL_TRUE@openssl_lib = crypto_openssl.la
 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)
 @HAVE_OPENSSL_TRUE@crypto_openssl_la_SOURCES = \
 @HAVE_OPENSSL_TRUE@	crypto_openssl.c
@@ -275,7 +277,7 @@ pkglib_LTLIBRARIES = $(openssl_lib)
 
 # Add libslurm to switch_elan to provide some symbols that are not
 #  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@crypto_openssl_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-- 
GitLab