X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fregex;h=9d2e4d235defcdea060918cf48f2dcd898a26659;hb=7ef6c64e210ac0979d7e8ac69bc5b5208c2405ab;hp=ecfd832ea01068b82ff8ce2ce0c5821fea1297ba;hpb=6f482faed630f7ed50f5c4ec414ddb7d7e110314;p=gnulib.git

diff --git a/modules/regex b/modules/regex
index ecfd832ea..9d2e4d235 100644
--- a/modules/regex
+++ b/modules/regex
@@ -8,36 +8,45 @@ lib/regex_internal.c
 lib/regex_internal.h
 lib/regexec.c
 lib/regcomp.c
+m4/eealloc.m4
 m4/regex.m4
 m4/mbstate_t.m4
 
 Depends-on:
-alloca-opt
-btowc
 extensions
-gettext-h
-localcharset
-malloc
-memcmp
-memmove
-mbrtowc
-mbsinit
-nl_langinfo
-stdbool
-stdint
 ssize_t
-wchar
-wcrtomb
-wctype
+alloca-opt      [test $ac_use_included_regex = yes]
+btowc           [test $ac_use_included_regex = yes]
+gettext-h       [test $ac_use_included_regex = yes]
+lock      [test "$ac_cv_gnu_library_2_1:$ac_use_included_regex" = no: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:
 
 Include:
 <regex.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPLv2+