diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-09-13 09:47:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:31 -0500 |
| commit | 0584c108dbf6072d28b97ca3dcd70ef25ff4359c (patch) | |
| tree | 8b1cbae13edaa2a17ac4e4401db447ff57219037 /source4/lib/replace/repdir | |
| parent | c447b8a199cc61221b99f4582d714bac3774ae1b (diff) | |
| download | samba-0584c108dbf6072d28b97ca3dcd70ef25ff4359c.tar.gz samba-0584c108dbf6072d28b97ca3dcd70ef25ff4359c.tar.bz2 samba-0584c108dbf6072d28b97ca3dcd70ef25ff4359c.zip | |
r18450: - autogenerate the OBJ_FILES for LIBREPLACE
- remove samba specific stuff from libreplace
- and include the readdir replacement stuff in the standalone builds
metze
(This used to be commit 3cac61152ef9a32313d7f7e5d38651f03a31f251)
Diffstat (limited to 'source4/lib/replace/repdir')
| -rw-r--r-- | source4/lib/replace/repdir/config.m4 | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/source4/lib/replace/repdir/config.m4 b/source4/lib/replace/repdir/config.m4 index cc91f2a97a..eda8f42ba9 100644 --- a/source4/lib/replace/repdir/config.m4 +++ b/source4/lib/replace/repdir/config.m4 @@ -1,25 +1,30 @@ -AC_CACHE_CHECK([for broken readdir],samba_cv_HAVE_BROKEN_READDIR,[ +AC_CACHE_CHECK([for broken readdir],libreplace_READDIR_NEEDED,[ AC_TRY_RUN([ #define test_readdir_os2_delete main +#error #include "$libreplacedir/test/os2_delete.c"], - [samba_cv_HAVE_BROKEN_READDIR=no], - [samba_cv_HAVE_BROKEN_READDIR=yes], - [samba_cv_HAVE_BROKEN_READDIR="assuming not"]) + [libreplace_READDIR_NEEDED=no], + [libreplace_READDIR_NEEDED=yes], + [libreplace_READDIR_NEEDED="assuming not"]) ]) -if test x"$samba_cv_HAVE_BROKEN_READDIR" = x"yes"; then -AC_CACHE_CHECK([for replacing readdir],samba_cv_REPLACE_READDIR,[ +# +# try to replace with getdents() if needed +# +if test x"$libreplace_READDIR_NEEDED" = x"yes"; then +AC_CACHE_CHECK([for replacing readdir using getdents()],libreplace_READDIR_GETDENTS,[ AC_TRY_RUN([ +#include "confdefs.h" #include "$libreplacedir/repdir/repdir.c" #define test_readdir_os2_delete main #include "$libreplacedir/test/os2_delete.c"], - [samba_cv_REPLACE_READDIR=yes], - [samba_cv_REPLACE_READDIR=no]) + [libreplace_READDIR_GETDENTS=yes], + [libreplace_READDIR_GETDENTS=no]) ]) fi - -SMB_ENABLE(REPLACE_READDIR, NO) -if test x"$samba_cv_REPLACE_READDIR" = x"yes"; then +if test x"$libreplace_READDIR_GETDENTS" = x"yes"; then AC_DEFINE(REPLACE_READDIR,1,[replace readdir]) - SMB_ENABLE(REPLACE_READDIR, YES) + AC_DEFINE(REPLACE_READDIR_GETDENTS,1,[replace readdir using getdents()]) + LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir/repdir.o" + libreplace_READDIR_NEEDED=no fi |