AC_SUBST(PROFILE_CMT)
AC_SUBST_FILE(MAKEFILE_PROFILE)
dnl
-dnl handle --enable-checker
+dnl handle --enable-gcov
dnl
-AC_ARG_ENABLE([checker],
-[ --enable-checker build checker libraries],
-if test "$enableval" = "no"
+AC_ARG_ENABLE([gcov],
+[ --enable-gcov build for coverage testing using gcov],
+if test "$enableval" = "yes"
then
- CHECKER_CMT=#
- MAKEFILE_CHECKER=/dev/null
- AC_MSG_RESULT([Disabling checker libraries])
-else
- CHECKER_CMT=
- MAKEFILE_CHECKER=$srcdir/lib/Makefile.checker
- AC_MSG_RESULT([Building checker libraries])
+ CFLAGS="-g -fprofile-arcs -ftest-coverage"
+ LDFLAGS="-fprofile-arcs -ftest-coverage"
+ AC_MSG_RESULT([Enabling gcov support])
fi
-,
-CHECKER_CMT=#
-MAKEFILE_CHECKER=/dev/null
-AC_MSG_RESULT([Disabling checker libraries by default])
)
-AC_SUBST(CHECKER_CMT)
-AC_SUBST_FILE(MAKEFILE_CHECKER)
+
dnl
dnl Substitute library extensions
dnl
AC_CHECK_LIB(uuid, uuid_generate,
[LIBUUID=`$PKG_CONFIG --libs uuid`;
STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`],
- [AC_MSG_ERROR([external uuid library not found])],
- [$LIBUUID])
+ [AC_MSG_ERROR([external uuid library not found])])
+ PROFILED_LIBUUID=$LIBUUID
UUID_CMT=#
AC_MSG_RESULT([Disabling private uuid library])
else
AC_CHECK_LIB(blkid, blkid_get_cache,
[LIBBLKID=`$PKG_CONFIG --libs blkid`;
STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
- [AC_MSG_ERROR([external blkid library not found])],
- [$LIBBLKID])
+ [AC_MSG_ERROR([external blkid library not found])], -luuid)
BLKID_CMT=#
+ PROFILED_LIBBLKID=$LIBBLKID
AC_MSG_RESULT([Disabling private blkid library])
else
LIBBLKID='$(LIB)/libblkid'$LIB_EXT
fi]
,
AC_DEFINE(USE_UUIDD, 1)
-UUIDD_CMT=""
-AC_MSG_RESULT([Building uuidd by default])
+if test -z "$UUID_CMT"
+then
+ UUIDD_CMT=""
+ AC_MSG_RESULT([Building uuidd by default])
+else
+ UUIDD_CMT="#"
+ AC_MSG_RESULT([Disabling uuidd by default])
+fi
)
AC_SUBST(UUIDD_CMT)
dnl
net/if_dl.h
netinet/in.h
sys/disklabel.h
+ sys/disk.h
sys/file.h
sys/ioctl.h
sys/mkdev.h
sys/mman.h
+ sys/mount.h
sys/prctl.h
- sys/queue.h
sys/resource.h
sys/select.h
sys/socket.h
sys/un.h
sys/wait.h
]))
-AC_CHECK_HEADERS(sys/disk.h sys/mount.h,,,
-[[
-#if HAVE_SYS_QUEUE_H
-#include <sys/queue.h>
-#endif
-]])
AC_CHECK_HEADERS(net/if.h,,,
[[
#if HAVE_SYS_TYPES_H
AC_SUBST(SIZEOF_LONG_LONG)
AC_SUBST(SIZEOF_OFF_T)
AC_C_BIGENDIAN
-BUILD_CC="$BUILD_CC" CPP="$CPP" /bin/sh $ac_aux_dir/parse-types.sh
+if test $cross_compiling = no; then
+ BUILD_CC="$BUILD_CC" CPP="$CPP" /bin/sh $ac_aux_dir/parse-types.sh
+else
+ CROSS_COMPILE="1" BUILD_CC="$BUILD_CC" CPP="$CPP" /bin/sh $ac_aux_dir/parse-types.sh
+fi
ASM_TYPES_HEADER=./asm_types.h
AC_SUBST_FILE(ASM_TYPES_HEADER)
dnl
__secure_getenv
backtrace
blkid_probe_get_topology
+ blkid_probe_enable_partitions
chflags
fadvise64
fallocate
posix_fadvise64
posix_memalign
prctl
+ pread
+ pwrite
+ pread64
+ pwrite64
secure_getenv
setmntent
setresgid
setresuid
+ snprintf
srandom
stpcpy
strcasecmp
sysconf
usleep
utime
+ utimes
valloc
]))
dnl
INCLUDES="$INCLUDES -D_REENTRANT"
fi
AC_SUBST(INCLUDES)
+AM_MKINSTALLDIRS
dnl
dnl Build CFLAGS
dnl
if test $cross_compiling = no; then
BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
BUILD_LDFLAGS="$LDFLAGS"
-else
- BUILD_CFLAGS=
- BUILD_LDFLAGS=
fi
AC_SUBST(BUILD_CFLAGS)
AC_SUBST(BUILD_LDFLAGS)
test -d include/linux || mkdir include/linux
test -d include/asm || mkdir include/asm
for i in MCONFIG Makefile e2fsprogs.spec \
+ e2fsprogs-RHEL-6.spec \
+ e2fsprogs-SUSE_LINUX-11.spec \
util/Makefile util/subst.conf util/gen-tarball util/install-symlink \
lib/et/Makefile lib/ss/Makefile lib/e2p/Makefile \
lib/ext2fs/Makefile lib/ext2fs/ext2_types.h \