0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

--disable-icons changed to --enable-kde (for KDE) ...

Browse source 
... & --enable-gnome (for GNOME 1 | 2)
This commit is contained in:
uid69097 2004-01-08 19:06:06 +00:00
parent 0521c59b88
commit a94de94784
6 changed files with 354 additions and 304 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -1,9 +1,5 @@
AUTOMAKE_OPTIONS = foreign
if ICONS
ISUBDIRS = icons
else
ISUBDIRS =
endif
SUBDIRS = src $(ISUBDIRS)
pkgdatadir=$(datadir)/@DATADIR@

15
Makefile.in
View file

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.7.9 from Makefile.am.
# Makefile.in generated by automake 1.7.8 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@ -67,9 +67,9 @@ FONT_FILES = @FONT_FILES@
GNOME1_DESKTOP = @GNOME1_DESKTOP@
GNOME1_FALSE = @GNOME1_FALSE@
GNOME1_TRUE = @GNOME1_TRUE@
GNOME2_FALSE = @GNOME2_FALSE@
GNOME2_TRUE = @GNOME2_TRUE@
GNOME_CONFIG = @GNOME_CONFIG@
ICONS_FALSE = @ICONS_FALSE@
ICONS_TRUE = @ICONS_TRUE@
IMAGE_FILES = @IMAGE_FILES@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -142,8 +142,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign
@ICONS_TRUE@ISUBDIRS = icons
@ICONS_FALSE@ISUBDIRS =
ISUBDIRS = icons
SUBDIRS = src $(ISUBDIRS)
dist_noinst_DATA = @MANUAL_FILES@ copyright changelog @UTIL_FILES@
@ -171,7 +170,7 @@ DIST_COMMON = README $(dist_man6_MANS) $(dist_noinst_DATA) \
$(srcdir)/configure COPYING INSTALL Makefile.am aclocal.m4 \
config.h.in configure configure.ac depcomp install-sh missing \
mkinstalldirs
DIST_SUBDIRS = src icons
DIST_SUBDIRS = $(SUBDIRS)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -443,7 +442,7 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
@ -543,7 +542,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:

384
configure vendored
View file

