X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fregex;h=8f5eda0612b0c303f054782f5a9ecd04c0445c2e;hb=d4d4aa2ee0869eebacf0322d35dcd12b576eeef3;hp=ee0ab026e45e898b5d7d1534b9764955d9379692;hpb=e8684643a28f1bf6a0839bf6a0c10f630c0f6335;p=gnulib.git

diff --git a/modules/regex b/modules/regex
index ee0ab026e..8f5eda061 100644
--- a/modules/regex
+++ b/modules/regex
@@ -8,29 +8,46 @@ lib/regex_internal.c
 lib/regex_internal.h
 lib/regexec.c
 lib/regcomp.c
-m4/codeset.m4
+m4/eealloc.m4
 m4/regex.m4
+m4/mbstate_t.m4
 
 Depends-on:
-alloca
 extensions
-gettext-h
-malloc
-stdint
-strcase
 ssize_t
+alloca-opt      [test $ac_use_included_regex = yes]
+btowc           [test $ac_use_included_regex = yes]
+gettext-h       [test $ac_use_included_regex = yes]
+malloc-gnu      [test $ac_use_included_regex = yes]
+memcmp          [test $ac_use_included_regex = yes]
+memmove         [test $ac_use_included_regex = yes]
+mbrtowc         [test $ac_use_included_regex = yes]
+mbsinit         [test $ac_use_included_regex = yes]
+nl_langinfo     [test $ac_use_included_regex = yes]
+stdbool         [test $ac_use_included_regex = yes]
+stdint          [test $ac_use_included_regex = yes]
+wchar           [test $ac_use_included_regex = yes]
+wcrtomb         [test $ac_use_included_regex = yes]
+wctype-h        [test $ac_use_included_regex = yes]
+wctype          [test $ac_use_included_regex = yes]
 
 configure.ac:
 gl_REGEX
+if test $ac_use_included_regex = yes; then
+  AC_LIBOBJ([regex])
+  gl_PREREQ_REGEX
+fi
 
 Makefile.am:
-EXTRA_DIST += regex.h regex.c regex_internal.c regex_internal.h regexec.c regcomp.c
 
 Include:
-"regex.h"
+<regex.h>
+
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all