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

cleanup a little the absolute/relative localedir handling

Browse source
This commit is contained in:
Yann Dirson 2004-09-03 17:19:03 +00:00
parent 477c4585cf
commit 12d29cb85f
11 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.in
View file

@ -138,6 +138,7 @@ GNOME1_TRUE = @GNOME1_TRUE@
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@

10
configure vendored
View file

@ -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 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 @@ if test "${with_localedir+set}" = set; then
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,@POSUB@,$POSUB,;t t
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

7
configure.ac
View file

@ -72,13 +72,12 @@ AC_ARG_WITH([localedir],
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],

1
icons/Makefile.in
View file

@ -122,6 +122,7 @@ GNOME1_TRUE = @GNOME1_TRUE@
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@

1
m4/Makefile.in
View file

@ -105,6 +105,7 @@ GNOME1_TRUE = @GNOME1_TRUE@
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@

2
src/Makefile.am
View file

@ -307,7 +307,7 @@ wesnoth_editor_SOURCES = editor/editor.cpp \
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

3
src/Makefile.in
View file

@ -234,6 +234,7 @@ GNOME1_TRUE = @GNOME1_TRUE@
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 @@ wesnoth_editor_SOURCES = editor/editor.cpp \
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)

11
src/filesystem.cpp
View file

@ -184,13 +184,10 @@ std::string get_cache_dir()
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;

1
src/server/Makefile.in
View file

@ -140,6 +140,7 @@ GNOME1_TRUE = @GNOME1_TRUE@
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@

1
src/tools/Makefile.in
View file

@ -181,6 +181,7 @@ GNOME1_TRUE = @GNOME1_TRUE@
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@

1
src/zip/Makefile.in
View file

@ -136,6 +136,7 @@ GNOME1_TRUE = @GNOME1_TRUE@
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@