Changeset 614 for abuse/trunk/configure.acTweet

Timestamp:

May 9, 2011, 12:55:14 AM (12 years ago)

Author:

Sam Hocevar

Message:

build: add a `--with-assetsdir' configure flag to specify where the
game data should be installed.

File:

• abuse/trunk/configure.ac (modified) (4 diffs)

abuse/trunk/configure.ac

@@ -20 +20 @@
 fi
 
-dnl Figure out where the datafiles will be
-EXPDATADIR="-DEXPDATADIR=\\\"$datadir/games/abuse\\\""
-AC_SUBST(EXPDATADIR)
-
 AC_ARG_ENABLE(debug,
   [  --enable-debug          build debug versions of the game (default no)])
@@ -31 +27 @@
   [  --disable-nonfree       disable non-free data (default no)])
 
-dnl Checks for libraries
+AC_ARG_WITH(assetsdir,
+  [  --with-assetsdir=DIR    override default game data directory])
+
+dnl  Figure out where the datafiles will be
+if test "x${with_assetsdir}" = x; then
+  with_assetsdir='$(datadir)/games/abuse'
+fi
+AC_SUBST([assetsdir], [$with_assetsdir])
+
+dnl  Checks for libraries
 dnl Do we need to link against something for X shared memory support?
-AC_CHECK_LIB(Xext,XShmAttach,:,[
-AC_CHECK_LIB(XextSam,XShmAttach,LIBS="$LIBS -lXextSam",,$X_LIBS -lX11 -lXext)
-],$X_LIBS -lX11)
+AC_CHECK_LIB(Xext, XShmAttach, :,
+             [AC_CHECK_LIB(XextSam, XShmAttach, LIBS="$LIBS -lXextSam", :,
+                           $X_LIBS -lX11 -lXext)],
+             $X_LIBS -lX11)
 
 dnl Checks for Solaris compatibility
-AC_CHECK_LIB(m,pow,LIBS="$LIBS -lm")
-AC_CHECK_LIB(socket,socket,LIBS="$LIBS -lsocket")
-AC_CHECK_LIB(nsl,gethostbyname,LIBS="$LIBS -lnsl")
+AC_CHECK_LIB(m, pow, LIBS="$LIBS -lm")
+AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
+AC_CHECK_LIB(nsl, gethostbyname, LIBS="$LIBS -lnsl")
 
 dnl Check for SDL
@@ -114 +120 @@
     #else
     #include <GL/gl.h>
-    #endif
-],[
-],[
-have_opengl=yes
-])
+    #endif],
+  [],
+  [have_opengl=yes])
 AC_MSG_RESULT($have_opengl)
-if test x$have_opengl = xyes; then
+if test "x$have_opengl" = xyes; then
     CFLAGS="$CFLAGS -DHAVE_OPENGL"
     CXXFLAGS="$CXXFLAGS -DHAVE_OPENGL"
@@ -140 +144 @@
 echo "
 ------ Configuration for $PACKAGE $VERSION ------
-    Compiler:         ${CC} (version `${CC} --version`)
-    Install prefix:   $prefix
-    SDL version:      `sdl-config --version`
-    OpenGL support:   $have_opengl
+    Compiler:          ${CC} (`${CC} --version | head -n 1`)
+    Install prefix:    ${prefix}
+    Assets directory:  ${with_assetsdir}
+    SDL version:       `sdl-config --version`
+    OpenGL support:    ${have_opengl}
 
 Now type 'make' to build $PACKAGE.