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

diff --git a/source/configure b/source/configure
index 6822e23..77cf48c 100755
--- a/source/configure
+++ b/source/configure
@@ -658,6 +658,7 @@ WX_CONFIG_PATH
 EGREP
 GREP
 CXXCPP
+DATAROOTDIR
 BINDIR
 PREFIX
 CPP
@@ -3558,6 +3559,12 @@ fi
 BINDIR=`eval echo $bindir`
 
 
+if test "x$datarootdir" = "xNONE" ; then
+	datarootdir="/share"
+fi
+DATAROOTDIR=`eval echo $datarootdir`
+
+
 # Checks for libraries.
 
 # wxWidgets
@@ -4961,14 +4968,14 @@ if test -z "$GTEST_FOUND_TRUE"; then :
   GTEST=`cat tests/test.commands`
 
 else
-  GTEST="echo \"Google Test was not found on the system.\""
+  GTEST="	@echo \"Google Test was not found on the system. Unable to build tests.\""
 
 fi
 if test -z "$GTEST_FOUND_TRUE"; then :
   echo "Google Test found on the system. Enabling Unit Tests."
 fi;
 
-ac_config_files="$ac_config_files Makefile"
+ac_config_files="$ac_config_files Makefile tests/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5558,7 +5565,7 @@ esac
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
-config_files="$ac_config_files"
+config_files="`echo $ac_config_files`"
 
 _ACEOF
 
@@ -5700,6 +5707,7 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac