-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}__])])