From 7fa82c43ded42cba943b7298acd03ac1bbadb37d Mon Sep 17 00:00:00 2001 From: Frank Lahm Date: Mon, 23 Apr 2012 12:58:32 +0200 Subject: [PATCH] Update macros --- configure.ac | 23 ++++++++++++----------- macros/netatalk.m4 | 47 +++++++++++++++++----------------------------- 2 files changed, 29 insertions(+), 41 deletions(-) diff --git a/configure.ac b/configure.ac index 30aa8cf4..4d3142e0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,13 +1,14 @@ dnl configure.ac for netatalk -AC_INIT(etc/afpd/main.c) +AC_INIT +AC_CONFIG_SRCDIR([etc/afpd/main.c]) NETATALK_VERSION=`cat $srcdir/VERSION` AC_SUBST(NETATALK_VERSION) -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(netatalk, ${NETATALK_VERSION}) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE([enable]) dnl Checks for programs. @@ -17,8 +18,7 @@ AC_PROG_CC_C99 AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL +LT_INIT([dlopen]) AC_PROG_PERL AC_PROG_GREP AC_PROG_PS @@ -56,9 +56,9 @@ AC_SYS_LARGEFILE([], AC_MSG_ERROR([AFP 3.x support requires Large File Support.] dnl -------------------------------------------------------------------------- dnl check if dlsym needs to add an underscore, uses libtool macros dnl -------------------------------------------------------------------------- -AC_LTDL_DLLIB +LT_LIB_DLLOAD AC_CHECK_FUNCS(dlopen dlsym dlclose) -AC_LTDL_DLSYM_USCORE +LT_FUNC_DLSYM_USCORE if test x"$libltdl_cv_need_uscore" = xyes; then AC_DEFINE(DLSYM_PREPEND_UNDERSCORE, 1, [BSD compatibility macro]) fi @@ -217,7 +217,7 @@ dnl Enable silent Automake rules if present m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) dnl --------------------- generate files -AC_OUTPUT([Makefile +AC_CONFIG_FILES([Makefile bin/Makefile bin/ad/Makefile bin/afppasswd/Makefile @@ -271,9 +271,10 @@ AC_OUTPUT([Makefile man/man8/Makefile test/Makefile test/afpd/Makefile - ], - [chmod a+x distrib/config/netatalk-config contrib/shell_utils/apple_*] -) + ]) +AC_CONFIG_COMMANDS([default],[chmod a+x distrib/config/netatalk-config contrib/shell_utils/apple_* +],[]) +AC_OUTPUT AC_NETATALK_LIBS_SUMMARY AC_NETATALK_CONFIG_SUMMARY diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 index 7da9e64b..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 @@ -686,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 ]) @@ -706,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 @@ -828,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]) @@ -950,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 @@ -964,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 + ]) ] ) -- 2.39.2