diff options
Diffstat (limited to 'src/libs/gnulib/m4/gnulib-comp.m4')
| -rw-r--r-- | src/libs/gnulib/m4/gnulib-comp.m4 | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/src/libs/gnulib/m4/gnulib-comp.m4 b/src/libs/gnulib/m4/gnulib-comp.m4 index 026df00d..e9556ede 100644 --- a/src/libs/gnulib/m4/gnulib-comp.m4 +++ b/src/libs/gnulib/m4/gnulib-comp.m4 @@ -28,7 +28,7 @@ # other built files. -# This macro should be invoked from src/libs/gnulib/configure.ac, in the section +# This macro should be invoked from src/libs/gnulib//configure.ac, in the section # "Checks for programs", right after AC_PROG_CC, and certainly before # any checks for libraries, header files, types and library functions. AC_DEFUN([gl_EARLY], @@ -42,6 +42,7 @@ AC_DEFUN([gl_EARLY], # Code from module configmake: # Code from module extensions: AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + # Code from module extern-inline: # Code from module include_next: # Code from module localcharset: # Code from module multiarch: @@ -59,7 +60,7 @@ AC_DEFUN([gl_EARLY], # Code from module wcwidth: ]) -# This macro should be invoked from src/libs/gnulib/configure.ac, in the section +# This macro should be invoked from src/libs/gnulib//configure.ac, in the section # "Check for header files, types and library functions". AC_DEFUN([gl_INIT], [ @@ -75,23 +76,24 @@ AC_DEFUN([gl_INIT], m4_pushdef([gl_LIBSOURCES_DIR], []) gl_COMMON gl_source_base='lib' -gl_CONFIGMAKE_PREP -gl_LOCALCHARSET -LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" -AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) -gl_MULTIARCH -gl_STDDEF_H -gl_STDINT_H -gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h]) -gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h]) -gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/width]) -gl_WCHAR_H -gl_WCTYPE_H -gl_FUNC_WCWIDTH -if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then - AC_LIBOBJ([wcwidth]) -fi -gl_WCHAR_MODULE_INDICATOR([wcwidth]) + gl_CONFIGMAKE_PREP + AC_REQUIRE([gl_EXTERN_INLINE]) + gl_LOCALCHARSET + LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" + AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) + gl_MULTIARCH + gl_STDDEF_H + gl_STDINT_H + gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h]) + gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h]) + gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/width]) + gl_WCHAR_H + gl_WCTYPE_H + gl_FUNC_WCWIDTH + if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then + AC_LIBOBJ([wcwidth]) + fi + gl_WCHAR_MODULE_INDICATOR([wcwidth]) # End of code from modules m4_ifval(gl_LIBSOURCES_LIST, [ m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || @@ -248,12 +250,14 @@ AC_DEFUN([gl_FILE_LIST], [ lib/uniwidth/cjk.h lib/uniwidth/width.c lib/wchar.in.h + lib/wctype-h.c lib/wctype.in.h lib/wcwidth.c m4/00gnulib.m4 m4/codeset.m4 m4/configmake.m4 m4/extensions.m4 + m4/extern-inline.m4 m4/fcntl-o.m4 m4/glibc21.m4 m4/gnulib-common.m4 |