@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Version: 0.12.
# From configure.ac Version: 0.13.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for wesnoth 0.12.
# Generated by GNU Autoconf 2.58 for wesnoth 0.13.
#
# Report bugs to <davidnwhite@optusnet.com.au>.
#
@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='wesnoth'
PACKAGE_TARNAME='Battle for Wesnoth'
PACKAGE_VERSION='0.12'
PACKAGE_STRING='wesnoth 0.12'
PACKAGE_VERSION='0.13'
PACKAGE_STRING='wesnoth 0.13'
PACKAGE_BUGREPORT='davidnwhite@optusnet.com.au'
ac_unique_file="src/actions.cpp"
@ -312,7 +312,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SDL_CONFIG GNOME_CONFIG GNOME1_DESKTOP GNOME1_TRUE GNOME1_FALSE KDE_CONFIG KDE_DESKTOP KDE_ICON KDE_TRUE KDE_FALSE SDL_LIBS SDL_IMAGE_LIBS SDL_MIXER_LIBS SDL_NET_LIBS SDL_TTF_LIBS CPP EGREP SDL_CFLAGS LIBOBJS DATADIR SERVER_TRUE SERVER_FALSE EDITOR_TRUE EDITOR_FALSE TOOLS_TRUE TOOLS_FALSE ICONS_TRUE ICONS_FALSE MANUAL_FILES DATA_FILES FONT_FILES IMAGE_FILES MUSIC_FILES SOUND_FILES UTIL_FILES LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SDL_CONFIG GNOME_CONFIG GNOME1_DESKTOP KDE_CONFIG KDE_DESKTOP KDE_ICON SDL_LIBS SDL_IMAGE_LIBS SDL_MIXER_LIBS SDL_NET_LIBS SDL_TTF_LIBS CPP EGREP SDL_CFLAGS LIBOBJS DATADIR SERVER_TRUE SERVER_FALSE EDITOR_TRUE EDITOR_FALSE TOOLS_TRUE TOOLS_FALSE KDE_TRUE KDE_FALSE GNOME1_TRUE GNOME1_FALSE GNOME2_TRUE GNOME2_FALSE MANUAL_FILES DATA_FILES FONT_FILES IMAGE_FILES MUSIC_FILES SOUND_FILES UTIL_FILES LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -789,7 +789,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures wesnoth 0.12 to adapt to many kinds of systems.
\`configure' configures wesnoth 0.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -851,7 +851,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of wesnoth 0.12:";;
short | recursive ) echo "Configuration of wesnoth 0.13:";;
esac
cat <<\_ACEOF
@ -861,11 +861,12 @@ Optional Features:
--disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors
--enable-debug Enable debug in wesnoth
--datadir-name[=dir] Change name of data directory. Default with this option: wesnoth-data
--datadir-name[=dir] Change name of data directory. Default with this option: wesnoth-data
--enable-server Enable compilation of server
--enable-editor Enable compilation editor
--enable-tools Enable compilation of translation tools
--disable-icons Disable installation of icons and menu entries
--enable-kde Enable installation of icon and KDE menu entry
--enable-gnome Enable installation of icon and GNOME menu entry
Some influential environment variables:
CXX C++ compiler command
@ -915,43 +916,40 @@ case $srcdir in
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
# Do not use `cd foo && pwd` to compute absolute paths, because
# the directories may not exist.
case `pwd` in
.) ac_abs_builddir="$ac_dir";;
case "$ac_dir" in
.) ac_abs_builddir=$ac_builddir;;
*)
case "$ac_dir" in
.) ac_abs_builddir=`pwd`;;
[\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
*) ac_abs_builddir=`pwd`/"$ac_dir";;
case $ac_builddir in
.) ac_abs_builddir="$ac_dir";;
[\\/]* | ?:[\\/]* ) ac_abs_builddir=$ac_builddir;;
*) ac_abs_builddir="$ac_dir"/$ac_builddir;;
esac;;
esac
case $ac_abs_builddir in
case "$ac_dir" in
.) ac_abs_top_builddir=${ac_top_builddir}.;;
*)
case ${ac_top_builddir}. in
.) ac_abs_top_builddir=$ac_abs_builddir;;
.) ac_abs_top_builddir="$ac_dir";;
[\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
*) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
*) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;;
esac;;
esac
case $ac_abs_builddir in
case "$ac_dir" in
.) ac_abs_srcdir=$ac_srcdir;;
*)
case $ac_srcdir in
.) ac_abs_srcdir=$ac_abs_builddir;;
.) ac_abs_srcdir="$ac_dir";;
[\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
*) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
*) ac_abs_srcdir="$ac_dir"/$ac_srcdir;;
esac;;
esac
case $ac_abs_builddir in
case "$ac_dir" in
.) ac_abs_top_srcdir=$ac_top_srcdir;;
*)
case $ac_top_srcdir in
.) ac_abs_top_srcdir=$ac_abs_builddir;;
.) ac_abs_top_srcdir="$ac_dir";;
[\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
*) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
*) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;;
esac;;
esac
@ -970,15 +968,15 @@ esac
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
cd "$ac_popdir"
cd $ac_popdir
done
fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
wesnoth configure 0.12
generated by GNU Autoconf 2.59
wesnoth configure 0.13
generated by GNU Autoconf 2.58
Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@ -991,8 +989,8 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by wesnoth $as_me 0.12, which was
generated by GNU Autoconf 2.59. Invocation command line was
It was created by wesnoth $as_me 0.13, which was
generated by GNU Autoconf 2.58. Invocation command line was
$ $0 $@
@ -2096,7 +2094,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2154,7 +2153,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2225,7 +2225,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2269,7 +2270,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2836,7 +2838,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2894,7 +2897,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3010,7 +3014,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3064,7 +3069,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3109,7 +3115,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3153,7 +3160,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3408,25 +3416,15 @@ test -n "$GNOME_CONFIG" || GNOME_CONFIG="none"
if test "x$GNOME_CONFIG" = "xnone"; then
gnome1=no
gnome1found=no
else
GNOME1_DESKTOP=`$GNOME_CONFIG --datadir`/gnome/apps/Games
gnome1=yes
gnome1found=yes
fi
if test x$gnome1 = xyes; then
GNOME1_TRUE=
GNOME1_FALSE='#'
else
GNOME1_TRUE='#'
GNOME1_FALSE=
fi
# KDE_CONFIG
for ac_prog in kde-config
@ -3476,26 +3474,16 @@ test -n "$KDE_CONFIG" || KDE_CONFIG="none"
if test "x$KDE_CONFIG" = "xnone"; then
kde=no
kdefound=no
else
KDE_DESKTOP=`$KDE_CONFIG --expandvars --install apps`/Games/TacticStrategy
KDE_ICON=`$KDE_CONFIG --expandvars --install icon`
kde=yes
kdefound=yes
fi
if test x$kde = xyes; then
KDE_TRUE=
KDE_FALSE='#'
else
KDE_TRUE='#'
KDE_FALSE=
fi
#######################################################################
# Checks for libraries. #
#######################################################################
@ -3547,7 +3535,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3621,7 +3610,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3695,7 +3685,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3769,7 +3760,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3858,7 +3850,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3930,7 +3923,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3984,7 +3978,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -4055,7 +4050,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -4109,7 +4105,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -4426,7 +4423,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -4605,7 +4603,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -4668,7 +4667,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -4816,7 +4816,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -4964,7 +4965,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -5112,7 +5114,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -5260,7 +5263,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -5418,7 +5422,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -5600,7 +5605,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -5655,7 +5661,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -5770,7 +5777,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -5830,7 +5838,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -5903,7 +5912,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -5968,7 +5978,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -6032,7 +6043,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -6094,7 +6106,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -6344,7 +6357,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -6413,7 +6427,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -6520,7 +6535,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -6673,7 +6689,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -6771,12 +6788,20 @@ else
tools=no
fi;
# Check whether --enable-icons or --disable-icons was given.
if test "${enable_icons+set}" = set; then
enableval="$enable_icons"
icons=$enableval
# Check whether --enable-kde or --disable-kde was given.
if test "${enable_kde+set}" = set; then
enableval="$enable_kde"
kde=$enableval
else
icons=yes
kde=no
fi;
# Check whether --enable-gnome or --disable-gnome was given.
if test "${enable_gnome+set}" = set; then
enableval="$enable_gnome"
gnome=$enableval
else
gnome=no
fi;
@ -6811,21 +6836,33 @@ fi
if test x$icons = xyes; then
ICONS_TRUE=
ICONS_FALSE='#'
if test x$kde = xyes && test x$kdefound = xyes; then
KDE_TRUE=
KDE_FALSE='#'
else
ICONS_TRUE='#'
ICONS_FALSE=
KDE_TRUE='#'
KDE_FALSE=
fi
if test x$gnome = xyes && test x$gnome1found = xyes; then
GNOME1_TRUE=
GNOME1_FALSE='#'
else
GNOME1_TRUE='#'
GNOME1_FALSE=
fi
#######################################################################
# Icon and menu handling #
#######################################################################
if test x$gnome = xyes && test x$gnome1found = xno; then
GNOME2_TRUE=
GNOME2_FALSE='#'
else
GNOME2_TRUE='#'
GNOME2_FALSE=
fi
#######################################################################
@ -6971,20 +7008,6 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${GNOME1_TRUE}" && test -z "${GNOME1_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"GNOME1\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"GNOME1\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${KDE_TRUE}" && test -z "${KDE_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"KDE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"KDE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${SERVER_TRUE}" && test -z "${SERVER_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"SERVER\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@ -7006,10 +7029,24 @@ echo "$as_me: error: conditional \"TOOLS\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ICONS_TRUE}" && test -z "${ICONS_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"ICONS\" was never defined.
if test -z "${KDE_TRUE}" && test -z "${KDE_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"KDE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"ICONS\" was never defined.
echo "$as_me: error: conditional \"KDE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${GNOME1_TRUE}" && test -z "${GNOME1_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"GNOME1\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"GNOME1\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${GNOME2_TRUE}" && test -z "${GNOME2_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"GNOME2\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"GNOME2\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@ -7284,8 +7321,8 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by wesnoth $as_me 0.12, which was
generated by GNU Autoconf 2.59. Invocation command line was
This file was extended by wesnoth $as_me 0.13, which was
generated by GNU Autoconf 2.58. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@ -7347,8 +7384,8 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
wesnoth config.status 0.12
configured by $0, generated by GNU Autoconf 2.59,
wesnoth config.status 0.13
configured by $0, generated by GNU Autoconf 2.58,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2003 Free Software Foundation, Inc.
@ -7593,13 +7630,9 @@ s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
s,@SDL_CONFIG@,$SDL_CONFIG,;t t
s,@GNOME_CONFIG@,$GNOME_CONFIG,;t t
s,@GNOME1_DESKTOP@,$GNOME1_DESKTOP,;t t
s,@GNOME1_TRUE@,$GNOME1_TRUE,;t t
s,@GNOME1_FALSE@,$GNOME1_FALSE,;t t
s,@KDE_CONFIG@,$KDE_CONFIG,;t t
s,@KDE_DESKTOP@,$KDE_DESKTOP,;t t
s,@KDE_ICON@,$KDE_ICON,;t t
s,@KDE_TRUE@,$KDE_TRUE,;t t
s,@KDE_FALSE@,$KDE_FALSE,;t t
s,@SDL_LIBS@,$SDL_LIBS,;t t
s,@SDL_IMAGE_LIBS@,$SDL_IMAGE_LIBS,;t t
s,@SDL_MIXER_LIBS@,$SDL_MIXER_LIBS,;t t
@ -7616,8 +7649,12 @@ s,@EDITOR_TRUE@,$EDITOR_TRUE,;t t
s,@EDITOR_FALSE@,$EDITOR_FALSE,;t t
s,@TOOLS_TRUE@,$TOOLS_TRUE,;t t
s,@TOOLS_FALSE@,$TOOLS_FALSE,;t t
s,@ICONS_TRUE@,$ICONS_TRUE,;t t
s,@ICONS_FALSE@,$ICONS_FALSE,;t t
s,@KDE_TRUE@,$KDE_TRUE,;t t
s,@KDE_FALSE@,$KDE_FALSE,;t t
s,@GNOME1_TRUE@,$GNOME1_TRUE,;t t
s,@GNOME1_FALSE@,$GNOME1_FALSE,;t t
s,@GNOME2_TRUE@,$GNOME2_TRUE,;t t
s,@GNOME2_FALSE@,$GNOME2_FALSE,;t t
s,@MANUAL_FILES@,$MANUAL_FILES,;t t
s,@DATA_FILES@,$DATA_FILES,;t t
s,@FONT_FILES@,$FONT_FILES,;t t
@ -7746,43 +7783,40 @@ case $srcdir in
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
# Do not use `cd foo && pwd` to compute absolute paths, because
# the directories may not exist.
case `pwd` in
.) ac_abs_builddir="$ac_dir";;
case "$ac_dir" in
.) ac_abs_builddir=$ac_builddir;;
*)
case "$ac_dir" in
.) ac_abs_builddir=`pwd`;;
[\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
*) ac_abs_builddir=`pwd`/"$ac_dir";;
case $ac_builddir in
.) ac_abs_builddir="$ac_dir";;
[\\/]* | ?:[\\/]* ) ac_abs_builddir=$ac_builddir;;
*) ac_abs_builddir="$ac_dir"/$ac_builddir;;
esac;;
esac
case $ac_abs_builddir in
case "$ac_dir" in
.) ac_abs_top_builddir=${ac_top_builddir}.;;
*)
case ${ac_top_builddir}. in
.) ac_abs_top_builddir=$ac_abs_builddir;;
.) ac_abs_top_builddir="$ac_dir";;
[\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
*) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
*) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;;
esac;;
esac
case $ac_abs_builddir in
case "$ac_dir" in
.) ac_abs_srcdir=$ac_srcdir;;
*)
case $ac_srcdir in
.) ac_abs_srcdir=$ac_abs_builddir;;
.) ac_abs_srcdir="$ac_dir";;
[\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
*) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
*) ac_abs_srcdir="$ac_dir"/$ac_srcdir;;
esac;;
esac
case $ac_abs_builddir in
case "$ac_dir" in
.) ac_abs_top_srcdir=$ac_top_srcdir;;
*)
case $ac_top_srcdir in
.) ac_abs_top_srcdir=$ac_abs_builddir;;
.) ac_abs_top_srcdir="$ac_dir";;
[\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
*) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
*) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;;
esac;;
esac
@ -7792,6 +7826,11 @@ esac
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
if test x"$ac_file" != x-; then
{ echo "$as_me:$LINENO: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@ -7830,12 +7869,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
fi;;
esac
done` || { (exit 1); exit 1; }
if test x"$ac_file" != x-; then
{ echo "$as_me:$LINENO: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
@ -8180,43 +8213,40 @@ case $srcdir in
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
# Do not use `cd foo && pwd` to compute absolute paths, because
# the directories may not exist.
case `pwd` in
.) ac_abs_builddir="$ac_dir";;
case "$ac_dir" in
.) ac_abs_builddir=$ac_builddir;;
*)
case "$ac_dir" in
.) ac_abs_builddir=`pwd`;;
[\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
*) ac_abs_builddir=`pwd`/"$ac_dir";;
case $ac_builddir in
.) ac_abs_builddir="$ac_dir";;
[\\/]* | ?:[\\/]* ) ac_abs_builddir=$ac_builddir;;
*) ac_abs_builddir="$ac_dir"/$ac_builddir;;
esac;;
esac
case $ac_abs_builddir in
case "$ac_dir" in
.) ac_abs_top_builddir=${ac_top_builddir}.;;
*)
case ${ac_top_builddir}. in
.) ac_abs_top_builddir=$ac_abs_builddir;;
.) ac_abs_top_builddir="$ac_dir";;
[\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
*) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
*) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;;
esac;;
esac
case $ac_abs_builddir in
case "$ac_dir" in
.) ac_abs_srcdir=$ac_srcdir;;
*)
case $ac_srcdir in
.) ac_abs_srcdir=$ac_abs_builddir;;
.) ac_abs_srcdir="$ac_dir";;
[\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
*) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
*) ac_abs_srcdir="$ac_dir"/$ac_srcdir;;
esac;;
esac
case $ac_abs_builddir in
case "$ac_dir" in
.) ac_abs_top_srcdir=$ac_top_srcdir;;
*)
case $ac_top_srcdir in
.) ac_abs_top_srcdir=$ac_abs_builddir;;
.) ac_abs_top_srcdir="$ac_dir";;
[\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
*) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
*) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;;
esac;;
esac

