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

diff --git a/configure.ac b/configure.ac
index f03af5d..7ee82d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/GameLayer.cc])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([subdir-objects])
+AM_INIT_AUTOMAKE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 
@@ -46,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
@@ -58,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")
 
 
@@ -152,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.])
@@ -252,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
@@ -334,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
 
 
@@ -362,7 +354,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])
 fi