diff options
| author | James Peach <jpeach@samba.org> | 2006-06-06 07:43:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:17:18 -0500 |
| commit | 777c22b300c573e94d4dc99452575b7af7676774 (patch) | |
| tree | 8563350bf4aea1a9a45509b4b40231c1e6a9eba4 /source3/configure.in | |
| parent | 656d8c30db52ecfeecff83909dbb9bafb37d123c (diff) | |
| download | samba-777c22b300c573e94d4dc99452575b7af7676774.tar.gz samba-777c22b300c573e94d4dc99452575b7af7676774.tar.bz2 samba-777c22b300c573e94d4dc99452575b7af7676774.zip | |
r16057: Coalesce the DMAPI configure tests into a single macro. Add
a more specific probe to try and eliminate old, incompatible
DMAPI implementations provided by IRIX 6.4 and AIX 4.3.
(This used to be commit aafd4db457ce8a60c628d54a3ace3b97c8885dca)
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/source3/configure.in b/source3/configure.in index 17ca07fc18..f8eba2349f 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -849,7 +849,6 @@ AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h s AC_CHECK_HEADERS(sys/sysmacros.h security/_pam_macros.h dlfcn.h) AC_CHECK_HEADERS(sys/syslog.h syslog.h) AC_CHECK_HEADERS(langinfo.h locale.h) -AC_CHECK_HEADERS(sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h) AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[ #if HAVE_RPC_RPC_H @@ -2473,29 +2472,7 @@ fi ################################################# # Check for DMAPI interfaces in libdm/libjfsdm/libxsdm -AC_CHECK_LIB(dm, dm_get_eventlist, - [samba_cv_HAVE_LIBDM=yes; samba_dmapi_libs="-ldm"], - [samba_cv_HAVE_LIBDM=no]) - -if test x"$samba_cv_HAVE_LIBDM" = x"yes" ; then - AC_DEFINE(HAVE_LIBDM, 1, [Whether dmapi libdm is available]) -fi - -AC_CHECK_LIB(jfsdm, dm_get_eventlist, - [samba_cv_HAVE_LIBJFSDM=yes; samba_dmapi_libs="-ljfsdm"], - [samba_cv_HAVE_LIBJFSDM=no]) - -if test x"$samba_cv_HAVE_LIBJFSDM" = x"yes" ; then - AC_DEFINE(HAVE_LIBJFSDM, 1, [Whether dmapi libjfsdm is available]) -fi - -AC_CHECK_LIB(xdsm, dm_get_eventlist, - [samba_cv_HAVE_LIBXDSM=yes; samba_dmapi_libs="-lxdsm"], - [samba_cv_HAVE_LIBXDSM=no]) - -if test x"$samba_cv_HAVE_LIBXDSM" = x"yes" ; then - AC_DEFINE(HAVE_LIBXDSM, 1, [Whether dmapi libxdsm is available]) -fi +SMB_CHECK_DMAPI([], AC_MSG_NOTICE(DMAPI support not present) ) AC_CACHE_CHECK([for kernel share modes],samba_cv_HAVE_KERNEL_SHARE_MODES,[ AC_TRY_RUN([ |