diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-10 15:05:41 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-10 15:05:41 +0200 |
| commit | 01fc095d6e2fa1b883b3f429085b4aca4254f105 (patch) | |
| tree | 51ca606a357c9c626dbd8067ec89fa9263445e1f /source4/build | |
| parent | ffbea676771bae16be547529eb1136c61d78203f (diff) | |
| parent | 7206c5fc4a0fc9d310fef199c6ff9d0300bc956b (diff) | |
| download | samba-01fc095d6e2fa1b883b3f429085b4aca4254f105.tar.gz samba-01fc095d6e2fa1b883b3f429085b4aca4254f105.tar.bz2 samba-01fc095d6e2fa1b883b3f429085b4aca4254f105.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
(This used to be commit 74e1dd28f2f669bc196dc16b68c8b175bf835721)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/m4/check_cc.m4 | 6 | ||||
| -rw-r--r-- | source4/build/smb_build/summary.pm | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4 index 569be38721..51531ca776 100644 --- a/source4/build/m4/check_cc.m4 +++ b/source4/build/m4/check_cc.m4 @@ -30,7 +30,7 @@ fi # check if the compiler can handle negative enum values # and don't truncate the values to INT_MAX # a runtime test is needed here -AC_CACHE_CHECK([that the C compiler understands negative enum values],SMB_BUILD_CC_NEGATIVE_ENUM_VALUES, [ +AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_CC_NEGATIVE_ENUM_VALUES, [ AC_TRY_RUN( [ #include <stdio.h> @@ -45,8 +45,8 @@ AC_CACHE_CHECK([that the C compiler understands negative enum values],SMB_BUILD_ return 0; } ], - SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes,SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=no)]) -if test x"$SMB_BUILD_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then + samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv_CC_NEGATIVE_ENUM_VALUES=no)]) +if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then AC_DEFINE(USE_UINT_ENUMS, 1, [Whether the compiler has uint enum support]) fi diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm index a6557fb1fe..4ea1ad525e 100644 --- a/source4/build/smb_build/summary.pm +++ b/source4/build/smb_build/summary.pm @@ -53,9 +53,6 @@ sub show($$) showitem($output, "using libblkid", ["BLKID"]); showitem($output, "using iconv", ["ICONV"]); showitem($output, "using pam", ["PAM"]); - if (enabled($config->{developer})) { - showitem($output, "using VDE", ["VDEPLUG"]); - } showitem($output, "python bindings", ["LIBPYTHON"]); showisexternal($output, "popt", "LIBPOPT"); showisexternal($output, "talloc", "LIBTALLOC"); |