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
4 dnl popt w float/double needs.
5 AC_CHECK_HEADERS(float.h)
7 -AC_CHECK_HEADERS(glob.h)
9 dnl statfs portability fiddles.
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.
15 -#AC_ARG_WITH(glob, [ --with-glob use the internal GNU glob ],
17 -# [AC_CHECK_FUNCS(glob, rpm_cv_glob=no, rpm_cv_glob=yes)])
19 +AC_ARG_WITH(glob, [ --with-glob use the internal GNU glob ],
21 + [AC_CHECK_FUNCS(glob, rpm_cv_glob=no, rpm_cv_glob=yes)])
23 #if test $rpm_cv_glob = no ; then
24 # AC_CACHE_CHECK([for GNU extensions to glob], rpm_cv_glob_ext, [
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?])
38 dnl Auto-detect which python bindings should be built.
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
43 If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
44 Otherwise, `glob' returns zero. */
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)
53 /* Free storage allocated in PGLOB by a previous `glob' call. */
55 -globfree (glob_t *pglob)
56 +rpm_globfree (glob_t *pglob)
58 if (pglob->gl_pathv != NULL)