diff options
Diffstat (limited to 'lgl/m4/gnulib-comp.m4')
| -rw-r--r-- | lgl/m4/gnulib-comp.m4 | 82 |
1 files changed, 79 insertions, 3 deletions
diff --git a/lgl/m4/gnulib-comp.m4 b/lgl/m4/gnulib-comp.m4 index b6ade09e21..da6970ce89 100644 --- a/lgl/m4/gnulib-comp.m4 +++ b/lgl/m4/gnulib-comp.m4 @@ -33,11 +33,11 @@ AC_DEFUN([lgl_EARLY], # "Check for header files, types and library functions". AC_DEFUN([lgl_INIT], [ + AM_CONDITIONAL([GL_COND_LIBTOOL], [true]) + gl_cond_libtool=true m4_pushdef([AC_LIBOBJ], m4_defn([lgl_LIBOBJ])) m4_pushdef([AC_REPLACE_FUNCS], m4_defn([lgl_REPLACE_FUNCS])) m4_pushdef([AC_LIBSOURCES], m4_defn([lgl_LIBSOURCES])) - AM_CONDITIONAL([GL_COND_LIBTOOL], [true]) - gl_cond_libtool=true gl_source_base='lgl' gl_FUNC_ALLOCA gl_GC @@ -76,6 +76,9 @@ AC_DEFUN([lgl_INIT], AM_GNU_GETTEXT_VERSION([0.17]) AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) + gl_MALLOCA + gl_FUNC_MEMCHR + gl_FUNC_MEMCMP gl_FUNC_MEMMEM gl_STRING_MODULE_INDICATOR([memmem]) gl_FUNC_MEMMOVE @@ -125,6 +128,29 @@ AC_DEFUN([lgl_INIT], AC_SUBST([lgl_LIBOBJS], [$lgl_libobjs]) AC_SUBST([lgl_LTLIBOBJS], [$lgl_ltlibobjs]) ]) + gltests_libdeps= + gltests_ltlibdeps= + m4_pushdef([AC_LIBOBJ], m4_defn([lgltests_LIBOBJ])) + m4_pushdef([AC_REPLACE_FUNCS], m4_defn([lgltests_REPLACE_FUNCS])) + m4_pushdef([AC_LIBSOURCES], m4_defn([lgltests_LIBSOURCES])) + gl_source_base='tests' + m4_popdef([AC_LIBSOURCES]) + m4_popdef([AC_REPLACE_FUNCS]) + m4_popdef([AC_LIBOBJ]) + AC_CONFIG_COMMANDS_PRE([ + lgltests_libobjs= + lgltests_ltlibobjs= + if test -n "$lgltests_LIBOBJS"; then + # Remove the extension. + sed_drop_objext='s/\.o$//;s/\.obj$//' + for i in `for i in $lgltests_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do + lgltests_libobjs="$lgltests_libobjs $i.$ac_objext" + lgltests_ltlibobjs="$lgltests_ltlibobjs $i.lo" + done + fi + AC_SUBST([lgltests_LIBOBJS], [$lgltests_libobjs]) + AC_SUBST([lgltests_LTLIBOBJS], [$lgltests_ltlibobjs]) + ]) ]) # Like AC_LIBOBJ, except that the module name goes @@ -134,6 +160,13 @@ AC_DEFUN([lgl_LIBOBJ], [ lgl_LIBOBJS="$lgl_LIBOBJS $1.$ac_objext" ]) +# m4_foreach_w is provided by autoconf-2.59c and later. +# This definition is to accommodate developers using versions +# of autoconf older than that. +m4_ifndef([m4_foreach_w], + [m4_define([m4_foreach_w], + [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) + # Like AC_REPLACE_FUNCS, except that the module name goes # into lgl_LIBOBJS instead of into LIBOBJS. AC_DEFUN([lgl_REPLACE_FUNCS], [ @@ -155,6 +188,41 @@ AC_DEFUN([lgl_LIBSOURCES], [ ]) ]) +# Like AC_LIBOBJ, except that the module name goes +# into lgltests_LIBOBJS instead of into LIBOBJS. +AC_DEFUN([lgltests_LIBOBJ], [ + AS_LITERAL_IF([$1], [lgltests_LIBSOURCES([$1.c])])dnl + lgltests_LIBOBJS="$lgltests_LIBOBJS $1.$ac_objext" +]) + +# m4_foreach_w is provided by autoconf-2.59c and later. +# This definition is to accommodate developers using versions +# of autoconf older than that. +m4_ifndef([m4_foreach_w], + [m4_define([m4_foreach_w], + [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) + +# Like AC_REPLACE_FUNCS, except that the module name goes +# into lgltests_LIBOBJS instead of into LIBOBJS. +AC_DEFUN([lgltests_REPLACE_FUNCS], [ + m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl + AC_CHECK_FUNCS([$1], , [lgltests_LIBOBJ($ac_func)]) +]) + +# Like AC_LIBSOURCES, except the directory where the source file is +# expected is derived from the gnulib-tool parametrization, +# and alloca is special cased (for the alloca-opt module). +# We could also entirely rely on EXTRA_lib..._SOURCES. +AC_DEFUN([lgltests_LIBSOURCES], [ + m4_foreach([_gl_NAME], [$1], [ + m4_if(_gl_NAME, [alloca.c], [], [ + m4_syscmd([test -r tests/]_gl_NAME[ || test ! -d tests])dnl + m4_if(m4_sysval, [0], [], + [AC_FATAL([missing tests/]_gl_NAME)]) + ]) + ]) +]) + # This macro records the list of files which have been installed by # gnulib-tool and may be removed by future gnulib-tool invocations. AC_DEFUN([lgl_FILE_LIST], [ @@ -169,7 +237,6 @@ AC_DEFUN([lgl_FILE_LIST], [ lib/asprintf.c lib/des.c lib/des.h - lib/dummy.c lib/float+.h lib/float.in.h lib/gc-gnulib.c @@ -180,12 +247,17 @@ AC_DEFUN([lgl_FILE_LIST], [ lib/hmac-md5.c lib/hmac-sha1.c lib/hmac.h + lib/malloca.c + lib/malloca.h + lib/malloca.valgrind lib/md2.c lib/md2.h lib/md4.c lib/md4.h lib/md5.c lib/md5.h + lib/memchr.c + lib/memcmp.c lib/memmem.c lib/memmove.c lib/memxor.c @@ -229,6 +301,7 @@ AC_DEFUN([lgl_FILE_LIST], [ m4/arctwo.m4 m4/codeset.m4 m4/des.m4 + m4/eealloc.m4 m4/eoverflow.m4 m4/extensions.m4 m4/float_h.m4 @@ -269,9 +342,12 @@ AC_DEFUN([lgl_FILE_LIST], [ m4/lock.m4 m4/longlong.m4 m4/malloc.m4 + m4/malloca.m4 m4/md2.m4 m4/md4.m4 m4/md5.m4 + m4/memchr.m4 + m4/memcmp.m4 m4/memmem.m4 m4/memmove.m4 m4/memxor.m4 |