X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure.ac;h=dc29d61e0945cb2f5e577dbbfa4021fc6bacf469;hp=0f46ef53253e2a542801618c61287d3943f8413e;hb=6a5d12788f2778a26223de690d34b00ac16a6ec3;hpb=9d0add74a28da0a1c24430eee52d41a7d367f857

diff --git a/configure.ac b/configure.ac
index 0f46ef5..dc29d61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,8 @@ AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/GameLayer.cc])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([subdir-objects])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 
 #
@@ -45,9 +46,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
@@ -57,12 +56,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")
 
 
@@ -151,13 +146,11 @@ 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.])
 fi
-fi
 
 AC_DEFINE_UNQUOTED([YOINK_LOGLEVEL], [$log_level],
 				   [Define to detail level of logging.])
@@ -251,7 +244,7 @@ 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
@@ -265,17 +258,14 @@ else
 					echo "***** Missing libGLU ($website) *****"])
 fi
 
-##### openal, alut #####
+##### openal #####
 website="http://connect.creativelabs.com/openal/"
-AC_CHECK_HEADERS([AL/al.h AL/alut.h],,
+AC_CHECK_HEADERS([AL/al.h AL/alc.h],,
 				 [missing=yes
 				  echo "***** Missing OpenAL headers ($website) *****"])
-AC_SEARCH_LIBS([alEnable], [openal openal32],,
+AC_SEARCH_LIBS([alEnable], [openal OpenAL32],,
 			   [missing=yes
 				echo "***** Missing libopenal ($website) *****"])
-AC_SEARCH_LIBS([alutInit], [alut],,
-			   [missing=yes
-				echo "***** Missing libalut ($website) *****"])
 
 ##### SDL_image #####
 website="http://www.libsdl.org/projects/SDL_image/"
@@ -336,7 +326,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt],
 
 if test x$missing == xyes
 then
-	AC_MSG_ERROR([please install missing dependencies (see messages above)])
+	AC_MSG_WARN([You may be missing some dependencies--see messages above.])
 fi
 
 
@@ -358,9 +348,15 @@ AC_SUBST([DATA_FILES])
 
 AC_CONFIG_FILES([Makefile
 				 data/Makefile
-				 src/Makefile
-				 doc/Makefile doc/yoink.6
-				 win32/Makefile win32/build-installer.sh])
+				 doc/Makefile
+				 doc/yoink.6
+				 src/Makefile])
+
+if test x$WIN32 = xyes
+then
+	AC_CONFIG_FILES([win32/Makefile win32/mkpackage.sh])
+fi
+
 
 AC_CONFIG_HEADERS([src/config.h])