X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure.ac;fp=configure.ac;h=054c4acf0e2b5b961a9f8566bbe85568239db0c2;hp=7ee82d3b12433836ee906a3576f9c39a76b5d284;hb=b357615aba1dbde81e3c6999366604e6001010a7;hpb=246d7d6e4386b686327163d621c7c8b398b7d479

diff --git a/configure.ac b/configure.ac
index 7ee82d3..054c4ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,11 +10,10 @@ AC_INIT([Yoink], [0.1], [chaz@dogcows.com], [yoink])
 
 AC_CANONICAL_TARGET
 
-AC_CONFIG_SRCDIR([src/GameLayer.cc])
+AC_CONFIG_SRCDIR([src/version.c])
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 
 #
@@ -139,7 +138,7 @@ fi
 if test x$threads = xyes
 then
 	AC_DEFINE([USE_THREADS], 1,
-			  [Define to 1 if you want to use threads for parallel tasks.])
+			  [Define to 1 if you want to use threads when applicable.])
 fi
 
 if test x$gtk = xyes
@@ -149,7 +148,7 @@ then
 elif test x$qt4 = xyes
 then
 	AC_DEFINE([USE_QT4], 1,
-			  [Define to 1 if you want to use QT info/error dialogs.])
+			  [Define to 1 if you want to use QT4 info/error dialogs.])
 fi
 
 AC_DEFINE_UNQUOTED([YOINK_LOGLEVEL], [$log_level],
@@ -267,14 +266,14 @@ AC_SEARCH_LIBS([alEnable], [openal OpenAL32],,
 			   [missing=yes
 				echo "***** Missing libopenal ($website) *****"])
 
-##### SDL_image #####
-website="http://www.libsdl.org/projects/SDL_image/"
-AC_CHECK_HEADERS([SDL/SDL_image.h],,
+##### libpng #####
+website="http://www.libpng.org/pub/png/libpng.html"
+AC_CHECK_HEADERS([png.h],,
 				 [missing=yes
-				  echo "***** Missing SDL_image header ($website) *****"])
-AC_SEARCH_LIBS([IMG_Load], [SDL_image],,
+				  echo "***** Missing libpng header ($website) *****"])
+AC_SEARCH_LIBS([png_sig_cmp], [png],,
 			   [missing=yes
-				echo "***** Missing libSDL_image ($website) *****"])
+				echo "***** Missing libpng ($website) *****"])
 
 ##### libvorbis #####
 website="http://www.xiph.org/downloads/"
@@ -331,14 +330,13 @@ fi
 
 
 #
-# Find the data files to install.
+# Find the game resources to install.
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-DATA_FILES=$(echo $(cd data; \
-					find . -name "*.lua" \
-						-o -name "*.ogg" \
-						-o -name "*.png" \
-						-o -name "yoinkrc"))
+DATA_FILES=$(echo $(cd data && find . -name "*.lua" \
+								   -o -name "*.ogg" \
+								   -o -name "*.png" \
+								   -o -name "yoinkrc"))
 AC_SUBST([DATA_FILES])
 
 
@@ -354,7 +352,7 @@ AC_CONFIG_FILES([Makefile
 
 if test x$WIN32 = xyes
 then
-	AC_CONFIG_FILES([win32/Makefile win32/mkpackage.sh])
+	AC_CONFIG_FILES([win32/Makefile win32/mkpackage.sh win32/yoink.nsi])
 fi