datarootdir autotools fix

[chaz/yoink] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2d839c9b0a36f115a8d8e21c045038694c37c592..c5ac1f048170e206ca6eaa05bc8f9187b3cd5671 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -63,17 +63,19 @@ then
        prefix="$ac_default_prefix"
 fi
 
-if test x$datadir = x'${datarootdir}'
-then
-       eval datarootdir="$datarootdir"
-       eval datadir="$datadir/yoink"
-fi
+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"],
+AC_DEFINE_UNQUOTED([YOINK_DATADIR], ["$DATADIR"],
                                   [Define to path of game asset directory.])
 
 AC_DEFINE_UNQUOTED([YOINK_CONFIGFILES],                                    
-                                  ["\$HOME/.yoinkrc:/etc/yoinkrc:$datadir/yoinkrc"],
+                                  ["\$HOME/.yoinkrc:/etc/yoinkrc:$DATADIR/yoinkrc"],
                                   [Define to colon-delimited config file paths.])
 
 
@@ -81,7 +83,7 @@ AC_DEFINE_UNQUOTED([YOINK_CONFIGFILES],
 # 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"])
@@ -170,7 +172,7 @@ echo " Configuration complete!"
 echo ""
 
 echo "  Prefix: $prefix"
-echo "    Data: $datadir"
+echo "    Data: $DATADIR"
 echo ""
 
 if test x$debug = xyes