X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure.ac;h=b52ea766b8a675162909a7165ac215d94e40f2ac;hp=7ee82d3b12433836ee906a3576f9c39a76b5d284;hb=be9ebc1104574e5e81e19c5caba0c23b54df826d;hpb=a723e23ca2d32e8eed32f9c53323afbbedba575b

diff --git a/configure.ac b/configure.ac
index 7ee82d3..b52ea76 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])])
 
 
 #
@@ -100,12 +99,6 @@ AC_ARG_ENABLE([qt4],
 			  [qt4=$enableval],
 			  [qt4=no])
 
-AC_ARG_WITH([log-level],
-			[AS_HELP_STRING([--with-log-level=NUM],
-							[0, none... 1, errors... 4, everything (default: 3)])],
-			[log_level=$withval],
-			[log_level=3])
-
 
 if test x$debug = xyes
 then
@@ -139,7 +132,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,12 +142,9 @@ 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],
-				   [Define to detail level of logging.])
-
 
 if test "x$prefix" = xNONE
 then
@@ -267,14 +257,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 +321,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 +343,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
 
 
@@ -373,7 +362,6 @@ echo ""
 echo "            Target: $target"
 echo "            Prefix: $prefix"
 echo "    Data Directory: $DATADIR"
-echo "         Log Level: $log_level"
 echo "             Debug: $debug"
 echo "  Double Precision: $double_precision"
 echo "           Profile: $profile"