mail[Wesnoth-commits] r25198 - in /trunk: Makefile.am SConstruct configure.ac


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by esr on March 27, 2008 - 18:16:
Author: esr
Date: Thu Mar 27 18:16:15 2008
New Revision: 25198

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25198&view=rev
Log:
Nuke the vestigial --lite option.

Modified:
    trunk/Makefile.am
    trunk/SConstruct
    trunk/configure.ac

Modified: trunk/Makefile.am
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/Makefile.am?rev=25198&r1=25197&r2=25198&view=diff
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Thu Mar 27 18:16:15 2008
@@ -6,12 +6,8 @@
 
 findfilterflags=! \( -name .svn -prune -o -name ".\#*" -o -name "*~" -o 
-name "*bak" -o -type d \)
 
-if LITE
-exclude=| egrep -v '(/sounds|/music)' 
-endif
-
-finddata=(cd $(top_srcdir) && find data fonts icons images sounds 
$(findfilterflags) -print ) $(exclude)
-finddatadirs=(cd $(top_srcdir) && find data fonts icons images sounds -type 
d \! \( -name .svn -prune \) -print ) $(exclude)
+finddata=(cd $(top_srcdir) && find data fonts icons images sounds 
$(findfilterflags) -print )
+finddatadirs=(cd $(top_srcdir) && find data fonts icons images sounds -type 
d \! \( -name .svn -prune \) -print )
 findnoinst=(cd $(top_srcdir) && find utils $(findfilterflags) -print )
 
 finddocdist=(cd $(top_srcdir) && find doc/manual -name "*.html" -o -name 
"*.css" -o -name "*.jpg" -o -name "*.txt")

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25198&r1=25197&r2=25198&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Thu Mar 27 18:16:15 2008
@@ -31,7 +31,6 @@
 opts.Add('server_gid', 'group id of the user who runs wesnothd', "")
 
 # FIXME: These are not yet implemented
-opts.Add(BoolOption('lite', 'Set to build lite version of wesnoth (no music 
or large images)', False))
 opts.Add(BoolOption('dummy_locales','Set to enable Wesnoth private locales', 
False))
 opts.Add(BoolOption('desktop_entry','Clear to disable desktop-entry', True))
 opts.Add(PathOption('localedir', 'sets the locale data directory to a 
non-default location', "translations", PathOption.PathAccept))

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/configure.ac?rev=25198&r1=25197&r2=25198&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Mar 27 18:16:15 2008
@@ -101,11 +101,6 @@
               AS_HELP_STRING([--enable-python-install], [enable installation 
of Python developer tools]),
              [python_install=$enableval],
              [python_install=no])
-
-AC_ARG_ENABLE([lite],
-              AS_HELP_STRING([--enable-lite], [enable lite version of 
wesnoth (without music or large images)]),
-             [lite=$enableval],
-             [lite=no])
 
 AC_ARG_ENABLE([tinygui],
               AS_HELP_STRING([--enable-tinygui], [enable GUI reductions for 
resolutions down to 320x240 (PDAs), resize images before installing]),
@@ -886,43 +881,41 @@
 # Check for OGG support in SDL_mixer                                  #
 #######################################################################
 
-if test "x$lite" = "xno"; then
-    if test -e "data/core/music/main_menu.ogg" ; then
-        AC_LANG([C])
-       AC_MSG_CHECKING([for OGG support in SDL_mixer])
-
-        OLD_CPPFLAGS=$CPPFLAGS
-       OLD_CFLAGS=$CFLAGS
-        OLD_LIBS=$LIBS
-
-
-       CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
-        CFLAGS="$CFLAGS $SDL_CFLAGS"
-       LIBS="$LIBS $SDL_LIBS $SDL_MIXER_LIBS"
-
-       ac_link="$LDPREFIX $ac_link"
-        AC_RUN_IFELSE([AC_LANG_SOURCE([
-       #include <SDL_mixer.h>
-        #include <stdlib.h>
-
-       int main(int argc, char **argv)
-        {
-           Mix_Music* music = Mix_LoadMUS("data/core/music/main_menu.ogg");
-           if (music == NULL)
-               exit(1);
-           exit(0);
-        }
-       ])],
-       [AC_MSG_RESULT(yes)],
-       [AC_MSG_RESULT(no)]
-       [AC_MSG_ERROR([*** SDL_mixer has no OGG support! You need SDL_mixer 
with OGG support])],
-       [AC_MSG_RESULT([not tested in cross-compiling])])
-
-
-        CPPFLAGS=$OLD_CPPFLAGS
-        CFLAGS=$OLD_CFLAGS
-        LIBS=$OLD_LIBS
-    fi
+if test -e "data/core/music/main_menu.ogg" ; then
+    AC_LANG([C])
+    AC_MSG_CHECKING([for OGG support in SDL_mixer])
+
+    OLD_CPPFLAGS=$CPPFLAGS
+    OLD_CFLAGS=$CFLAGS
+    OLD_LIBS=$LIBS
+
+
+    CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+    CFLAGS="$CFLAGS $SDL_CFLAGS"
+    LIBS="$LIBS $SDL_LIBS $SDL_MIXER_LIBS"
+
+    ac_link="$LDPREFIX $ac_link"
+    AC_RUN_IFELSE([AC_LANG_SOURCE([
+    #include <SDL_mixer.h>
+    #include <stdlib.h>
+
+    int main(int argc, char **argv)
+    {
+       Mix_Music* music = Mix_LoadMUS("data/core/music/main_menu.ogg");
+       if (music == NULL)
+           exit(1);
+       exit(0);
+    }
+    ])],
+    [AC_MSG_RESULT(yes)],
+    [AC_MSG_RESULT(no)]
+    [AC_MSG_ERROR([*** SDL_mixer has no OGG support! You need SDL_mixer with 
OGG support])],
+    [AC_MSG_RESULT([not tested in cross-compiling])])
+
+
+    CPPFLAGS=$OLD_CPPFLAGS
+    CFLAGS=$OLD_CFLAGS
+    LIBS=$OLD_LIBS
 fi
 
 #######################################################################
@@ -1043,10 +1036,6 @@
 # Data file substitution.                                             #
 #######################################################################
 
-AM_CONDITIONAL([LITE], [test "x$lite" = "xyes"])
-if test "x$lite" = "xyes"; then
-    PACKAGE=$PACKAGE-lite
-fi
 AC_SUBST([DATA_FILES])
 AC_SUBST([FONT_FILES])
 AC_SUBST([IMAGE_FILES])




Related Messages


Powered by MHonArc, Updated Thu Mar 27 18:21:36 2008