diff options
| -rw-r--r-- | lib/util/fault.m4 | 2 | ||||
| -rw-r--r-- | source3/lib/display_sec.c | 6 | ||||
| -rw-r--r-- | source4/auth/config.m4 | 2 | ||||
| -rw-r--r-- | source4/build/m4/public.m4 | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/lib/util/fault.m4 b/lib/util/fault.m4 index bac553a158..c22976998e 100644 --- a/lib/util/fault.m4 +++ b/lib/util/fault.m4 @@ -9,6 +9,8 @@ if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x EXECINFO_CPPFLAGS="$CPPFLAGS" EXECINFO_LDFLAGS="$LDFLAGS" LIB_REMOVE_USR_LIB(EXECINFO_LDFLAGS) + CFLAGS_REMOVE_USR_INCLUDE(EXECINFO_CFLAGS) + CFLAGS_REMOVE_USR_INCLUDE(EXECINFO_CPPFLAGS) else SMB_ENABLE(EXECINFO,NO) fi diff --git a/source3/lib/display_sec.c b/source3/lib/display_sec.c index fe1ae77edd..6edbb27f3a 100644 --- a/source3/lib/display_sec.c +++ b/source3/lib/display_sec.c @@ -24,7 +24,7 @@ convert a security permissions into a string ****************************************************************************/ -char *get_sec_mask_str(TALLOC_CTX *ctx, uint32 type) +char *get_sec_mask_str(TALLOC_CTX *ctx, uint32_t type) { char *typestr = talloc_strdup(ctx, ""); @@ -122,7 +122,7 @@ void display_sec_access(uint32_t *info) { char *mask_str = get_sec_mask_str(NULL, *info); printf("\t\tPermissions: 0x%x: %s\n", *info, mask_str ? mask_str : ""); - TALLOC_FREE(mask_str); + talloc_free(mask_str); } /**************************************************************************** @@ -238,7 +238,7 @@ void display_sec_acl(SEC_ACL *sec_acl) } } -void display_acl_type(uint16 type) +void display_acl_type(uint16_t type) { fstring typestr=""; diff --git a/source4/auth/config.m4 b/source4/auth/config.m4 index fb9ee58c60..9735b17cac 100644 --- a/source4/auth/config.m4 +++ b/source4/auth/config.m4 @@ -28,6 +28,8 @@ if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_cli SASL_CPPFLAGS="$CPPFLAGS" SASL_LDFLAGS="$LDFLAGS" LIB_REMOVE_USR_LIB(SASL_LDFLAGS) + CFLAGS_REMOVE_USR_INCLUDE(SASL_CPPFLAGS) + CFLAGS_REMOVE_USR_INCLUDE(SASL_CFLAGS) else SMB_ENABLE(cyrus_sasl,NO) fi diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index bd98a400be..2bf63f0ca6 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -102,10 +102,12 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], ac_cv_$1_libs_only_other="`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`" LIB_REMOVE_USR_LIB(ac_cv_$1_libs_only_other) + ac_cv_$1_includedir_only="`$PKG_CONFIG --cflags-only-I '$2'`" + CFLAGS_REMOVE_USR_INCLUDE(ac_cv_$1_includedir_only) SMB_EXT_LIB($1, [`$PKG_CONFIG --libs-only-l '$2'`], [`$PKG_CONFIG --cflags-only-other '$2'`], - [`$PKG_CONFIG --cflags-only-I '$2'`], + [$ac_cv_$1_includedir_only], [$ac_cv_$1_libs_only_other]) ac_cv_$1_found=yes |