diff options
Diffstat (limited to 'liblock/configure.ac')
| -rw-r--r-- | liblock/configure.ac | 76 |
1 files changed, 36 insertions, 40 deletions
diff --git a/liblock/configure.ac b/liblock/configure.ac index 5e1745c..41a4551 100644 --- a/liblock/configure.ac +++ b/liblock/configure.ac @@ -2,8 +2,8 @@ dnl dnl Copyright 1998 - 2004 Double Precision, Inc. See COPYING for dnl distribution information. -AC_PREREQ(2.59) -AC_INIT(liblock, 0.60, courier-users@lists.sourceforge.net) +AC_PREREQ([2.71]) +AC_INIT([liblock],[0.60],[courier-users@lists.sourceforge.net]) >confdefs.h # Kill PACKAGE_ macros @@ -17,16 +17,15 @@ CFLAGS="-I.. -I${srcdir}/.. $CFLAGS" dnl Checks for programs. AC_PROG_AWK AC_PROG_CC -AC_PROG_CC_C99 AC_PROG_INSTALL AC_PROG_LN_S -AC_PROG_LIBTOOL +LT_INIT dnl Checks for libraries. dnl Checks for header files. AC_CHECK_HEADERS(errno.h fcntl.h sys/fcntl.h sys/ioctl.h sys/file.h unistd.h sysexits.h) -AC_HEADER_STDC + AC_HEADER_SYS_WAIT dnl Checks for typedefs, structures, and compiler characteristics. @@ -34,19 +33,18 @@ dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_OFF_T AC_TYPE_PID_T -AC_TYPE_SIGNAL AC_SYS_LARGEFILE AC_CACHE_CHECK( [for off64_t], liblock_cv_hasoff64t, liblock_cv_hasoff64t="no" -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> off64_t n; -],[ +]], [[ n=0; -], liblock_cv_hasoff64t="yes") +]])],[liblock_cv_hasoff64t="yes"],[]) ) @@ -61,7 +59,7 @@ AC_DEFINE_UNQUOTED(LL_OFFSET_TYPE,$LL_OFFSET_TYPE, AC_CACHE_CHECK( [for flock_t], liblock_cv_hasflock_t, liblock_cv_hasflock_t="no" -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #if HAVE_CONFIG_H #include "config.h" #endif @@ -73,8 +71,8 @@ AC_TRY_COMPILE([ #include <sys/fcntl.h> #endif flock_t t; -],[ -], liblock_cv_hasflock_t="yes")) +]], [[ +]])],[liblock_cv_hasflock_t="yes"],[])) if test "$liblock_cv_hasflock_t" = "yes" then @@ -92,12 +90,12 @@ AC_CHECK_FUNC(setpgrp, AC_CACHE_CHECK( [for fcntl], liblock_cv_hasfcntl, liblock_cv_hasfcntl="no" -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #define LL_OFFSET_TYPE $LL_OFFSET_TYPE #include "${srcdir}/lockfcntl.c" int n; -],[ -], liblock_cv_hasfcntl="yes")) +]], [[ +]])],[liblock_cv_hasfcntl="yes"],[])) if test "$liblock_cv_hasfcntl" = "yes" then AC_DEFINE_UNQUOTED(HAS_FCNTL,1, @@ -106,12 +104,12 @@ fi AC_CACHE_CHECK( [for flock], liblock_cv_hasflock, liblock_cv_hasflock="no" -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #define LL_OFFSET_TYPE $LL_OFFSET_TYPE #include "${srcdir}/lockflock.c" int n; -],[ -], liblock_cv_hasflock="yes")) +]], [[ +]])],[liblock_cv_hasflock="yes"],[])) if test "$liblock_cv_hasflock" = "yes" then AC_DEFINE_UNQUOTED(HAS_FLOCK,1, @@ -120,12 +118,12 @@ fi AC_CACHE_CHECK( [for lockf], liblock_cv_haslockf, liblock_cv_haslockf="no" -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #define LL_OFFSET_TYPE $LL_OFFSET_TYPE #include "${srcdir}/locklockf.c" int n; -],[ -], liblock_cv_haslockf="yes")) +]], [[ +]])],[liblock_cv_haslockf="yes"],[])) if test "$liblock_cv_haslockf" = "yes" then AC_DEFINE_UNQUOTED(HAS_LOCKF,1, @@ -137,59 +135,56 @@ AC_ARG_WITH(locking-method, [], lockmethod="$withval", lockmethod="") case x$lockmethod in xfcntl) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #define USE_FCNTL 1 #define LL_OFFSET_TYPE $LL_OFFSET_TYPE #include "${srcdir}/locktest.c" -], , AC_MSG_ERROR(fcntl test failed.), - : - ) +]])],[],[AC_MSG_ERROR(fcntl test failed.)],[: + ]) ;; x) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #define USE_FCNTL 1 #define LL_OFFSET_TYPE $LL_OFFSET_TYPE #include "${srcdir}/locktest.c" -], lockmethod=fcntl, ,AC_MSG_ERROR(--with-locking-method option required)) +]])],[lockmethod=fcntl],[],[AC_MSG_ERROR(--with-locking-method option required)]) ;; esac case x$lockmethod in xlockf) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #define USE_LOCKF 1 #define LL_OFFSET_TYPE $LL_OFFSET_TYPE #include "${srcdir}/locktest.c" -], , AC_MSG_ERROR(lockf test failed.), - : - ) +]])],[],[AC_MSG_ERROR(lockf test failed.)],[: + ]) ;; x) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #define USE_LOCKF 1 #define LL_OFFSET_TYPE $LL_OFFSET_TYPE #include "${srcdir}/locktest.c" -], lockmethod=lockf, , AC_MSG_ERROR(--with-locking-method option required)) +]])],[lockmethod=lockf],[],[AC_MSG_ERROR(--with-locking-method option required)]) ;; esac case x$lockmethod in xflock) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #define USE_FLOCK 1 #define LL_OFFSET_TYPE $LL_OFFSET_TYPE #include "${srcdir}/locktest.c" -], , AC_MSG_ERROR(flock test failed.), - : - ) +]])],[],[AC_MSG_ERROR(flock test failed.)],[: + ]) ;; x) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #define USE_FLOCK 1 #define LL_OFFSET_TYPE $LL_OFFSET_TYPE #include "${srcdir}/locktest.c" -], lockmethod=flock, , AC_MSG_ERROR(--with-locking-method option required)) +]])],[lockmethod=flock],[],[AC_MSG_ERROR(--with-locking-method option required)]) ;; esac @@ -215,4 +210,5 @@ AM_CONDITIONAL(HAVE_SGML, test -d ${srcdir}/../docbook) AC_DEFINE_UNQUOTED(liblock_config_h,1, [liblock/config.h has been read]) -AC_OUTPUT(Makefile) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT |