diff options
| author | Harshavardhana <harsha@harshavardhana.net> | 2014-08-19 18:24:23 -0700 |
|---|---|---|
| committer | Harshavardhana <harsha@harshavardhana.net> | 2014-08-29 09:13:02 -0700 |
| commit | 2dd53eb4de91c25817af85475cfa9ff66e79c97b (patch) | |
| tree | 1fce885b03af9a07d797dfac92f9ecd24817617e /configure.ac | |
| parent | 04be6a47df5c7d5c04c84fed06df9a8a1652c582 (diff) | |
porting: various fixes regression tests OSX/FreeBSD
- `wc -l` on OSX/FreeBSD adds spurious spaces, this clobbers
up TAP output parsers - fix it.
- `umount -l` doesn't exist on OSX/FreeBSD use 'umount -f' if
available.
- Add check for 'file' version, to handle mime type variations
across versions
- Converge 'glusterfs --attribute-timeout=0 --entry-timeout=0'
into '$GFS'
- Modify remaining 'mount -t nfs' to use 'mount_nfs'
- Update sha1sum for OSX to use 'openssl sha1'.
Change-Id: Id1012faa5d67a921513d220e7fa9cebafe830d34
BUG: 1131713
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-on: http://review.gluster.org/8501
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 3c72b34f0d9..51da67e43db 100644 --- a/configure.ac +++ b/configure.ac @@ -606,7 +606,7 @@ AC_SUBST(SYNCDAEMON_SUBDIR) # CDC xlator - check if libz is present if so enable HAVE_LIB_Z BUILD_CDC=yes PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0],, - [AC_CHECK_LIB([z], [deflate], [LIBZ_LIBS="-lz"], + [AC_CHECK_LIB([z], [deflate], [ZLIB_LIBS="-lz"], [BUILD_CDC=no])]) echo -n "features requiring zlib enabled: " if test "x$BUILD_CDC" = "xyes" ; then @@ -615,8 +615,8 @@ if test "x$BUILD_CDC" = "xyes" ; then else echo "no" fi -AC_SUBST(LIBZ_CFLAGS) -AC_SUBST(LIBZ_LIBS) +AC_SUBST(ZLIB_CFLAGS) +AC_SUBST(ZLIB_LIBS) # end CDC xlator secion # check for systemtap/dtrace |