X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure.ac;h=9267e807d9756934773b1a42cc19f172acc6505b;hp=2d839c9b0a36f115a8d8e21c045038694c37c592;hb=29e3d45f7bbbf31eadf793c41ff2b3d9c47b7539;hpb=7d15b919681bb9ec0088b4b27c6abf62d6dfb9b1

diff --git a/configure.ac b/configure.ac
index 2d839c9..9267e80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,25 +63,27 @@ then
 	prefix="$ac_default_prefix"
 fi
 
-if test x$datadir = x'${datarootdir}'
-then
-	eval datarootdir="$datarootdir"
-	eval datadir="$datadir/yoink"
-fi
-
-AC_DEFINE_UNQUOTED([YOINK_DATADIR], ["$datadir"],
+AC_ARG_WITH([assetdir],
+			[AS_HELP_STRING([--with-assetdir=DIR],
+							[real path to game assets (default: $datarootdir/yoink)])],
+			[DATADIR="$withval"],
+			[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.])
 
 
 #
 # Checks for libraries.
 #
 
-AM_PATH_SDL([1.2.14],
+AM_PATH_SDL([1.2.10],
 			[CFLAGS="$CFLAGS $SDL_CFLAGS"
 			 CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
 			 LIBS="$LIBS $SDL_LIBS"])
@@ -99,9 +101,12 @@ AC_SEARCH_LIBS([IMG_Load], [SDL_image],,
 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([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.])])
 
 
 #
@@ -133,7 +138,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])
 
 
 #
@@ -151,9 +156,9 @@ AC_SUBST([DATA_FILES])
 
 AC_CONFIG_FILES([Makefile
 				 data/Makefile
-                 src/Makefile
 				 doc/Makefile
 				 doc/yoink.6
+                 src/Makefile
 				 yajl/Makefile])
 
 AC_CONFIG_HEADERS([src/config.h])
@@ -170,7 +175,7 @@ echo " Configuration complete!"
 echo ""
 
 echo "  Prefix: $prefix"
-echo "    Data: $datadir"
+echo "    Data: $DATADIR"
 echo ""
 
 if test x$debug = xyes