diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-07-20 21:22:05 -0700 |
|---|---|---|
| committer | Eryu Guan <eguan@redhat.com> | 2017-07-28 18:53:50 +0800 |
| commit | fb05a918085e86f60fa371e4c4620bcef9f76bea (patch) | |
| tree | d58063387d27e9ab793520410ffc2cc73b45206c /m4 | |
| parent | 4556c97ebf901daec3596084ed3f8fe14d7a2505 (diff) | |
build: remove IRIX-specific build logic
As xfstests is no longer supported on IRIX, remove the ability to build
xfstests for IRIX.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/package_globals.m4 | 2 | ||||
| -rw-r--r-- | m4/package_libcdev.m4 | 2 | ||||
| -rw-r--r-- | m4/package_utilies.m4 | 14 | ||||
| -rw-r--r-- | m4/package_xfslibs.m4 | 13 |
4 files changed, 9 insertions, 22 deletions
diff --git a/m4/package_globals.m4 b/m4/package_globals.m4 index 72fbbb78..ce7a8c51 100644 --- a/m4/package_globals.m4 +++ b/m4/package_globals.m4 @@ -39,7 +39,7 @@ AC_DEFUN([AC_PACKAGE_GLOBALS], test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION" AC_SUBST(pkg_distribution) - pkg_platform=`uname -s | tr 'A-Z' 'a-z' | sed -e 's/irix64/irix/'` + pkg_platform=`uname -s | tr 'A-Z' 'a-z'` test -z "$PLATFORM" || pkg_platform="$PLATFORM" AC_SUBST(pkg_platform) ]) diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4 index 5156ced6..fb123f33 100644 --- a/m4/package_libcdev.m4 +++ b/m4/package_libcdev.m4 @@ -67,7 +67,7 @@ AC_DEFUN([AC_HAVE_SENDFILE], ]) # -# Check if we have a getmntent libc call (IRIX, Linux) +# Check if we have a getmntent libc call (Linux) # AC_DEFUN([AC_HAVE_GETMNTENT], [ AC_MSG_CHECKING([for getmntent ]) diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4 index 726406c8..108ef455 100644 --- a/m4/package_utilies.m4 +++ b/m4/package_utilies.m4 @@ -41,7 +41,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], 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) + AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin) fi if test -z "$MAKE"; then AC_PATH_PROG(MAKE, make,, /usr/bin) @@ -54,19 +54,19 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], 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) + AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/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) + AC_PATH_PROG(TAR, tar,, /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) + AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin) fi zip=$ZIP @@ -108,14 +108,14 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], if test "$enable_gettext" = yes; then if test -z "$MSGFMT"; then - AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin) + AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/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) + AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin) fi msgmerge=$MSGMERGE AC_SUBST(msgmerge) @@ -123,7 +123,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], fi if test -z "$RPM"; then - AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin) + AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin) fi rpm=$RPM AC_SUBST(rpm) diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4 index 5588e9ed..9be56e11 100644 --- a/m4/package_xfslibs.m4 +++ b/m4/package_xfslibs.m4 @@ -92,19 +92,6 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE], AC_SUBST(libhdl) ]) -AC_DEFUN([AC_PACKAGE_NEED_IRIX_LIBHANDLE], - [ - AC_MSG_CHECKING([libhandle.a for IRIX]) - libhdl="`pwd`/../irix/libhandle/libhandle.a" - if ! test -f $libhdl; then - echo 'no' - echo 'FATAL ERROR: could not find IRIX XFS handle library.' - exit 1 - fi - echo 'yes' - AC_SUBST(libhdl) - ]) - AC_DEFUN([AC_PACKAGE_NEED_XFSCTL_MACRO], [ AC_MSG_CHECKING([xfsctl from xfs/xfs.h]) AC_TRY_LINK([ |