dnl This is free software: you are free to do what the fuck you want to.
dnl There is NO WARRANTY, to the extent permitted by law.
-dnl DX_GNULIB_SYMFILES(filename)
+dnl DX_GNULIB_SYMFILES(filename, [shortname])
dnl
dnl When using the glconfig symbol-renaming functionality to include gnulib
dnl components in a library, it may not be the case that every file is actually
dnl based on the actually-enabled gnulib objects.
dnl
dnl The list of leftover objects which are not subject to symbol renaming is
-dnl then placed in the gnulib_extra_objects make variable.
+dnl then placed in the gnulib_extra_objects make variable. If shortname is
+dnl nonempty, these object file names will be prefixed with the specified
+dnl value followed by a hyphen (to match up with Automake's object file
+dnl renaming system).
AC_DEFUN_ONCE([DX_GNULIB_SYMFILES],
[AC_REQUIRE([DX_PROG_JOIN])dnl
CONFIGURE_DEPENDENCIES=${CONFIGURE_DEPENDENCIES:+" "}'${top_srcdir}/$1'
$[1] "/" $[2] "/" $[3] == "gnulib_symfiles/=/$(gnulib_all_symfiles)" {
objlst = symlst = "";
while ((rc = getline < f) > 0) {
- if ($[3] == "x")
+ if ($[3] == "x") {
symlst = symlst " " $[1] ".glsym";
- else
- objlst = objlst " " $[1] $[2];
+ } else {
+ m4_ifnblank([$2], [sub(/[[^\/]]*$/, "$2-&", $[1]);
+ ])objlst = objlst " " $[1] $[2];
+ }
}
if (rc < 0)
AT_CLEANUP
+AT_SETUP([DX_GNULIB_SYMFILES shortname])
+AT_KEYWORDS([DX_GNULIB_SYMFILES macro])
+
+TEST_SYMFILES_INIT
+
+sed '/GNULIB_SYMFILES/c\
+[DX_GNULIB_SYMFILES([symfiles.lst], [x])]' configure.ac >configure.tmp
+sed '/gnulib_objects/s|$| a/b.o a/b/c.o|' Makefile.am >Makefile.tmp
+mv -f configure.tmp configure.ac
+mv -f Makefile.tmp Makefile.am
+
+AT_DATA([symfiles.lst],
+[[b.c
+c.c
+d.c
+e.c
+]])
+TEST_AUTORECONF
+
+TEST_CONFIGURE
+AT_CHECK([make -s do_test], [0],
+[[b.glsym
+c.glsym
+d.glsym
+e.glsym
+///
+a/b/x-c.o
+a/x-b.o
+x-a.o
+]])
+
+AT_CLEANUP
+
AT_SETUP([DX_GNULIB_SYMFILES distribution])
AT_KEYWORDS([DX_GNULIB_SYMFILES macro])