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

diff --git a/source/configure.ac b/source/configure.ac
index d1a6ce8..5834f8b 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
@@ -73,6 +79,8 @@ LIBS="$LIBS $WX_LIBS"
 
 # SFML Audio Library
 
+PKG_CHECK_MODULES([SFML], [sfml-all >= 2.4.1])
+
 AC_CHECK_LIB([sfml-audio], [main], [], [echo "The SFML libraries must be installed on your system.
 Please check that this library is installed properly before
 running configure again."
@@ -89,6 +97,8 @@ AC_LANG_POP([C++])
 
 # curl Library
 
+PKG_CHECK_MODULES([CURL], [libcurl >= 7.54.1])
+
 AC_CHECK_LIB([curl], [main], [], [echo "The cURL library must be installed on your system.
 Please check that this library is installed properly before
 running configure again."
@@ -189,8 +199,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