AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability])
+AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability subdir-objects])
AM_MAINTAINER_MODE([enable])
AC_PROG_CC
AC_PATH_PROG(RPMBUILD, rpmbuild)
AC_CHECK_TOOLS(AR, ar)
-LUSTRE_VERSION_VARIABLES
+LUSTRE_VERSION_CPP_MACROS
LB_CONFIGURE