X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure.ac;h=a35b3a4879e7187b698f1fe411686bed5f20f46b;hp=7a01c45c1a5f7b23aeae3ad09b0cac4e2687cebc;hb=321f005b45580b8c2c14ddc577fb6ca7780a68c5;hpb=90b2c7fb10b244b781b84965a0d36f1f323ee94d

diff --git a/configure.ac b/configure.ac
index 7a01c45..a35b3a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,12 +70,12 @@ AC_ARG_ENABLE([debug],
 			  [debug=no])
 
 AC_ARG_ENABLE([double-precision],
-			  [  --enable-double-precision      use double-precision numbers],
+			  [  --enable-double-precision      use doubles instead of floats],
 			  [double_precision=$enableval],
 			  [double_precision=no])
 
 AC_ARG_ENABLE([profile],
-			  [  --enable-profile        make a binary for use with gprof profiler],
+			  [  --enable-profile        make a binary with code profiling instructions],
 			  [profile=$enableval],
 			  [profile=no])
 
@@ -84,18 +84,23 @@ AC_ARG_ENABLE([extra-warnings],
 			  [extra_warnings=$enableval],
 			  [extra_warnings=no])
 
+AC_ARG_ENABLE([clock_gettime],
+			  [  --enable-clock_gettime  use clock_gettime() instead of SDL_GetTicks()],
+			  [clock_gettime=$enableval],
+			  [clock_gettime=no])
+
 AC_ARG_ENABLE([threads],
-			  [  --enable-threads        use threads for some parallel tasks],
+			  [  --enable-threads        use threads for concurrency where appropriate],
 			  [threads=$enableval],
 			  [threads=no])
 
 AC_ARG_ENABLE([gtk],
-			  [  --enable-gtk            enable GTK+ info/warning dialogs],
+			  [  --enable-gtk            enable GTK+ modal dialogs],
 			  [gtk=$enableval],
 			  [gtk=no])
 
 AC_ARG_ENABLE([qt4],
-			  [  --enable-qt4            enable QT info/warning dialogs],
+			  [  --enable-qt4            enable QT modal dialogs],
 			  [qt4=$enableval],
 			  [qt4=no])
 
@@ -138,11 +143,11 @@ fi
 if test x$gtk = xyes
 then
 	AC_DEFINE([USE_GTK], 1,
-			  [Define to 1 if you want to use GTK+ info/error dialogs.])
+			  [Define to 1 if you want to use GTK+ modal dialogs.])
 elif test x$qt4 = xyes
 then
 	AC_DEFINE([USE_QT4], 1,
-			  [Define to 1 if you want to use QT4 info/error dialogs.])
+			  [Define to 1 if you want to use QT4 modal dialogs.])
 fi
 
 
@@ -211,15 +216,20 @@ 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.])])
+if test x$clock_gettime = xyes
+then
+	AC_SEARCH_LIBS([clock_gettime], [rt],
+				   [AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
+							  [Define to 1 if you have the 'clock_gettime' function.])])
+fi
 
 
 #
 # Checks for build dependencies.
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+echo "checking for dependencies..."
+
 ##### boost #####
 website="http://www.boost.org/"
 BOOST_SMART_PTR
@@ -229,38 +239,21 @@ BOOST_FUNCTION
 
 ##### SDL #####
 website="http://www.libsdl.org/"
-AM_PATH_SDL([1.2.10],
-			[CFLAGS="$CFLAGS $SDL_CFLAGS"
-			 CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-			 LIBS="$LIBS $SDL_LIBS"])
+PKG_CHECK_MODULES([SDL], [sdl],
+				  [LIBS="$LIBS $SDL_LIBS"
+				   CFLAGS="$CFLAGS $SDL_CFLAGS"
+				   CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"],
+				  [missing=yes
+				   echo "***** Missing SDL ($website) *****"])
 
 ##### opengl, glu #####
 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
-then
-# autoconf library search macro doesn't find opengl32 on windows because it uses
-# different name hashing or something, but it links fine; assume it's there
-	LIBS="$LIBS -lglu32 -lopengl32"
-else
-	AC_SEARCH_LIBS([glEnable], [GL MesaGL],,
-				   [missing=yes
-					echo "***** Missing libGL ($website) *****"])
-	AC_SEARCH_LIBS([gluDisk], [GLU MesaGLU],,
-				   [missing=yes
-					echo "***** Missing libGLU ($website) *****"])
-fi
-
-##### openal #####
-website="http://connect.creativelabs.com/openal/"
-AC_CHECK_HEADERS([AL/al.h AL/alc.h],,
-				 [missing=yes
-				  echo "***** Missing OpenAL headers ($website) *****"])
-AC_SEARCH_LIBS([alEnable], [openal OpenAL32],,
-			   [missing=yes
-				echo "***** Missing libopenal ($website) *****"])
+PKG_CHECK_MODULES([OPENGL], [gl glu],
+				  [LIBS="$LIBS $OPENGL_LIBS"
+				   CFLAGS="$CFLAGS $OPENGL_CFLAGS"
+				   CXXFLAGS="$CXXFLAGS $GLU_CFLAGS"],
+				  [missing=yes
+				   echo "***** Missing OpenGL ($website) *****"])
 
 ##### liblua #####
 website="http://www.lua.org/"
@@ -280,6 +273,15 @@ PKG_CHECK_MODULES([PNG], [libpng],
 				  [missing=yes
 				   echo "***** Missing libpng ($website) *****"])
 
+##### openal #####
+website="http://connect.creativelabs.com/openal/"
+PKG_CHECK_MODULES([OPENAL], [openal],
+				  [LIBS="$LIBS $OPENAL_LIBS"
+				   CFLAGS="$CFLAGS $OPENAL_CFLAGS"
+				   CXXFLAGS="$CXXFLAGS $OPENAL_CFLAGS"],
+				  [missing=yes
+				   echo "***** Missing OpenAL ($website) *****"])
+
 ##### libvorbis #####
 website="http://www.xiph.org/downloads/"
 PKG_CHECK_MODULES([VORBIS], [vorbisfile],
@@ -316,7 +318,7 @@ fi
 
 if test x$missing == xyes
 then
-	AC_MSG_WARN([It looks like you're missing some dependencies--building may fail.])
+	AC_MSG_WARN([It looks like you're missing some dependencies--building may fail!])
 fi
 
 
@@ -359,13 +361,13 @@ AC_OUTPUT
 echo ""
 echo " Configuration complete! :-)"
 echo ""
-echo "            Target: $target"
-echo "            Prefix: $prefix"
-echo "    Data Directory: $DATADIR"
-echo "             Debug: $debug"
-echo "  Double Precision: $double_precision"
-echo "           Profile: $profile"
-echo "    Extra Warnings: $extra_warnings"
+echo "      Host: $target"
+echo "    Prefix: $prefix"
+echo "      Data: $DATADIR"
+echo ""
+echo "       CXX: $CXX"
+echo "  CXXFLAGS: $(echo $CXXFLAGS)"
+echo "      LIBS: $(echo $LIBS)"
 echo ""
 echo " To finish the installation, execute:"
 echo "  make"