Author: metze Date: 2006-03-12 13:36:08 +0000 (Sun, 12 Mar 2006) New Revision: 14240
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14240 Log: fix summary output (step 2) we now need to explicit enable external libraries in *.m4 files again... metze Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm branches/SAMBA_4_0/source/lib/popt/config.m4 branches/SAMBA_4_0/source/lib/replace/readline.m4 branches/SAMBA_4_0/source/ntvfs/posix/config.m4 Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-03-12 13:14:21 UTC (rev 14239) +++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-03-12 13:36:08 UTC (rev 14240) @@ -175,7 +175,11 @@ } unless(defined($part->{ENABLE})) { - $part->{ENABLE} = "YES"; + if ($part->{TYPE} eq "EXT_LIB") { + $part->{ENABLE} = "NO"; + } else { + $part->{ENABLE} = "YES"; + } } } Modified: branches/SAMBA_4_0/source/lib/popt/config.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/popt/config.m4 2006-03-12 13:14:21 UTC (rev 14239) +++ branches/SAMBA_4_0/source/lib/popt/config.m4 2006-03-12 13:36:08 UTC (rev 14240) @@ -35,6 +35,7 @@ [], [EXT_LIB_POPT]) SMB_EXT_LIB(POPT, [${TMP_LIBPOPT_LIBS}]) + SMB_EXT_LIB_ENABLE(POPT,YES) AC_MSG_RESULT(no) fi Modified: branches/SAMBA_4_0/source/lib/replace/readline.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/replace/readline.m4 2006-03-12 13:14:21 UTC (rev 14239) +++ branches/SAMBA_4_0/source/lib/replace/readline.m4 2006-03-12 13:36:08 UTC (rev 14240) @@ -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 @@ 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 @@ 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 @@ [], [$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 Modified: branches/SAMBA_4_0/source/ntvfs/posix/config.m4 =================================================================== --- branches/SAMBA_4_0/source/ntvfs/posix/config.m4 2006-03-12 13:14:21 UTC (rev 14239) +++ branches/SAMBA_4_0/source/ntvfs/posix/config.m4 2006-03-12 13:36:08 UTC (rev 14240) @@ -30,6 +30,7 @@ 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 @@ 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
