no more useless singleton class

[chaz/yoink] / configure.ac

diff --git a/configure.ac b/configure.ac
index c5ac1f048170e206ca6eaa05bc8f9187b3cd5671..e8fd379c8091dcb2bbc7f704f3732d8446495641 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,8 +39,8 @@ AC_ARG_ENABLE([debug],
                          [debug=$enableval
                           if test x$debug = xyes
                           then
-                                  CFLAGS="-Wall -Werror -g -O0 -DDEBUG"
-                                  CXXFLAGS="-Wall -Werror -g -O0 -DDEBUG"
+                                  CFLAGS="-Wall -Werror -gstabs+ -O0 -DDEBUG"
+                                  CXXFLAGS="-Wall -Werror -gstabs+ -O0 -DDEBUG"
                           else
                                   CFLAGS="-O2 -DNDEBUG"
                                   CXXFLAGS="-O2 -DNDEBUG"
@@ -70,13 +70,13 @@ AC_ARG_WITH([assetdir],
                        [eval DATADIR="$datarootdir/yoink"])
 
 AC_SUBST([DATADIR])
-
 AC_DEFINE_UNQUOTED([YOINK_DATADIR], ["$DATADIR"],
                                   [Define to path of game asset directory.])
 
-AC_DEFINE_UNQUOTED([YOINK_CONFIGFILES],                                    
-                                  ["\$HOME/.yoinkrc:/etc/yoinkrc:$DATADIR/yoinkrc"],
-                                  [Define to colon-delimited config file paths.])
+CONFIGFILES="\$HOME/.yoinkrc:/etc/yoinkrc"
+
+AC_DEFINE_UNQUOTED([YOINK_CONFIGFILES], ["$CONFIGFILES"],
+                                  [Define to colon-delimited configuration file paths.])
 
 
 #
@@ -98,12 +98,24 @@ BOOST_FUNCTION
 AC_SEARCH_LIBS([IMG_Load], [SDL_image],,
                           [AC_MSG_ERROR([libSDL_image is required])])
 
+AC_SEARCH_LIBS([Sound_Init], [SDL_sound],,
+                          [AC_MSG_ERROR([libSDL_sound is required])])
+
 AC_SEARCH_LIBS([glBegin], [GL],,
                           [AC_MSG_ERROR([libGL is required])])
 
+AC_SEARCH_LIBS([gluPerspective], [GLU],,
+                          [AC_MSG_ERROR([libGLU is required])])
+
+AC_SEARCH_LIBS([alGenBuffers], [openal],,
+                          [AC_MSG_ERROR([libopenal is required])])
+
+AC_SEARCH_LIBS([alutInit], [alut],,
+                          [AC_MSG_ERROR([libalut is required])])
+
 AC_SEARCH_LIBS([clock_gettime], [rt],
-                          [AC_DEFINE([HAVE_LIBRT], 1,
-                                                 [Define to 1 if you have the 'rt' library.])])
+                          [AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
+                                                 [Define to 1 if you have the 'clock_gettime' function.])])
 
 
 #
@@ -135,7 +147,7 @@ AC_TYPE_SSIZE_T
 
 AC_FUNC_ERROR_AT_LINE
 AC_FUNC_STRTOD
-AC_CHECK_FUNCS([strchr strcspn strrchr strstr])
+AC_CHECK_FUNCS([nanosleep strchr strcspn strrchr strstr])
 
 
 #
@@ -153,9 +165,10 @@ AC_SUBST([DATA_FILES])
 
 AC_CONFIG_FILES([Makefile
                                 data/Makefile
-                 src/Makefile
                                 doc/Makefile
                                 doc/yoink.6
+                                extra/yoink.spec
+                 src/Makefile
                                 yajl/Makefile])
 
 AC_CONFIG_HEADERS([src/config.h])
@@ -167,7 +180,7 @@ AC_OUTPUT
 # Print a friendly little message.
 #
 
-echo "====================================="
+echo "======================================"
 echo " Configuration complete!"
 echo ""
 
@@ -190,5 +203,5 @@ fi
 echo " To finish the installation, execute:"
 echo "  make"
 echo "  make install"
-echo "====================================="
+echo "======================================"