diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-09-27 14:47:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:14:51 -0500 |
| commit | 3ae0baefa18dac1d94c7fb0a92816e195c07f2b0 (patch) | |
| tree | 9ffa0901b86cf0f28ac2b66604291d4cebe4c866 /source3 | |
| parent | 94c9d528721a25c4faad08a188d86e05d939e559 (diff) | |
| download | samba-3ae0baefa18dac1d94c7fb0a92816e195c07f2b0.tar.gz samba-3ae0baefa18dac1d94c7fb0a92816e195c07f2b0.tar.bz2 samba-3ae0baefa18dac1d94c7fb0a92816e195c07f2b0.zip | |
r18961: merge from samba4:
fix caching of some configure tests AC_CACHE_CHECK()
*needs* '_cv_' in the shell var to do caching...
metze
(This used to be commit c460f28b68b75342bfabe3b396dd06e07a668ec4)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/replace/dlfcn.m4 | 6 | ||||
| -rw-r--r-- | source3/lib/replace/repdir.m4 | 34 |
2 files changed, 20 insertions, 20 deletions
diff --git a/source3/lib/replace/dlfcn.m4 b/source3/lib/replace/dlfcn.m4 index 0f099f4bac..c9d31592e0 100644 --- a/source3/lib/replace/dlfcn.m4 +++ b/source3/lib/replace/dlfcn.m4 @@ -6,10 +6,10 @@ AC_SEARCH_LIBS(dlopen, dl) AC_CHECK_HEADERS(dlfcn.h) -libreplace_dlfcn=no -AC_CHECK_FUNCS([dlopen dlsym dlerror dlclose],[],[libreplace_dlfcn=yes]) +libreplace_cv_dlfcn=no +AC_CHECK_FUNCS([dlopen dlsym dlerror dlclose],[],[libreplace_cv_dlfcn=yes]) -if test x"${libreplace_dlfcn}" = x"yes";then +if test x"${libreplace_cv_dlfcn}" = x"yes";then LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o" fi diff --git a/source3/lib/replace/repdir.m4 b/source3/lib/replace/repdir.m4 index 93bf4ec911..81025d618a 100644 --- a/source3/lib/replace/repdir.m4 +++ b/source3/lib/replace/repdir.m4 @@ -1,38 +1,38 @@ -AC_CACHE_CHECK([for broken readdir],libreplace_READDIR_NEEDED,[ +AC_CACHE_CHECK([for broken readdir],libreplace_cv_READDIR_NEEDED,[ AC_TRY_RUN([ #define test_readdir_os2_delete main #include "$libreplacedir/test/os2_delete.c"], - [libreplace_READDIR_NEEDED=no], - [libreplace_READDIR_NEEDED=yes], - [libreplace_READDIR_NEEDED="assuming not"]) + [libreplace_cv_READDIR_NEEDED=no], + [libreplace_cv_READDIR_NEEDED=yes], + [libreplace_cv_READDIR_NEEDED="assuming not"]) ]) # # try to replace with getdents() if needed # -if test x"$libreplace_READDIR_NEEDED" = x"yes"; then +if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then AC_CHECK_FUNCS(getdents) -AC_CACHE_CHECK([for replacing readdir using getdents()],libreplace_READDIR_GETDENTS,[ +AC_CACHE_CHECK([for replacing readdir using getdents()],libreplace_cv_READDIR_GETDENTS,[ AC_TRY_RUN([ #define _LIBREPLACE_REPLACE_H #include "$libreplacedir/repdir_getdents.c" #define test_readdir_os2_delete main #include "$libreplacedir/test/os2_delete.c"], - [libreplace_READDIR_GETDENTS=yes], - [libreplace_READDIR_GETDENTS=no]) + [libreplace_cv_READDIR_GETDENTS=yes], + [libreplace_cv_READDIR_GETDENTS=no]) ]) fi -if test x"$libreplace_READDIR_GETDENTS" = x"yes"; then +if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then AC_DEFINE(REPLACE_READDIR,1,[replace readdir]) AC_DEFINE(REPLACE_READDIR_GETDENTS,1,[replace readdir using getdents()]) LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdents.o" - libreplace_READDIR_NEEDED=no + libreplace_cv_READDIR_NEEDED=no fi # # try to replace with getdirentries() if needed # -if test x"$libreplace_READDIR_NEEDED" = x"yes"; then +if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then AC_CHECK_FUNCS(getdirentries) AC_VERIFY_C_PROTOTYPE([long telldir(const DIR *dir)], [ @@ -51,25 +51,25 @@ AC_VERIFY_C_PROTOTYPE([int seekdir(DIR *dir, long ofs)], ],[],[ #include <dirent.h> ]) -AC_CACHE_CHECK([for replacing readdir using getdirentries()],libreplace_READDIR_GETDIRENTRIES,[ +AC_CACHE_CHECK([for replacing readdir using getdirentries()],libreplace_cv_READDIR_GETDIRENTRIES,[ AC_TRY_RUN([ #define _LIBREPLACE_REPLACE_H #include "$libreplacedir/repdir_getdirentries.c" #define test_readdir_os2_delete main #include "$libreplacedir/test/os2_delete.c"], - [libreplace_READDIR_GETDIRENTRIES=yes], - [libreplace_READDIR_GETDIRENTRIES=no]) + [libreplace_cv_READDIR_GETDIRENTRIES=yes], + [libreplace_cv_READDIR_GETDIRENTRIES=no]) ]) fi -if test x"$libreplace_READDIR_GETDIRENTRIES" = x"yes"; then +if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = x"yes"; then AC_DEFINE(REPLACE_READDIR,1,[replace readdir]) AC_DEFINE(REPLACE_READDIR_GETDIRENTRIES,1,[replace readdir using getdirentries()]) LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdirentries.o" - libreplace_READDIR_NEEDED=no + libreplace_cv_READDIR_NEEDED=no fi AC_MSG_CHECKING([a usable readdir()]) -if test x"$libreplace_READDIR_NEEDED" = x"yes"; then +if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then AC_MSG_RESULT(no) AC_MSG_WARN([the provided readdir() is broken]) else |