# This trick should define gnulib_orderonly to | iff we're using GNU make.
gnulib_have_orderonly = $(findstring order-only,$(.FEATURES))
gnulib_orderonly = $(gnulib_have_orderonly:order-only=|)
-gnulib_headers = $(gnulib_orderonly)
+gnulib_core_headers = $(gnulib_orderonly)
+gnulib_src_headers = $(gnulib_core_headers)
+gnulib_headers = $(gnulib_src_headers)
EOF
$printed_header = 1;
# useful for non-recursive builds. Strip them out.
drop if (/^(AM_CPPFLAGS|AM_CFLAGS)/);
+ # Library dependencies are added automatically to libgnu.la by
+ # gnulib-tool. Unfortunately, this means that everything linking
+ # against libgnu.la is forced to pull in the same deps, even if they're
+ # unneeded. Furthermore, a libtool linker flag reordering bug prevents
+ # --as-needed from stripping out the useless deps, so it's better to
+ # handle them all manually.
+ drop if (/LDFLAGS/);
+
# Rewrite automake hook targets to be more generic.
if (s/^(.*)-local:/\1-gnulib:/) {
print ".PHONY: $1-gnulib\n";
# BUILT_SOURCES has similar problems to recursive make: inadequate
# dependencies lead to incorrect builds. Collect them into an
# ordinary variable so we can deal with them later.
- s/BUILT_SOURCES/gnulib_headers/;
+ s/BUILT_SOURCES/gnulib_core_headers/;
# Targets are similar to variables: the target and its dependencies
# need to be mangled.
print <<'EOF';
gnulib_lt_objects = $(libgnu_la_OBJECTS) $(gl_LTLIBOBJS)
-$(gnulib_lt_objects): $(gnulib_headers)
+$(gnulib_lt_objects): $(gnulib_src_headers)
EOF
print @cleanfiles;
open(M4OUT, '>', $m4output) or die "$m4output: $!\n";
- print M4OUT "dnl This file was generated by fix-gnulib.pl\n";
- print M4OUT "AC_DEFUN([$m4macro], [dnl\n";
+ print M4OUT <<EOF;
+dnl This file was generated by fix-gnulib.pl
+dnl
+dnl Usage: DX_FIX_GNULIB([symbol-prefix])
+dnl where symbol-prefix is the application-specific symbol prefix to apply
+dnl to Gnulib's symbols. Defaults to \${PACKAGE}__.
+dnl top-level source directory; e.g. lib.
+AC_DEFUN([$m4macro], [dnl
+EOF
print M4OUT <<'EOF';
+GLSRC=lib
+GLSYM_PREFIX='ifelse([$1], [], [${PACKAGE}__], [$1])'
+AC_SUBST([GLSRC])
+AC_SUBST([GLSYM_PREFIX])
+
m4_foreach([gl_objvar], [[gl_LIBOBJS], [gl_LTLIBOBJS]], [dnl
set x $gl_objvar; shift
gl_objvar=
done
])
EOF
-
foreach (@vars) {
print M4OUT "$_=\${$_:+lib/\$$_}\n";
}