[gnome-video-arcade] Bug 642689 - README out of date: sdlmame does not exist anymore

[Matthew Barnes <mbarnes src gnome org>]

commit 35cbbe6afbccfdc51b79066c02eeebbf145ae1a4
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Feb 18 13:51:42 2011 -0500

    Bug 642689 - README out of date: sdlmame does not exist anymore
    
    Also change SDLMAME options in configure.ac to MAME.

 README       |   21 ++++++++++++---------
 configure.ac |   16 ++++++++--------
 2 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/README b/README
index a38a835..d573e8b 100644
--- a/README
+++ b/README
@@ -18,14 +18,17 @@ Dependencies
 GNOME Video Arcade has a few external dependencies which need to be
 installed prior to compiling the source code:
 
-   - sdlmame or xmame
+   - mame or xmame
 
        These may be available as pre-compiled packages from your
        GNU/Linux distribution.  If not, you can download and compile
        the source code yourself.
 
-          sdlmame:  http://rbelmont.mameworld.info/?page_id=163
-          xmame:    http://x.mame.net/
+       I recommend mame (formerly sdlmame) over xmame.  The mame project
+       is still actively developed, xmame has been defunct for years.
+
+          mame:     http://mamedev.org/
+          xmame:    (formerly http://x.mame.net/, since taken down)
 
    - intltool
 
@@ -150,19 +153,19 @@ The standard installation procedure looks like this:
    To start: Applications -> Games -> Video Arcade
 
 If the configure script cannot find the MAME program, you can
-specify the MAME program location by defining an SDLMAME or
-XMAME environment variable, like this:
+specify the MAME program location by defining a MAME or XMAME
+environment variable, like this:
 
-   $ SDLMAME=/path/to/program/sdlmame ./configure
+   $ MAME=/path/to/program/mame ./configure
 
    or
 
    $ XMAME=/path/to/program/xmame ./configure
 
 The choice of environment variable determines which MAME driver
-is compiled, so use the SDLMAME environment variable if you have
-sdlmame installed, or the XMAME environment variable if you have
-xmame installed.
+is compiled, so use the MAME environment variable if you have the
+official mame software installed, or the XMAME environment variable
+if you have xmame installed.
 
 You can use the --with-category-file configure option to specify
 the location of a catver.ini file as mentioned above.  Usage looks
diff --git a/configure.ac b/configure.ac
index bbe042a..99a9b6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,16 +133,16 @@ AC_PATH_PROG(BASENAME, basename)
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 
 # MAME Program
-AC_ARG_VAR([SDLMAME], [SDLMAME command])
-AC_PATH_PROGS([SDLMAME], [mame sdlmame],, [$PATH:/usr/local/games:/usr/games])
-if test "x$SDLMAME" != "x"; then
-        MAME=$SDLMAME
+AC_ARG_VAR([MAME], [MAME command])
+AC_PATH_PROGS([MAME], [mame sdlmame],, [$PATH:/usr/local/games:/usr/games])
+if test "x$MAME" != "x"; then
+        MAME_PROGRAM=$MAME
         MAME_BACKEND='gva-mame-sdlmame.$(OBJEXT)'
 else
         AC_ARG_VAR([XMAME], [XMAME command])
         AC_PATH_PROG([XMAME], [xmame],, [$PATH:/usr/local/games:/usr/games])
         if test "x$XMAME" != "x"; then
-                MAME=$XMAME
+                MAME_PROGRAM=$XMAME
                 MAME_BACKEND='gva-mame-xmame.$(OBJEXT)'
         fi
 fi
@@ -152,13 +152,13 @@ if test "x$MAME" = "x"; then
         Unable to find a MAME program.
 
         Please install either sdlmame or xmame, or specify the
-        MAME command with a SDLMAME or XMAME environment variable.
+        MAME command with a MAME or XMAME environment variable.
 
         e.g. XMAME=/path/to/program/xmame.x11 ./configure
 ])
 fi
 AC_SUBST([MAME_BACKEND])
-AC_DEFINE_UNQUOTED(MAME_PROGRAM, "$MAME", [Location of the MAME program])
+AC_DEFINE_UNQUOTED(MAME_PROGRAM, "$MAME_PROGRAM", [Location of the MAME program])
 
 # Localization
 AH_TEMPLATE(GETTEXT_PACKAGE, [Package name for gettext])
@@ -233,7 +233,7 @@ echo
 echo "    Configuration Summary"
 echo "    ---------------------"
 echo
-echo "    MAME Program    : $MAME"
+echo "    MAME Program    : $MAME_PROGRAM"
 echo "    Category File   : $with_category"
 echo "    History File    : $with_history"
 echo "    NPlayers File   : $with_nplayers"