From 3eeec270d3af166e3bc09537626850562487742b Mon Sep 17 00:00:00 2001 From: Roy Li Date: Fri, 22 Jan 2016 16:44:11 +0800 Subject: [PATCH] make test dir configurable Upstream-Status: Pending test maybe be run on target in cross-compile environment, and test dir is not the compilation dir, so make it configurable Signed-off-by: Roy Li --- Makefile.am | 2 +- configure.ac | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 931d13f..7155ec7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -209,7 +209,7 @@ AM_CPPFLAGS = \ -DROOTLIBDIR=\"$(rootlibdir)\" \ -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \ -DROOTHOMEDIR=\"$(roothomedir)\" \ - -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ + -DTEST_DIR=\"$(testdir)/test\" \ -I $(top_srcdir)/src \ -I $(top_builddir)/src/basic \ -I $(top_srcdir)/src/basic \ diff --git a/configure.ac b/configure.ac index 76090a1..b02968d 100644 --- a/configure.ac +++ b/configure.ac @@ -1411,6 +1411,11 @@ AC_ARG_WITH([roothomedir], [], [with_roothomedir=/root]) +AC_ARG_WITH([testdir], + AS_HELP_STRING([--with-testdir=DIR], [test file directory]), + [], + [with_testdir=${abs_top_srcdir}]) + AC_ARG_WITH([pamlibdir], AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]), [], @@ -1503,6 +1508,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir]) AC_SUBST([rootprefix], [$with_rootprefix]) AC_SUBST([rootlibdir], [$with_rootlibdir]) AC_SUBST([roothomedir], [$with_roothomedir]) +AC_SUBST([testdir], [$with_testdir]) AC_CONFIG_FILES([ Makefile @@ -1593,6 +1599,7 @@ AC_MSG_RESULT([ lib dir: ${libdir} rootlib dir: ${with_rootlibdir} root home dir: ${with_roothomedir} + test dir: ${with_testdir} SysV init scripts: ${SYSTEM_SYSVINIT_PATH} SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} Build Python: ${PYTHON} -- 1.9.1