X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fconfigure.ac;h=a3f68568f5ba7a4833c308cbb1c421b518c4a26f;hb=3d6725d5ac8805e56dbf32cf95e05326add68b17;hp=d1a6ce8d90e385e3179d244b6d526a7ae9ead74c;hpb=e7eaa503e46395e1126c901b1ff0d25388259ba5;p=xestiaab%2F.git

diff --git a/source/configure.ac b/source/configure.ac
index d1a6ce8..a3f6856 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -32,6 +32,12 @@ fi
 BINDIR=`eval echo $bindir`
 AC_SUBST([BINDIR])
 
+if test "x$datarootdir" = "xNONE" ; then
+	datarootdir="/share"
+fi
+DATAROOTDIR=`eval echo $datarootdir`
+AC_SUBST([DATAROOTDIR])
+
 # Checks for libraries.
 
 # wxWidgets
@@ -189,8 +195,8 @@ AM_COND_IF([DEBUG], [echo "Debugging mode has been enabled."])
 
 AM_CONDITIONAL([GTEST_FOUND], [test x$gtestfound = xyes])
 AM_COND_IF([GTEST_FOUND], [AC_SUBST([GTEST], [`cat tests/test.commands`])], 
-	[AC_SUBST([GTEST], ["echo \"Google Test was not found on the system.\""])])
+	[AC_SUBST([GTEST], ["	@echo \"Google Test was not found on the system. Unable to build tests.\""])])
 AM_COND_IF([GTEST_FOUND], [echo "Google Test found on the system. Enabling Unit Tests."]);
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile tests/Makefile])
 AC_OUTPUT