clean out ovis-auth.sh; export ovis-auth-libs var

ovis-hpc · Mar 29, 2023 · 7f51672 · 7f51672
1 parent 8740604
commit 7f51672
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 17 deletions.
diff --git a/configure.ac b/configure.ac
@@ -539,11 +539,6 @@ dnl munge
 OPTION_DEFAULT_DISABLE([munge], [ENABLE_MUNGE])
 OPTION_WITH([munge], [MUNGE])
 
-dnl OPTION_DEFAULT_ENABLE([ovis-lib], [ENABLE_OVIS_LIB])
-# OPTION_WITH_OR_BUILD([ovis-lib],[../lib/src],[mmalloc third coll ovis_util zap ovis_ctrl ovis_event ovis_auth],[ovis-auth.sh],[ovis-lib],[ovis_auth])
-dnl OPTION_WITH_OR_BUILD([ovis-lib],[../lib/src],[mmalloc third json tada coll ovis_util zap ovis_ctrl ovis_event ovis_auth ],[ovis-auth.sh],[ovis-lib],[ovis_auth])
-dnl substitute values we need from ovis-auth.sh during joint configure
-
 LDMSD_PLUGIN_LIBPATH=${pkglibdir}
 AC_SUBST(LDMSD_PLUGIN_LIBPATH)
 
@@ -997,7 +992,6 @@ lib/src/ovis_event/Makefile
 lib/src/ovis_ctrl/Makefile
 lib/src/ovis_util/Makefile
 lib/src/ovis_auth/Makefile
-lib/src/ovis_auth/ovis-auth.sh
 lib/src/ovis_ref/Makefile
 lib/src/ovis_log/Makefile
 lib/src/zap/Makefile

diff --git a/ldms/src/ovis-ldms-configvars.sh.in b/ldms/src/ovis-ldms-configvars.sh.in
@@ -25,3 +25,4 @@ ovis_ldms_exec_prefix=@exec_prefix@
 ovis_ldms_pkglibdir=@pkglibdir@
 ovis_ldms_pythondir=@pythondir@
 ovis_ldms_soslibdir=@soslibdir@
+ovis_ldms_auth_libs="@OVIS_AUTH_LIBS@"
diff --git a/lib/src/ovis_auth/Makefile.am b/lib/src/ovis_auth/Makefile.am
@@ -8,7 +8,3 @@ libovis_authincludedir = $(includedir)/ovis_auth
 libovis_auth_conf = /etc/ld.so.conf.d/libovis_auth.conf
 libovis_auth_la_LIBADD = @LDFLAGS_GETTIME@ @OPENSSL_LIBS@
 lib_LTLIBRARIES += libovis_auth.la
-
-# override pkglib sanity checks
-mypkglibdir = $(pkglibdir)
-mypkglib_SCRIPTS = ovis-auth.sh
diff --git a/lib/src/ovis_auth/ovis-auth.sh.in b/lib/src/ovis_auth/ovis-auth.sh.in