Rewrite Gnulib symbols to be in libcdecl's namespace.

[dxcommon.git] / scripts / fix-gnulib.pl

diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl
index 17163c7e24cc15d436bd5dd593c7629212bc5963..b8185fa642107538128023f844d76eb03191f286 100755 (executable)
--- a/scripts/fix-gnulib.pl
+++ b/scripts/fix-gnulib.pl
@@ -174,9 +174,21 @@ if (defined $m4output) {
 
        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=
@@ -185,7 +197,6 @@ while test ${#} -gt 0; do
 done
 ])
 EOF
-
        foreach (@vars) {
                print M4OUT "$_=\${$_:+lib/\$$_}\n";
        }