X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure.ac;h=f7e75b0a2a7ea1295c77ac2e019da35ca36fc38b;hp=39129322d1de7bf8f522bc144d23877580c5aeeb;hb=892da43bf5796e7c5f593a6d0f53bd797a36bd3e;hpb=9351bfa7871c88a5ad6e63f1d9c4483f50e4fed1

diff --git a/configure.ac b/configure.ac
index 3912932..f7e75b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_INIT([Yoink], [0.1], [chaz@dogcows.com], [yoink])
 
 AC_CANONICAL_TARGET
 
-AC_CONFIG_SRCDIR([src/YoinkApp.cc])
+AC_CONFIG_SRCDIR([src/GameLayer.cc])
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE
@@ -42,6 +42,8 @@ case "${host}" in
 			AC_MSG_ERROR([windres could not be found])
 		fi
 		AC_SUBST(WINDRES)
+		AC_PATH_PROGS([MAKENSIS], [makensis])
+		AC_SUBST(MAKENSIS)
 	;;
 	*cygwin*)
 		CYGWIN=yes
@@ -51,8 +53,14 @@ case "${host}" in
 		MACOSX=yes
 		LIBS="$LIBS -Wl,-framework"
 	;;
+	*-linux-gnu*)
+		LINUX=yes
+		AC_PATH_PROGS([RPMBUILD], [rpmbuild])
+		AC_SUBST(RPMBUILD)
+	;;
 esac
 
+AM_CONDITIONAL([LINUX], test "$LINUX" = "yes")
 AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
 
 
@@ -145,12 +153,6 @@ AC_DEFINE_UNQUOTED([YOINK_DATADIR], ["$DATADIR"],
 				   [Define to path of game asset directory.])
 
 
-CONFIGFILES="\$HOME/.yoinkrc:/etc/yoinkrc"
-
-AC_DEFINE_UNQUOTED([YOINK_CONFIGFILES], ["$CONFIGFILES"],
-				   [Define to colon-delimited configuration file paths.])
-
-
 #
 # Split the version number into components.
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -168,6 +170,12 @@ AC_DEFINE_UNQUOTED([VERSION_MINOR], [${VERSION_MINOR:-0}],
 AC_DEFINE_UNQUOTED([VERSION_REVISION], [${VERSION_REVISION:-0}],
 				   [Define to revision version number component.])
 
+if test x$WIN32 = xyes
+then
+	PVERSION="${VERSION_MAJOR:-0}.${VERSION_MINOR:-0}.${VERSION_REVISION:-0}.0"
+	AC_SUBST([PVERSION])
+fi
+
 # these are used in src/yoink.rc
 
 
@@ -260,6 +268,15 @@ AC_SEARCH_LIBS([ov_open], [vorbisfile],,
 			   [missing=yes
 				echo "***** Missing libvorbisfile ($website) *****"])
 
+##### liblua #####
+website="http://www.lua.org/"
+AC_CHECK_HEADERS([lua.h],,
+				 [missing=yes
+				  echo "***** Missing lua headers ($website) *****"])
+AC_SEARCH_LIBS([lua_load], [lua],,
+			   [missing=yes
+				echo "***** Missing liblua ($website) *****"])
+
 ##### librt (optional) #####
 AC_SEARCH_LIBS([clock_gettime], [rt],
 			   [AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
@@ -278,6 +295,7 @@ fi
 
 DATA_FILES=$(echo $(cd data; \
 					find . -name "*.json" \
+						-o -name "*.lua" \
 						-o -name "*.ogg" \
 						-o -name "*.png" \
 						-o -name "*.xm" \
@@ -295,6 +313,7 @@ AC_CONFIG_FILES([Makefile
 				 doc/yoink.6
 				 extra/Makefile
 				 extra/yoink.spec
+				 make-win32-installer.sh
                  src/Makefile])
 
 AC_CONFIG_HEADERS([src/config.h])