From: Nathan Scott Date: Wed, 16 Nov 2005 05:04:35 +0000 (+0000) Subject: Rebuild aclocal.m4 for xfsprogs. X-Git-Tag: v2.8.0~62 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8022d0a295596699347a702efd91654bdc02650;p=thirdparty%2Fxfsprogs-dev.git Rebuild aclocal.m4 for xfsprogs. Merge of master-melb:xfs-cmds:24456a by kenmcd. --- diff --git a/aclocal.m4 b/aclocal.m4 index e96d0cc6c..98a101ba7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,20 +1,403 @@ -# generated automatically by aclocal 1.8.3 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -m4_include([./m4/manual_format.m4]) -m4_include([./m4/package_globals.m4]) -m4_include([./m4/package_libcdev.m4]) -m4_include([./m4/package_pthread.m4]) -m4_include([./m4/package_types.m4]) -m4_include([./m4/package_utilies.m4]) -m4_include([./m4/package_uuiddev.m4]) +dnl aclocal.m4 generated automatically by aclocal 1.4-p6 + +dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. + +# +# Generic macro, sets up all of the global packaging variables. +# The following environment variables may be set to override defaults: +# DEBUG OPTIMIZER MALLOCLIB PLATFORM DISTRIBUTION INSTALL_USER INSTALL_GROUP +# BUILD_VERSION +# +AC_DEFUN([AC_PACKAGE_GLOBALS], + [ pkg_name="$1" + AC_SUBST(pkg_name) + + . ./VERSION + pkg_version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} + AC_SUBST(pkg_version) + pkg_release=$PKG_BUILD + test -z "$BUILD_VERSION" || pkg_release="$BUILD_VERSION" + AC_SUBST(pkg_release) + + DEBUG=${DEBUG:-'-DDEBUG'} dnl -DNDEBUG + debug_build="$DEBUG" + AC_SUBST(debug_build) + + OPTIMIZER=${OPTIMIZER:-'-g'} dnl -O2 + opt_build="$OPTIMIZER" + AC_SUBST(opt_build) + + MALLOCLIB=${MALLOCLIB:-''} dnl /usr/lib/libefence.a + malloc_lib="$MALLOCLIB" + AC_SUBST(malloc_lib) + + pkg_user=`id -u` + test -z "$INSTALL_USER" || pkg_user="$INSTALL_USER" + AC_SUBST(pkg_user) + + pkg_group=`id -g` + test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP" + AC_SUBST(pkg_group) + + pkg_distribution=`uname -s` + test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION" + AC_SUBST(pkg_distribution) + + pkg_platform=`uname -s | tr 'A-Z' 'a-z' | sed -e 's/irix64/irix/'` + test -z "$PLATFORM" || pkg_platform="$PLATFORM" + AC_SUBST(pkg_platform) + ]) + +# +# Check for specified utility (env var) - if unset, fail. +# +AC_DEFUN([AC_PACKAGE_NEED_UTILITY], + [ if test -z "$2"; then + echo + echo FATAL ERROR: $3 does not seem to be installed. + echo $1 cannot be built without a working $4 installation. + exit 1 + fi + ]) + +# +# Generic macro, sets up all of the global build variables. +# The following environment variables may be set to override defaults: +# CC MAKE LIBTOOL TAR ZIP MAKEDEPEND AWK SED ECHO SORT +# MSGFMT MSGMERGE RPM +# +AC_DEFUN([AC_PACKAGE_UTILITIES], + [ AC_PROG_CC + cc="$CC" + AC_SUBST(cc) + AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler]) + + if test -z "$MAKE"; then + AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin) + fi + if test -z "$MAKE"; then + AC_PATH_PROG(MAKE, make,, /usr/bin) + fi + make=$MAKE + AC_SUBST(make) + AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) + + if test -z "$LIBTOOL"; then + AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin) + fi + if test -z "$LIBTOOL"; then + AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin) + fi + libtool=$LIBTOOL + AC_SUBST(libtool) + AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool]) + + if test -z "$TAR"; then + AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin) + fi + tar=$TAR + AC_SUBST(tar) + if test -z "$ZIP"; then + AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin) + fi + + zip=$ZIP + AC_SUBST(zip) + + if test -z "$MAKEDEPEND"; then + AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true) + fi + makedepend=$MAKEDEPEND + AC_SUBST(makedepend) + + if test -z "$AWK"; then + AC_PATH_PROG(AWK, awk,, /bin:/usr/bin) + fi + awk=$AWK + AC_SUBST(awk) + + if test -z "$SED"; then + AC_PATH_PROG(SED, sed,, /bin:/usr/bin) + fi + sed=$SED + AC_SUBST(sed) + + if test -z "$ECHO"; then + AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin) + fi + echo=$ECHO + AC_SUBST(echo) + + if test -z "$SORT"; then + AC_PATH_PROG(SORT, sort,, /bin:/usr/bin) + fi + sort=$SORT + AC_SUBST(sort) + + dnl check if symbolic links are supported + AC_PROG_LN_S + + if test "$enable_gettext" = yes; then + if test -z "$MSGFMT"; then + AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin) + fi + msgfmt=$MSGFMT + AC_SUBST(msgfmt) + AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext) + + if test -z "$MSGMERGE"; then + AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin) + fi + msgmerge=$MSGMERGE + AC_SUBST(msgmerge) + AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext) + fi + + if test -z "$RPM"; then + AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin) + fi + rpm=$RPM + AC_SUBST(rpm) + + dnl .. and what version is rpm + rpm_version=0 + test -n "$RPM" && test -x "$RPM" && rpm_version=`$RPM --version \ + | awk '{print $NF}' | awk -F. '{V=1; print $V}'` + AC_SUBST(rpm_version) + dnl At some point in rpm 4.0, rpm can no longer build rpms, and + dnl rpmbuild is needed (rpmbuild may go way back; not sure) + dnl So, if rpm version >= 4.0, look for rpmbuild. Otherwise build w/ rpm + if test $rpm_version -ge 4; then + AC_PATH_PROG(RPMBUILD, rpmbuild) + rpmbuild=$RPMBUILD + else + rpmbuild=$RPM + fi + AC_SUBST(rpmbuild) + ]) + +AC_DEFUN([AC_PACKAGE_NEED_UUID_H], + [ AC_CHECK_HEADERS([uuid.h sys/uuid.h uuid/uuid.h]) + if test $ac_cv_header_uuid_h = no -a \ + $ac_cv_header_sys_uuid_h = no -a \ + $ac_cv_header_uuid_uuid_h = no; then + echo + echo 'FATAL ERROR: could not find a valid UUID header.' + echo 'Install the Universally Unique Identifiers development package.' + exit 1 + fi + ]) + +AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE], + [ AC_CHECK_FUNCS(uuid_compare) + if test $ac_cv_func_uuid_compare = yes; then + libuuid="" + else + AC_CHECK_LIB(uuid, uuid_compare,, [ + echo + echo 'FATAL ERROR: could not find a valid UUID library.' + echo 'Install the Universally Unique Identifiers library package.' + exit 1]) + libuuid="-luuid" + fi + AC_SUBST(libuuid) + ]) + +AC_DEFUN([AC_PACKAGE_NEED_PTHREAD_H], + [ AC_CHECK_HEADERS(pthread.h) + if test $ac_cv_header_pthread_h = no; then + AC_CHECK_HEADERS(pthread.h,, [ + echo + echo 'FATAL ERROR: could not find a valid pthread header.' + exit 1]) + fi + ]) + +AC_DEFUN([AC_PACKAGE_NEED_PTHREADMUTEXINIT], + [ AC_CHECK_LIB(pthread, pthread_mutex_init,, [ + echo + echo 'FATAL ERROR: could not find a valid pthread library.' + exit 1 + ]) + libpthread=-lpthread + AC_SUBST(libpthread) + ]) + +# +# Check if we have a working fadvise system call +# +AC_DEFUN([AC_HAVE_FADVISE], + [ AC_MSG_CHECKING([for fadvise ]) + AC_TRY_COMPILE([ +#define _GNU_SOURCE +#define _FILE_OFFSET_BITS 64 +#include + ], [ + posix_fadvise(0, 1, 0, POSIX_FADV_NORMAL); + ], have_fadvise=yes + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + AC_SUBST(have_fadvise) + ]) + +# +# Check if we have a working madvise system call +# +AC_DEFUN([AC_HAVE_MADVISE], + [ AC_MSG_CHECKING([for madvise ]) + AC_TRY_COMPILE([ +#define _GNU_SOURCE +#define _FILE_OFFSET_BITS 64 +#include + ], [ + posix_madvise(0, 0, MADV_NORMAL); + ], have_madvise=yes + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + AC_SUBST(have_madvise) + ]) + +# +# Check if we have a working mincore system call +# +AC_DEFUN([AC_HAVE_MINCORE], + [ AC_MSG_CHECKING([for mincore ]) + AC_TRY_COMPILE([ +#define _GNU_SOURCE +#define _FILE_OFFSET_BITS 64 +#include + ], [ + mincore(0, 0, 0); + ], have_mincore=yes + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + AC_SUBST(have_mincore) + ]) + +# +# Check if we have a working sendfile system call +# +AC_DEFUN([AC_HAVE_SENDFILE], + [ AC_MSG_CHECKING([for sendfile ]) + AC_TRY_COMPILE([ +#define _GNU_SOURCE +#define _FILE_OFFSET_BITS 64 +#include + ], [ + sendfile(0, 0, 0, 0); + ], have_sendfile=yes + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + AC_SUBST(have_sendfile) + ]) + +# +# Check if we have a getmntent libc call (IRIX, Linux) +# +AC_DEFUN([AC_HAVE_GETMNTENT], + [ AC_MSG_CHECKING([for getmntent ]) + AC_TRY_COMPILE([ +#include +#include + ], [ + getmntent(0); + ], have_getmntent=yes + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + AC_SUBST(have_getmntent) + ]) + +# +# Check if we have a getmntinfo libc call (FreeBSD, Mac OS X) +# +AC_DEFUN([AC_HAVE_GETMNTINFO], + [ AC_MSG_CHECKING([for getmntinfo ]) + AC_TRY_COMPILE([ +#include +#include +#include + ], [ + getmntinfo(0, 0); + ], have_getmntinfo=yes + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + AC_SUBST(have_getmntinfo) + ]) + +# +# Check if we have a type for the pointer's size integer (__psint_t) +# +AC_DEFUN([AC_TYPE_PSINT], + [ AC_MSG_CHECKING([for __psint_t ]) + AC_TRY_COMPILE([ +#include +#include +#include + ], [ + __psint_t psint; + ], AC_DEFINE(HAVE___PSINT_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no)) + ]) + +# +# Check if we have a type for the pointer's size unsigned (__psunsigned_t) +# +AC_DEFUN([AC_TYPE_PSUNSIGNED], + [ AC_MSG_CHECKING([for __psunsigned_t ]) + AC_TRY_COMPILE([ +#include +#include +#include + ], [ + __psunsigned_t psuint; + ], AC_DEFINE(HAVE___PSUNSIGNED_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no)) + ]) + +# +# Check type sizes +# +AC_DEFUN([AC_SIZEOF_POINTERS_AND_LONG], + [ if test "$cross_compiling" = yes -a -z "$ac_cv_sizeof_long"; then + AC_MSG_WARN([Cross compiling; assuming 32bit long and 32bit pointers]) + fi + AC_CHECK_SIZEOF(long, 4) + AC_CHECK_SIZEOF(char *, 4) + if test $ac_cv_sizeof_long -eq 4 -o $ac_cv_sizeof_long -eq 0; then + AC_DEFINE(HAVE_32BIT_LONG) + fi + if test $ac_cv_sizeof_long -eq 8; then + AC_DEFINE(HAVE_64BIT_LONG) + fi + if test $ac_cv_sizeof_char_p -eq 4 -o $ac_cv_sizeof_char_p -eq 0; then + AC_DEFINE(HAVE_32BIT_PTR) + fi + if test $ac_cv_sizeof_char_p -eq 8; then + AC_DEFINE(HAVE_64BIT_PTR) + fi + ]) + +# +# Find format of installed man pages. +# Always gzipped on Debian, but not Redhat pre-7.0. +# We don't deal with bzip2'd man pages, which Mandrake uses, +# someone will send us a patch sometime hopefully. :-) +# +AC_DEFUN([AC_MANUAL_FORMAT], + [ have_zipped_manpages=false + for d in ${prefix}/share/man ${prefix}/man ; do + if test -f $d/man1/man.1.gz + then + have_zipped_manpages=true + break + fi + done + AC_SUBST(have_zipped_manpages) + ]) +