[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 07:34:42 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <address@hidden> 04/09/03 11:29:56
Modified files:
. : Makefile.in configure configure.ac
icons : Makefile.in
m4 : Makefile.in
po : Makefile.in.in
src : Makefile.am Makefile.in
src/server : Makefile.am Makefile.in
src/tools : Makefile.am Makefile.in
src/zip : Makefile.in
Log message:
added --with-localedir configure option; fixed configure options broken
when migrating to --with; cause --enable-debug to force -O0
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/Makefile.in.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.diff?tr1=1.96&tr2=1.97&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.78&tr2=1.79&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/icons/Makefile.in.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/m4/Makefile.in.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/Makefile.in.in.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.in.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/Makefile.am.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/Makefile.in.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tools/Makefile.am.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tools/Makefile.in.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/zip/Makefile.in.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
Patches:
Index: wesnoth/Makefile.in
diff -u wesnoth/Makefile.in:1.38 wesnoth/Makefile.in:1.39
--- wesnoth/Makefile.in:1.38 Thu Sep 2 09:36:11 2004
+++ wesnoth/Makefile.in Fri Sep 3 11:29:56 2004
@@ -168,6 +168,7 @@
LIBS = @LIBS@
LITE_FALSE = @LITE_FALSE@
LITE_TRUE = @LITE_TRUE@
+LOCALEDIR = @LOCALEDIR@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
Index: wesnoth/configure
diff -u wesnoth/configure:1.96 wesnoth/configure:1.97
--- wesnoth/configure:1.96 Thu Sep 2 19:40:45 2004
+++ wesnoth/configure Fri Sep 3 11:29:56 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 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 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.
@@ -892,6 +892,7 @@
--with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
--without-libintl-prefix don't search for libintl in includedir and
libdir
--with-datadir-name[=dir] change name of data directory. [wesnoth]
+ --with-localedir=dir install locale data under dir [$datadir/locale]
--with-kde enable installation of icon and KDE menu entry
--with-gnome enable installation of icon and GNOME menu entry
--with-x use the X Window System
@@ -9846,7 +9847,7 @@
if test "${enable_debug+set}" = set; then
enableval="$enable_debug"
if test "x${enableval}" = "xyes" ; then
- CXXFLAGS="$CXXFLAGS -DDEBUG -ggdb3"
+ CXXFLAGS="$CXXFLAGS -DDEBUG -O0 -ggdb3"
fi
fi;
@@ -9878,19 +9879,36 @@
# Check whether --with-datadir-name or --without-datadir-name was given.
if test "${with_datadir_name+set}" = set; then
withval="$with_datadir_name"
- case "${enableval}" in
+ case "${withval}" in
yes)
- DATADIR="wesnoth-data"
+ DATADIR="wesnoth"
;;
no)
;;
*)
- DATADIR="${enableval}"
+ DATADIR="${withval}"
;;
esac
fi;
+LOCALEDIR="$datadir/locale"
+
+# Check whether --with-localedir or --without-localedir was given.
+if test "${with_localedir+set}" = set; then
+ withval="$with_localedir"
+ case "${withval}" in
+ yes)
+ LOCALEDIR="$datadir/locale"
+ ;;
+ no)
+ ;;
+ *)
+ LOCALEDIR="${withval}"
+ ;;
+ esac
+fi;
+
# Check whether --enable-server or --disable-server was given.
if test "${enable_server+set}" = set; then
@@ -17078,6 +17096,7 @@
s,@LTLIBINTL@,$LTLIBINTL,;t t
s,@POSUB@,$POSUB,;t t
s,@DATADIR@,$DATADIR,;t t
+s,@LOCALEDIR@,$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.78 wesnoth/configure.ac:1.79
--- wesnoth/configure.ac:1.78 Thu Sep 2 19:40:46 2004
+++ wesnoth/configure.ac Fri Sep 3 11:29:56 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.78 $])
+AC_REVISION([$Revision: 1.79 $])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([foreign 1.5])
@@ -27,7 +27,7 @@
AC_ARG_ENABLE([debug],
[ --enable-debug enable debug in wesnoth],
[if test "x${enableval}" = "xyes" ; then
- CXXFLAGS="$CXXFLAGS -DDEBUG -ggdb3"
+ CXXFLAGS="$CXXFLAGS -DDEBUG -O0 -ggdb3"
fi])
AC_ARG_ENABLE([static],
@@ -44,19 +44,33 @@
AC_ARG_ENABLE([datadir-name],,[AC_MSG_ERROR([Please use --with-datadir-name
instead of obsolete --enable-datadir-name])])
AC_ARG_WITH([datadir-name],
[ --with-datadir-name[[=dir]] change name of data directory.
[[wesnoth]]],
- [case "${enableval}" in
+ [case "${withval}" in
yes)
- DATADIR="wesnoth-data"
+ DATADIR="wesnoth"
;;
no)
;;
*)
- DATADIR="${enableval}"
+ DATADIR="${withval}"
;;
esac])
-
AC_SUBST([DATADIR])
+LOCALEDIR="$datadir/locale"
+AC_ARG_WITH([localedir],
+ [ --with-localedir=dir install locale data under dir
[[$datadir/locale]]],
+ [case "${withval}" in
+ yes)
+ LOCALEDIR="$datadir/locale"
+ ;;
+ no)
+ ;;
+ *)
+ LOCALEDIR="${withval}"
+ ;;
+ esac])
+AC_SUBST([LOCALEDIR])
+
AC_ARG_ENABLE([server],
[ --enable-server enable compilation of server],
[server=$enableval],
Index: wesnoth/icons/Makefile.in
diff -u wesnoth/icons/Makefile.in:1.30 wesnoth/icons/Makefile.in:1.31
--- wesnoth/icons/Makefile.in:1.30 Thu Sep 2 09:36:11 2004
+++ wesnoth/icons/Makefile.in Fri Sep 3 11:29:56 2004
@@ -152,6 +152,7 @@
LIBS = @LIBS@
LITE_FALSE = @LITE_FALSE@
LITE_TRUE = @LITE_TRUE@
+LOCALEDIR = @LOCALEDIR@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
Index: wesnoth/m4/Makefile.in
diff -u wesnoth/m4/Makefile.in:1.10 wesnoth/m4/Makefile.in:1.11
--- wesnoth/m4/Makefile.in:1.10 Thu Sep 2 09:36:11 2004
+++ wesnoth/m4/Makefile.in Fri Sep 3 11:29:56 2004
@@ -135,6 +135,7 @@
LIBS = @LIBS@
LITE_FALSE = @LITE_FALSE@
LITE_TRUE = @LITE_TRUE@
+LOCALEDIR = @LOCALEDIR@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
Index: wesnoth/po/Makefile.in.in
diff -u wesnoth/po/Makefile.in.in:1.10 wesnoth/po/Makefile.in.in:1.11
--- wesnoth/po/Makefile.in.in:1.10 Fri Sep 3 09:28:41 2004
+++ wesnoth/po/Makefile.in.in Fri Sep 3 11:29:56 2004
@@ -24,7 +24,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = @LOCALEDIR@
gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.46 wesnoth/src/Makefile.am:1.47
--- wesnoth/src/Makefile.am:1.46 Thu Sep 2 15:41:09 2004
+++ wesnoth/src/Makefile.am Fri Sep 3 11:29:56 2004
@@ -20,8 +20,6 @@
pkgdatadir=$(datadir)/@DATADIR@
-localedir=$(datadir)/locale
-
#############################################################################
# Wesnoth #
#############################################################################
@@ -308,7 +306,7 @@
widgets/widget.hpp \
wesconfig.h
-AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\"
-DLOCALEDIR=\"$(localedir)\" \
+AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\"
-DLOCALEDIR=\"$(LOCALEDIR)\" \
-I../intl -I$(top_srcdir)/intl
if X11
Index: wesnoth/src/Makefile.in
diff -u wesnoth/src/Makefile.in:1.67 wesnoth/src/Makefile.in:1.68
--- wesnoth/src/Makefile.in:1.67 Thu Sep 2 15:41:09 2004
+++ wesnoth/src/Makefile.in Fri Sep 3 11:29:56 2004
@@ -266,6 +266,7 @@
LITE_FALSE = @LITE_FALSE@
LITE_TRUE = @LITE_TRUE@
+LOCALEDIR = @LOCALEDIR@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
@@ -362,7 +363,6 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
SUBDIRS = . $(am__append_1) $(am__append_2) $(am__append_4)
-localedir = $(datadir)/locale
#############################################################################
# Wesnoth #
Index: wesnoth/src/server/Makefile.am
diff -u wesnoth/src/server/Makefile.am:1.11 wesnoth/src/server/Makefile.am:1.12
--- wesnoth/src/server/Makefile.am:1.11 Mon Aug 23 01:46:58 2004
+++ wesnoth/src/server/Makefile.am Fri Sep 3 11:29:56 2004
@@ -28,5 +28,5 @@
../log.hpp \
../network.hpp
-AM_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(localedir)\"
+AM_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(LOCALEDIR)\"
AM_LDFLAGS = @SDL_LIBS@ @SDL_NET_LIBS@
Index: wesnoth/src/server/Makefile.in
diff -u wesnoth/src/server/Makefile.in:1.40 wesnoth/src/server/Makefile.in:1.41
--- wesnoth/src/server/Makefile.in:1.40 Thu Sep 2 09:36:11 2004
+++ wesnoth/src/server/Makefile.in Fri Sep 3 11:29:56 2004
@@ -170,6 +170,7 @@
LIBS = @LIBS@
LITE_FALSE = @LITE_FALSE@
LITE_TRUE = @LITE_TRUE@
+LOCALEDIR = @LOCALEDIR@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
Index: wesnoth/src/tools/Makefile.am
diff -u wesnoth/src/tools/Makefile.am:1.11 wesnoth/src/tools/Makefile.am:1.12
--- wesnoth/src/tools/Makefile.am:1.11 Sat Aug 28 21:16:17 2004
+++ wesnoth/src/tools/Makefile.am Fri Sep 3 11:29:56 2004
@@ -5,14 +5,12 @@
bin_PROGRAMS += exploder cutter
endif
-localedir=$(datadir)/locale
-
#############################################################################
# Translation Tools #
#############################################################################
AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" -I../ \
- -DLOCALEDIR=\"$(localedir)\"
+ -DLOCALEDIR=\"$(LOCALEDIR)\"
AM_LDFLAGS = @SDL_LIBS@
if LIBPNG
Index: wesnoth/src/tools/Makefile.in
diff -u wesnoth/src/tools/Makefile.in:1.38 wesnoth/src/tools/Makefile.in:1.39
--- wesnoth/src/tools/Makefile.in:1.38 Thu Sep 2 09:36:11 2004
+++ wesnoth/src/tools/Makefile.in Fri Sep 3 11:29:56 2004
@@ -211,6 +211,7 @@
LIBS = @LIBS@
LITE_FALSE = @LITE_FALSE@
LITE_TRUE = @LITE_TRUE@
+LOCALEDIR = @LOCALEDIR@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
Index: wesnoth/src/zip/Makefile.in
diff -u wesnoth/src/zip/Makefile.in:1.23 wesnoth/src/zip/Makefile.in:1.24
--- wesnoth/src/zip/Makefile.in:1.23 Thu Sep 2 09:36:11 2004
+++ wesnoth/src/zip/Makefile.in Fri Sep 3 11:29:56 2004
@@ -166,6 +166,7 @@
LIBS = @LIBS@
LITE_FALSE = @LITE_FALSE@
LITE_TRUE = @LITE_TRUE@
+LOCALEDIR = @LOCALEDIR@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
- [Wesnoth-cvs-commits] wesnoth ./Makefile.in ./configure ./configure.a...,
Yann Dirson <=