diff options
Diffstat (limited to 'source3/m4')
| -rw-r--r-- | source3/m4/aclocal.m4 | 17 | ||||
| -rw-r--r-- | source3/m4/check_path.m4 | 18 |
2 files changed, 8 insertions, 27 deletions
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4 index bdad6fa6e5..ae6a78f889 100644 --- a/source3/m4/aclocal.m4 +++ b/source3/m4/aclocal.m4 @@ -99,14 +99,14 @@ case "$withval" in build_lib=yes ;; *) - AC_MSG_RESULT(no) + AC_MSG_RESULT(yes) build_lib=no ;; esac ], [ # if unspecified, default is not to build -AC_MSG_RESULT(no) +AC_MSG_RESULT(yes) build_lib=no ] ) @@ -335,7 +335,7 @@ AC_DEFUN([AC_CHECK_FUNC_EXT], [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$1])) $3], [$4])dnl AS_VAR_POPDEF([ac_var])dnl -])# AC_CHECK_FUNC_EXT +])# AC_CHECK_FUNC # AH_CHECK_FUNC_EXT(FUNCNAME) # --------------------- @@ -697,13 +697,13 @@ AC_DEFUN([SMB_CHECK_DMAPI], fi if test x"$samba_dmapi_libs" = x"" ; then - AC_CHECK_LIB(dmapi, dm_get_eventlist, - [samba_dmapi_libs="-ldmapi"], []) + AC_CHECK_LIB(xdsm, dm_get_eventlist, + [samba_dmapi_libs="-lxdsm"], []) fi if test x"$samba_dmapi_libs" = x"" ; then - AC_CHECK_LIB(xdsm, dm_get_eventlist, - [samba_dmapi_libs="-lxdsm"], []) + AC_CHECK_LIB(dmapi, dm_get_eventlist, + [samba_dmapi_libs="-ldmapi"], []) fi @@ -831,9 +831,6 @@ AC_DEFUN([SMB_IF_RTSIGNAL_BUG], #include <fcntl.h> #include <signal.h> -#ifndef SIGRTMIN -#define SIGRTMIN NSIG -#endif /* from smbd/notify_kernel.c */ #ifndef RT_SIGNAL_NOTIFY #define RT_SIGNAL_NOTIFY (SIGRTMIN+2) diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4 index 3683802964..62bc2da5c6 100644 --- a/source3/m4/check_path.m4 +++ b/source3/m4/check_path.m4 @@ -265,7 +265,7 @@ AC_ARG_WITH(mandir, ################################################ # set locale directory location AC_ARG_WITH(localedir, -[AS_HELP_STRING([--with-localedir=DIR],[Where to put po files ($ac_default_prefix/share/locale)])], +[ --with-localedir=DIR Where to put po files ($ac_default_prefix/share/locale)], [ case "$withval" in yes|no) # @@ -278,22 +278,6 @@ AC_ARG_WITH(localedir, ;; esac]) -################################################# -# set codepage directory location -AC_ARG_WITH(codepagedir, -[AS_HELP_STRING([--with-codepagedir=DIR], [Where to put codepages ($ac_default_prefix/lib/samba)])], -[ case "$withval" in - yes|no) - # - # Just in case anybody calls it without argument - # - AC_MSG_WARN([--with-codepagedir called without argument - will use default]) - ;; - * ) - codepagedir="$withval" - ;; - esac]) - AC_SUBST(configdir) AC_SUBST(lockdir) |