X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure.ac;h=7ee82d3b12433836ee906a3576f9c39a76b5d284;hp=0d9f5fd5b0a1a51895463a199c2154464f24bba0;hb=7e84479de612a4ce287c6f63deb014b447a993ec;hpb=5918751f97a3eb976a7b24647786109edc58234c

diff --git a/configure.ac b/configure.ac
index 0d9f5fd..7ee82d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,7 @@ AC_CONFIG_SRCDIR([src/GameLayer.cc])
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 
 #
@@ -27,6 +28,8 @@ AC_PROG_INSTALL
 AC_PROG_RANLIB
 AM_PROG_CC_C_O
 
+PKG_PROG_PKG_CONFIG
+
 AC_PATH_PROGS([DOXYGEN], [doxygen])
 AC_SUBST(DOXYGEN)
 
@@ -43,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
@@ -55,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")
 
 
@@ -93,6 +90,16 @@ AC_ARG_ENABLE([threads],
 			  [threads=$enableval],
 			  [threads=no])
 
+AC_ARG_ENABLE([gtk],
+			  [  --enable-gtk            enable GTK+ info/warning dialogs],
+			  [gtk=$enableval],
+			  [gtk=no])
+
+AC_ARG_ENABLE([qt4],
+			  [  --enable-qt4            enable QT info/warning dialogs],
+			  [qt4=$enableval],
+			  [qt4=no])
+
 AC_ARG_WITH([log-level],
 			[AS_HELP_STRING([--with-log-level=NUM],
 							[0, none... 1, errors... 4, everything (default: 3)])],
@@ -135,6 +142,16 @@ then
 			  [Define to 1 if you want to use threads for parallel tasks.])
 fi
 
+if test x$gtk = xyes
+then
+	AC_DEFINE([USE_GTK], 1,
+			  [Define to 1 if you want to use GTK+ info/error dialogs.])
+elif test x$qt4 = xyes
+then
+	AC_DEFINE([USE_QT4], 1,
+			  [Define to 1 if you want to use QT info/error dialogs.])
+fi
+
 AC_DEFINE_UNQUOTED([YOINK_LOGLEVEL], [$log_level],
 				   [Define to detail level of logging.])
 
@@ -227,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
@@ -241,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/"
@@ -280,6 +294,30 @@ AC_SEARCH_LIBS([lua_load], [lua],,
 			   [missing=yes
 				echo "***** Missing liblua ($website) *****"])
 
+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"
+					   CFLAGS="$CFLAGS $GTK_CFLAGS"
+					   CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"],
+					  [missing=yes
+					   echo "***** Missing GTK+-2.0 ($website) *****"])
+fi
+
+if test x$qt4 = xyes
+then
+	##### QT4 #####
+	website="http://qt.nokia.com/"
+	PKG_CHECK_MODULES([QT], [QtGui],
+					  [LIBS="$LIBS $QT_LIBS"
+					   CFLAGS="$CFLAGS $QT_CFLAGS"
+					   CXXFLAGS="$CXXFLAGS $QT_CFLAGS"],
+					  [missing=yes
+					   echo "***** Missing QT ($website) *****"])
+fi
+
 ##### librt (optional) #####
 AC_SEARCH_LIBS([clock_gettime], [rt],
 			   [AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
@@ -288,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
 
 
@@ -308,18 +346,17 @@ AC_SUBST([DATA_FILES])
 # Create the build files.
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+AC_CONFIG_FILES([Makefile
+				 data/Makefile
+				 doc/Makefile
+				 doc/yoink.6
+				 src/Makefile])
+
 if test x$WIN32 = xyes
 then
-	make_win32="win32/Makefile win32/build-installer.sh"
-else
-	make_doc="doc/Makefile doc/yoink.6"
+	AC_CONFIG_FILES([win32/Makefile win32/mkpackage.sh])
 fi
 
-AC_CONFIG_FILES([Makefile
-				 data/Makefile
-				 src/Makefile
-				 $make_doc
-				 $make_win32])
 
 AC_CONFIG_HEADERS([src/config.h])