X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure.ac;h=fa996164497112097c86a85f632056a99f660e60;hp=997a7f23b14d6228c12ad4fd7d3017dd90abbe1d;hb=ed5fcf5f1357fc42749408f705e9ec55531ff006;hpb=592c83141aef55c6e3a17c516e2f09441f29c267

diff --git a/configure.ac b/configure.ac
index 997a7f2..fa99616 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ 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
@@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE
 
 #
 # Checks for programs.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 AC_PROG_CXX
 AC_PROG_CC
@@ -27,10 +27,14 @@ AC_PROG_INSTALL
 AC_PROG_RANLIB
 AM_PROG_CC_C_O
 
+PKG_PROG_PKG_CONFIG
+
+AC_PATH_PROGS([DOXYGEN], [doxygen])
+AC_SUBST(DOXYGEN)
 
 #
 # Configure platform-specific stuff.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 case "${host}" in
 	*mingw32*)
@@ -41,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
@@ -53,20 +55,14 @@ case "${host}" in
 		MACOSX=yes
 		LIBS="$LIBS -Wl,-framework"
 	;;
-	*-linux-gnu*)
-		LINUX=yes
-		AC_PATH_PROGS([RPMBUILD], [rpmbuild])
-		AC_SUBST(RPMBUILD)
-	;;
 esac
 
-AM_CONDITIONAL([LINUX], test "$LINUX" = "yes")
 AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
 
 
 #
 # Checks for configuration arguments.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 AC_ARG_ENABLE([debug],
 			  [  --enable-debug          include debugging symbols and features],
@@ -93,17 +89,21 @@ AC_ARG_ENABLE([threads],
 			  [threads=$enableval],
 			  [threads=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])
+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])
 
 
 if test x$debug = xyes
 then
-	CFLAGS="$CFLAGS -Wall -g -DDEBUG"
-	CXXFLAGS="$CXXFLAGS -Wall -g -DDEBUG"
+	CFLAGS="$CFLAGS -DDEBUG -Wall -Wno-uninitialized"
+	CXXFLAGS="$CXXFLAGS -DDEBUG -Wall -Wno-uninitialized"
 else
 	CFLAGS="$CFLAGS -DNDEBUG"
 	CXXFLAGS="$CXXFLAGS -DNDEBUG"
@@ -132,11 +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
 
-AC_DEFINE_UNQUOTED([YOINK_LOGLEVEL], [$log_level],
-				   [Define to detail level of logging.])
+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 QT4 info/error dialogs.])
+fi
 
 
 if test "x$prefix" = xNONE
@@ -148,7 +155,7 @@ if test x$WIN32 = xyes
 then
 	DATADIR="data"
 else
-	eval eval DATADIR="${datadir}/yoink"
+	eval eval DATADIR="${datadir}/$PACKAGE"
 fi
 
 AC_SUBST([DATADIR])
@@ -158,7 +165,7 @@ AC_DEFINE_UNQUOTED([YOINK_DATADIR], ["$DATADIR"],
 
 #
 # Split the version number into components.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 VERSION_MAJOR=$(echo $VERSION | cut -d. -f1)
 VERSION_MINOR=$(echo $VERSION | cut -d. -f2)
@@ -184,7 +191,7 @@ fi
 
 #
 # Checks for system functions/headers and compiler characteristics.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 AC_C_STRINGIZE
 AC_C_INLINE
@@ -203,10 +210,15 @@ 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.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ##### boost #####
 website="http://www.boost.org/"
@@ -227,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],,
@@ -241,81 +253,99 @@ 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/"
-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) *****"])
+##### liblua #####
+website="http://www.lua.org/"
+PKG_CHECK_MODULES([LUA], [lua],
+				  [LIBS="$LIBS $LUA_LIBS"
+				   CFLAGS="$CFLAGS $LUA_CFLAGS"
+				   CXXFLAGS="$CXXFLAGS $LUA_CFLAGS"],
+				  [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/"
-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],,
-				 [missing=yes
-				  echo "***** Missing lua headers ($website) *****"])
-AC_SEARCH_LIBS([lua_load], [lua],,
-			   [missing=yes
-				echo "***** Missing liblua ($website) *****"])
+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
+	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
 
-##### librt (optional) #####
-AC_SEARCH_LIBS([clock_gettime], [rt],
-			   [AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
-						  [Define to 1 if you have the 'clock_gettime' function.])])
+##### QT4 #####
+if test x$qt4 = xyes
+then
+	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
 
 
 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.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-DATA_FILES=$(echo $(cd data; \
-					find . -name "*.lua" \
-						-o -name "*.ogg" \
-						-o -name "*.png" \
-						-o -name "yoinkrc"))
+# Find the game resources to install.
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+DATA_FILES=$(echo $(cd data && find . -name "*.lua" \
+								   -o -name "*.ogg" \
+								   -o -name "*.png" \
+								   -o -name "yoinkrc"))
 AC_SUBST([DATA_FILES])
 
 
 #
 # Create the build files.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 AC_CONFIG_FILES([Makefile
 				 data/Makefile
 				 doc/Makefile
 				 doc/yoink.6
-				 extra/Makefile
-				 extra/yoink.spec
-				 make-win32-installer.sh
-                 src/Makefile])
+				 src/Makefile])
+
+if test x$WIN32 = xyes
+then
+	AC_CONFIG_FILES([win32/Makefile win32/mkpackage.sh win32/yoink.nsi])
+fi
+
 
 AC_CONFIG_HEADERS([src/config.h])
 
@@ -324,7 +354,7 @@ AC_OUTPUT
 
 #
 # Print a friendly little message.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 echo ""
 echo " Configuration complete! :-)"
@@ -332,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"