X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fnetatalk.m4;h=ce587f081bb271e8e011b81000ee0ac0f8899640;hb=7fa82c43ded42cba943b7298acd03ac1bbadb37d;hp=7c5210342b4fc934c4f76322f4f7ac08c7802657;hpb=f22164785e624912a0e13777434a2b56d545b521;p=netatalk.git diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 index 7c521034..ce587f08 100644 --- a/macros/netatalk.m4 +++ b/macros/netatalk.m4 @@ -5,10 +5,8 @@ AC_DEFUN([AC_NETATALK_LIBEVENT], [ AC_MSG_CHECKING([whether to disable bundled libevent (define CPPFLAGS and LDFLAGS otherwise appropiately to pick up installed version)]) AC_ARG_ENABLE( bundled-libevent, - [AC_HELP_STRING( - [--disable-bundled-libevent], - [whether the bundled version of libevent shall not be used (define CPPFLAGS and LDFLAGS otherwise appropiately to pick up installed version)] - )], + [AS_HELP_STRING([--disable-bundled-libevent],[whether the bundled version of libevent shall not be used (define CPPFLAGS and LDFLAGS otherwise appropiately to pick up installed version) + ])], use_bundled_libevent=$enableval, use_bundled_libevent=yes ) @@ -443,13 +441,11 @@ if test x"$this_os" = "xsolaris"; then fi AC_CACHE_CHECK([for timeout_id_t],netatalk_cv_HAVE_TIMEOUT_ID_T,[ - AC_TRY_LINK([\ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[\ #include -#include ], -[\ +#include ]], [[\ timeout_id_t dummy; -], -netatalk_cv_HAVE_TIMEOUT_ID_T=yes,netatalk_cv_HAVE_TIMEOUT_ID_T=no,netatalk_cv_HAVE_TIMEOUT_ID_T=cross)]) +]])],[netatalk_cv_HAVE_TIMEOUT_ID_T=yes],[netatalk_cv_HAVE_TIMEOUT_ID_T=no])]) AC_DEFINE(HAVE_TIMEOUT_ID_T, test x"$netatalk_cv_HAVE_TIMEOUT_ID" = x"yes", [define for timeout_id_t]) fi @@ -575,15 +571,20 @@ AC_ARG_WITH(ldap, ) AC_MSG_RESULT($netatalk_cv_ldap) -save_CFLAGS=$CFLAGS -save_LDLFLAGS=$LDLFLAGS +save_CFLAGS="$CFLAGS" +save_LDFLAGS="$LDFLAGS" +save_LIBS="$LIBS" CFLAGS="" -LDLFLAGS="" +LDFLAGS="" +LIBS="" +LDAP_CFLAGS="" +LDAP_LDFLAGS="" +LDAP_LIBS="" if test x"$netatalk_cv_ldap" != x"no" ; then if test x"$netatalk_cv_ldap" != x"yes" -a x"$netatalk_cv_ldap" != x"auto"; then - CFLAGS=-I$netatalk_cv_ldap/include - LDLFLAGS=-L$netatalk_cv_ldap/lib + CFLAGS="-I$netatalk_cv_ldap/include" + LDFLAGS="-L$netatalk_cv_ldap/lib" fi AC_CHECK_HEADER([ldap.h], netatalk_cv_ldap=yes, [ if test x"$netatalk_cv_ldap" = x"yes" ; then @@ -600,18 +601,18 @@ if test x"$netatalk_cv_ldap" != x"no" ; then fi if test x"$netatalk_cv_ldap" = x"yes"; then - echo "********************************************************************" - LDAP_CFLAGS=$CFLAGS - LDAP_LDLFLAGS=$LDLFLAGS - LDAP_LIBS=-lldap + LDAP_CFLAGS="$CFLAGS" + LDAP_LDFLAGS="$LDFLAGS" + LDAP_LIBS="-lldap" AC_DEFINE(HAVE_LDAP,1,[Whether LDAP is available]) - AC_SUBST(LDAP_CFLAGS) - AC_SUBST(LDAP_LDLFLAGS) - AC_SUBST(LDAP_LIBS) fi -CFLAGS=$save_CFLAGS -LDLFLAGS=$save_LDLFLAGS +AC_SUBST(LDAP_CFLAGS) +AC_SUBST(LDAP_LDFLAGS) +AC_SUBST(LDAP_LIBS) +CFLAGS="$save_CFLAGS" +LDLFLAGS="$save_LDLFLAGS" +LIBS="$save_LIBS" ]) dnl Check for ACL support @@ -681,17 +682,15 @@ if test x"$with_acl_support" = x"yes" ; then AC_CACHE_CHECK([for POSIX ACL support],netatalk_cv_HAVE_POSIX_ACLS,[ acl_LIBS=$LIBS LIBS="$LIBS $ACL_LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include - ],[ + ]], [[ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry(acl, entry_id, entry_p); - ], - [netatalk_cv_HAVE_POSIX_ACLS=yes], - [netatalk_cv_HAVE_POSIX_ACLS=no + ]])],[netatalk_cv_HAVE_POSIX_ACLS=yes],[netatalk_cv_HAVE_POSIX_ACLS=no with_acl_support=no]) LIBS=$acl_LIBS ]) @@ -701,16 +700,14 @@ if test x"$with_acl_support" = x"yes" ; then AC_CACHE_CHECK([for acl_get_perm_np],netatalk_cv_HAVE_ACL_GET_PERM_NP,[ acl_LIBS=$LIBS LIBS="$LIBS $ACL_LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include - ],[ + ]], [[ acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np(permset_d, perm); - ], - [netatalk_cv_HAVE_ACL_GET_PERM_NP=yes], - [netatalk_cv_HAVE_ACL_GET_PERM_NP=no]) + ]])],[netatalk_cv_HAVE_ACL_GET_PERM_NP=yes],[netatalk_cv_HAVE_ACL_GET_PERM_NP=no]) LIBS=$acl_LIBS ]) if test x"$netatalk_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then @@ -823,18 +820,16 @@ if test x"$ac_cv_func_getxattr" = x"yes" ; then AC_CACHE_CHECK([whether xattr interface takes additional options], smb_attr_cv_xattr_add_opt, [ old_LIBS=$LIBS LIBS="$LIBS $ACL_LIBS" - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #if HAVE_ATTR_XATTR_H #include #elif HAVE_SYS_XATTR_H #include #endif - ],[ + ]], [[ getxattr(0, 0, 0, 0, 0, 0); - ], - [smb_attr_cv_xattr_add_opt=yes], - [smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS]) + ]])],[smb_attr_cv_xattr_add_opt=yes],[smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS]) ]) if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then AC_DEFINE(XATTR_ADD_OPT, 1, [xattr functions have additional options]) @@ -945,7 +940,7 @@ dnl --------------------- Check if realpath() takes NULL AC_DEFUN([AC_NETATALK_REALPATH], [ AC_CACHE_CHECK([if the realpath function allows a NULL argument], neta_cv_REALPATH_TAKES_NULL, [ - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include #include @@ -959,11 +954,8 @@ AC_CACHE_CHECK([if the realpath function allows a NULL argument], signal(SIGSEGV, exit_on_core); newpath = realpath("/tmp", NULL); exit((newpath != NULL) ? 0 : 1); - }], - neta_cv_REALPATH_TAKES_NULL=yes, - neta_cv_REALPATH_TAKES_NULL=no, - neta_cv_REALPATH_TAKES_NULL=cross - ) + }]])],[neta_cv_REALPATH_TAKES_NULL=yes],[neta_cv_REALPATH_TAKES_NULL=no],[neta_cv_REALPATH_TAKES_NULL=cross + ]) ] )