summaryrefslogtreecommitdiff
path: root/modules/glob
diff options
context:
space:
mode:
Diffstat (limited to 'modules/glob')
-rw-r--r--modules/glob66
1 files changed, 23 insertions, 43 deletions
diff --git a/modules/glob b/modules/glob
index 94b3fd05ff..4bf2dd2eac 100644
--- a/modules/glob
+++ b/modules/glob
@@ -3,8 +3,6 @@ glob() function: Search for files and directories with paths matching a
pattern, with GNU extensions.
Files:
-lib/glob.in.h
-lib/glob-libc.h
lib/glob.c
lib/glob_internal.h
lib/glob_pattern_p.c
@@ -12,58 +10,40 @@ lib/globfree.c
m4/glob.m4
Depends-on:
+glob-h
c99
-extensions
largefile
-snippet/c++defs
-alloca [test $REPLACE_GLOB = 1]
-builtin-expect [test $REPLACE_GLOB = 1]
-closedir [test $REPLACE_GLOB = 1]
-d-type [test $REPLACE_GLOB = 1]
-flexmember [test $REPLACE_GLOB = 1]
-fnmatch [test $REPLACE_GLOB = 1]
-getlogin_r [test $REPLACE_GLOB = 1]
-libc-config [test $REPLACE_GLOB = 1]
-lstat [test $REPLACE_GLOB = 1]
-memchr [test $REPLACE_GLOB = 1]
-mempcpy [test $REPLACE_GLOB = 1]
-opendir [test $REPLACE_GLOB = 1]
-readdir [test $REPLACE_GLOB = 1]
-scratch_buffer [test $REPLACE_GLOB = 1]
-stdbool [test $REPLACE_GLOB = 1]
-stdint [test $REPLACE_GLOB = 1]
-strdup [test $REPLACE_GLOB = 1]
-sys_stat [test $REPLACE_GLOB = 1]
-unistd [test $REPLACE_GLOB = 1]
-malloc-posix [test $REPLACE_GLOB = 1]
+alloca [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+builtin-expect [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+closedir [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+d-type [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+flexmember [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+fnmatch [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+getlogin_r [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+memchr [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+mempcpy [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+opendir [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+readdir [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+scratch_buffer [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+stdbool [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+stdint [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+strdup [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+unistd [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+malloc-posix [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
configure.ac:
gl_GLOB
-if test $REPLACE_GLOB = 1; then
+if test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1; then
AC_LIBOBJ([glob])
- AC_LIBOBJ([glob_pattern_p])
AC_LIBOBJ([globfree])
gl_PREREQ_GLOB
fi
+if test $HAVE_GLOB_PATTERN_P = 0 || test $REPLACE_GLOB_PATTERN_P = 1; then
+ AC_LIBOBJ([glob_pattern_p])
+fi
+gl_GLOB_MODULE_INDICATOR([glob])
Makefile.am:
-BUILT_SOURCES += glob.h
-
-# We need the following in order to create <glob.h>.
-glob.h: glob.in.h $(top_builddir)/config.status $(CXXDEFS_H)
- $(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
- -e 's|@''REPLACE_GLOB''@|$(REPLACE_GLOB)|g' \
- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
- -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
- -e 's|@''NEXT_GLOB_H''@|$(NEXT_GLOB_H)|g' \
- -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
- < $(srcdir)/glob.in.h; \
- } > $@-t && \
- mv -f $@-t $@
-MOSTLYCLEANFILES += glob.h glob.h-t
Include:
<glob.h>