X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure.ac;h=813b6b51fb80a0df31ca10f8785fedfccddde44b;hp=f03af5d2b1fbc5b611bceaf717c038d667906079;hb=e973a129b5b83b628ba3f09e8c95682fc74080cd;hpb=71bd9dbaf1c1e3c55a9f63392a73865d8aeee7d4

diff --git a/configure.ac b/configure.ac
index f03af5d..813b6b5 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([subdir-objects])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_INIT_AUTOMAKE
 
 
 #
@@ -46,9 +45,7 @@ case "${host}" in
 		then
 			AC_MSG_ERROR([windres could not be found])
 		fi
-		AC_SUBST(WINDRES)
 		AC_PATH_PROGS([MAKENSIS], [makensis])
-		AC_SUBST(MAKENSIS)
 	;;
 	*cygwin*)
 		CYGWIN=yes
@@ -58,12 +55,8 @@ case "${host}" in
 		MACOSX=yes
 		LIBS="$LIBS -Wl,-framework"
 	;;
-	*-linux-gnu*)
-		LINUX=yes
-	;;
 esac
 
-AM_CONDITIONAL([LINUX], test "$LINUX" = "yes")
 AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
 
 
@@ -106,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
@@ -145,23 +132,18 @@ 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
 then
 	AC_DEFINE([USE_GTK], 1,
 			  [Define to 1 if you want to use GTK+ info/error dialogs.])
-else
-if test x$qt4 = xyes
+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
-fi
-
-AC_DEFINE_UNQUOTED([YOINK_LOGLEVEL], [$log_level],
-				   [Define to detail level of logging.])
 
 
 if test "x$prefix" = xNONE
@@ -228,6 +210,11 @@ AC_HEADER_STDBOOL
 AC_HEADER_STDC
 AC_CHECK_HEADERS([stddef.h stdint.h stdlib.h string.h unistd.h])
 
+##### clock_gettime #####
+AC_SEARCH_LIBS([clock_gettime], [rt],
+			   [AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
+						  [Define to 1 if you have the 'clock_gettime' function.])])
+
 
 #
 # Checks for build dependencies.
@@ -252,10 +239,10 @@ website="http://www.mesa3d.org/"
 AC_CHECK_HEADERS([GL/gl.h GL/glu.h],,
 				 [missing=yes
 				  echo "***** Missing GL headers ($website) *****"])
-if test x$WIN32 == xyes
+if test x$WIN32 = xyes
 then
 # autoconf library search macro doesn't find opengl32 on windows because it uses
-# different name hashing, but it links fine; assume it's there
+# different name hashing or something, but it links fine; assume it's there
 	LIBS="$LIBS -lglu32 -lopengl32"
 else
 	AC_SEARCH_LIBS([glEnable], [GL MesaGL],,
@@ -275,24 +262,6 @@ 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],,
-				 [missing=yes
-				  echo "***** Missing SDL_image header ($website) *****"])
-AC_SEARCH_LIBS([IMG_Load], [SDL_image],,
-			   [missing=yes
-				echo "***** Missing libSDL_image ($website) *****"])
-
-##### libvorbis #####
-website="http://www.xiph.org/downloads/"
-AC_CHECK_HEADERS([vorbis/codec.h vorbis/vorbisfile.h],,
-				 [missing=yes
-				  echo "***** Missing vorbis headers ($website) *****"])
-AC_SEARCH_LIBS([ov_open], [vorbisfile],,
-			   [missing=yes
-				echo "***** Missing libvorbisfile ($website) *****"])
-
 ##### liblua #####
 website="http://www.lua.org/"
 AC_CHECK_HEADERS([lua.h],,
@@ -302,9 +271,27 @@ AC_SEARCH_LIBS([lua_load], [lua],,
 			   [missing=yes
 				echo "***** Missing liblua ($website) *****"])
 
+##### libpng #####
+website="http://www.libpng.org/pub/png/libpng.html"
+PKG_CHECK_MODULES([PNG], [libpng],
+				  [LIBS="$LIBS $PNG_LIBS"
+				   CFLAGS="$CFLAGS $PNG_CFLAGS"
+				   CXXFLAGS="$CXXFLAGS $PNG_CFLAGS"],
+				  [missing=yes
+				   echo "***** Missing libpng ($website) *****"])
+
+##### libvorbis #####
+website="http://www.xiph.org/downloads/"
+PKG_CHECK_MODULES([VORBIS], [vorbisfile],
+				  [LIBS="$LIBS $VORBIS_LIBS"
+				   CFLAGS="$CFLAGS $VORBIS_CFLAGS"
+				   CXXFLAGS="$CXXFLAGS $VORBIS_CFLAGS"],
+				  [missing=yes
+				   echo "***** Missing libvorbisfile ($website) *****"])
+
+##### GTK+ 2.0 #####
 if test x$gtk = xyes
 then
-	##### GTK+ 2.0 #####
 	website="http://www.gtk.org/"
 	PKG_CHECK_MODULES([GTK], [gtk+-2.0],
 					  [LIBS="$LIBS $GTK_LIBS"
@@ -314,9 +301,9 @@ then
 					   echo "***** Missing GTK+-2.0 ($website) *****"])
 fi
 
+##### QT4 #####
 if test x$qt4 = xyes
 then
-	##### QT4 #####
 	website="http://qt.nokia.com/"
 	PKG_CHECK_MODULES([QT], [QtGui],
 					  [LIBS="$LIBS $QT_LIBS"
@@ -326,27 +313,21 @@ then
 					   echo "***** Missing QT ($website) *****"])
 fi
 
-##### librt (optional) #####
-AC_SEARCH_LIBS([clock_gettime], [rt],
-			   [AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
-						  [Define to 1 if you have the 'clock_gettime' function.])])
-
 
 if test x$missing == xyes
 then
-	AC_MSG_ERROR([please install missing dependencies (see messages above)])
+	AC_MSG_WARN([It looks like you're missing some dependencies--building may fail.])
 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])
 
 
@@ -362,7 +343,7 @@ AC_CONFIG_FILES([Makefile
 
 if test x$WIN32 = xyes
 then
-	AC_CONFIG_FILES([win32/Makefile win32/build-installer.sh])
+	AC_CONFIG_FILES([win32/Makefile win32/mkpackage.sh win32/yoink.nsi])
 fi
 
 
@@ -381,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"