Restore libpmi build on AIX

slurm.spec

@@ -289,10 +289,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir %attr(0755,root,root) %{_prefix}/include/slurm
 %{_prefix}/include/slurm/*
-%ifnos aix5.3
 %{_libdir}/libpmi.a
 %{_libdir}/libpmi.la
-%endif
 %{_libdir}/libslurm.a
 %{_libdir}/libslurm.la
 %{_mandir}/man3/*

src/api/Makefile.am

@@ -40,10 +40,7 @@ current = $(SLURM_API_CURRENT)
 age     = $(SLURM_API_AGE)
 rev     = $(SLURM_API_REVISION)
 
-lib_LTLIBRARIES = libslurm.la
-if !HAVE_AIX
-lib_LTLIBRARIES += libpmi.la
-endif
+lib_LTLIBRARIES = libslurm.la libpmi.la
 
 # BUILT_SOURCES tells automake that when "make" is called, these targets
 # need to be built before anything else.  For instance, this takes care

src/api/Makefile.in

@@ -40,7 +40,6 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
-@HAVE_AIX_FALSE@am__append_1 = libpmi.la
 subdir = src/api
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -82,7 +81,6 @@ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
 libpmi_la_DEPENDENCIES = $(top_builddir)/src/api/libslurm.la
 am_libpmi_la_OBJECTS = pmi.lo
 libpmi_la_OBJECTS = $(am_libpmi_la_OBJECTS)
-@HAVE_AIX_FALSE@am_libpmi_la_rpath = -rpath $(libdir)
 am__DEPENDENCIES_1 = $(common_dir)/libcommon.la \
 	$(common_dir)/libspank.la $(common_dir)/libeio.la
 libslurm_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -328,7 +326,7 @@ INCLUDES = -I$(top_srcdir)
 current = $(SLURM_API_CURRENT)
 age = $(SLURM_API_AGE)
 rev = $(SLURM_API_REVISION)
-lib_LTLIBRARIES = libslurm.la $(am__append_1)
+lib_LTLIBRARIES = libslurm.la libpmi.la
 
 # BUILT_SOURCES tells automake that when "make" is called, these targets
 # need to be built before anything else.  For instance, this takes care
@@ -463,7 +461,7 @@ clean-noinstLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libpmi.la: $(libpmi_la_OBJECTS) $(libpmi_la_DEPENDENCIES) 
-	$(LINK) $(am_libpmi_la_rpath) $(libpmi_la_LDFLAGS) $(libpmi_la_OBJECTS) $(libpmi_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(libdir) $(libpmi_la_LDFLAGS) $(libpmi_la_OBJECTS) $(libpmi_la_LIBADD) $(LIBS)
 libslurm.la: $(libslurm_la_OBJECTS) $(libslurm_la_DEPENDENCIES) 
 	$(LINK) -rpath $(libdir) $(libslurm_la_LDFLAGS) $(libslurm_la_OBJECTS) $(libslurm_la_LIBADD) $(LIBS)
 libslurmhelper.la: $(libslurmhelper_la_OBJECTS) $(libslurmhelper_la_DEPENDENCIES)