]>
Commit | Line | Data |
---|---|---|
1cb01048 PS |
1 | --- rpm-4.4.1/configure.ac.orig 2005-07-15 20:06:31.000000000 +0000 |
2 | +++ rpm-4.4.1/configure.ac 2005-07-15 20:22:45.000000000 +0000 | |
3 | @@ -619,7 +619,6 @@ | |
4 | dnl popt w float/double needs. | |
5 | AC_CHECK_HEADERS(float.h) | |
6 | ||
7 | -AC_CHECK_HEADERS(glob.h) | |
8 | ||
9 | dnl statfs portability fiddles. | |
10 | dnl | |
11 | @@ -843,10 +842,10 @@ | |
12 | dnl XXX Glob is "fixed" in glibc-2.3.3-61, but the cost is that | |
13 | dnl dangling symlinks are no longer globbed. Always use the internal glob. | |
14 | dnl | |
15 | -#AC_ARG_WITH(glob, [ --with-glob use the internal GNU glob ], | |
16 | -# [rpm_cv_glob=yes], | |
17 | -# [AC_CHECK_FUNCS(glob, rpm_cv_glob=no, rpm_cv_glob=yes)]) | |
18 | -# | |
19 | +AC_ARG_WITH(glob, [ --with-glob use the internal GNU glob ], | |
20 | + [rpm_cv_glob=yes], | |
21 | + [AC_CHECK_FUNCS(glob, rpm_cv_glob=no, rpm_cv_glob=yes)]) | |
22 | + | |
23 | #if test $rpm_cv_glob = no ; then | |
24 | # AC_CACHE_CHECK([for GNU extensions to glob], rpm_cv_glob_ext, [ | |
25 | # rm -f t | |
26 | @@ -870,11 +869,11 @@ | |
27 | # fi | |
28 | #fi | |
29 | # | |
30 | -#if test "$rpm_cv_glob" = yes; then | |
31 | +if test "$rpm_cv_glob" = yes; then | |
32 | AC_DEFINE(USE_GNU_GLOB, 1, [Use the included glob.c?]) | |
33 | AC_LIBOBJ(glob) | |
34 | AC_LIBOBJ(fnmatch) | |
35 | -#fi | |
36 | +fi | |
37 | dnl | |
38 | dnl Auto-detect which python bindings should be built. | |
39 | dnl | |
40 | --- rpm-4.4.1/misc/glob.c.orig 2005-01-28 06:19:54.000000000 +0000 | |
41 | +++ rpm-4.4.1/misc/glob.c 2005-07-15 20:35:31.000000000 +0000 | |
42 | @@ -130,7 +130,7 @@ | |
43 | If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned. | |
44 | Otherwise, `glob' returns zero. */ | |
45 | int | |
46 | -glob (const char *pattern, int flags, | |
47 | +rpm_glob (const char *pattern, int flags, | |
48 | int (*errfunc) __P ((const char *, int)), glob_t *pglob) | |
49 | { | |
50 | const char *filename; | |
51 | @@ -831,7 +831,7 @@ | |
52 | ||
53 | /* Free storage allocated in PGLOB by a previous `glob' call. */ | |
54 | void | |
55 | -globfree (glob_t *pglob) | |
56 | +rpm_globfree (glob_t *pglob) | |
57 | { | |
58 | if (pglob->gl_pathv != NULL) | |
59 | { |