#!/usr/bin/env perl
#
-# Copyright © 2011 Nick Bowler
+# Copyright © 2011-2012 Nick Bowler
#
# Prepare the Gnulib tree for inclusion into a non-recursive automake build.
#
my $output = undef;
my $input = undef;
-my $m4output = undef;
-my $m4macro = "DX_FIX_GNULIB";
my $line = 0;
GetOptions(
"o|output=s" => \$output,
"i|input=s" => \$input,
- "m|m4output=s" => \$m4output,
- "M|m4macro=s" => \$m4macro,
);
open STDOUT, ">", $output or die "$output: $!\n" if (defined $output);
if (!$printed_header) {
print "# Postprocessed by ", basename($0), "\n\n";
print <<'EOF';
+# BEGIN AUTOMAKE/M4 POLYGLOT \
+m4_unquote(m4_argn([2], [
+.PHONY: # Automake code follows
+
# 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=|)
# prepend lib/ if and only if they're not empty. Unfortunately, make is not
# powerful to do this, so we need to put this transformation into configure
# itself by defining a new autoconf macro.
-if (defined $m4output) {
- my $lc = List::Compare->new('-u', '-a', \%sourcevars, \%allvars);
- my @vars = $lc->get_unique;
-
- open(M4OUT, '>', $m4output) or die "$m4output: $!\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])
+
+my $lc = List::Compare->new('-u', '-a', \%sourcevars, \%allvars);
+my @vars = $lc->get_unique;
+
+print <<'EOF';
+if FALSE
+], [dnl M4 code follows
+
+AC_SUBST([GLSRC], [lib])
+AC_DEFUN_ONCE([DX_GLSYM_PREFIX], [AC_SUBST([GLSYM_PREFIX], [$1])])
+AC_CONFIG_COMMANDS_PRE([DX_GLSYM_PREFIX([${PACKAGE}__])])
m4_foreach([gl_objvar], [[gl_LIBOBJS], [gl_LTLIBOBJS]], [dnl
set x $gl_objvar; shift
done
])
EOF
- foreach (@vars) {
- print M4OUT "$_=\${$_:+lib/\$$_}\n";
- }
- print M4OUT "])\n";
- close M4OUT;
+foreach (@vars) {
+ print "$_=\${$_:+lib/\$$_}\n";
}
+
+print <<'EOF';
+], [
+endif
+# ]))dnl
+# END AUTOMAKE/M4 POLYGLOT
+EOF
# Copyright © 2011 Nick Bowler
#
# Automake fragment to generate a Gnulib config header to rewrite exported
-# symbols. This fragment relies on the Gnulib makefile enhancements done by
-# fix-gnulib.pl. Furthermore, the following additional changes may be
+# symbols. This fragment relies on the Gnulib makefile postprocessing done by
+# fix-gnulib.pl. Furthermore, the following additions to configure.ac may be
# required:
#
# * Add AM_PROC_CC_C_O to configure.ac
-# * Pass the desired symbol prefix to DX_FIX_GNULIB in configure.ac.
+# * Pass the desired symbol prefix to DX_GLSYM_PREFIX in configure.ac,
+# after including the fix-gnulib.pl output.
#
# License WTFPL2: Do What The Fuck You Want To Public License, version 2.
# This is free software: you are free to do what the fuck you want to.