Changeset 582

Timestamp:

09/28/07 09:22:29 (1 year ago)

Author:

takkaria

Message:

Fix up autoconf support somewhat.

Files:

• trunk (modified) (2 props)
• trunk/configure.ac (modified) (5 diffs)
• trunk/lib/data/Makefile (modified) (1 diff)
• trunk/mk/objective.mk (modified) (1 diff)
• trunk/src/Makefile (modified) (1 diff)

trunk/configure.ac

@@ -11 +11 @@
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])
+
+AC_ARG_WITH(setgid,       [  --with-setgid=NAME      install angband as group NAME])
+AC_ARG_WITH(private_dirs, [  --with-private-dirs     use private scorefiles/savefiles/datafiles])
+AC_ARG_WITH(noinstall,    [  --with-noinstall        don't install globally at all])
+
+if test "x$with_setgid" != "xyes"; then
+        if test "x$with_setgid" != "x"; then
+                wsetgid=yes
+        fi
+fi
+
+if test "x$wsetgid$with_private_dirs$with_noinstall" != "xyes";  then
+
+        echo "Please run ./configure with one of:
+
+--with-setgid=<groupname>
+    This configures the game to store savefiles and scorefiles in a central
+    location on the system, writeable only by the group \"groupname\".  If you
+    want a traditional installation of Angband, where all users share a
+    scorefile, then use this option, and set the groupname to your \"games\"
+    group.  This option requires the game to have the \"setgid\" bit set on its
+    permissions, and thus this option requires root when installing.
+
+--with-private-dirs
+    This configures the game to store savefiles and scorefiles for each user
+    in that user's home directory.  The game requires no special privileges if
+    you do this, and should be used for most installations of the game.
+
+--with-noinstall
+    This configures the game to store savefiles and scorefiles in the "lib"
+    directory that the game uses.  This is useful if you don't want to install
+    system-wide at all; \"make install\" will just move the executable to the
+    directory above \"src\" if you choose this option.  This option is
+    recommended for developers.
+"
+
+        AC_MSG_ERROR([Please specify an installation method.])
+fi
+
-
-dnl Check for C compiler
@@ -27 +66 @@
-AC_PATH_PROG(CP, cp)
-
-s
+
-if test "$prefix" = "NONE"; then
-        prefix="${ac_default_prefix}"
@@ -33 +72 @@
-
-
-
+
+
+
+
+
-AC_ARG_WITH(libpath, [  --with-libpath=PATH     use PATH as the path to the Angband lib folder])
-
-if test "$with_libpath" != ""; then
-        libpath="${with_libpath}"
-
-
-
+
-        libpath="./lib/"
-        bindir=".."
+else
+        libpath="${prefix}/share/${PACKAGE}/"
-fi
-
@@ -52 +95 @@
-AC_DEFINE_UNQUOTED([DEFAULT_PATH], "${game_datadir}", [Path to the game's lib directory])
-
-SETEGID="$with_setgid";    AC_SUBST(SETEGID
-DATA_PATH="$game_datadir"; AC_SUBST(DATA_PATH
-
+NOINSTALL="$with_noinstall"; AC_SUBST(NOINSTALL
+SETEGID="$with_setgid";      AC_SUBST(SETEGID
+
-
-dnl Frontends
-AC_ARG_ENABLE(gtk,
-  --enable-gtk                         Enables GTK 2.x frontend, can't use on system-wide installs (default: disabled
+AS_HELP_STRING([--enable-gtk],       [Enables GTK 2.x frontend (default: disabled)]
-        [enable_gtk=$enableval],
-        [enable_gtk=no])
-AC_ARG_ENABLE(curses,
-  --enable-curses                      Enables Curses frontend (default: enabled
+AS_HELP_STRING([--enable-curses],    [Enables Curses frontend (default: enabled)]
-        [enable_curses=$enableval],
-        [enable_curses=yes])
-AC_ARG_ENABLE(x11,
-  --enable-x11                         Enables X11 frontend (default: enabled
+AS_HELP_STRING([--enable-x11],       [Enables X11 frontend (default: enabled)]
-        [enable_x11=$enableval],
-        [enable_x11=yes])
-AC_ARG_ENABLE(sdl,
-  --enable-sdl                         Enables SDL frontend (default: disabled
+AS_HELP_STRING([--enable-sdl],       [Enables SDL frontend (default: disabled)]
-        [enable_sdl=$enableval],
-        [enable_sdl=no])
@@ -76 +119 @@
-dnl Sound modules
-AC_ARG_ENABLE(sdl_mixer,
-  --enable-sdl-mixer                   Enables SDL mixer sound support (default: enabled
+AS_HELP_STRING([--enable-sdl-mixer], [Enables SDL mixer sound support (default: enabled)]
-        [enable_sdl_mixer=$enable_sdl_mixer],
-        [enable_sdl_mixer=yes])
-
-
+if test "x$enable_gtk$with_setgid" != "xyes"; then
+        AC_MSG_ERROR([The "setgid" option and the GTK port are incompatible.])
+fi
-
-

trunk/lib/data/Makefile

@@ -28 +28 @@
-                        touch ${DATA_PATH}/data/prices.raw; \
-                        touch ${DATA_PATH}/data/shop_own.raw; \
+                        touch ${DATA_PATH}/data/spells.raw; \
-                        touch ${DATA_PATH}/data/terrain.raw; \
-                        touch ${DATA_PATH}/data/vault.raw; \

trunk/mk/objective.mk

@@ -31 +31 @@
-        fi
-        @if [ "x$(OBJECTIVE_DATA)" != "x" ]; then \
-SETEGID)" !
+NOINSTALL)" 
-                for i in $(OBJECTIVE_DATA); do \
-                        source=`echo $$i | cut -d ":" -f1`; \

trunk/src/Makefile

@@ -25 +25 @@
-                if [ "x$(DRY)" = "x" ]; then \
-                        chown root:${SETEGID} $(DESTDIR)$(BINDIR)/angband; \
+                        chmod g+s $(DESTDIR)$(BINDIR)/angband; \
-                fi; \
-        fi