43
configure.ac
View file

@ -4,10 +4,10 @@
# Initial configuration #
#######################################################################
#AC_PREREQ(2.57)
AC_INIT(wesnoth, 0.12, davidnwhite@optusnet.com.au, Battle for Wesnoth)
AC_PREREQ(2.57)
AC_INIT(wesnoth, 0.13, davidnwhite@optusnet.com.au, Battle for Wesnoth)
AC_REVISION($Version: 0.12$)
AC_REVISION($Version: 0.13$)
PACKAGE=wesnoth
MAJOR_VERSION="0"
MINOR_VERSION="6"
@ -51,14 +51,13 @@ fi
AC_PATH_PROGS([GNOME_CONFIG], [gnome-config], [none])
if test "x$GNOME_CONFIG" = "xnone"; then
gnome1=no
gnome1found=no
else
GNOME1_DESKTOP=`$GNOME_CONFIG --datadir`/gnome/apps/Games
gnome1=yes
gnome1found=yes
fi
AC_SUBST([GNOME1_DESKTOP])
AM_CONDITIONAL(GNOME1, test x$gnome1 = xyes)
# KDE_CONFIG
@ -66,16 +65,15 @@ AM_CONDITIONAL(GNOME1, test x$gnome1 = xyes)
AC_PATH_PROGS(KDE_CONFIG, kde-config, none)
if test "x$KDE_CONFIG" = "xnone"; then
kde=no
kdefound=no
else
KDE_DESKTOP=`$KDE_CONFIG --expandvars --install apps`/Games/TacticStrategy
KDE_ICON=`$KDE_CONFIG --expandvars --install icon`
kde=yes
kdefound=yes
fi
AC_SUBST([KDE_DESKTOP])
AC_SUBST([KDE_ICON])
AM_CONDITIONAL(KDE, test x$kde = xyes)
#######################################################################
# Checks for libraries. #
@ -251,7 +249,7 @@ AC_ARG_ENABLE(debug,
DATADIR=$PACKAGE
AC_ARG_ENABLE(datadir-name,
[ --datadir-name[[=dir]] Change name of data directory. Default with this option: wesnoth-data],
[ --datadir-name[[=dir]] Change name of data directory. Default with this option: wesnoth-data],
[case "${enableval}" in
yes)
DATADIR="wesnoth-data"
@ -285,23 +283,22 @@ AC_ARG_ENABLE(tools,
tools=$enableval,
tools=no)
AC_ARG_ENABLE(icons,
[ --disable-icons Disable installation of icons and menu entries],
icons=$enableval,
icons=yes)
AC_ARG_ENABLE(kde,
[ --enable-kde Enable installation of icon and KDE menu entry],
kde=$enableval,
kde=no)
AC_ARG_ENABLE(gnome,
[ --enable-gnome Enable installation of icon and GNOME menu entry],
gnome=$enableval,
gnome=no)
AM_CONDITIONAL(SERVER, test x$server = xyes)
AM_CONDITIONAL(EDITOR, test x$editor = xyes)
AM_CONDITIONAL(TOOLS, test x$tools = xyes)
AM_CONDITIONAL(ICONS, test x$icons = xyes)
#######################################################################
# Icon and menu handling #
#######################################################################
AM_CONDITIONAL(KDE, test x$kde = xyes && test x$kdefound = xyes)
AM_CONDITIONAL(GNOME1, test x$gnome = xyes && test x$gnome1found = xyes)
AM_CONDITIONAL(GNOME2, test x$gnome = xyes && test x$gnome1found = xno)
#######################################################################
# Data file substitution. #

21
icons/Makefile.am
View file

@ -1,17 +1,20 @@
appicondir = $(datadir)/icons
appicon_DATA = ../images/wesnoth-icon.png
desktopdir = $(datadir)/applications
dist_desktop_DATA = wesnoth.desktop
if GNOME1
gnome1desktopdir = @GNOME1_DESKTOP@
gnome1desktop_DATA = $(dist_desktop_DATA)
dist_gnome1desktop_DATA = wesnoth.desktop
gnome1icondir = $(datadir)/icons
gnome1icon_DATA = ../images/wesnoth-icon.png
endif
if GNOME2
gnome2desktopdir = $(datadir)/applications
dist_gnome2desktop_DATA =
gnome2icondir = $(datadir)/icons
gnome2icon_DATA = ../images/wesnoth-icon.png
endif
if KDE
kdedesktopdir = @KDE_DESKTOP@
kdedesktop_DATA = $(dist_desktop_DATA)
dist_kdedesktop_DATA = wesnoth.desktop
kdeicondir = @KDE_ICON@
kdeicon_DATA = $(appicon_DATA)
kdeicon_DATA = ../images/wesnoth-icon.png
endif

191
icons/Makefile.in
View file

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.7.9 from Makefile.am.
# Makefile.in generated by automake 1.7.8 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@ -67,9 +67,9 @@ FONT_FILES = @FONT_FILES@
GNOME1_DESKTOP = @GNOME1_DESKTOP@
GNOME1_FALSE = @GNOME1_FALSE@
GNOME1_TRUE = @GNOME1_TRUE@
GNOME2_FALSE = @GNOME2_FALSE@
GNOME2_TRUE = @GNOME2_TRUE@
GNOME_CONFIG = @GNOME_CONFIG@
ICONS_FALSE = @ICONS_FALSE@
ICONS_TRUE = @ICONS_TRUE@
IMAGE_FILES = @IMAGE_FILES@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -141,29 +141,32 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
appicondir = $(datadir)/icons
appicon_DATA = ../images/wesnoth-icon.png
desktopdir = $(datadir)/applications
dist_desktop_DATA = wesnoth.desktop
@GNOME1_TRUE@gnome1desktopdir = @GNOME1_DESKTOP@
@GNOME1_TRUE@gnome1desktop_DATA = $(dist_desktop_DATA)
@GNOME1_TRUE@dist_gnome1desktop_DATA = wesnoth.desktop
@GNOME1_TRUE@gnome1icondir = $(datadir)/icons
@GNOME1_TRUE@gnome1icon_DATA = ../images/wesnoth-icon.png
@GNOME2_TRUE@gnome2desktopdir = $(datadir)/applications
@GNOME2_TRUE@dist_gnome2desktop_DATA =
@GNOME2_TRUE@gnome2icondir = $(datadir)/icons
@GNOME2_TRUE@gnome2icon_DATA = ../images/wesnoth-icon.png
@KDE_TRUE@kdedesktopdir = @KDE_DESKTOP@
@KDE_TRUE@kdedesktop_DATA = $(dist_desktop_DATA)
@KDE_TRUE@dist_kdedesktop_DATA = wesnoth.desktop
@KDE_TRUE@kdeicondir = @KDE_ICON@
@KDE_TRUE@kdeicon_DATA = $(appicon_DATA)
@KDE_TRUE@kdeicon_DATA = ../images/wesnoth-icon.png
subdir = icons
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
DIST_SOURCES =
DATA = $(appicon_DATA) $(dist_desktop_DATA) $(gnome1desktop_DATA) \
$(kdedesktop_DATA) $(kdeicon_DATA)
DATA = $(dist_gnome1desktop_DATA) $(dist_gnome2desktop_DATA) \
$(dist_kdedesktop_DATA) $(gnome1icon_DATA) $(gnome2icon_DATA) \
$(kdeicon_DATA)
DIST_COMMON = $(dist_desktop_DATA) $(srcdir)/Makefile.in Makefile.am
DIST_COMMON = $(dist_gnome1desktop_DATA) $(dist_gnome2desktop_DATA) \
$(dist_kdedesktop_DATA) $(srcdir)/Makefile.in Makefile.am
all: all-am
.SUFFIXES:
@ -173,78 +176,96 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
uninstall-info-am:
appiconDATA_INSTALL = $(INSTALL_DATA)
install-appiconDATA: $(appicon_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(appicondir)
@list='$(appicon_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(appiconDATA_INSTALL) $$d$$p $(DESTDIR)$(appicondir)/$$f"; \
$(appiconDATA_INSTALL) $$d$$p $(DESTDIR)$(appicondir)/$$f; \
done
uninstall-appiconDATA:
@$(NORMAL_UNINSTALL)
@list='$(appicon_DATA)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(appicondir)/$$f"; \
rm -f $(DESTDIR)$(appicondir)/$$f; \
done
dist_desktopDATA_INSTALL = $(INSTALL_DATA)
install-dist_desktopDATA: $(dist_desktop_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(desktopdir)
@list='$(dist_desktop_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(dist_desktopDATA_INSTALL) $$d$$p $(DESTDIR)$(desktopdir)/$$f"; \
$(dist_desktopDATA_INSTALL) $$d$$p $(DESTDIR)$(desktopdir)/$$f; \
done
uninstall-dist_desktopDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_desktop_DATA)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(desktopdir)/$$f"; \
rm -f $(DESTDIR)$(desktopdir)/$$f; \
done
gnome1desktopDATA_INSTALL = $(INSTALL_DATA)
install-gnome1desktopDATA: $(gnome1desktop_DATA)
dist_gnome1desktopDATA_INSTALL = $(INSTALL_DATA)
install-dist_gnome1desktopDATA: $(dist_gnome1desktop_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(gnome1desktopdir)
@list='$(gnome1desktop_DATA)'; for p in $$list; do \
@list='$(dist_gnome1desktop_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(gnome1desktopDATA_INSTALL) $$d$$p $(DESTDIR)$(gnome1desktopdir)/$$f"; \
$(gnome1desktopDATA_INSTALL) $$d$$p $(DESTDIR)$(gnome1desktopdir)/$$f; \
echo " $(dist_gnome1desktopDATA_INSTALL) $$d$$p $(DESTDIR)$(gnome1desktopdir)/$$f"; \
$(dist_gnome1desktopDATA_INSTALL) $$d$$p $(DESTDIR)$(gnome1desktopdir)/$$f; \
done
uninstall-gnome1desktopDATA:
uninstall-dist_gnome1desktopDATA:
@$(NORMAL_UNINSTALL)
@list='$(gnome1desktop_DATA)'; for p in $$list; do \
@list='$(dist_gnome1desktop_DATA)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(gnome1desktopdir)/$$f"; \
rm -f $(DESTDIR)$(gnome1desktopdir)/$$f; \
done
kdedesktopDATA_INSTALL = $(INSTALL_DATA)
install-kdedesktopDATA: $(kdedesktop_DATA)
dist_gnome2desktopDATA_INSTALL = $(INSTALL_DATA)
install-dist_gnome2desktopDATA: $(dist_gnome2desktop_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir)
@list='$(kdedesktop_DATA)'; for p in $$list; do \
$(mkinstalldirs) $(DESTDIR)$(gnome2desktopdir)
@list='$(dist_gnome2desktop_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(kdedesktopDATA_INSTALL) $$d$$p $(DESTDIR)$(kdedesktopdir)/$$f"; \
$(kdedesktopDATA_INSTALL) $$d$$p $(DESTDIR)$(kdedesktopdir)/$$f; \
echo " $(dist_gnome2desktopDATA_INSTALL) $$d$$p $(DESTDIR)$(gnome2desktopdir)/$$f"; \
$(dist_gnome2desktopDATA_INSTALL) $$d$$p $(DESTDIR)$(gnome2desktopdir)/$$f; \
done
uninstall-kdedesktopDATA:
uninstall-dist_gnome2desktopDATA:
@$(NORMAL_UNINSTALL)
@list='$(kdedesktop_DATA)'; for p in $$list; do \
@list='$(dist_gnome2desktop_DATA)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(gnome2desktopdir)/$$f"; \
rm -f $(DESTDIR)$(gnome2desktopdir)/$$f; \
done
dist_kdedesktopDATA_INSTALL = $(INSTALL_DATA)
install-dist_kdedesktopDATA: $(dist_kdedesktop_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir)
@list='$(dist_kdedesktop_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(dist_kdedesktopDATA_INSTALL) $$d$$p $(DESTDIR)$(kdedesktopdir)/$$f"; \
$(dist_kdedesktopDATA_INSTALL) $$d$$p $(DESTDIR)$(kdedesktopdir)/$$f; \
done
uninstall-dist_kdedesktopDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_kdedesktop_DATA)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(kdedesktopdir)/$$f"; \
rm -f $(DESTDIR)$(kdedesktopdir)/$$f; \
done
gnome1iconDATA_INSTALL = $(INSTALL_DATA)
install-gnome1iconDATA: $(gnome1icon_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(gnome1icondir)
@list='$(gnome1icon_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(gnome1iconDATA_INSTALL) $$d$$p $(DESTDIR)$(gnome1icondir)/$$f"; \
$(gnome1iconDATA_INSTALL) $$d$$p $(DESTDIR)$(gnome1icondir)/$$f; \
done
uninstall-gnome1iconDATA:
@$(NORMAL_UNINSTALL)
@list='$(gnome1icon_DATA)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(gnome1icondir)/$$f"; \
rm -f $(DESTDIR)$(gnome1icondir)/$$f; \
done
gnome2iconDATA_INSTALL = $(INSTALL_DATA)
install-gnome2iconDATA: $(gnome2icon_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(gnome2icondir)
@list='$(gnome2icon_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(gnome2iconDATA_INSTALL) $$d$$p $(DESTDIR)$(gnome2icondir)/$$f"; \
$(gnome2iconDATA_INSTALL) $$d$$p $(DESTDIR)$(gnome2icondir)/$$f; \
done
uninstall-gnome2iconDATA:
@$(NORMAL_UNINSTALL)
@list='$(gnome2icon_DATA)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(gnome2icondir)/$$f"; \
rm -f $(DESTDIR)$(gnome2icondir)/$$f; \
done
kdeiconDATA_INSTALL = $(INSTALL_DATA)
install-kdeiconDATA: $(kdeicon_DATA)
@$(NORMAL_INSTALL)
@ -306,7 +327,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(appicondir) $(DESTDIR)$(desktopdir) $(DESTDIR)$(gnome1desktopdir) $(DESTDIR)$(kdedesktopdir) $(DESTDIR)$(kdeicondir)
$(mkinstalldirs) $(DESTDIR)$(gnome1desktopdir) $(DESTDIR)$(gnome2desktopdir) $(DESTDIR)$(kdedesktopdir) $(DESTDIR)$(gnome1icondir) $(DESTDIR)$(gnome2icondir) $(DESTDIR)$(kdeicondir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@ -318,7 +339,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@ -347,8 +368,9 @@ info: info-am
info-am:
install-data-am: install-appiconDATA install-dist_desktopDATA \
install-gnome1desktopDATA install-kdedesktopDATA \
install-data-am: install-dist_gnome1desktopDATA \
install-dist_gnome2desktopDATA install-dist_kdedesktopDATA \
install-gnome1iconDATA install-gnome2iconDATA \
install-kdeiconDATA
install-exec-am:
@ -375,22 +397,25 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-appiconDATA uninstall-dist_desktopDATA \
uninstall-gnome1desktopDATA uninstall-info-am \
uninstall-kdedesktopDATA uninstall-kdeiconDATA
uninstall-am: uninstall-dist_gnome1desktopDATA \
uninstall-dist_gnome2desktopDATA uninstall-dist_kdedesktopDATA \
uninstall-gnome1iconDATA uninstall-gnome2iconDATA \
uninstall-info-am uninstall-kdeiconDATA
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am info info-am install \
install-am install-appiconDATA install-data install-data-am \
install-dist_desktopDATA install-exec install-exec-am \
install-gnome1desktopDATA install-info install-info-am \
install-kdedesktopDATA install-kdeiconDATA install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-appiconDATA uninstall-dist_desktopDATA \
uninstall-gnome1desktopDATA uninstall-info-am \
uninstall-kdedesktopDATA uninstall-kdeiconDATA
install-am install-data install-data-am \
install-dist_gnome1desktopDATA install-dist_gnome2desktopDATA \
install-dist_kdedesktopDATA install-exec install-exec-am \
install-gnome1iconDATA install-gnome2iconDATA install-info \
install-info-am install-kdeiconDATA install-man install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
uninstall-dist_gnome1desktopDATA \
uninstall-dist_gnome2desktopDATA uninstall-dist_kdedesktopDATA \
uninstall-gnome1iconDATA uninstall-gnome2iconDATA \
uninstall-info-am uninstall-kdeiconDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.