[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth ./Makefile.in ./configure ./configure.a...
|
From: |
Yann Dirson |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth ./Makefile.in ./configure ./configure.a... |
|
Date: |
Fri, 03 Sep 2004 13:24:09 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <address@hidden> 04/09/03 17:19:03
Modified files:
. : Makefile.in configure configure.ac
icons : Makefile.in
m4 : Makefile.in
src : Makefile.am Makefile.in filesystem.cpp
src/server : Makefile.in
src/tools : Makefile.in
src/zip : Makefile.in
Log message:
cleanup a little the absolute/relative localedir handling
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/Makefile.in.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.diff?tr1=1.98&tr2=1.99&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.80&tr2=1.81&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/icons/Makefile.in.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/m4/Makefile.in.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.in.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filesystem.cpp.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/Makefile.in.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tools/Makefile.in.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/zip/Makefile.in.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
Patches:
Index: wesnoth/Makefile.in
diff -u wesnoth/Makefile.in:1.40 wesnoth/Makefile.in:1.41
--- wesnoth/Makefile.in:1.40 Fri Sep 3 15:08:51 2004
+++ wesnoth/Makefile.in Fri Sep 3 17:19:02 2004
@@ -138,6 +138,7 @@
GNOME2_FALSE = @GNOME2_FALSE@
GNOME2_TRUE = @GNOME2_TRUE@
GNOME_CONFIG = @GNOME_CONFIG@
+HAS_RELATIVE_LOCALEDIR = @HAS_RELATIVE_LOCALEDIR@
HAVE_ASPRINTF = @HAVE_ASPRINTF@
HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
Index: wesnoth/configure
diff -u wesnoth/configure:1.98 wesnoth/configure:1.99
--- wesnoth/configure:1.98 Fri Sep 3 15:08:51 2004
+++ wesnoth/configure Fri Sep 3 17:19:02 2004
@@ -312,7 +312,7 @@
# 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 mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT
MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include
am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE
am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu
host_vendor host_os RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21
HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV
INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME
INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL
LTLIBINTL POSUB DATADIR LOCALEDIR FULLLOCALEDIR STATIC_TRUE STATIC_FALSE
SERVER_TRUE SERVER_FALSE EDITOR_TRUE EDITOR_FALSE TOOLS_TRUE TOOLS_FALSE
KDE_TRUE KDE_FALSE GNOME1_TRUE GNOME1_FALSE GNOME2_TRUE GNOME2_FALSE GCC_TRUE
GCC_FALSE WZIP_TRUE WZIP_FALSE INCLUDEDINTL_TRUE INCLUDEDINTL_FALSE CXX
CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE X_CFLAGS
X_PRE_LIBS X_LIBS X_EXTRA_LIBS X11_TRUE X11_FALSE SDL_CONFIG PNG_CONFIG
PNG_CFLAGS PNG_LIBS LIBPNG_TRUE LIBPNG_FALSE GNOME_CONFIG GNOME1_DESKTOP
KDE_CONFIG KDE_DESKTOP KDE_ICON LTOOL LDPREFIX SDL_LIBS SDL_IMAGE_LIBS
SDL_MIXER_LIBS SDL_NET_LIBS SDL_TTF_LIBS SDL_CFLAGS LIBOBJS LITE_TRUE
LITE_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 mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT
MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include
am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE
am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu
host_vendor host_os RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21
HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV
INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME
INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL
LTLIBINTL POSUB DATADIR LOCALEDIR FULLLOCALEDIR HAS_RELATIVE_LOCALEDIR
STATIC_TRUE STATIC_FALSE SERVER_TRUE SERVER_FALSE EDITOR_TRUE EDITOR_FALSE
TOOLS_TRUE TOOLS_FALSE KDE_TRUE KDE_FALSE GNOME1_TRUE GNOME1_FALSE GNOME2_TRUE
GNOME2_FALSE GCC_TRUE GCC_FALSE WZIP_TRUE WZIP_FALSE INCLUDEDINTL_TRUE
INCLUDEDINTL_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE
am__fastdepCXX_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X11_TRUE X11_FALSE
SDL_CONFIG PNG_CONFIG PNG_CFLAGS PNG_LIBS LIBPNG_TRUE LIBPNG_FALSE GNOME_CONFIG
GNOME1_DESKTOP KDE_CONFIG KDE_DESKTOP KDE_ICON LTOOL LDPREFIX SDL_LIBS
SDL_IMAGE_LIBS SDL_MIXER_LIBS SDL_NET_LIBS SDL_TTF_LIBS SDL_CFLAGS LIBOBJS
LITE_TRUE LITE_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.
@@ -9911,12 +9911,11 @@
fi;
-set -x
case "`eval echo \"$LOCALEDIR\"`" in
-/*) FULLLOCALEDIR="$LOCALEDIR" ;;
-*) FULLLOCALEDIR='${datadir}/${DATADIR}/${LOCALEDIR}' ;;
+/*) FULLLOCALEDIR="$LOCALEDIR"; HAS_RELATIVE_LOCALEDIR=0 ;;
+*) FULLLOCALEDIR='${datadir}/${DATADIR}/${LOCALEDIR}';
HAS_RELATIVE_LOCALEDIR=1 ;;
esac
-set +x
+
# Check whether --enable-server or --disable-server was given.
@@ -17107,6 +17106,7 @@
s,@DATADIR@,$DATADIR,;t t
s,@LOCALEDIR@,$LOCALEDIR,;t t
s,@FULLLOCALEDIR@,$FULLLOCALEDIR,;t t
+s,@HAS_RELATIVE_LOCALEDIR@,$HAS_RELATIVE_LOCALEDIR,;t t
s,@STATIC_TRUE@,$STATIC_TRUE,;t t
s,@STATIC_FALSE@,$STATIC_FALSE,;t t
s,@SERVER_TRUE@,$SERVER_TRUE,;t t
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.80 wesnoth/configure.ac:1.81
--- wesnoth/configure.ac:1.80 Fri Sep 3 15:08:51 2004
+++ wesnoth/configure.ac Fri Sep 3 17:19:02 2004
@@ -10,7 +10,7 @@
dnl AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org"], [The default
server for this version])
AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org:14999"], [The default
server for this version])
-AC_REVISION([$Revision: 1.80 $])
+AC_REVISION([$Revision: 1.81 $])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([foreign 1.5])
@@ -72,13 +72,12 @@
esac])
AC_SUBST([LOCALEDIR])
-set -x
case "`eval echo \"$LOCALEDIR\"`" in
-/*) FULLLOCALEDIR="$LOCALEDIR" ;;
-*) FULLLOCALEDIR='${datadir}/${DATADIR}/${LOCALEDIR}' ;;
+/*) FULLLOCALEDIR="$LOCALEDIR"; HAS_RELATIVE_LOCALEDIR=0 ;;
+*) FULLLOCALEDIR='${datadir}/${DATADIR}/${LOCALEDIR}';
HAS_RELATIVE_LOCALEDIR=1 ;;
esac
-set +x
AC_SUBST([FULLLOCALEDIR])
+AC_SUBST([HAS_RELATIVE_LOCALEDIR])
AC_ARG_ENABLE([server],
[ --enable-server enable compilation of server],
Index: wesnoth/icons/Makefile.in
diff -u wesnoth/icons/Makefile.in:1.32 wesnoth/icons/Makefile.in:1.33
--- wesnoth/icons/Makefile.in:1.32 Fri Sep 3 15:08:52 2004
+++ wesnoth/icons/Makefile.in Fri Sep 3 17:19:02 2004
@@ -122,6 +122,7 @@
GNOME2_FALSE = @GNOME2_FALSE@
GNOME2_TRUE = @GNOME2_TRUE@
GNOME_CONFIG = @GNOME_CONFIG@
+HAS_RELATIVE_LOCALEDIR = @HAS_RELATIVE_LOCALEDIR@
HAVE_ASPRINTF = @HAVE_ASPRINTF@
HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
Index: wesnoth/m4/Makefile.in
diff -u wesnoth/m4/Makefile.in:1.12 wesnoth/m4/Makefile.in:1.13
--- wesnoth/m4/Makefile.in:1.12 Fri Sep 3 15:08:52 2004
+++ wesnoth/m4/Makefile.in Fri Sep 3 17:19:03 2004
@@ -105,6 +105,7 @@
GNOME2_FALSE = @GNOME2_FALSE@
GNOME2_TRUE = @GNOME2_TRUE@
GNOME_CONFIG = @GNOME_CONFIG@
+HAS_RELATIVE_LOCALEDIR = @HAS_RELATIVE_LOCALEDIR@
HAVE_ASPRINTF = @HAVE_ASPRINTF@
HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.48 wesnoth/src/Makefile.am:1.49
--- wesnoth/src/Makefile.am:1.48 Fri Sep 3 15:08:52 2004
+++ wesnoth/src/Makefile.am Fri Sep 3 17:19:03 2004
@@ -307,7 +307,7 @@
wesconfig.h
AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" \
- -DLOCALEDIR=\"$(LOCALEDIR)\" -DFULLLOCALEDIR=\"$(FULLLOCALEDIR)\" \
+ -DLOCALEDIR=\"$(LOCALEDIR)\"
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR) \
-I../intl -I$(top_srcdir)/intl
if X11
Index: wesnoth/src/Makefile.in
diff -u wesnoth/src/Makefile.in:1.69 wesnoth/src/Makefile.in:1.70
--- wesnoth/src/Makefile.in:1.69 Fri Sep 3 15:08:52 2004
+++ wesnoth/src/Makefile.in Fri Sep 3 17:19:03 2004
@@ -234,6 +234,7 @@
GNOME2_FALSE = @GNOME2_FALSE@
GNOME2_TRUE = @GNOME2_TRUE@
GNOME_CONFIG = @GNOME_CONFIG@
+HAS_RELATIVE_LOCALEDIR = @HAS_RELATIVE_LOCALEDIR@
HAVE_ASPRINTF = @HAVE_ASPRINTF@
HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
@@ -651,7 +652,7 @@
wesconfig.h
AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" \
- -DLOCALEDIR=\"$(LOCALEDIR)\" -DFULLLOCALEDIR=\"$(FULLLOCALEDIR)\" \
+ -DLOCALEDIR=\"$(LOCALEDIR)\"
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR) \
-I../intl -I$(top_srcdir)/intl
CXXLD = $(LDPREFIX) $(CXX)
Index: wesnoth/src/filesystem.cpp
diff -u wesnoth/src/filesystem.cpp:1.39 wesnoth/src/filesystem.cpp:1.40
--- wesnoth/src/filesystem.cpp:1.39 Fri Sep 3 15:08:52 2004
+++ wesnoth/src/filesystem.cpp Fri Sep 3 17:19:03 2004
@@ -1,4 +1,4 @@
-/* $Id: filesystem.cpp,v 1.39 2004/09/03 15:08:52 ydirson Exp $ */
+/* $Id: filesystem.cpp,v 1.40 2004/09/03 17:19:03 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -184,13 +184,10 @@
std::string get_intl_dir()
{
std::string res;
-#ifdef FULLLOCALEDIR
- if (strcmp(LOCALEDIR,FULLLOCALEDIR) != 0)
-#endif
- res = game_config::path + "/" LOCALEDIR;
-#ifdef FULLLOCALEDIR
- else
- res = LOCALEDIR;
+#if HAS_RELATIVE_LOCALEDIR
+ res = game_config::path + "/" LOCALEDIR;
+#else
+ res = LOCALEDIR;
#endif
return res;
Index: wesnoth/src/server/Makefile.in
diff -u wesnoth/src/server/Makefile.in:1.42 wesnoth/src/server/Makefile.in:1.43
--- wesnoth/src/server/Makefile.in:1.42 Fri Sep 3 15:08:52 2004
+++ wesnoth/src/server/Makefile.in Fri Sep 3 17:19:03 2004
@@ -140,6 +140,7 @@
GNOME2_FALSE = @GNOME2_FALSE@
GNOME2_TRUE = @GNOME2_TRUE@
GNOME_CONFIG = @GNOME_CONFIG@
+HAS_RELATIVE_LOCALEDIR = @HAS_RELATIVE_LOCALEDIR@
HAVE_ASPRINTF = @HAVE_ASPRINTF@
HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
Index: wesnoth/src/tools/Makefile.in
diff -u wesnoth/src/tools/Makefile.in:1.40 wesnoth/src/tools/Makefile.in:1.41
--- wesnoth/src/tools/Makefile.in:1.40 Fri Sep 3 15:08:52 2004
+++ wesnoth/src/tools/Makefile.in Fri Sep 3 17:19:03 2004
@@ -181,6 +181,7 @@
GNOME2_FALSE = @GNOME2_FALSE@
GNOME2_TRUE = @GNOME2_TRUE@
GNOME_CONFIG = @GNOME_CONFIG@
+HAS_RELATIVE_LOCALEDIR = @HAS_RELATIVE_LOCALEDIR@
HAVE_ASPRINTF = @HAVE_ASPRINTF@
HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
Index: wesnoth/src/zip/Makefile.in
diff -u wesnoth/src/zip/Makefile.in:1.25 wesnoth/src/zip/Makefile.in:1.26
--- wesnoth/src/zip/Makefile.in:1.25 Fri Sep 3 15:08:53 2004
+++ wesnoth/src/zip/Makefile.in Fri Sep 3 17:19:03 2004
@@ -136,6 +136,7 @@
GNOME2_FALSE = @GNOME2_FALSE@
GNOME2_TRUE = @GNOME2_TRUE@
GNOME_CONFIG = @GNOME_CONFIG@
+HAS_RELATIVE_LOCALEDIR = @HAS_RELATIVE_LOCALEDIR@
HAVE_ASPRINTF = @HAVE_ASPRINTF@
HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_SNPRINTF = @HAVE_SNPRINTF@