diff options
| -rw-r--r-- | source4/build/smb_build/input.pm | 6 | ||||
| -rw-r--r-- | source4/lib/popt/config.m4 | 1 | ||||
| -rw-r--r-- | source4/lib/replace/readline.m4 | 23 | ||||
| -rw-r--r-- | source4/ntvfs/posix/config.m4 | 2 |
4 files changed, 26 insertions, 6 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index c0139cb7df..73157758c0 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -175,7 +175,11 @@ sub check($$$$$) } unless(defined($part->{ENABLE})) { - $part->{ENABLE} = "YES"; + if ($part->{TYPE} eq "EXT_LIB") { + $part->{ENABLE} = "NO"; + } else { + $part->{ENABLE} = "YES"; + } } } diff --git a/source4/lib/popt/config.m4 b/source4/lib/popt/config.m4 index 0eca06ceed..41d49993e0 100644 --- a/source4/lib/popt/config.m4 +++ b/source4/lib/popt/config.m4 @@ -35,6 +35,7 @@ else [], [EXT_LIB_POPT]) SMB_EXT_LIB(POPT, [${TMP_LIBPOPT_LIBS}]) + SMB_EXT_LIB_ENABLE(POPT,YES) AC_MSG_RESULT(no) fi diff --git a/source4/lib/replace/readline.m4 b/source4/lib/replace/readline.m4 index 0d1aa60d17..8248a1d900 100644 --- a/source4/lib/replace/readline.m4 +++ b/source4/lib/replace/readline.m4 @@ -2,6 +2,7 @@ # Readline included by default unless explicitly asked not to test "${with_readline+set}" != "set" && with_readline=yes +EXTERNAL_READLINE=no # test for where we get readline() from AC_MSG_CHECKING(whether to use readline) AC_ARG_WITH(readline, @@ -19,7 +20,7 @@ AC_ARG_WITH(readline, done AC_CHECK_LIB(readline, rl_callback_handler_install, [TERMLIBS="-lreadline $TERMLIBS" - AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline]) + EXTERNAL_READLINE=yes break], [TERMLIBS=], $TERMLIBS)]) ;; no) @@ -50,7 +51,7 @@ AC_ARG_WITH(readline, LDFLAGS="-L$with_readline/lib $LDFLAGS" CPPFLAGS="-I$with_readline/include $CPPFLAGS" TERMLIBS="-lreadline $TERMLIBS" - AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline]) + EXTERNAL_READLINE=yes break], [TERMLIBS= CPPFLAGS=$_cppflags], $TERMLIBS)]) ;; @@ -67,6 +68,18 @@ AC_CHECK_LIB(readline, rl_completion_matches, [], [$TERMLIBS]) -SMB_EXT_LIB(READLINE, [${TERMLIBS}]) - -SMB_SUBSYSTEM(LIBREADLINE, [lib/replace/readline.o], [EXT_LIB_READLINE]) +AC_MSG_CHECKING(whether to use extern readline) +if test x"$EXTERNAL_READLINE" = x"yes"; then + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline]) + SMB_SUBSYSTEM(LIBREADLINE, + [lib/replace/readline.o], + [EXT_LIB_READLINE]) + SMB_EXT_LIB(READLINE, [${TERMLIBS}]) + SMB_EXT_LIB_ENABLE(READLINE,YES) +else + SMB_SUBSYSTEM(LIBREADLINE, + [lib/replace/readline.o], + []) + AC_MSG_RESULT(no) +fi diff --git a/source4/ntvfs/posix/config.m4 b/source4/ntvfs/posix/config.m4 index 7cc4f8e3df..37c2b57cf1 100644 --- a/source4/ntvfs/posix/config.m4 +++ b/source4/ntvfs/posix/config.m4 @@ -30,6 +30,7 @@ AC_CHECK_FUNC_EXT(flistxattr, $XATTR_LIBS) SMB_EXT_LIB(XATTR,[${XATTR_LIBS}],[${XATTR_CFLAGS}],[${XATTR_CPPFLAGS}],[${XATTR_LDFLAGS}]) if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then AC_DEFINE(HAVE_XATTR_SUPPORT,1,[Whether we have xattr support]) + SMB_EXT_LIB_ENABLE(XATTR,YES) fi AC_CHECK_HEADERS(blkid/blkid.h) @@ -38,4 +39,5 @@ AC_CHECK_FUNC_EXT(blkid_get_cache, $BLKID_LIBS) SMB_EXT_LIB(BLKID,[${BLKID_LIBS}],[${BLKID_CFLAGS}],[${BLKID_CPPFLAGS}],[${BLKID_LDFLAGS}]) if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then AC_DEFINE(HAVE_LIBBLKID,1,[Whether we have blkid support (e2fsprogs)]) + SMB_EXT_LIB_ENABLE(BLKID,YES) fi |