Replace LT_ARGZ_H_PATH usage with bool for LTARGZH_EXISTS

* m4/ltdl.mk: Add conditional with LTARGZH_EXISTS to append path for
  LT_ARGZ_H file to BUILT_SOURCES.
* m4/ltargz.m4: Remove LT_ARGZ_H_PATH.
* m4/ltdl.m4: Add AM_CONDITIONAL for LTARGZH_EXISTS that is set to
  true if LT_ARGZ_H is non-empty.

diff --git a/libltdl/ltdl.mk b/libltdl/ltdl.mk
index 2e224cbc53fddf1a2409f9da62961776c25b8a18..9d6be8292ffd060f6de0acbcb796a6b210b105b3 100644 (file)
--- a/libltdl/ltdl.mk
+++ b/libltdl/ltdl.mk
@@ -131,7 +131,9 @@ EXTRA_DIST         += libltdl/COPYING.LIB \
 ## Gnulib Makefile.am snippets ##
 ## --------------------------- ##
 
-BUILT_SOURCES  += $(LT_ARGZ_H_PATH)
+if LTARGZH_EXISTS
+BUILT_SOURCES  += libltdl/libltdl/$(LT_ARGZ_H)
+endif
 EXTRA_DIST     += libltdl/libltdl/lt__argz_.h \
                   libltdl/lt__argz.c
 

diff --git a/m4/ltargz.m4 b/m4/ltargz.m4
index 327b0b47c57852ae692a00c93fc88ca5fec7c951..b93c28240d178f473bf34f0867437c89dcde0a27 100644 (file)
--- a/m4/ltargz.m4
+++ b/m4/ltargz.m4
@@ -8,7 +8,7 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 3 ltargz.m4
+# serial 2 ltargz.m4
 
 AC_DEFUN([LT_FUNC_ARGZ], [
 dnl Required for use of '$SED' in Cygwin configuration.
@@ -71,9 +71,7 @@ AS_IF([test -z "$LT_ARGZ_H"],
         [AC_DEFINE([HAVE_WORKING_ARGZ], 1,
                    [This value is set to 1 to indicate that the system argz facility works])],
         [LT_ARGZ_H=lt__argz.h
-        LT_ARGZ_H_PATH=libltdl/libltdl/$LT_ARGZ_H
         AC_LIBOBJ([lt__argz])])])
 
 AC_SUBST([LT_ARGZ_H])
-AC_SUBST([LT_ARGZ_H_PATH])
 ])

diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index c47bb98c750d8a3b77066e97cc4b06503e9bfc8d..af2440896b4cacd948094552bfa88f32026e3070 100644 (file)
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -8,7 +8,7 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 23 LTDL_INIT
+# serial 24 LTDL_INIT
 
 # LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
 # ------------------------------------------
@@ -435,7 +435,8 @@ esac
 
 m4_ifdef([AM_CONDITIONAL],
 [AM_CONDITIONAL(INSTALL_LTDL, test no != "${enable_ltdl_install-no}")
- AM_CONDITIONAL(CONVENIENCE_LTDL, test no != "${enable_ltdl_convenience-no}")])
+ AM_CONDITIONAL(CONVENIENCE_LTDL, test no != "${enable_ltdl_convenience-no}")
+ AM_CONDITIONAL(LTARGZH_EXISTS, test -n "$LT_ARGZ_H")])
 ])# _LT_ENABLE_INSTALL