diff options
-rw-r--r-- | m4/.cvsignore | 3 | ||||
-rw-r--r-- | m4/gnulib.m4 | 33 | ||||
-rw-r--r-- | m4/mu_libobj.m4 | 5 |
3 files changed, 31 insertions, 10 deletions
diff --git a/m4/.cvsignore b/m4/.cvsignore index 9c0e17fed..5f04d0169 100644 --- a/m4/.cvsignore +++ b/m4/.cvsignore @@ -1,6 +1,9 @@ +Makefile +Makefile.in codeset.m4 gettext.m4 glibc21.m4 +gmailboxc2.m4 iconv.m4 intdiv0.m4 intmax.m4 diff --git a/m4/gnulib.m4 b/m4/gnulib.m4 index a145b8cdb..cd339e5d9 100644 --- a/m4/gnulib.m4 +++ b/m4/gnulib.m4 @@ -18,15 +18,9 @@ gl_XALLOC # xalloc gl_XALLOC -# fnmatch -# No macro. You should also use one of fnmatch-posix or fnmatch-gnu. - # getpass-gnu gl_FUNC_GETPASS_GNU -# malloc -AC_FUNC_MALLOC - # mbswidth gl_MBSWIDTH @@ -75,20 +69,35 @@ gl_FUNC_STRTOK_R # md5 gl_MD5 +# glob +gl_GLOB + # extensions dnl gl_USE_SYSTEM_EXTENSIONS must be added quite early to configure.ac. +# fnmatch +# No macro. You should also use one of fnmatch-posix or fnmatch-gnu. + # getdelim gl_FUNC_GETDELIM +# getlogin_r +gl_GETLOGIN_R + # getopt gl_GETOPT # gettext-h +# malloc +AC_FUNC_MALLOC + # mbchar gl_MBCHAR +# mbuiter +gl_MBITER + # memchr gl_FUNC_MEMCHR @@ -104,15 +113,24 @@ gl_C_RESTRICT # size_max gl_SIZE_MAX +# stat-macros +gl_STAT_MACROS + # stdbool AM_STDBOOL_H +# stdint +gl_STDINT_H + # strcase gl_STRCASE # strchrnul gl_FUNC_STRCHRNUL +# strdup +gl_FUNC_STRDUP + # strndup gl_FUNC_STRNDUP @@ -124,9 +142,6 @@ gl_FUNC_STRNLEN # sysexits gl_SYSEXITS -# unlocked-io -gl_FUNC_GLIBC_UNLOCKED_IO - # vasnprintf gl_FUNC_VASNPRINTF diff --git a/m4/mu_libobj.m4 b/m4/mu_libobj.m4 index f09749f27..b72f2288d 100644 --- a/m4/mu_libobj.m4 +++ b/m4/mu_libobj.m4 @@ -20,6 +20,7 @@ AC_SUBST(MU_LIBOBJS) AC_SUBST(MU_EXTRA_DIST) AC_DEFUN([MU_LIBSOURCES],[]) +AC_DEFUN([MU_LIBSOURCE],[]) AC_DEFUN([MU_LIBOBJ],[ MU_LIBOBJS="$MU_LIBOBJS $1.o"]) @@ -29,7 +30,9 @@ AC_DEFUN([MU_CHECK_FUNC],[ [MU_LIBOBJ($1)])]) AC_DEFUN([MU_REPLACE_FUNCS], -[AC_CHECK_FUNCS([$1], , [MU_LIBOBJ($ac_func)]) +[AC_CHECK_FUNCS([$1], , [dnl + MU_LIBOBJ($ac_func) + AC_DEFINE($ac_func, [mu_repl_]$ac_func, [Define to a replacement function name for ]$ac_func)]) ]) AC_SUBST(GNU_INCLS) |