[bug-gnu-libiconv] [PATCH] On AIX, skip libiconv.a tweaks when not created.

[Michael Haubenwallner]

---
 ChangeLog       | 5 +++++
 lib/Makefile.in | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b7f5fab..5b166bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-14  Michael Haubenwallner  <address@hidden>
+
+       On AIX, skip libiconv.a tweaks when not created.
+       * lib/Makefile.in (install): Test for existing libiconv.a first.
+
 2018-05-04  Bruno Haible  <address@hidden>
 
        Drop special instructions for OSF/1.
diff --git a/lib/Makefile.in b/lib/Makefile.in
index d328290..b92f40d 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -101,12 +101,14 @@ install-lib : all force
 
 # On AIX, libiconv.a must include the object files of /lib/libiconv.a,
 # otherwise the setlocale() call fails when invoked from executables linked
-# with -rpath $(libdir), even if linked without -liconv.
+# with -rpath $(libdir), even if linked without -liconv.  However, since
+# the --with-aix-soname flag libtool may not create libiconv.a at all.
 install : all force
        if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) 
$(DESTDIR)$(libdir) ; fi
        $(LIBTOOL_INSTALL) $(INSTALL) libiconv.la 
$(DESTDIR)$(libdir)/libiconv.la
        case "@host_os@" in \
          aix*) (cd $(DESTDIR)$(libdir) && \
+                { test -e libiconv.a || exit 0; } && \
                 objects=`$(AR) t libiconv.a`" "`$(AR) t /lib/libiconv.a` && \
                 $(AR) x libiconv.a && $(AR) x /lib/libiconv.a && \
                 $(AR) q libiconv.new.a $$objects && \
-- 
2.16.1