Fixed

@@ -39,6 +39,9 @@ gl_FUNC_SNPRINTF
 # vasprintf
 gl_FUNC_VASPRINTF
 
+# xstrtol
+gl_XSTRTOL
+
 # xalloc-die
 
 # xsize

@@ -6,9 +6,9 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_XSTRTOL],
 [
-  MU_LIBSOURCES([xstrtol.c, xstrtol.h, xstrtoul.c, intprops.h])
-  MU_LIBOBJ([xstrtol])
-  MU_LIBOBJ([xstrtoul])
+  AC_LIBSOURCES([xstrtol.c, xstrtol.h, xstrtoul.c, intprops.h])
+  AC_LIBOBJ([xstrtol])
+  AC_LIBOBJ([xstrtoul])
 
   AC_REQUIRE([gl_PREREQ_XSTRTOL])
   AC_REQUIRE([gl_PREREQ_XSTRTOUL])

@@ -222,4 +222,4 @@ libmailutils_la_SOURCES += vsnprintf.h
 
 libmailutils_la_SOURCES += xsize.h
 
-EXTRA_DIST += dirname.c dirname.h dirname.c strcasecmp.c strncasecmp.c unlocked-io.h getndelim2.c xstrtol.c xstrtol.h xstrtoul.c intprops.h xstrtol.c xstrtoul.c fnmatch.c getdelim.c getdelim.h getdelim.c getopt.c getopt1.c mbchar.c memchr.c mempcpy.c mempcpy.h mempcpy.c getlogin_r.c getlogin_r.c inttostr.c inttostr.h intprops.h imaxtostr.c offtostr.c umaxtostr.c imaxtostr.c offtostr.c umaxtostr.c regex.c stat-macros.h strchrnul.c strdup.c strdup.h strdup.c strndup.c strndup.h strndup.c strnlen.c strnlen.h strnlen.c strtok_r.c vasnprintf.c printf-args.c printf-parse.c asnprintf.c vsnprintf.c getline.c getline.c getline.h getline.c glob.c glob_.h glob-libc.h glob.c md5.c md5.h md5.c
+EXTRA_DIST += unlocked-io.h getndelim2.c fnmatch.c getdelim.c getdelim.h getdelim.c getopt.c getopt1.c mbchar.c mempcpy.c mempcpy.h mempcpy.c regex.c strcasecmp.c strncasecmp.c getlogin_r.c getlogin_r.c inttostr.c inttostr.h intprops.h imaxtostr.c offtostr.c umaxtostr.c imaxtostr.c offtostr.c umaxtostr.c strchrnul.c strdup.c strdup.h strdup.c strndup.c strndup.h strndup.c strnlen.c strnlen.h strnlen.c strtok_r.c vasnprintf.c printf-args.c printf-parse.c asnprintf.c vsnprintf.c getline.c getline.c getline.h getline.c glob.c glob_.h glob-libc.h glob.c md5.c md5.h md5.c memchr.c stat-macros.h